执法结果

src/views/components/AddDialog/tab1.vue

@@ -54,7 +54,7 @@
       </el-form>
     </div>
     <div class="tables" v-loading="loading">
-      <el-table v-loading="loading" :data="newList">
+      <el-table v-loading="loading" :data="newList" height="400">
         <el-table-column
           label="企业名称"
           align="center"
@@ -221,7 +221,7 @@ export default {
         deptId: null,
         district: null,
         plannedYear: null,
-        isPoint: "",
+        isPoint: 1,
         enterpriseName: null,
         lawSort: null,
         lawAreas: null,
@@ -470,8 +470,8 @@ export default {
       align-items: center;
       justify-content: space-between;
       flex-wrap: wrap;
-      padding-top: 10px;
-      padding-bottom: 10px;
+      // padding-top: 10px;
+      // padding-bottom: 10px;
       .btn-search {
         background: #2378ec;
         color: #ffffff;
@@ -536,7 +536,7 @@ export default {
           }
         }
         .el-table__body-wrapper {
-          height: 448px !important;
+          // height: 448px !important;
           overflow-y: auto;
         }
       }

src/views/components/AddDialog/tab2.vue

@@ -221,7 +221,7 @@ export default {
         deptId: null,
         district: null,
         plannedYear: null,
-        isPoint: "",
+        isPoint: 2,
         enterpriseName: null,
         lawSort: null,
         lawAreas: null,

src/views/yingji/echarts/finishRate.vue

@@ -50,7 +50,7 @@ export default {
           this.arr2.push({
             value: value1.count,
             name: value1.lawAreas,
-            pt: value1.completionRate == "NaN" ? 0 : value1.completionRate.toFixed(2),
+            pt: value1.completionRate
           });
         // }
       });

src/views/yingji/enforcing.vue

@@ -49,7 +49,7 @@
           ></el-input>
         </div>
         <div class="select-input">
-          <div class="select-span">区划:</div>
+          <div class="select-span">行政区划:</div>
           <executive
             @quhua="quhua"
             @quhuadizhi="quhuadizhi"
@@ -64,7 +64,7 @@
         <el-checkbox-group v-model="checkList" @change="setmealSelect">
           <el-checkbox label="">全部</el-checkbox>
           <el-checkbox label="1">已检查</el-checkbox>
-          <el-checkbox label="2">未检查</el-checkbox>
+          <el-checkbox label="0">未检查</el-checkbox>
         </el-checkbox-group>
       </div>
       <div style="display: flex">
@@ -102,7 +102,7 @@
         >
           <template slot-scope="scope">
             <span
-              >{{ scope.row.plannedYear }}-{{ scope.row.plannedMouth }}</span
+              >{{ scope.row.plannedYear }}-{{ scope.row.plannedMonth }}</span
             >
           </template>
         </el-table-column>
@@ -137,8 +137,18 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="" label="检查结束时间" header-align="center" />
-        <el-table-column prop="" label="检查时效" header-align="center" />
+        <el-table-column prop="examineEndTime" label="检查结束时间" header-align="center" />
+        <el-table-column
+          prop="checkAgeing"
+          label="检查时效"
+          header-align="center"
+        >
+          <template slot-scope="scope">
+            <span style="color:green" v-if="scope.row.checkAgeing == 1">{{ scope.row.checkAgeing | checkAgeing }}</span>
+            <span style="color:blue" v-else-if="scope.row.checkAgeing == 2">{{ scope.row.checkAgeing | checkAgeing }}</span>
+            <span style="color:red" v-else-if="scope.row.checkAgeing == 3">{{ scope.row.checkAgeing | checkAgeing }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" header-align="center">
           <template slot-scope="scope">
             <div class="tabs-btns">
@@ -412,6 +422,8 @@ export default {
     multipleChange(e) {
       // console.log(e.join(','));
       this.form.plannedMouth = e.join(",");
+      this.searchBefore = { ...this.searchBefore, ...this.form };
+      this.getList();
     },
     filterTable(a, b) {
       if (!b) return;
@@ -423,14 +435,10 @@ export default {
       this.option.map((item) => {
         if (item.value == district) {
           name = item.label;
-          // console.log(item);
-          // console.log(district);
-          // console.log(name);
         } else {
           item.children.map((itemTwo) => {
             if (itemTwo.value == district) {
               name = item.label + "-" + itemTwo.label;
-              // console.log(name);
             }
           });
         }
@@ -453,8 +461,11 @@ export default {
       this.searchBefore = {
         pageSize: 10,
         pageNum: 1,
+        plannedMouth: "",
       };
 
+      this.plannedMouth = "";
+      this.checkList = [""];
       this.form.plannedYear = this.$moment(new Date()).format("yyyy");
       this.searchBefore = { ...this.searchBefore, ...this.form };
     },
@@ -467,6 +478,7 @@ export default {
       this.addShow = false;
     },
     look(e) {
+      console.log(e);
       this.addShow = true;
       this.detailLoad = true;
       enforcingGet(e.longId).then((res) => {
@@ -518,6 +530,7 @@ export default {
         pageSize: 10,
         pageNum: 1,
       };
+      this.searchBefore.plannedMouth = this.plannedMouth;
       this.searchBefore = { ...this.searchBefore, ...this.form };
       this.getList();
     },
@@ -585,6 +598,18 @@ export default {
   mounted() {
     this.checkListTwo = this.checkList;
   },
+  filters: {
+    checkAgeing: function (value) {
+      switch (value) {
+        case 1:
+          return "当月";
+        case 2:
+          return "提前";
+        case 3:
+          return "滞后";
+      }
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/yingji/home.vue

@@ -103,9 +103,7 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <span class="numb-hover" @click="openDialog(scope.row)">{{
-                scope.row.lawAreas
-              }}</span>
+              {{ scope.row.lawAreas }}
             </template>
           </el-table-column>
           <el-table-column prop="count" label="执法计划" header-align="center">
@@ -131,9 +129,7 @@
           >
             <template slot-scope="scope">
               {{
-                scope.row.completionRate == "NaN"
-                  ? "0"
-                  : (scope.row.completionRate * 100).toFixed(2)
+                scope.row.completionRate
               }}%
             </template>
           </el-table-column>
@@ -181,7 +177,9 @@
           </el-table-column>
           <el-table-column prop="count" label="执法计划" header-align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.count }}家</span>
+             <span class="numb-hover" @click="routerLink(scope.row)"
+                >{{ scope.row.count }}家</span
+              >
             </template>
           </el-table-column>
           <el-table-column
@@ -200,9 +198,7 @@
           >
             <template slot-scope="scope">
               {{
-                scope.row.completionRate == "NaN"
-                  ? "0"
-                  : (scope.row.completionRate * 100).toFixed(2)
+                scope.row.completionRate
               }}%
             </template>
           </el-table-column>
@@ -337,7 +333,7 @@ export default {
       treeEnterprise(this.queryParams).then((response) => {
         // console.log(response);
         this.tableData = response.data;
-        this.newTable =  response.data
+        this.newTable = response.data;
       });
     },
     // 打开县区下的列表数据
@@ -352,6 +348,9 @@ export default {
       treeEnterprise(queryParams).then((response) => {
         this.tableInfoData = response.data;
       });
+    },
+    routerLink(){
+
     },
     active(e) {
       this.activeIndex = e;

src/views/yingji/planManage.vue

@@ -114,7 +114,7 @@
         :row-class-name="tableRowClassName"
         height="430"
       >
-        <el-table-column label="计划年份" align="center" prop="plannedYear">
+        <el-table-column label="计划年月" align="center" prop="plannedYear">
           <template slot-scope="scope">
             <span>
               {{ scope.row.plannedYear }}-{{ scope.row.plannedMonth }}