up

src/layout/components/tags.vue

@@ -76,7 +76,7 @@
 		},
 		watch: {
 			$route(e) {
-				this.addViewTags(e)
+				this.addViewTags(e);
 			},
 			contextMenuVisible(value) {
 				var _this = this;
@@ -137,10 +137,22 @@
 			//TAB 刷新
 			refreshTab(){
 				var nowTag = this.contextMenuItem;
-				this.$router.push({
-					path: nowTag.path
-				})
 				this.contextMenuVisible = false
+				//判断是否当前路由，否的话跳转
+				if(this.$route.path != nowTag.path){
+					this.$router.push({
+						path: nowTag.path
+					})
+				}
+				var _this = this;
+				setTimeout(function() {
+					_this.$store.commit("removeKeepLive", nowTag.name)
+					_this.$store.commit("setRouteShow", false)
+					_this.$nextTick(() => {
+						_this.$store.commit("pushKeepLive",nowTag.name)
+						_this.$store.commit("setRouteShow", true)
+					})
+				}, 0);
 			},
 			//TAB 关闭
 			closeTabs(){

src/store/modules/keepAlive.js

@@ -1,6 +1,8 @@
 export default {
 	state: {
-		keepLiveRoute: []
+		keepLiveRoute: [],
+		routeKey: null,
+		routeShow: true
 	},
 	mutations: {
 		pushKeepLive(state, component){
@@ -16,6 +18,17 @@ export default {
 		},
 		clearKeepLive(state){
 			state.keepLiveRoute = []
+		},
+		setRouteKey(state, key){
+			state.routeKey = key
+		},
+		setRouteShow(state, key){
+			state.routeShow = key
+		}
+	},
+	actions: {
+		setRouteKey({ commit }, key) {
+			commit('setRouteKey', key);
 		}
 	}
 }

src/views/home.vue

@@ -52,6 +52,9 @@
 			return {
 
 			}
+		},
+		mounted(){
+			console.log("home.vue mounted #57");
 		}
 	}
 </script>

src/views/list.vue

@@ -23,7 +23,7 @@
 			</el-header>
 
 			<el-main id="tableMain">
-				<el-card shadow="never">
+				<el-card shadow="never" v-loading="loading">
 					<el-table :data="tableData" row-key="name" stripe default-expand-all :height="tableHeight">
 						<el-table-column type="selection" width="50"></el-table-column>
 						<el-table-column label="显示名称" prop="meta.title" width="200"></el-table-column>
@@ -82,14 +82,21 @@
 				],
 				tableHeight: '0',
 				tableData: [],
+				loading: true,
 				drawer: false
 			}
 		},
 		components: {
 			Show
 		},
-		created() {
+		async created() {
-			this.tableData = this.$TOOL.data.get("user").menuList;
+			var userInfo = await this.$API.user.info();
+			var _this = this;
+			setTimeout(function() {
+				_this.tableData = userInfo.data.menuList;
+				_this.loading = false;
+			}, 500);
+
 		},
 		mounted(){
 			this.$nextTick(() => {

src/views/other/empty.vue

@@ -1,7 +1,7 @@
 <template>
 	<router-view v-slot="{ Component }">
-		<keep-alive :include="keepAliveNameList">
+		<keep-alive :include="this.$store.state.keepAlive.keepLiveRoute">
-			<component :is="Component" :key="$route.fullPath"/>
+			<component :is="Component" :key="$route.fullPath" v-if="$store.state.keepAlive.routeShow"/>
 		</keep-alive>
 	</router-view>
 </template>
@@ -10,11 +10,8 @@
 	export default {
 		data() {
 			return {
-				keepAliveNameList: this.$store.state.keepAlive.keepLiveRoute
+
 			}
-		},
+		}
-		created: function() {
-			
-		},
 	}
 </script>