Merge branch 'test' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into test

src/router/index.js

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

src/views/main-shuju/main.vue

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