Commit 7f4b1d78 by LJM

bug

parent 06bd5465
Showing with 18 additions and 23 deletions
...@@ -4,13 +4,14 @@ ...@@ -4,13 +4,14 @@
<div class="con-box clr"> <div class="con-box clr">
<div class="logo fl">云芯系统</div> <div class="logo fl">云芯系统</div>
<div class="tab-box fl" ref="scrollbox"> <div class="tab-box fl" ref="scrollbox">
<!--tab 栏目-->
<div class="item-boxs row verCenter" ref="scrollboxinner"> <div class="item-boxs row verCenter" ref="scrollboxinner">
<a class="item first row rowCenter verCenter" href="/#/" :class="{'act':$route.path=='/','scrollsg':rpcg}"> <a class="item first row rowCenter verCenter" href="/#/" :class="{'act':$route.path=='/','scrollsg':rpcg}">
<font class="fl">概况</font> <font class="fl">概况</font>
</a> </a>
<a class="item row rowCenter verCenter" :class="{'scrollsg':rpcg,'act':(JSON.stringify(item)==JSON.stringify({path: $route.path,title: $route.meta.title,query:$route.query}))}" @click="tabUrl(item)" v-for="item in tabs"> <a class="item row rowCenter verCenter" :class="{'scrollsg':rpcg,'act':(JSON.stringify(item)==JSON.stringify({path: $route.path,title: $route.meta.title,query:$route.query}))}" @click="tabUrl(item)" v-for="item in tabs">
<font class="fl">{{ item.title }}</font> <font class="fl">{{ item.title }}</font>
<span class="icon iconfont fl" @click.stop="closetab(item.path)"></span> <span class="icon iconfont fl" @click.stop="closetab(item.path,item.query)"></span>
</a> </a>
</div> </div>
</div> </div>
...@@ -102,7 +103,8 @@ ...@@ -102,7 +103,8 @@
</el-menu> </el-menu>
</div> </div>
</div> </div>
<div class="nav-left2" v-show="collapse"> <!--收缩图标-->
<div class="nav-icon" v-show="collapse">
<div class="zankai"> <div class="zankai">
<span class="icon iconfont fr" @click="zk"></span> <span class="icon iconfont fr" @click="zk"></span>
</div> </div>
...@@ -316,9 +318,16 @@ export default { ...@@ -316,9 +318,16 @@ export default {
path: "/", path: "/",
}) })
} else { } else {
if (tab_arr[i - 1].query) {
this.$router.push({ this.$router.push({
path: tab_arr[i - 1].path, path: tab_arr[i - 1].path,
query: tab_arr[i - 1].query
}) })
} else {
this.$router.push({
path: tab_arr[i - 1].path,
})
}
} }
} }
break; break;
...@@ -357,7 +366,6 @@ export default { ...@@ -357,7 +366,6 @@ export default {
Util.delCookie('token'); Util.delCookie('token');
window.location.href = '/#/login'; window.location.href = '/#/login';
window.userInfo = "" window.userInfo = ""
history.go(0); history.go(0);
}, 2000) }, 2000)
} else { } else {
...@@ -676,7 +684,7 @@ export default { ...@@ -676,7 +684,7 @@ export default {
} }
.nav-left2 { .nav-icon {
width: 62px; width: 62px;
background: #fff; background: #fff;
position: fixed; position: fixed;
......
...@@ -3,24 +3,18 @@ import App from "./App.vue"; ...@@ -3,24 +3,18 @@ import App from "./App.vue";
import router from "./router"; import router from "./router";
import filters from './filters' import filters from './filters'
import directive from './directive' import directive from './directive'
import { import {http} from './ajax/index.js';
http
} from './ajax/index.js';
import axios from 'axios' import axios from 'axios'
import { import {hideLoading, showLoading} from './ajax/loading';
showLoading,
hideLoading
} from './ajax/loading';
import Util from "./tool"; import Util from "./tool";
//本地环境开启提示信息
Vue.config.productionTip = false;
//加载全局样式 //加载全局样式
import '@/assets/css/public/common.min.css' import '@/assets/css/public/common.min.css'
import '@/assets/css/font/iconfont.css' import '@/assets/css/font/iconfont.css'
//本地环境开启提示信息
Vue.config.productionTip = false;
Vue.prototype.$ELEMENT = { Vue.prototype.$ELEMENT = {
size: 'mini', size: 'mini',
zIndex: 3000 zIndex: 3000
...@@ -45,12 +39,7 @@ router.afterEach((to, from, next) => { ...@@ -45,12 +39,7 @@ router.afterEach((to, from, next) => {
for (var i = 0; i < tabOldJson.length; i++) { for (var i = 0; i < tabOldJson.length; i++) {
tabNewJson.push(JSON.stringify(tabOldJson[i])) tabNewJson.push(JSON.stringify(tabOldJson[i]))
} }
if (tabNewJson.indexOf(JSON.stringify({ if (tabNewJson.indexOf(JSON.stringify({path: to.path, title: to.meta.title, query: to.query})) == -1) {
path: to.path,
title: to.meta.title,
query: to.query
})) == -1) {
tabOldJson.push({ tabOldJson.push({
path: to.path, path: to.path,
title: to.meta.title, title: to.meta.title,
...@@ -63,8 +52,6 @@ router.afterEach((to, from, next) => { ...@@ -63,8 +52,6 @@ router.afterEach((to, from, next) => {
title: to.meta.title, title: to.meta.title,
query: to.query query: to.query
}] }]
} }
if (tabOldJson) { if (tabOldJson) {
sessionStorage.setItem('tabs', JSON.stringify(tabOldJson)); sessionStorage.setItem('tabs', JSON.stringify(tabOldJson));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment