From b11822039100b5cf07297a59ef92947b47c0f1f5 Mon Sep 17 00:00:00 2001
From: dhy1725534722 <1725534722@qq.com>
Date: Fri, 6 Oct 2023 16:55:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/yingji/echarts/completePlan.vue  | 22 ++++++++--
 src/views/yingji/echarts/executionPlan.vue | 19 +++++++--
 src/views/yingji/echarts/finishRate.vue    | 19 +++++++--
 src/views/yingji/enforcing.vue             |  5 ++-
 src/views/yingji/home.vue                  | 48 +++++++++-------------
 5 files changed, 73 insertions(+), 40 deletions(-)

diff --git a/src/views/yingji/echarts/completePlan.vue b/src/views/yingji/echarts/completePlan.vue
index 7f0d792..794b26b 100644
--- a/src/views/yingji/echarts/completePlan.vue
+++ b/src/views/yingji/echarts/completePlan.vue
@@ -14,22 +14,36 @@ export default {
       arr2: [],
     };
   },
-
   props: {
     loadS: {
       type: Boolean,
       default: true,
     },
+    newTable: {
+      type: Array,
+      default: [],
+    },
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.getData();
+    });
+  },
+  watch: {
+    newTable(newVal, oldVal) {
+      this.getData()
+    },
   },
