maxiaoxiao 1 年之前
父節點
當前提交
c23d9c08d0

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

@@ -220,7 +220,7 @@ export default {
       //更新范围
       var _temp = this.$refs.range.getRange();
       this.ruleForm.xzfw = _temp.xzfw;
-      this.ruleForm.xzmj = _temp.xzmj;
+      this.ruleForm.xzmj = _temp.xzmj || hgxfx.xzmj;
 
       this.is_form()
         .then((res) => {
@@ -229,15 +229,15 @@ export default {
           //   cancelButtonText: "取消",
           //   type: "warning",
           // }).then(() => {
-            this.$parent.loading = true;
-            Add({ ...this.ruleForm }).then((res) => {
-              if (res.success) {
-                this.$parent.rzMc = this.ruleForm.xmmc;
-                this.$parent.rzBsm = res.data;
-                this.$parent.rwBsm = res.data;
-              }
-              this.$parent.loading = false;
-            });
+          this.$parent.loading = true;
+          Add({ ...this.ruleForm }).then((res) => {
+            if (res.success) {
+              this.$parent.rzMc = this.ruleForm.xmmc;
+              this.$parent.rzBsm = res.data;
+              this.$parent.rwBsm = res.data;
+            }
+            this.$parent.loading = false;
+          });
           // });
         })
         .catch((res) => {

+ 8 - 25
src/views/complianceAnalysis/components/lsjl.vue

@@ -88,24 +88,6 @@ export default {
     rzBsm: {
       type: String,
     },
-    activeTabs: {
-      type: String,
-    },
-    scjgObj: {
-      type: Object,
-    },
-    tempObj: {
-      type: Object,
-    },
-    rwBsm: {
-      type: String,
-    },
-    loading: {
-      type: String,
-    },
-    rzMc: {
-      type: String,
-    },
   },
   data() {
     return {
@@ -150,17 +132,18 @@ export default {
         .catch(() => {});
     },
     checkDetails(item) {
-      // parent.emit("update:rwBsm", item.bsm);
+      this.$parent.rwBsm = item.bsm;
       // GetFxjg({ bsm: item.bsm }).then((res) => {
       //   if (res.success) {
-      //     parent.emit("update:scjgObj", JSON.parse(JSON.stringify(res.data)));
-      //     parent.emit("update:activeTabs", "scjg");
+      // this.$parent.scjgObj=JSON.parse(JSON.stringify(res.data))
+      // this.$parent.scjgObj=JSON.parse(JSON.stringify(res.data))
+      this.$parent.activeTabs = "scjg";
       //   }
       // });
     },
     checkRz(item) {
-      parent.emit("update:rzMc", item.xmmc);
-      parent.emit("update:rzBsm", item.bsm);
+      this.$parent.rzMc = item.xmmc;
+      this.$parent.rzBsm = item.bsm;
     },
 
     changeForm() {
@@ -179,10 +162,10 @@ export default {
     },
 
     getData() {
-      parent.emit("update:loading", true);
+      this.$parent.loading = true;
       GetPage({ ...this.pageObj }).then((res) => {
         setTimeout(() => {
-          parent.emit("update:loading", false);
+          this.$parent.loading = false;
         }, 100);
         this.pageObj.total = res.recordstotal;
         this.pageObj.page = res.page;

+ 9 - 36
src/views/complianceAnalysis/index.vue

@@ -9,44 +9,17 @@
       </h2>
       <el-tabs type="border-card" class="xz_box" v-model="activeTabs" stretch>
         <el-tab-pane label="合规性分析" name="hgxsc">
-          <Hgxsc
-            :tableData="tableData"
-            :form="form"
-            :dialogVisible="dialogVisible"
-            :selectVisible="selectVisible"
-            :mbVisible="mbVisible"
-            :projectVisible="projectVisible"
-            :scjgObj="scjgObj"
-            :loading="loading"
-            :rzBsm="rzBsm"
-            :rwBsm="rwBsm"
-            :rzMc="rzMc"
-            :jgTable="jgTable"
-            :activeTabs="activeTabs"
-          ></Hgxsc>
+          <Hgxsc :loading="loading" :activeTabs="activeTabs"></Hgxsc>
         </el-tab-pane>
         <el-tab-pane label="历史记录" name="lsju">
-          <Lsjl
-            :activeTabs="activeTabs"
-            :rzBsm="rzBsm"
-            :scjgObj="scjgObj"
-            :rwBsm="rwBsm"
-            :rwObj="rwObj"
-            :rzMc="rzMc"
-          ></Lsjl>
+          <Lsjl :rzBsm="rzBsm"></Lsjl>
         </el-tab-pane>
-        <!-- :disabled="activeTabs != 'scjg'" -->
-        <el-tab-pane label="检查结果" name="scjg">
-          <Scjg
-            :activeNames="activeNames"
-            :form="form"
-            :scjgObj="scjgObj"
-            :rwBsm="rwBsm"
-            :loading="loading"
-            :rwObj="rwObj"
-            :activeTabs="activeTabs"
-            :jgTable="jgTable"
-          ></Scjg
+        <el-tab-pane
+          label="检查结果"
+          :disabled="activeTabs != 'scjg'"
+          name="scjg"
+        >
+          <Scjg :scjgObj="scjgObj" :jgTable="jgTable"></Scjg
         ></el-tab-pane>
       </el-tabs>
     </div>
@@ -134,7 +107,7 @@ export default {
         overflow-y: auto;
       }
     }
-   
+
     .xz-btn {
       width: 100%;
       // background: #efefef;