Merge branch 'main' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/suzhouyingjiPC

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,
           });
         }
       });

src/views/yingji/enforcing.vue

@@ -23,8 +23,7 @@
         </div>
         <div class="select-input">
           <div class="select-span">区划:</div>
-
+          <executive @quhua="quhua" @quhuadizhi="quhuadizhi"  ref="executive"></executive>
-          <executive @quhua="quhua" @quhuadizhi="quhuadizhi"></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.tableData = res.rows;
-        this.total = res.data.total;
+        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();
     },

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>
@@ -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();
     },

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>