逻辑修改

src/components/Combinations/toolBar/toolBar.vue

@@ -46,9 +46,9 @@
       <li class="sm-btn sm-tool-btn" :title="Resource.sceneOptions" @click="choose(3)">
         <i class="el-icon-setting"></i>
       </li>
-      <li class="sm-btn sm-tool-btn" title="行政区划开关" @click="choose(12)">
+      <!-- <li class="sm-btn sm-tool-btn" title="行政区划开关" @click="choose(12)">
         <i class="el-icon-map-location"></i>
-      </li>
+      </li> -->
       <!-- </ul> -->
       <div style="display: none" class="sm-tool-btn" @click="toggleVisibility" :class="{ 'sm-tool-btn-only': !show }">
         <span class="iconfont" :class="!show
@@ -250,18 +250,20 @@ export default {
       this.show = !this.show;
     },
     choose(i) {
-      if (i == 12) {
-        
-        store.setXzqh_flag(!store.state.xzqh_flag);
+      // if (i == 12) {
 
-        // 隐藏行政区划console.log();
-        cockpit.hidden_xzqh(store.state.xzqh_flag);
-        // 隐藏墙体
-        cockpit.hidden_wall(store.state.xzqh_flag);
-      } else {
-        store.setToolBarAction(i);
+      //   store.setXzqh_flag(!store.state.xzqh_flag);
 
-      }
+      //   // 隐藏行政区划console.log();
+      //   cockpit.hidden_xzqh(store.state.xzqh_flag);
+      //   // 隐藏墙体
+      //   cockpit.hidden_wall(store.state.xzqh_flag);
+      // } else {
+      //   store.setToolBarAction(i);
+
+      // }
+
+      store.setToolBarAction(i);
     },
   },
   watch: {

src/views/cockpit/common/DialWatch.vue

@@ -85,11 +85,15 @@ export default {
     methods: {
         draw_vector() {
             this.icon_switch = !this.icon_switch
+            console.log('this.icon_switch: ', this.icon_switch);
             this.$emit('draw_vector', this.icon_switch)
 
-            store.setViewerFlagb(false);
-            store.setToolBarShow(false);
-            store.setXzqh_flag(false);
+            if (this.icon_switch) {
+                store.setViewerFlagb(false);
+                store.setToolBarShow(false);
+                store.setXzqh_flag(false);
+            }
+
         },
         init_dial_watch(echart_data) {
             var myChart = echarts.init(this.$refs.dial_watch_scjg);

src/views/viewer.vue

@@ -83,7 +83,10 @@ export default {
     //监控data中的数据变化
     watch: {
 
-        isViewer_flag(newVal, oldVal) { console.log(newVal, oldVal); },
+        isViewer_flag(newVal, oldVal) { 
+            cockpit.hidden_xzqh(newVal);
+            cockpit.hidden_wall(newVal);
+         },
 
         isxzqh_flag(newVal, oldVal) {
             

static/Config/config.js

@@ -1,5 +1,7 @@
 //后台地址配置
 window.axiosURI = "http://192.168.100.30:8080";
+// window.axiosURI = "http://3wz57758kj72.vicp.fun";
+
 //倾斜模型高度配置
 window.modelBottomAltitude = 10;
 // 服务器ip