Browse Source

修复bug

shibei_master
dai 3 years ago
parent
commit
36d9e714be
  1. 9
      src/router/index.js
  2. 14
      src/views/main-shuju/main.vue

9
src/router/index.js

@ -326,13 +326,12 @@ router.beforeEach((to, from, next) => {
// url: "visual/basicinfo/basicInfoMain", // url: "visual/basicinfo/basicInfoMain",
children: [ children: [
{ {
url: "https://test-rxs-job.elinkservice.cn/haiqin-ai/aisecurity.html#/monitor-panel", // url: "https://test-rxs-job.elinkservice.cn/haiqin-ai/aisecurity.html#/monitor-panel",
// url: "/visual/ai/index", url: "/visual/ai/index",
name: "视频监控", name: "视频监控",
id: "5feawfwa111111efwa57", id: "5feawfwa111111efwa57",
}, },
/*{ /*{
// url: "http://www.baidu.com",
url: "/visual/ai/renliu", url: "/visual/ai/renliu",
name: "人流数据", name: "人流数据",
id: "5fwaefwae222112fawef58", id: "5fwaefwae222112fawef58",
@ -353,8 +352,8 @@ router.beforeEach((to, from, next) => {
id: "fewafwafewaefddd", id: "fewafwafewaefddd",
},*/ },*/
{ {
// url: "/visual/ai/yujing", url: "/visual/ai/yujing",
url: "https://test-rxs-job.elinkservice.cn/haiqin-ai/aisecurity.html#/data-analysis", // url: "https://test-rxs-job.elinkservice.cn/haiqin-ai/aisecurity.html#/data-analysis",
name: "预警分析", name: "预警分析",
id: "545345fdsfs", id: "545345fdsfs",
}, },

14
src/views/main-shuju/main.vue

@ -1,5 +1,6 @@
<template> <template>
<div v-loading.fullscreen.lock="loading" <div
v-loading.fullscreen.lock="loading"
:element-loading-text="$t('loading')" :element-loading-text="$t('loading')"
:class="[ :class="[
'g-bd', 'g-bd',
@ -7,12 +8,15 @@
{ {
'z-sidebar--noside': true, 'z-sidebar--noside': true,
}, },
]"> ]"
>
<template v-if="!loading"> <template v-if="!loading">
<main-navbar ref="ref_navbar" /> <main-navbar ref="ref_navbar" />
<div class="g-cnt"> <div class="g-cnt">
<main-content v-if="!$store.state.contentIsNeedRefresh" <main-content
@changeCustomerName="changeCustomerName" /> v-if="!$store.state.contentIsNeedRefresh"
@changeCustomerName="changeCustomerName"
/>
</div> </div>
</template> </template>
</div> </div>
@ -79,6 +83,8 @@ export default {
// , // ,
routeHandle(route) { routeHandle(route) {
if (!route.meta.isTab) { if (!route.meta.isTab) {
this.$store.state.mainShuju.activeName = "";
this.$store.state.mainShuju.contentTabsActiveName = "";
return false; return false;
} }
var tab = this.$store.state.contentTabs.filter( var tab = this.$store.state.contentTabs.filter(

Loading…
Cancel
Save