zc

src/api/safetyCheck/index.js

@@ -470,6 +470,30 @@ export function checkHazardList(query) {
     params: query
   })
 }
+//待整改
+export function rectifyList(query) {
+  return request({
+    url: '/zd-security/checkHazard/rectifyList',
+    method: 'get',
+    params: query
+  })
+}
+//待复核
+export function recheckList(query) {
+  return request({
+    url: '/zd-security/checkHazard/recheckList',
+    method: 'get',
+    params: query
+  })
+}
+//已完成
+export function overList(query) {
+  return request({
+    url: '/zd-security/checkHazard/overList',
+    method: 'get',
+    params: query
+  })
+}
 
 //安全隐患-校院巡察/批量审核列表
 export function batchApprovalList(query) {

src/views/safetyCheck/safetyHazard/departmentListPage.vue

@@ -6,10 +6,6 @@
         <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true" label-width="80px">
           <div class="form-button-max-big-box">
             <div class="form-button-big-box" style="margin-left:10px;">
-              <div :class="queryParams.rectifyStatus==''?'checkDiv':''" @click="topLeftClickType('')">
-                <p class="text-p">全部</p>
-                <p class="el-icon-check icon-p" v-if="queryParams.rectifyStatus==''"></p>
-              </div>
               <div :class="queryParams.rectifyStatus==2?'checkDiv':''" @click="topLeftClickType(2)">
                 <p class="text-p">待整改</p>
                 <p class="el-icon-check icon-p" v-if="queryParams.rectifyStatus==2"></p>
@@ -120,7 +116,7 @@
 </template>
 
 <script>
-  import { checkHazardList } from '@/api/safetyCheck/index'
+  import { rectifyList, recheckList, overList } from '@/api/safetyCheck/index'
   import batchAudit from './batchAudit.vue'
   import infoDialog from '@/views/safetyCheck/components/infoDialog/infoDialog.vue'
   export default {
@@ -145,7 +141,7 @@
           pageNum:1,
           pageSize:20,
           hazardType:2,
-          rectifyStatus:"",
+          rectifyStatus:"2",
           examineResult:"",
           searchValue:"",
           checkTimeOrder:"",
@@ -233,10 +229,22 @@
         }else{
           obj.endTime = "";
         }
-        checkHazardList(obj).then(response => {
-          this.total = response.data.total;
-          this.tableList = response.data.records;
-        });
+        if(this.queryParams.rectifyStatus == 2){
+          rectifyList(obj).then(response => {
+            this.total = response.data.total;
+            this.tableList = response.data.records;
+          });
+        } else if (this.queryParams.rectifyStatus == 3){
+          recheckList(obj).then(response => {
+            this.total = response.data.total;
+            this.tableList = response.data.records;
+          });
+        }  else if (this.queryParams.rectifyStatus == 1){
+          overList(obj).then(response => {
+            this.total = response.data.total;
+            this.tableList = response.data.records;
+          });
+        }
       },
       /** 搜索按钮操作 */
       handleQuery() {
@@ -250,7 +258,7 @@
           pageNum:1,
           pageSize:20,
           hazardType:2,
-          rectifyStatus:"",
+          rectifyStatus:"2",
           examineResult:"",
           searchValue:"",
           checkTimeOrder:"",

src/views/safetyCheck/safetyHazard/schoolListPage.vue

@@ -6,10 +6,6 @@
         <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true" label-width="80px">
           <div class="form-button-max-big-box">
             <div class="form-button-big-box" style="margin-left:10px;">
-              <div :class="queryParams.rectifyStatus==''?'checkDiv':''" @click="topLeftClickType('')">
-                <p class="text-p">全部</p>
-                <p class="el-icon-check icon-p" v-if="queryParams.rectifyStatus==''"></p>
-              </div>
               <div :class="queryParams.rectifyStatus==2?'checkDiv':''" @click="topLeftClickType(2)">
                 <p class="text-p">待整改</p>
                 <p class="el-icon-check icon-p" v-if="queryParams.rectifyStatus==2"></p>
@@ -120,7 +116,7 @@
 </template>
 
 <script>
-  import { checkHazardList } from '@/api/safetyCheck/index'
+  import { rectifyList, recheckList, overList } from '@/api/safetyCheck/index'
   import batchAudit from './batchAudit.vue'
   import infoDialog from '@/views/safetyCheck/components/infoDialog/infoDialog.vue'
   export default {
@@ -145,7 +141,7 @@
           pageNum:1,
           pageSize:20,
           hazardType:1,
-          rectifyStatus:"",
+          rectifyStatus:"2",
           examineResult:"",
           searchValue:"",
           checkTimeOrder:"",
@@ -233,10 +229,22 @@
         }else{
           obj.endTime = "";
         }
-        checkHazardList(obj).then(response => {
-          this.total = response.data.total;
-          this.tableList = response.data.records;
-        });
+        if(this.queryParams.rectifyStatus == 2){
+          rectifyList(obj).then(response => {
+            this.total = response.data.total;
+            this.tableList = response.data.records;
+          });
+        } else if (this.queryParams.rectifyStatus == 3){
+          recheckList(obj).then(response => {
+            this.total = response.data.total;
+            this.tableList = response.data.records;
+          });
+        }  else if (this.queryParams.rectifyStatus == 1){
+          overList(obj).then(response => {
+            this.total = response.data.total;
+            this.tableList = response.data.records;
+          });
+        }
       },
       /** 搜索按钮操作 */
       handleQuery() {
@@ -250,7 +258,7 @@
           pageNum:1,
           pageSize:20,
           hazardType:1,
-          rectifyStatus:"",
+          rectifyStatus:"2",
           examineResult:"",
           searchValue:"",
           checkTimeOrder:"",