修改

src/views/safetyManage/confirmDelimitationManage/sluice/index.vue

@@ -467,6 +467,29 @@ export default {
           sortBy: "desc",
         },
       },
+      // 查询参数
+      conQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        ids: null,
+        data: {
+          adcd: null,
+          wagaName: null,
+          wagaCode: null,
+          wagaType: null,
+          wagaId: null,
+          createUid: null,
+          updateUid: null,
+          owerDept: null,
+        },
+        // 排序方式
+        params: {
+          // 按哪个字段排序
+          orderBy: "create_time",
+          // desc降序，升序asc
+          sortBy: "desc",
+        },
+      },
       // 表单参数
       form: {},
       // 表单校验
@@ -525,7 +548,8 @@ export default {
     },
     viewInfo(row) {
       const id = row.id;
-      listQqhj({ data: { wagaId: id } }).then((res) => {
+      this.conQueryParams.data.wagaId = id;
+      listQqhj(this.conQueryParams).then((res) => {
         // console.log(res);
         if (res.records[0]) {
           this.viewMsg = res.records[0];
@@ -537,7 +561,8 @@ export default {
     comfirm(row) {
       this.baseMsg = row;
       const id = row.id;
-      listQqhj({ data: { wagaId: id } }).then((res) => {
+      this.conQueryParams.data.wagaId = id;
+      listQqhj(this.conQueryParams).then((res) => {
         // console.log(res);
         if (res.records[0]) {
           this.form = res.records[0];

src/views/safetyManage/declarationManage/sluice/declare/components/dataCharts.vue

@@ -21,6 +21,7 @@ export default {
     async getData() {
       const res1 = await getPie();
       const res2 = await getHistogram();
+      this.pieChartData = [];
       for (let key in res1[0]) {
         this.pieChartData.push({ value: res1[0][key], name: key });
       }

src/views/safetyManage/declarationManage/sluice/declare/components/listPage/index.vue

@@ -574,6 +574,7 @@ import { regionData, codeToText, TextToCode } from "element-china-area-data";
 
 export default {
   name: "Jbxx",
+  props: ["chartEleGetData"],
   components: { transform },
   data() {
     return {
@@ -1040,13 +1041,12 @@ export default {
               }
             });
           } else {
+            this.chartEleGetData();
             addJbxx(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("新增成功");
                 this.open = false;
                 this.getList();
-                // console.log(9999, this.$emit);
-                // this.$emit("chartEleGetData");
               }
             });
           }

src/views/safetyManage/declarationManage/sluice/declare/index.vue

@@ -11,7 +11,7 @@
       </el-breadcrumb-item>
     </el-breadcrumb>
     <dataCharts ref="dataCharts" />
-    <listPage :@chartEleGetData="chartEleGetData" />
+    <listPage :chartEleGetData="chartEleGetData" />
   </div>
 </template>
 <script>
@@ -31,12 +31,18 @@ export default {
           routeName: "申报管理列表",
         },
       ],
+      chartEleGetData: "",
     };
   },
-  computed: {
-    chartEleGetData() {
-      return this.$refs.dataCharts?.getData;
-    },
+  watch: {},
+  // computed: {
+  //   chartEleGetData() {
+  //     console.log(111, this.$refs.dataCharts?.getData);
+  //     return this.$refs.dataCharts?.getData;
+  //   },
+  // },
+  mounted() {
+    this.chartEleGetData = this.$refs.dataCharts?.getData;
   },
 };
 </script>

src/views/safetyManage/declarationManage/sluice/examine/components/dataCharts.vue

@@ -21,6 +21,7 @@ export default {
     async getData() {
       const res1 = await getPie();
       const res2 = await getHistogram();
+      this.pieChartData = [];
       for (let key in res1[0]) {
         this.pieChartData.push({ value: res1[0][key], name: key });
       }

src/views/safetyManage/declarationManage/sluice/examine/components/listPage/index.vue

@@ -573,6 +573,7 @@ import { regionData, codeToText, TextToCode } from "element-china-area-data";
 
 export default {
   name: "Jbxx",
+  props: ["chartEleGetData"],
   components: { transform },
   data() {
     return {
@@ -1049,6 +1050,7 @@ export default {
     },
     zxForm() {
       const id = this.form.id;
+      this.chartEleGetData();
       delJbxx(id).then((response) => {
         if (response.code === 200) {
           this.getList();

src/views/safetyManage/declarationManage/sluice/examine/index.vue

@@ -10,8 +10,8 @@
         {{ item.routeName }}
       </el-breadcrumb-item>
     </el-breadcrumb>
-    <dataCharts />
-    <listPage />
+    <dataCharts ref="dataCharts" />
+    <listPage :chartEleGetData="chartEleGetData" />
   </div>
 </template>
 <script>
@@ -31,7 +31,11 @@ export default {
           routeName: "申报审核管理列表",
         },
       ],
+      chartEleGetData: "",
     };
   },
+  mounted() {
+    this.chartEleGetData = this.$refs.dataCharts?.getData;
+  },
 };
 </script>

src/views/safetyManage/responsiblePersonManage/index.vue

@@ -10,12 +10,15 @@
         {{ item.routeName }}
       </el-breadcrumb-item>
     </el-breadcrumb>
-    <sluiceDataCharts v-if="selectTab == 1" />
-    <dykeDataCharts v-if="selectTab == 2" />
+    <sluiceDataCharts ref="dataCharts" v-if="selectTab == 1" />
+    <dykeDataCharts ref="dataCharts" v-if="selectTab == 2" />
 
     <reservoirResponsible v-if="selectTab == 0" />
-    <sluiceResponsible v-if="selectTab == 1" />
-    <dykeResponsible v-if="selectTab == 2" />
+    <sluiceResponsible
+      v-if="selectTab == 1"
+      :chartEleGetData="chartEleGetData"
+    />
+    <dykeResponsible v-if="selectTab == 2" :chartEleGetData="chartEleGetData" />
   </div>
 </template>
 <script>
@@ -46,7 +49,11 @@ export default {
           routeName: "责任人管理列表",
         },
       ],
+      chartEleGetData: "",
     };
   },
+  mounted() {
+    this.chartEleGetData = this.$refs.dataCharts?.getData;
+  },
 };
 </script>

src/views/safetyManage/responsiblePersonManage/sluice/index.vue

@@ -14,6 +14,7 @@
           style="width: 100%"
           @change="handleQuery"
           filterable
+          clearable
         >
           <el-option
             v-for="dict in wagaNameOptions"
@@ -330,6 +331,7 @@ import { listJbxx, getJbxx } from "@/api/yg/jbxx";
 
 export default {
   name: "Fzr",
+  props: ["chartEleGetData"],
   data() {
     return {
       // 遮罩层
@@ -573,6 +575,7 @@ export default {
               }
             });
           } else {
+            this.chartEleGetData();
             addFzr(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("新增成功");
@@ -598,6 +601,7 @@ export default {
           })
           .then(() => {
             this.getList();
+            this.chartEleGetData();
             this.msgSuccess("删除成功");
           })
           .catch(function () {});

src/views/safetyManage/safeProduction/index.vue

@@ -10,12 +10,15 @@
         {{ item.routeName }}
       </el-breadcrumb-item>
     </el-breadcrumb>
-    <sluiceDataCharts v-if="selectTab == 1" />
-    <dykeDataCharts v-if="selectTab == 2" />
+    <sluiceDataCharts ref="dataCharts" v-if="selectTab == 1" />
+    <dykeDataCharts ref="dataCharts" v-if="selectTab == 2" />
 
     <reservoirResponsible v-if="selectTab == 0" />
-    <sluiceResponsible v-if="selectTab == 1" />
-    <dykeResponsible v-if="selectTab == 2" />
+    <sluiceResponsible
+      v-if="selectTab == 1"
+      :chartEleGetData="chartEleGetData"
+    />
+    <dykeResponsible v-if="selectTab == 2" :chartEleGetData="chartEleGetData" />
   </div>
 </template>
 <script>
@@ -46,7 +49,11 @@ export default {
           routeName: "责任人管理列表",
         },
       ],
+      chartEleGetData: "",
     };
   },
+  mounted() {
+    this.chartEleGetData = this.$refs.dataCharts?.getData;
+  },
 };
 </script>

src/views/safetyManage/safeProduction/sluice/dataCharts.vue

@@ -21,6 +21,7 @@ export default {
     async getData() {
       const res1 = await getPie();
       const res2 = await getHistogram();
+      this.pieChartData = [];
       for (let key in res1[0]) {
         this.pieChartData.push({ value: res1[0][key], name: key });
       }

src/views/safetyManage/safeProduction/sluice/index.vue

@@ -348,6 +348,7 @@ import { getFileStream } from "@/api/system/upload";
 
 export default {
   name: "Yhxx",
+  props: ["chartEleGetData"],
   data() {
     return {
       // 遮罩层
@@ -581,8 +582,10 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          this.chartEleGetData();
           this.form.photo = JSON.stringify(this.fileList);
           if (this.form.id != null) {
+            if (!this.isResolve) this.form.status = "0";
             if (this.isResolve) this.form.status = "1";
             updateYhxx(this.form).then((response) => {
               if (response.code === 200) {
@@ -617,6 +620,7 @@ export default {
           })
           .then(() => {
             this.getList();
+            this.chartEleGetData();
             this.msgSuccess("删除成功");
           })
           .catch(function () {});

src/views/safetyManage/safetyAppraisal/sluice/components/statisticsOne.vue

@@ -149,6 +149,7 @@ export default {
 
         series: [
           {
+            name: "完成率（%）",
             type: "bar",
             data: this.barChartData.value,
             barMaxWidth: "10%",