YangJian0701 2 years ago
parent
commit
475335a207
4 changed files with 24 additions and 6 deletions
  1. 9 0
      src/router/index.js
  2. 8 0
      src/store/index.js
  3. 4 1
      src/views/layout/Topmenu.vue
  4. 3 5
      src/views/layout/tabs.vue

+ 9 - 0
src/router/index.js

@@ -90,6 +90,15 @@ const router = new VueRouter({
 
 //登录拦截//未登录返回到登录界面
 router.beforeEach((to, from, next) => {
+	if(to.name=='login'){//退出登录之后清零
+		store.state.tabList = [{
+			title:'工作首页',
+			path:'/home',
+			name:'home'
+		}],
+		store.state.includeTabs = []
+		console.log('login了')
+	}
 	if(to.name!=-1 && to.name!='login'){
 		store.commit('addTab',{
 			title:to.meta.title,

+ 8 - 0
src/store/index.js

@@ -27,6 +27,14 @@ export default new Vuex.Store({
 				state.includeTabs.push(tab.name)
 			}
 		},
+		addinclude: (state, tab) => {
+			var tb = tab.replace('/','');
+			state.includeTabs.forEach(function(item,index) {
+				if(item === tb){
+					state.includeTabs.splice(index,1)
+				}
+			})
+		},
 		delTab: (state, tab) => {
 			state.tabList.forEach(function(item,index) {
 				if(item.path === tab){

+ 4 - 1
src/views/layout/Topmenu.vue

@@ -6,7 +6,9 @@
 					<img src="@/assets/img/logo2-1.png" alt="logo">
 				</div>
 				<div class="TopmenuPir-logo2">
-					<img src="@/assets/img/logo2-2.png" alt="logo">
+					<!-- <el-input v-model="input" placeholder="请输入内容"></el-input> -->
+
+					<!-- <img src="@/assets/img/logo2-2.png" alt="logo"> -->
 				</div>
 			</div>
 			<div class="TopmenuPir-mai">
@@ -149,6 +151,7 @@
 				.TopmenuPir-logo2 {
 					height: 60px;
 					display: flex;
+					margin-left: 10px;
 					align-items: center;
 
 					img {

+ 3 - 5
src/views/layout/tabs.vue

@@ -27,12 +27,10 @@
 			tabClose(e) {
 				// this.$router.push(e.name)
 				this.$store.commit('delTab', e)
-				this.$router.replace(this.TabsData[this.TabsData.length-1].path)
-				console.log('tabClick',this.TabsData)
+				console.log('tabClick',e,this.TabsData)
+				this.$store.commit('addinclude', e)
 				if(e===this.$route.path){//删除当前这个
-					TabsData
-				}else{//删除其他
-					
+					this.$router.replace(this.TabsData[this.TabsData.length-1].path)
 				}
 			},
 		},