From d37a450be0bccae55450e8fc976b93f073fc7d6e Mon Sep 17 00:00:00 2001
From: dhy1725534722 <1725534722@qq.com>
Date: Sat, 30 Sep 2023 09:45:40 +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/finishRate.vue |  2 +-
 src/views/yingji/enforcing.vue          | 18 ++++++------------
 src/views/yingji/enterprise.vue         | 11 ++++-------
 src/views/yingji/home.vue               |  2 +-
 4 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/views/yingji/echarts/finishRate.vue b/src/views/yingji/echarts/finishRate.vue
index cb101af..b4e9576 100644
--- a/src/views/yingji/echarts/finishRate.vue
+++ b/src/views/yingji/echarts/finishRate.vue
@@ -39,7 +39,7 @@ export default {
           this.arr2.push({
             value: value1.plannedEnterpriseCount,
             name: value1.institutionName,
-            pt: value1.pt,
+            pt: value1.pt=='NaN'?0:value1.pt,
           });
         }
       });
diff --git a/src/views/yingji/enforcing.vue b/src/views/yingji/enforcing.vue
index 8672de5..05f1953 100644
--- a/src/views/yingji/enforcing.vue
+++ b/src/views/yingji/enforcing.vue
@@ -23,8 +23,7 @@
         </div>
         <div class="select-input">
           <div class="select-span">区划:</div>
-
-          <executive @quhua="quhua" @quhuadizhi="quhuadizhi"></executive>
+          <executive @quhua="quhua" @quhuadizhi="quhuadizhi"  ref="executive"></executive>
         </div>
         <div class="my-checkbox">
           <el-checkbox-group v-model="checkList" @change="setmealSelect">
@@ -176,8 +175,6 @@ export default {
       option: [],
       loads: true,
       total: 0,
-      //这个是点击搜索之前的值
-      district: [],
       form: {
         district: "",
         plannedYear: "",
@@ -340,7 +337,7 @@ export default {
         plannedYear: "",
         checkStatus: "",
       };
-      // this.district = [];
+      this.$refs.executive.district = [];
       this.searchBefore = {
         pageSize: 10,
         pageNum: 1,
@@ -400,12 +397,9 @@ export default {
       });
     },
     quhua(e) {
-      this.district = e;
+      this.form.district  = e;
     },
     searchList() {
-      if (this.district) {
-        this.form.district = this.district;
-      }
       this.searchBefore = {
         pageSize: 10,
         pageNum: 1,
@@ -418,8 +412,8 @@ export default {
       this.loads = true;
       enforcingDetail(this.searchBefore).then((res) => {
         console.log(res);
-        this.tableData = res.data.list;
-        this.total = res.data.total;
+        this.tableData = res.rows;
+        this.total = res.total;
         this.loads = false;
       });
     },
@@ -453,7 +447,7 @@ export default {
     },
     // 页码，当前页切换事件
     pagesChange(pages) {
-      this.searchBefore.pageNum = pages.pageNum;
+      this.searchBefore.pageNum= pages.pageNum;
       this.searchBefore.pageSize = pages.pageSize;
       this.getList();
     },
diff --git a/src/views/yingji/enterprise.vue b/src/views/yingji/enterprise.vue
index d928c8e..6d449d4 100644
--- a/src/views/yingji/enterprise.vue
+++ b/src/views/yingji/enterprise.vue
@@ -4,7 +4,7 @@
       <div class="one-line">
         <div class="select-input">
           <div class="select-span">行政区划:</div>
-          <executive @quhua="quhua" @quhuadizhi="quhuadizhi"></executive>
+          <executive @quhua="quhua" @quhuadizhi="quhuadizhi" ref="executive"></executive>
         </div>
         <div class="select-input">
           <div class="select-span">经济类型:</div>
@@ -192,7 +192,7 @@
       </el-table>
     </div>
     <div class="pagination">
-      <my-pagination :total="total" @pagesChange="pagesChange"></my-pagination>
+      <my-pagination :total="total" @pagesChange="pagesChange" ref="mypagination"></my-pagination>
     </div>
     <!-- 查看 -->
     <el-dialog
@@ -709,7 +709,7 @@ export default {
       });
     },
     quhua(e) {
-      this.subdistrict = e;
+      this.form.subdistrict = e;
     },
     searchList() {
       this.searchBefore = {
@@ -717,9 +717,6 @@ export default {
         pageNum: 1,
       };
       this.$refs.mypagination.defaultPages();
-      if (this.subdistrict) {
-        this.form.subdistrict = this.subdistrict;
-      }
       this.searchBefore = { ...this.searchBefore, ...this.form };
       this.getList();
     },
@@ -733,11 +730,11 @@ export default {
         entprColor: "",
         uscCode: "",
       };
-      // this.subdistrict = []
       this.searchBefore = {
         pageSize: 10,
         pageNum: 1,
       };
+      this.$refs.executive.district = [];
       this.$refs.mypagination.defaultPages();
       this.getList();
     },
diff --git a/src/views/yingji/home.vue b/src/views/yingji/home.vue
index ed42ef9..5f12bec 100644
--- a/src/views/yingji/home.vue
+++ b/src/views/yingji/home.vue
@@ -128,7 +128,7 @@
           >
           </el-table-column>
           <el-table-column label="完成率" prop="pt" header-align="center">
-            <template slot-scope="scope"> {{ scope.row.pt * 100 }}% </template>
+            <template slot-scope="scope"> {{ scope.row.pt == 'NaN'?'0':scope.row.pt * 100 }}% </template>
           </el-table-column>
         </el-table>
       </div>