zpf před 1 rokem
rodič
revize
c2237977b2

+ 5 - 0
src/common/js/cockpit.js

@@ -42,6 +42,11 @@ const hidden_wall = (flag) => {
     }
 }
 const pick_xzqh = (pri_name) => {
+    if (pri_name == false) {
+        manager_entity.entities.values.forEach((res) => {
+            res.billboard.show._value = false
+        })
+    }
     manager_entity.entities.values.forEach((res) => {
         if (res.properties.name._value == pri_name) {//选中
             res.billboard.show._value = true;

+ 0 - 11
src/router/index.js

@@ -115,15 +115,4 @@ const router = new Router({
 })
 
 
-router.afterEach((to, from) => {
-    // 三维报建
-    if (to.path == "/overview" && from.path == '/') {
-        hidden_xzqh(true);
-        hidden_wall(true);
-    } else {
-        hidden_xzqh(false);
-        hidden_wall(false);
-    }
-
-})
 export default router;

+ 0 - 1
src/views/cockpit/wpjg.vue

@@ -70,7 +70,6 @@ export default {
 
         }
       })
-      console.log('this.active_xzqh: ', this.active_xzqh);
 
       this.init_wpjg_echart_xzqh(this.active_xzqh)
     },

+ 4 - 1
src/views/map3d.vue

@@ -80,7 +80,9 @@
       </div>
     </div>
     <div class="routerContainer">
-      <router-view ref="routeViewRef"></router-view>
+      <keep-alive :include="['viewer']">
+        <router-view ref="routeViewRef"></router-view>
+      </keep-alive>
     </div>
     <sm-viewer @viewerChange="viewerChange" :isdefaultbig="true"> </sm-viewer>
     <!-- <div class="masking_top">
@@ -455,6 +457,7 @@ export default {
   top: 1rem;
   font-weight: 700;
   margin-left: 4vw;
+
   .el-menu--horizontal>.el-menu-item.is-active,
   .el-menu-item.is-active,
   .el-submenu.is-active {

+ 12 - 6
src/views/viewer.vue

@@ -55,6 +55,7 @@ import { cockpitInfo } from '@/api/cockpit'
 import * as cockpit from "@/common/js/cockpit.js";
 
 export default {
+    name: 'viewer',
     components: { KJZB, BJXM, TDSC, HYSY, TDSY, GDBH, STXF, WPJG, datePicker, JCBD },
     data() {
         return {
@@ -90,6 +91,7 @@ export default {
             this.flag = !this.flag;
         },
         setDatas() {
+
             // 耕地保护
             this.$refs.gdbh_ref.init_zbph(this.params);
             this.$refs.gdbh_ref.init_info(this.params);
@@ -216,11 +218,8 @@ export default {
                 } else {
                     // 暂时点击周围数据显示三亚市
                     // 清除所有xzqh状态
-                    viewer.entities.values.forEach((res) => {
-                        if (res.billboard != undefined)
-                            res.billboard.show._value = false
-                    })
 
+                    cockpit.pick_xzqh();
                     // 管控指标
                     that.gkzb();
 
@@ -402,8 +401,15 @@ export default {
     updated() { }, //生命周期 - 更新之后
     beforeDestroy() { }, //生命周期 - 销毁之前
     destroy() { },//生命周期 - 销毁完成
-    activated() { }, //若组件实例是 <KeepAlive> 缓存树的一部分,当组件被插入到 DOM 中时调用。
-    deactivated() { } //若组件实例是 <KeepAlive> 缓存树的一部分,当组件从 DOM 中被移除时调用。
+    activated() {
+        cockpit.hidden_xzqh(true);
+        cockpit.hidden_wall(true);
+    }, //若组件实例是 <KeepAlive> 缓存树的一部分,当组件被插入到 DOM 中时调用。
+    deactivated() {
+        cockpit.hidden_xzqh(false);
+        cockpit.hidden_wall(false);
+
+    } //若组件实例是 <KeepAlive> 缓存树的一部分,当组件从 DOM 中被移除时调用。
 };
 </script>
 <style  scoped lang="scss" >