Browse Source

合规性分析时间线

maxiaoxiao 1 year ago
parent
commit
49d9a59927

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

@@ -226,7 +226,7 @@ export default {
             if (res.success) {
               this.$emit("updateParent", "rzMc", this.ruleForm.xmmc);
               this.$emit("updateParent", "rzBsm", res.data);
-              this.$emit("updateParent", "rwBsm", res.data);
+              // this.$emit("updateParent", "rwBsm", res.data);
             }
             this.$emit("updateParent", "loading", false);
           });

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

@@ -83,9 +83,6 @@ import { GetPage, GetFxjg, Delect } from "@/api/ghss/hgxfx.js";
 import hgxfx from "../../../../static/data/ghss/data.js";
 export default {
   props: {
-    rzBsm: {
-      type: String,
-    },
     historyList: {
       type: Array,
     },
@@ -142,7 +139,7 @@ export default {
         .catch(() => {});
     },
     checkDetails(item) {
-      this.$emit("updateParent", "rwBsm", item.bsm);
+      // this.$emit("updateParent", "rwBsm", item.bsm);
       // GetFxjg({ bsm: item.bsm }).then((res) => {
       //   if (res.success) {
       // this.$emit("updateParent", "scjgObj=JSON.parse(JSON.stringify(res.data))
@@ -198,11 +195,7 @@ export default {
       });
     },
   },
-  watch: {
-    rzBsm() {
-      this.changeForm();
-    },
-  },
+  watch: {},
 };
 </script>
 

+ 4 - 5
src/views/complianceAnalysis/components/rzDtails.vue

@@ -1,8 +1,9 @@
 <template>
   <div>
+    <!-- v-model="dialog" append-to-body -->
     <el-dialog
       :title="rzMc"
-      v-model="dialog"
+      :visible.sync="dialog"
       width="600px"
       :before-close="handleClose"
     >
@@ -48,7 +49,7 @@ export default {
   },
   data() {
     return {
-      data: [],
+      data: [{ rzsj: "2024-03-26", rzlr: "wqewe" }, {}],
       dialog: false,
       timer: "",
     };
@@ -58,7 +59,7 @@ export default {
   },
   methods: {
     handleClose() {
-      parent.emit("update:rzBsm", "");
+      this.$emit("updateParent", "rzBsm", "");
     },
     getRzData() {
       GetLog({ bsm: this.$props.rzBsm }).then((res) => {
@@ -90,8 +91,6 @@ export default {
     rzBsm(newValue) {
       if (newValue != "") {
         this.dialog = true;
-        console.log("-------")
-        this.getRzData();
       } else {
         this.dialog = false;
       }

+ 0 - 3
src/views/complianceAnalysis/components/scjg.vue

@@ -40,9 +40,6 @@ export default {
     scjgObj: {
       type: Object,
     },
-    jgTable: {
-      type: Boolean,
-    },
   },
   data() {
     return {

+ 34 - 29
src/views/complianceAnalysis/index.vue

@@ -9,12 +9,16 @@
       </h2>
       <el-tabs type="border-card" class="xz_box" v-model="activeTabs" stretch>
         <el-tab-pane label="合规性分析" name="hgxsc">
-          <Hgxsc @updateParent="changeData" ref="hgxfx"></Hgxsc>
+          <Hgxsc
+            v-loading="loading"
+            @updateParent="changeData"
+            ref="hgxfx"
+          ></Hgxsc>
         </el-tab-pane>
         <el-tab-pane label="历史记录" name="lsju">
           <Lsjl
+            v-loading="loading"
             type="hgxfx"
-            :rzBsm="rzBsm"
             @updateParent="changeData"
             ref="lsju"
           ></Lsjl>
@@ -24,11 +28,11 @@
           name="scjg"
           :disabled="activeTabs != 'scjg'"
         >
-          <Scjg :scjgObj="scjgObj" :jgTable="jgTable" ref="scjg"></Scjg
+          <Scjg v-loading="loading" :scjgObj="scjgObj" ref="scjg"></Scjg
         ></el-tab-pane>
       </el-tabs>
     </div>
-    <RzDtails :rzBsm="rzBsm" :rzMc="rzMc"></RzDtails>
+    <RzDtails :rzBsm="rzBsm" :rzMc="rzMc" @updateParent="changeData"></RzDtails>
   </div>
 </template>
 
@@ -49,37 +53,36 @@ export default {
   },
   data() {
     return {
-      dialogVisible: false,
-      selectVisible: false,
-      mbVisible: false,
-      projectVisible: false,
-      activeNames: [],
+      // dialogVisible: false,
+      // selectVisible: false,
+      // mbVisible: false,
+      // projectVisible: false,
+      // activeNames: [],
       loading: false,
       activeTabs: "hgxsc",
       rzBsm: "",
-      rwBsm: "",
+      // rwBsm: "",
       rzMc: "",
-      form: {
-        ydxz_bsm: "",
-        ydmjbegin: "",
-        ydmjend: "",
-        kddk: "",
-        zdpd: "",
-        yxyz: "",
-        xzmj: 0,
-        sjy: "",
-        xzfw: "",
-        xmmc: "",
-        jsdw: "",
-        yjydlx: "",
-        fwlx: 0,
-      },
+      // form: {
+      //   ydxz_bsm: "",
+      //   ydmjbegin: "",
+      //   ydmjend: "",
+      //   kddk: "",
+      //   zdpd: "",
+      //   yxyz: "",
+      //   xzmj: 0,
+      //   sjy: "",
+      //   xzfw: "",
+      //   xmmc: "",
+      //   jsdw: "",
+      //   yjydlx: "",
+      //   fwlx: 0,
+      // },
       scjgObj: {
         task: { fxbg: "@/../static/data/ghss/合规性分析报告.docx" },
       },
-      rwObj: {},
-      tableData: [],
-      jgTable: false,
+      // rwObj: {},
+      // tableData: [],
     };
   },
   created() {},
@@ -92,8 +95,10 @@ export default {
   watch: {
     activeTabs(newValue) {
       if (newValue != "hgxfx") this.$refs.scjg.reset();
-      else if (newValue != "lsju") this.$refs.scjg.reset();
+      else if (newValue != "lsju")
+        viewer.dataSources.removeAll(); //this.$refs.scjg.reset();
       else if (newValue != "scjg") this.$refs.scjg.reset();
+      if (newValue == "lsju") this.$refs.lsju.changeForm();
     },
   },
 };

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

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