-  mounted() {},
   methods: {
-    getData(e) {
+    getData() {
       this.arr1 = [];
       this.arr2 = [];
-      e.forEach((value) => {
+      this.newTable.forEach((value) => {
         this.arr1.push(value.institutionName);
         this.arr2.push(value.checkEnterpriseCount);
       });
+      this.arr1.reverse();
+      this.arr2.reverse();
       this.initChart();
     },
     initChart() {
diff --git a/src/views/yingji/echarts/executionPlan.vue b/src/views/yingji/echarts/executionPlan.vue
index f331c33..b787346 100644
--- a/src/views/yingji/echarts/executionPlan.vue
+++ b/src/views/yingji/echarts/executionPlan.vue
@@ -17,13 +17,26 @@ export default {
       type: Boolean,
       default: true,
     },
+    newTable:{
+      type: Array,
+      default: [],
+    }
+  },
+  mounted() {
+    this.$nextTick(()=>{
+      this.getData()
+    })
+  },
+  watch: {
+    newTable(newVal, oldVal) {
+      this.getData()
+    },
   },
-  mounted() {},
   methods: {
-    getData(e) {
+    getData() {
       this.arr1 = [];
       this.arr2 = [];
-      e.forEach((value) => {
+      this.newTable.forEach((value) => {
         if (value.institutionName == "苏州市") {
           this.arr1.unshift(value.institutionName);
           this.arr2.unshift(value.plannedEnterpriseCount);
diff --git a/src/views/yingji/echarts/finishRate.vue b/src/views/yingji/echarts/finishRate.vue
index 9276d45..7ffbfac 100644
--- a/src/views/yingji/echarts/finishRate.vue
+++ b/src/views/yingji/echarts/finishRate.vue
@@ -15,18 +15,31 @@ export default {
       numTotal: 0,
     };
   },
-  mounted() {},
+  mounted() {
+    this.$nextTick(() => {
+      this.getData();
+    });
+  },
   props: {
     loadS: {
       type: Boolean,
       default: true,
     },
+    newTable: {
+      type: Array,
+      default: [],
+    },
+  },
+  watch: {
+    newTable(newVal, oldVal) {
+      this.getData();
+    },
   },
   methods: {
-    getData(e) {
+    getData() {
       this.arr1 = [];
       this.arr2 = [];
-      e.forEach((value1) => {
+      this.newTable.forEach((value1) => {
         if (value1.institutionName != "苏州市") {
           this.arr1.push({
             value: value1.checkEnterpriseCount,
diff --git a/src/views/yingji/enforcing.vue b/src/views/yingji/enforcing.vue
index abc30b5..2d54117 100644
--- a/src/views/yingji/enforcing.vue
+++ b/src/views/yingji/enforcing.vue
@@ -87,7 +87,7 @@
           <template slot-scope="scope">
             <div
               style="font-family: 'Alibaba PuHuiTi'"
-              :class="scope.row.checkStatus == '2' ? 'isStyle' : ''"
+              :class="scope.row.checkStatus == '2' ? 'isStyle' : 'isStyle1'"
             >
               {{ scope.row.checkStatus == 2 ? "未检查" : "已检查" }}
             </div>
@@ -478,6 +478,9 @@ export default {
 .isStyle {
   color: #f71052;
 }
+.isStyle1{
+  color: #28B384;
+}
 .dialog-slot {
   .closeClick {
     position: absolute;
diff --git a/src/views/yingji/home.vue b/src/views/yingji/home.vue
index 5d090cb..986564b 100644
--- a/src/views/yingji/home.vue
+++ b/src/views/yingji/home.vue
@@ -37,16 +37,16 @@
     <!-- 各区域执法计划 -->
     <div class="bodyBox boxAllStyle" v-if="activeIndex == 1">
       <div id="execution">
-        <executionPlan ref="executionPlan" :loadS="loadS"></executionPlan>
+        <executionPlan :newTable="newTable" :loadS="loadS"></executionPlan>
       </div>
     </div>
     <div class="bottomBox" v-if="activeIndex == 1">
       <div class="boxAllStyle">
-        <completePlan ref="completePlan" :loadS="loadS"></completePlan>
+        <completePlan :newTable="newTable" :loadS="loadS"></completePlan>
       </div>
       <div style="width: 15px"></div>
       <div class="boxAllStyle">
-        <finishRate ref="finishRate" :loadS="loadS"></finishRate>
+        <finishRate :newTable="newTable" :loadS="loadS"></finishRate>
       </div>
     </div>
     <div class="bgContent" v-if="activeIndex == 0">
@@ -128,7 +128,11 @@
           >
           </el-table-column>
           <el-table-column label="完成率" prop="pt" header-align="center">
-            <template slot-scope="scope"> {{ scope.row.pt == 'NaN'?'0':(scope.row.pt * 100).toFixed(2) }}% </template>
+            <template slot-scope="scope">
+              {{
+                scope.row.pt == "NaN" ? "0" : (scope.row.pt * 100).toFixed(2)
+              }}%
+            </template>
           </el-table-column>
         </el-table>
       </div>
@@ -179,6 +183,7 @@ export default {
       beforeParams: {},
       //传递的等待效果
       loadS: false,
+      newTable:[],
     };
   },
   components: {
@@ -195,42 +200,27 @@ export default {
   methods: {
     searchList() {
       this.beforeParams = { ...this.beforeParams, ...this.ruleForm };
-      this.handoff();
+      this.getHomeList()
     },
     getHomeList() {
       this.load1 = true;
+      this.loadS = true;
       indexRegionalism(this.beforeParams).then((res) => {
         this.tableData = res.rows;
-        res.rows.forEach((value1,index1)=>{
-          if(value1.institutionName == '苏州市'){
-            let arr1 = this.tableData.slice(index1,index1+1)
-            this.tableData.splice(index1,1)
-            this.tableData.unshift(arr1[0])
+        this.newTable = res.rows
+        res.rows.forEach((value1, index1) => {
+          if (value1.institutionName == "苏州市") {
+            let arr1 = this.tableData.slice(index1, index1 + 1);
+            this.tableData.splice(index1, 1);
+            this.tableData.unshift(arr1[0]);
           }
-        })
+        });
         this.load1 = false;
+        this.loadS = false;
       });
     },
-    handoff() {
-      if (this.activeIndex == 0) {
-        this.getHomeList();
-      } else {
-        this.loadS = true;
-        indexRegionalism(this.beforeParams).then((res) => {
-          this.$refs.executionPlan.getData(res.rows);
-          this.$refs.completePlan.getData(res.rows);
-          this.$refs.finishRate.getData(res.rows);
-          this.loadS = false;
-        });
-      }
-    },
     active(e) {
       this.activeIndex = e;
-      this.ruleForm = {
-        plannedYear: "",
-      };
-      this.beforeParams = {};
-      this.handoff();
     },
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 !== 0) {