Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/components/Query/clickQuery/clickQuery.vue

@@ -57,7 +57,7 @@ import CockpitVector from "./CockpitVector.vue";
 import MultiLevelQuery from "./MultiLevelQuery.vue";
 
 import * as pick_cockpit_vector from "./pick_cockpit_vector.js";
-
+import * as tdsy from "@/views/cockpit/js/tdsy";
 let gwtype;
 export default {
   name: "clickQuery",
@@ -167,6 +167,8 @@ export default {
     toggleVisibility() {
       this.removeMapLayerQuery();
       store.setToolBarAction(9);
+      tdsy.remove()
+      store.state.vectorData = [];
     },
     addGeometrys(fill) {
       this.viewer.entities.removeAll();

src/views/cockpit/common/VectorSpace/BoxCommonVector.vue

@@ -123,7 +123,7 @@ export default {
             store.setViewerFlagb(true);
             tdsy.remove();
             store.state.vectorData = [];
-            store.setToolBarAction(9);
+            // store.setToolBarAction(9);
 
         },
         info() { },

src/views/complianceAnalysis/components/hgxsc.vue

@@ -114,12 +114,17 @@ export default {
     };
   },
   mounted() {
-    this.ruleForm.xmmc = `合规_${moment(new Date()).format( "YYYY-MM-DD-HH-mm-ss")}`;
-    this.ruleForm.xmlx = `项目类型`;
-    this.ruleForm.jsdw = `建设单位`;
+    this.initform();
     this.getKzx();
   },
   methods: {
+    initform() {
+      this.ruleForm.xmmc = `合规_${moment(new Date()).format(
+        "YYYY-MM-DD-HH-mm-ss"
+      )}`;
+      this.ruleForm.xmlx = `项目类型`;
+      this.ruleForm.jsdw = `建设单位`;
+    },
     //获取检查要素
     getKzx() {
       GetScx().then((res) => {

src/views/complianceAnalysis/index.vue

@@ -6,7 +6,7 @@
         <span class="pange_text">合规性分析</span>
       </h2>
       <el-tabs type="border-card" class="xz_box" v-model="activeTabs" stretch>
-        <el-tab-pane label="合规性分析" name="hgxsc">
+        <el-tab-pane label="合规性分析" name="hgxfx">
           <Hgxsc
             v-loading="loading"
             @updateParent="changeData"
@@ -56,7 +56,7 @@ export default {
   data() {
     return {
       loading: false,
-      activeTabs: "hgxsc",
+      activeTabs: "hgxfx",
       // 日志
       rzBsm: "",
       nowObj: {}, //当前点击对象
@@ -76,6 +76,8 @@ export default {
       if (newValue != "hgxfx") this.$refs.hgxfx.reset();
       if (newValue != "lsju") this.$refs.lsju.reset();
       if (newValue != "scjg") this.$refs.scjg.reset();
+      console.log(newValue,'---',this.$refs.hgxfx)
+      if (newValue == "hgxfx") this.$refs.hgxfx.initform();
       if (newValue == "lsju") {
         this.$refs.lsju.reset();
         this.$refs.lsju.changeForm();

src/views/viewer.vue

@@ -57,7 +57,7 @@ import InfoVector from '@/views/cockpit/common/VectorSpace/InfoVector.vue';
 import datePicker from './cockpit/datePicker.vue';
 import xzqh from "../../static/data/460200_full.json";
 import hyqy from "../../static/data/460200_hyqy.json";
-
+import * as tdsy from "@/views/cockpit/js/tdsy";
 
 import { cockpitInfo } from '@/api/cockpit'
 import * as cockpit from "@/common/js/cockpit.js";
@@ -124,6 +124,9 @@ export default {
         bigViewerChange() {
             store.setViewerFlagb(!store.state.viewer_flag);
             store.setToolBarShow(!store.state.viewer_flag);
+            tdsy.remove();
+            store.state.vectorData = [];
+
             // store.setToolBarShow(true);
 
             // // 隐藏行政区划