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

src/views/yingji/echarts/completePlan.vue

@@ -20,14 +20,12 @@ export default {
       type: Boolean,
       default: true,
     },
-
-  },
-  mounted() {
   },
+  mounted() {},
   methods: {
     getData(e) {
-      this.arr1= []
-      this.arr2= []
+      this.arr1 = [];
+      this.arr2 = [];
       e.forEach((value) => {
         this.arr1.push(value.institutionName);
         this.arr2.push(value.checkEnterpriseCount);

src/views/yingji/echarts/executionPlan.vue

@@ -24,8 +24,13 @@ export default {
       this.arr1 = [];
       this.arr2 = [];
       e.forEach((value) => {
-        this.arr1.push(value.institutionName);
-        this.arr2.push(value.plannedEnterpriseCount);
+        if (value.institutionName == "苏州市") {
+          this.arr1.unshift(value.institutionName);
+          this.arr2.unshift(value.plannedEnterpriseCount);
+        } else {
+          this.arr1.push(value.institutionName);
+          this.arr2.push(value.plannedEnterpriseCount);
+        }
       });
       this.init();
     },

src/views/yingji/echarts/finishRate.vue

@@ -15,9 +15,7 @@ export default {
       numTotal: 0,
     };
   },
-  mounted() {
- 
-  },
+  mounted() {},
   props: {
     loadS: {
       type: Boolean,
@@ -26,10 +24,10 @@ export default {
   },
   methods: {
     getData(e) {
-      this.arr1= []
-      this.arr2= []
+      this.arr1 = [];
+      this.arr2 = [];
       e.forEach((value1) => {
-        if (value1.institutionName != "苏州") {
+        if (value1.institutionName != "苏州市") {
           this.arr1.push({
             value: value1.checkEnterpriseCount,
             name: value1.institutionName,
@@ -38,8 +36,8 @@ export default {
         } else {
           this.arr2.push({
             value: value1.plannedEnterpriseCount,
-            name: value1.institutionName,
-            pt: value1.pt=='NaN'?0:value1.pt,
+            name: value1.institutionName ,
+            pt: value1.pt == "NaN" ? 0 : value1.pt.toFixed(2),
           });
         }
       });
@@ -141,7 +139,7 @@ export default {
                 position: "center",
                 formatter: function (params) {
                   console.log(params);
-                  return `{a|${params.data.pt * 100}%}\n{b|${
+                  return `{a|${Number(params.data.pt) * 100}%}\n{b|${
                     params.data.name
                   }完成率}`;
                 },

src/views/yingji/enforcing.vue

@@ -224,11 +224,6 @@ export default {
           label: "检查场所",
           value: "",
         },
-        {
-          eng: "examineSituation",
-          label: "检查情况",
-          value: "",
-        },
         {
           eng: "examineSource",
           label: "检查来源",
@@ -285,12 +280,16 @@ export default {
           label: "文书类型",
           value: "",
         },
-
         {
           eng: "writNo",
           label: "文书文号",
           value: "",
         },
+        {
+          eng: "examineSituation",
+          label: "检查情况",
+          value: "",
+        },
       ],
       searchBefore: {
         pageSize: 10,

src/views/yingji/enterprise.vue

@@ -4,7 +4,11 @@
       <div class="one-line">
         <div class="select-input">
           <div class="select-span">行政区划:</div>
-          <executive @quhua="quhua" @quhuadizhi="quhuadizhi" ref="executive"></executive>
+          <executive
+            @quhua="quhua"
+            @quhuadizhi="quhuadizhi"
+            ref="executive"
+          ></executive>
         </div>
         <div class="select-input">
           <div class="select-span">经济类型:</div>
@@ -192,7 +196,11 @@
       </el-table>
     </div>
     <div class="pagination">
-      <my-pagination :total="total" @pagesChange="pagesChange" ref="mypagination"></my-pagination>
+      <my-pagination
+        :total="total"
+        @pagesChange="pagesChange"
+        ref="mypagination"
+      ></my-pagination>
     </div>
     <!-- 查看 -->
     <el-dialog
@@ -620,7 +628,8 @@ export default {
       for (let key in this.details) {
         this.listDes.forEach((value1, index1) => {
           if (key == value1.eng) {
-            this.listDes[index1].value = this.details[key] == '无' ? '/' : this.details[key];
+            this.listDes[index1].value =
+              this.details[key] == "无" ? "/" : this.details[key];
             return;
           }
         });
@@ -639,7 +648,7 @@ export default {
             this.dict.type.economic_categories,
             value1.value
           );
-        } 
+        }
         //经济类型小类
         if (value1.eng == "ecoTypeSmall") {
           this.listDes[index1].value = this.filterTable(
@@ -700,11 +709,14 @@ export default {
             value1.value
           );
         }
-        if (value1.value == null ) {
-          this.listDes[index1].value = '/'
+        if (value1.value == null) {
+          this.listDes[index1].value = "/";
+        }
+        if (value1.value == "false") {
+          this.listDes[index1].value = "否";
         }
-        if ( value1.value == 'false') {
-          this.listDes[index1].value = '否'
+        if (value1.value == "true") {
+          this.listDes[index1].value = "是";
         }
       });
     },

src/views/yingji/focusEnter.vue

@@ -11,7 +11,7 @@
     <div class="enforce-the-law-title">
       <div class="filtrate-condition">
         <div class="select-input">
-          <div class="select-span">年份:</div>
+          <div class="select-span">年月:</div>
           <div>
             <el-date-picker
               v-model="queryParms.year"

src/views/yingji/home.vue

@@ -5,9 +5,9 @@
         <div class="navText">年份:</div>
         <el-date-picker
           v-model="ruleForm.plannedYear"
-          type="month"
+          type="year"
           size="mini"
-          value-format="yyyy-MM"
+          value-format="yyyy"
           placeholder="请选择年份"
         >
         </el-date-picker>
@@ -128,7 +128,7 @@
           >
           </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 }}% </template>
+            <template slot-scope="scope"> {{ scope.row.pt == 'NaN'?'0':(scope.row.pt * 100).toFixed(2) }}% </template>
           </el-table-column>
         </el-table>
       </div>
@@ -201,6 +201,13 @@ export default {
       this.load1 = 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.load1 = false;
       });
     },