工作 检查

src/views/bdglregular/regularinfo/index.vue

@@ -295,10 +295,7 @@
           >
             {{ scope.row.currentState }}
           </div>
-          <div
-            style="color: #909399"
-            v-if="scope.row.currentState == '已逾期'"
-          >
+          <div style="color: #909399" v-if="scope.row.currentState == '已逾期'">
             {{ scope.row.currentState }}
           </div>
         </template>
@@ -716,6 +713,29 @@ export default {
     };
   },
   created() {
+    this.queryParams={
+        pageNum: 1,
+        pageSize: 10,
+        inspectedUnitId: null,
+        inspectedUnit: null,
+        inspectionType: null,
+        unitCheckId: null,
+        unitCheck: null,
+        inspectionTime: null,
+        inspectionSite: null,
+        score: null,
+        rectificationTime: null,
+        currentState: null,
+        question: null,
+        createUserId: null,
+        createUser: null,
+        chargePeopleId: null,
+        chargePeople: null,
+        correctiveAction: null,
+        pictureProof: null,
+        documentProof: null,
+        caoZuoType: 0,
+      };
     //部门数据
     getDept().then((res) => {
       if (res.code == 200) {
@@ -746,16 +766,36 @@ export default {
   },
   watch: {
     $route(to, from) {
+      this.queryParams={
+        pageNum: 1,
+        pageSize: 10,
+        inspectedUnitId: null,
+        inspectedUnit: null,
+        inspectionType: null,
+        unitCheckId: null,
+        unitCheck: null,
+        inspectionTime: null,
+        inspectionSite: null,
+        score: null,
+        rectificationTime: null,
+        currentState: null,
+        question: null,
+        createUserId: null,
+        createUser: null,
+        chargePeopleId: null,
+        chargePeople: null,
+        correctiveAction: null,
+        pictureProof: null,
+        documentProof: null,
+        caoZuoType: 0,
+      };
       if (to.query.id) {
         bumenlist(to.query.id).then((res) => {
           this.regularinfoList = res.rows;
           this.total = res.total;
           this.loading = false;
         });
-      } else {
-        this.getList();
-      }
-      if (to.query.obj) {
+      } else if (to.query.obj) {
         this.queryParams.inspectedUnitId = to.query.obj.id + "";
         this.queryParams.currentState = to.query.obj.name + "";
 
@@ -768,6 +808,7 @@ export default {
       } else {
         this.getList();
       }
+
       // listRegularinfos
       console.log(to.query.obj);
     },

src/views/bdglregular/specialcountinfo/index.vue

@@ -8,7 +8,7 @@
         <el-table
           :data="peopleList"
           :header-cell-style="{ background: '#0c2c50', color: 'white' }"
-          style="width:98%;background:#0c2c50;margin-left:1%;"
+          style="width: 98%; background: #0c2c50; margin-left: 1%"
           height="88%"
         >
           <!-- <el-table-column type="selection" width="55" align="center" /> -->
@@ -17,12 +17,12 @@
           <el-table-column label="单位" align="center" prop="name" />
           <el-table-column label="加分" align="center" prop="addscore">
             <template slot-scope="scope">
-              <div style="color: rgb(2 255 2) ;">{{ scope.row.addscore }}</div>
+              <div style="color: rgb(2 255 2)">{{ scope.row.addscore }}</div>
             </template>
           </el-table-column>
           <el-table-column label="减分" align="center" prop="subscore">
             <template slot-scope="scope">
-              <div style="color:rgb(255 106 0);">{{ scope.row.subscore }}</div>
+              <div style="color: rgb(255 106 0)">{{ scope.row.subscore }}</div>
             </template>
           </el-table-column>
           <el-table-column label="总分" align="center" prop="zongfen" />
@@ -35,7 +35,7 @@
         <el-table
           :data="peopleList2"
           :header-cell-style="{ background: '#0c2c50', color: 'white' }"
-          style="width:98%;background:#0c2c50;margin-left:1%;"
+          style="width: 98%; background: #0c2c50; margin-left: 1%"
           height="88%"
           @row-click="rowclick"
         >
@@ -58,10 +58,15 @@
           ></el-table-column>
           <el-table-column label="减分" align="center" prop="score">
             <template slot-scope="scope">
-              <div style="color:rgb(255 106 0);">{{ scope.row.score }}</div>
+              <div style="color: rgb(255 106 0)">{{ scope.row.score }}</div>
             </template>
           </el-table-column>
-          <el-table-column label="事由" show-overflow-tooltip align="center" prop="question" />
+          <el-table-column
+            label="事由"
+            show-overflow-tooltip
+            align="center"
+            prop="question"
+          />
           <el-table-column
             label="整改时间"
             align="center"
@@ -110,7 +115,7 @@ import {
   unitrank,
   pendingacceptance,
   completeproportion,
-  unitproportion
+  unitproportion,
 } from "@/api/bdglregular/specialcountinfo";
 import * as echarts from "echarts";
 export default {
@@ -118,7 +123,7 @@ export default {
     return {
       peopleList: [],
       peopleList2: [],
-      peopleList3: []
+      peopleList3: [],
     };
   },
   created() {
@@ -131,21 +136,21 @@ export default {
   },
   methods: {
     getlist() {
-      unitrank().then(res => {
+      unitrank().then((res) => {
         if (res.code == 200) {
           this.peopleList = res.data;
         }
       });
     },
     getlist2() {
-      pendingacceptance().then(res => {
+      pendingacceptance().then((res) => {
         if (res.code == 200) {
           this.peopleList2 = res.data;
         }
       });
     },
     getlist3() {
-      completeproportion().then(res => {
+      completeproportion().then((res) => {
         if (res.code == 200) {
           var myChart = echarts.init(
             document.getElementById("foot-left-content")
@@ -154,11 +159,11 @@ export default {
             title: {
               text: "",
               subtext: "",
-              left: ""
+              left: "",
             },
             tooltip: {
               trigger: "item",
-              formatter: "{a} <br/>{b} : {c} ({d}%)"
+              formatter: "{a} <br/>{b} : {c} ({d}%)",
             },
             color: ["#fac858", "#5470c6", "#ee6666", "#91cc75"],
             legend: {
@@ -167,9 +172,9 @@ export default {
               top: "10%",
               itemGap: 20,
               textStyle: {
-                color: "#fff"
+                color: "#fff",
               },
-              data: ["待处理", "待验收", "未通过", "已通过"]
+              data: ["待处理", "待验收", "未通过", "已通过"],
             },
             series: [
               {
@@ -184,39 +189,45 @@ export default {
                     textStyle: {
                       fontWeight: 300,
                       fontSize: 16,
-                      color: "#fff"
-                    }
-                  }
+                      color: "#fff",
+                    },
+                  },
                 },
                 data: [
                   {
-                    value: res.data[0].daiyanshou==0?null:res.data[0].daiyanshou,
-                    name: "待验收"
+                    value:
+                      res.data[0].daiyanshou == 0
+                        ? null
+                        : res.data[0].daiyanshou,
+                    name: "待验收",
                   },
-                   {
-                    value: res.data[0].daichuli==0?null:res.data[0].daichuli,
-                    name: "待处理"
+                  {
+                    value:
+                      res.data[0].daichuli == 0 ? null : res.data[0].daichuli,
+                    name: "待处理",
                   },
                   {
-                    value: res.data[0].weitongguo==0?null:res.data[0].weitongguo,
-                    name: "未通过"
+                    value:
+                      res.data[0].weitongguo == 0
+                        ? null
+                        : res.data[0].weitongguo,
+                    name: "未通过",
                   },
                   {
-                    value: res.data[0].yitongguo==0?null:res.data[0].yitongguo,
-                    name: "已通过"
+                    value:
+                      res.data[0].yitongguo == 0 ? null : res.data[0].yitongguo,
+                    name: "已通过",
                   },
-                 
-                  
                 ],
                 emphasis: {
                   itemStyle: {
                     shadowBlur: 10,
                     shadowOffsetX: 0,
-                    shadowColor: "rgba(0, 0, 0, 0.5)"
-                  }
-                }
-              }
-            ]
+                    shadowColor: "rgba(0, 0, 0, 0.5)",
+                  },
+                },
+              },
+            ],
           };
           myChart.setOption(option);
         }
@@ -224,7 +235,7 @@ export default {
     },
     getlist4() {},
     echarfun() {
-      unitproportion().then(res => {
+      unitproportion().then((res) => {
         if (res.code == 200) {
           this.peopleList3 = res.data;
           var roseCharts = document.getElementsByClassName("block");
@@ -242,13 +253,13 @@ export default {
                   color: "#ffff",
                   // fontSize: 12,
                   fontStyle: "normal",
-                  fontWeight: "normal"
-                }
+                  fontWeight: "normal",
+                },
               },
               color: ["#fac858", "#5470c6", "#ee6666", "#91cc75"],
               tooltip: {
                 trigger: "item",
-                formatter: "{a} <br/>{b} : {c} ({d}%)"
+                formatter: "{a} <br/>{b} : {c} ({d}%)",
               },
               // legend: {
               //   orient: "vertical",
@@ -274,41 +285,53 @@ export default {
                       textStyle: {
                         fontWeight: 300,
                         fontSize: 16,
-                        color: "#fff"
-                      }
-                    }
+                        color: "#fff",
+                      },
+                    },
                   },
                   data: [
                     {
-                      value: this.peopleList3[i].daiyanshou==0?null:this.peopleList3[i].daiyanshou,
+                      value:
+                        this.peopleList3[i].daiyanshou == 0
+                          ? null
+                          : this.peopleList3[i].daiyanshou,
                       name: "待验收",
                       id: this.peopleList3[i].deptId,
                     },
                     {
-                      value: this.peopleList3[i].daichuli==0?null:this.peopleList3[i].daichuli,
+                      value:
+                        this.peopleList3[i].daichuli == 0
+                          ? null
+                          : this.peopleList3[i].daichuli,
                       name: "待处理",
                       id: this.peopleList3[i].deptId,
                     },
                     {
-                      value: this.peopleList3[i].weitonguo==0?null:this.peopleList3[i].weitonguo,
+                      value:
+                        this.peopleList3[i].weitonguo == 0
+                          ? null
+                          : this.peopleList3[i].weitonguo,
                       name: "未通过",
                       id: this.peopleList3[i].deptId,
                     },
                     {
-                      value: this.peopleList3[i].yitongguo==0?null:this.peopleList3[i].yitongguo,
+                      value:
+                        this.peopleList3[i].yitongguo == 0
+                          ? null
+                          : this.peopleList3[i].yitongguo,
                       name: "已通过",
                       id: this.peopleList3[i].deptId,
-                    }
+                    },
                   ],
                   emphasis: {
                     itemStyle: {
                       shadowBlur: 10,
                       shadowOffsetX: 0,
-                      shadowColor: "rgba(0, 0, 0, 0.5)"
-                    }
-                  }
-                }
-              ]
+                      shadowColor: "rgba(0, 0, 0, 0.5)",
+                    },
+                  },
+                },
+              ],
             };
             myChart.setOption(option);
             myChart.on("click", this.eConsole);
@@ -319,21 +342,26 @@ export default {
     rowclick(row) {
       console.log(row.inspectedUnitId);
       this.$router
-        .push({ path: "/bdglregular/specialinfo", query: { id:row.inspectedUnitId  } })
+        .push({
+          path: "/bdglregular/specialinfo",
+          query: { id: row.inspectedUnitId },
+        })
         .catch(() => {});
-      
     },
     //饼状图点击事件
     eConsole(param) {
       // console.log(param.data);
-      this.$router
-        .push({
-          path: "/bdglregular/specialinfo",
-          query: { obj: param.data },
-        })
-        .catch(() => {});
+      // console.log(param.data);
+      if (param.data) {
+        this.$router
+          .push({
+            path: "/bdglregular/specialinfo",
+            query: { obj: param.data },
+          })
+          .catch(() => {});
+      }
     },
-  }
+  },
 };
 </script>
 
@@ -352,10 +380,10 @@ export default {
 .head {
   width: 100%;
   /* height: 43.5vh; */
-  flex:1;
+  flex: 1;
   display: flex;
   flex-direction: row;
-  margin-top:10px;
+  margin-top: 10px;
   margin-bottom: 10px;
 }
 .head-left {
@@ -364,8 +392,8 @@ export default {
   background-image: url("../../../assets/images/底 拷贝 3.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
-  margin-left:10px;
-  margin-right:10px;
+  margin-left: 10px;
+  margin-right: 10px;
 }
 .head-right {
   flex: 6;
@@ -373,7 +401,7 @@ export default {
   background-image: url("../../../assets/images/底 拷贝 3.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
-  margin-right:10px;
+  margin-right: 10px;
 }
 
 .head-left-title {
@@ -399,10 +427,10 @@ export default {
 .foot {
   width: 100%;
   /* height: 45vh; */
-  flex:1;
+  flex: 1;
   display: flex;
   flex-direction: row;
-   margin-bottom: 10px;
+  margin-bottom: 10px;
 }
 .foot-left {
   flex: 4;
@@ -411,7 +439,7 @@ export default {
   background-repeat: no-repeat;
   background-size: 100% 100%;
   margin-left: 10px;
-  margin-right:10px;
+  margin-right: 10px;
 }
 .foot-right {
   flex: 6;
@@ -419,7 +447,7 @@ export default {
   background-image: url("../../../assets/images/底 拷贝 3.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
-  margin-right:10px;
+  margin-right: 10px;
 }
 .foot-right-main {
   width: 100%;

src/views/bdglregular/specialinfo/index.vue

@@ -289,10 +289,7 @@
           >
             {{ scope.row.currentState }}
           </div>
-          <div
-            style="color: #909399"
-            v-if="scope.row.currentState == '已逾期'"
-          >
+          <div style="color: #909399" v-if="scope.row.currentState == '已逾期'">
             {{ scope.row.currentState }}
           </div>
         </template>
@@ -549,7 +546,7 @@ import {
   editissuccess,
   editisfalse,
   bumenlist,
-  listSpecialinfos
+  listSpecialinfos,
 } from "@/api/bdglregular/specialinfo";
 
 export default {
@@ -626,6 +623,25 @@ export default {
     };
   },
   created() {
+    this.queryParams={
+        pageNum: 1,
+        pageSize: 10,
+        inspectedUnitId: null,
+        inspectedUnit: null,
+        inspectionTime: null,
+        score: null,
+        rectificationTime: null,
+        currentState: null,
+        question: null,
+        chargePeopleId: null,
+        chargePeople: null,
+        correctiveAction: null,
+        pictureProof: null,
+        documentProof: null,
+        createUserId: null,
+        createUser: null,
+        caoZuoType: 0,
+      };
     //部门数据
     getDept().then((res) => {
       if (res.code == 200) {
@@ -640,7 +656,15 @@ export default {
     });
     if (this.$route.query.id) {
       bumenlist(this.$route.query.id).then((res) => {
-        console.log(1);
+        this.specialinfoList = res.rows;
+        this.total = res.total;
+        this.loading = false;
+      });
+    } else if (this.$route.query.obj) {     
+      this.queryParams.inspectedUnitId = this.$route.query.obj.id;
+      this.queryParams.currentState = this.$route.query.obj.name + "";
+
+      listSpecialinfos(this.queryParams).then((res) => {
         this.specialinfoList = res.rows;
         this.total = res.total;
         this.loading = false;
@@ -651,16 +675,34 @@ export default {
   },
   watch: {
     $route(to, from) {
+      this.queryParams={
+        pageNum: 1,
+        pageSize: 10,
+        inspectedUnitId: null,
+        inspectedUnit: null,
+        inspectionTime: null,
+        score: null,
+        rectificationTime: null,
+        currentState: null,
+        question: null,
+        chargePeopleId: null,
+        chargePeople: null,
+        correctiveAction: null,
+        pictureProof: null,
+        documentProof: null,
+        createUserId: null,
+        createUser: null,
+        caoZuoType: 0,
+      };
       if (to.query.id) {
+        console.log(1);
         bumenlist(to.query.id).then((res) => {
           this.specialinfoList = res.rows;
           this.total = res.total;
           this.loading = false;
         });
-      } else {
-        this.getList();
-      }
-      if (to.query.obj) {
+      } else if (to.query.obj) {
+        console.log(2);
         this.queryParams.inspectedUnitId = to.query.obj.id;
         this.queryParams.currentState = to.query.obj.name + "";
 
@@ -671,6 +713,7 @@ export default {
           this.loading = false;
         });
       } else {
+        console.log(3);
         this.getList();
       }
     },

src/views/taishi/index.vue

@@ -1021,18 +1021,18 @@ export default {
       wylist: [],
       smztlist:[],
       config: {
-        header: ["单位", "防疫名称", "现有数量"],
+        header: [ "防疫名称", "现有数量"],
         data: [
-          ["行1列1", "行1列2", "行1列3"],
-          ["行2列1", "行2列2", "行2列3"],
-          ["行3列1", "行3列2", "行3列3"],
-          ["行4列1", "行4列2", "行4列3"],
-          ["行5列1", "行5列2", "行5列3"],
-          ["行6列1", "行6列2", "行6列3"],
-          ["行7列1", "行7列2", "行7列3"],
-          ["行8列1", "行8列2", "行8列3"],
-          ["行9列1", "行9列2", "行9列3"],
-          ["行10列1", "行10列2", "行10列3"],
+          ["行1列1", "行1列2"],
+          ["行2列1", "行2列2"],
+          ["行3列1", "行3列2"],
+          ["行4列1", "行4列2"],
+          ["行5列1", "行5列2"],
+          ["行6列1", "行6列2"],
+          ["行7列1", "行7列2"],
+          ["行8列1", "行8列2"],
+          ["行9列1", "行9列2"],
+          ["行10列1", "行10列2"],
         ],
         index: true,
         columnWidth: [],

src/views/workingArrangements/planTask/index.vue

@@ -103,12 +103,12 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="名称" align="center" prop="name" />
-      <el-table-column
+      <!-- <el-table-column
         label="发布单位"
         align="center"
         prop="unitName"
         :formatter="unit3Format"
-      />
+      /> -->
       <el-table-column
         label="发布人"
         align="center"
@@ -133,7 +133,7 @@
         width="180"
       >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}") }}</span>
+          <span>{{ parseTime(scope.row.startTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -143,7 +143,7 @@
         width="180"
       >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
+          <span>{{ parseTime(scope.row.endTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -321,7 +321,6 @@
             size="small"
             v-model="form.startTime"
             type="datetime"
-            value-format="yyyy-MM-dd HH-mm-ss"
             placeholder="请选择开始时间"
           >
           </el-date-picker>
@@ -332,7 +331,6 @@
             size="small"
             v-model="form.endTime"
             type="datetime"
-            value-format="yyyy-MM-dd HH-mm-ss"
             placeholder="请选择结束时间"
             style="width: 200px"
             default-time="00:00:00"

src/views/workingArrangements/workTask/index.vue

@@ -151,12 +151,12 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="名称" align="center" prop="name" />
-      <el-table-column
+      <!-- <el-table-column
         label="发布单位"
         align="center"
         prop="adminId"
         :formatter="unit3Format"
-      />
+      /> -->
       <el-table-column label="发布人" align="center" prop="username" />
       <el-table-column
         label="任务类型"
@@ -179,7 +179,7 @@
       >
         <template slot-scope="scope">
           <span>{{
-            parseTime(scope.row.startTime, "{y}-{m}-{d} {h}-{m}-{s}")
+            parseTime(scope.row.startTime)
           }}</span>
         </template>
       </el-table-column>
@@ -191,7 +191,7 @@
       >
         <template slot-scope="scope">
           <span>{{
-            parseTime(scope.row.endTime, "{y}-{m}-{d} {h}-{m}-{s}")
+            parseTime(scope.row.endTime)
           }}</span>
         </template>
       </el-table-column>
@@ -366,7 +366,6 @@
             size="small"
             v-model="form.startTime"
             type="datetime"
-            value-format="yyyy-MM-dd HH-mm-ss"
             style="width: 200px"
           >
           </el-date-picker>
@@ -378,7 +377,6 @@
             size="small"
             v-model="form.endTime"
             type="datetime"
-            value-format="yyyy-MM-dd HH-mm-ss"
             default-time="00:00:00"
           >
           </el-date-picker>