maxiaoxiao 11 maanden geleden
bovenliggende
commit
77f57026b8

+ 1 - 2
src/views/complianceAnalysis/components/hgxsc.vue

@@ -211,7 +211,6 @@ export default {
         xzmj: 0,
       };
       this.$refs.range.reset();
-      viewer.dataSources.removeAll();
     },
     submitData() {
       //更新范围
@@ -271,7 +270,7 @@ export default {
   },
   watch: {
     activeTabs(newValue) {
-      if (newValue != "scjg") this.reset();
+      if (newValue != "hgxsc") this.reset();
     },
   },
 

+ 12 - 9
src/views/complianceAnalysis/components/lsjl.vue

@@ -147,8 +147,8 @@ export default {
     },
 
     changeForm() {
-      this.pageObj.page = 1;
-      this.getData();
+      // this.pageObj.page = 1;
+      // this.getData();
     },
     changedate(val) {
       if (val) {
@@ -186,13 +186,16 @@ export default {
       });
     },
   },
-
-  // watch(
-  //     () => prop.rzBsm,
-  //     (newValue, oldValue) => {
-  //       this.changeForm();
-  //     }
-  //   );
+  watch: {
+    activeTabs(newValue) {
+      if (newValue != "lsjl") {
+        viewer.dataSources.removeAll();
+      }
+    },
+    rzBsm() {
+      this.changeForm();
+    },
+  },
 };
 </script>
 

+ 7 - 2
src/views/complianceAnalysis/components/scjg.vue

@@ -140,8 +140,13 @@ export default {
   //       });
   //     }
   //   );
-  beforeDestroy() {
-    viewer.dataSources.removeAll();
+  watch: {
+    activeTabs(newValue) {
+      if (newValue != "scjg") {
+        this.dataSources = {};
+        viewer.dataSources.removeAll();
+      }
+    },
   },
 };
 </script>

+ 5 - 2
src/views/complianceAnalysis/index.vue

@@ -14,8 +14,11 @@
         <el-tab-pane label="历史记录" name="lsju">
           <Lsjl :rzBsm="rzBsm" @updateParent="changeData"></Lsjl>
         </el-tab-pane>
-        <!-- :disabled="activeTabs != 'scjg'" -->
-        <el-tab-pane label="检查结果" name="scjg">
+        <el-tab-pane
+          label="检查结果"
+          :disabled="activeTabs != 'scjg'"
+          name="scjg"
+        >
           <Scjg :scjgObj="scjgObj" :jgTable="jgTable"></Scjg
         ></el-tab-pane>
       </el-tabs>

+ 1 - 1
static/data/ghss/data.js

@@ -3,7 +3,7 @@ var data = {
     name: '',
     // 面积
     xzmj: 62.1,
-    datalist: [{ xmlx: '合规性测试', jsdw: "建设单位", rwzt: 2, fxbg: "@/../static/data/ghss/合规性分析报告.docx" }],
+    datalist: [{ xmlx: '合规性测试', jsdw: "建设单位", rwzt: 2, bsm: '/static/data/ghss/导入.geojson', fxbg: "@/../static/data/ghss/合规性分析报告.docx" }],
     // 现状分析
     xzfxlist: [
         { name: "耕地", value: 7.39 },