zc

src/api/safetyCheck/index.js

@@ -265,6 +265,16 @@ export function findByCheckPlanId(data) {
   })
 }
 
+//检查计划-查询管理列表
+//自查任务-查询管理列表
+export function checkManageList(data) {
+  return request({
+    url: '/zd-security/checkManage/list',
+    method: 'post',
+    data: data
+  })
+}
+
 //检查计划-根据计划ID删除
 //自查任务-根据计划ID删除
 export function checkPlanDelete(query) {

src/views/safetyCheck/checkItemLibrary/index.vue

@@ -404,7 +404,7 @@
       },
       //查询
       onSearch() {
-        // this.getListPlan();
+        this.getList();
       },
       //重置
       resetForm() {

src/views/safetyCheck/laboratorySelfTest/selfInspectionManagement/index.vue

@@ -62,9 +62,9 @@
           </el-form-item>
           <div class="form-button-max-big-box">
             <div class="form-button-big-box">
-              <div :class="queryParams.myType==1?'checkDiv':''" style="width:100px;" @click="topRightClickType">
+              <div :class="queryParams.isSelf==1?'checkDiv':''" style="width:100px;" @click="topRightClickType">
                 <p class="text-p">本人发起</p>
-                <p class="el-icon-check icon-p" v-if="queryParams.myType==1"></p>
+                <p class="el-icon-check icon-p" v-if="queryParams.isSelf==1"></p>
               </div>
             </div>
           </div>
@@ -73,25 +73,37 @@
       <div class="content-box">
         <el-table  border :data="tableList" ref="multipleTable" @sort-change="sortChange">
           <el-table-column label="序号" align="center"  type="index" width="60" />
-          <el-table-column label="计划标题" align="center" prop="hardwareNum" show-overflow-tooltip width="250"/>
-          <el-table-column label="实验室" align="center" prop="deptName" show-overflow-tooltip width="220"/>
-          <el-table-column label="学院" align="center" prop="deptName" show-overflow-tooltip width="150"/>
-          <el-table-column label="检查状态" align="center" prop="deptName" show-overflow-tooltip width="90"/>
-          <el-table-column label="检查者" align="center" prop="deptName" show-overflow-tooltip width="100"/>
-          <el-table-column label="检查结果" align="center" prop="deptName" show-overflow-tooltip width="80"/>
-          <el-table-column label="隐患数" align="center" prop="deptName" show-overflow-tooltip width="80"/>
-          <el-table-column label="整改进度" align="center" prop="deptName" show-overflow-tooltip width="200"/>
-          <el-table-column label="任务周期" align="center" prop="deptName" show-overflow-tooltip width="270"/>
-          <el-table-column label="检查时间" sortable align="center" prop="deptName" show-overflow-tooltip width="157"/>
+          <el-table-column label="计划标题" align="center" prop="title" show-overflow-tooltip width="250"/>
+          <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="220"/>
+          <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="150"/>
+          <el-table-column label="检查状态" align="center" prop="manageStatus" show-overflow-tooltip width="90">
+            <template slot-scope="scope">
+              <p :class="scope.row.manageStatus==0?'manageStatus-color-1':(scope.row.manageStatus==1?'manageStatus-color-2':(scope.row.manageStatus==2?'manageStatus-color-3':''))">{{scope.row.manageStatus==0?'待检查':(scope.row.manageStatus==1?'检查中':(scope.row.manageStatus==2?'已检查':''))}}</p>
+            </template>
+          </el-table-column>
+          <el-table-column label="检查者" align="center" prop="checkUser" show-overflow-tooltip width="100"/>
+          <el-table-column label="检查结果" align="center" prop="checkResult" show-overflow-tooltip width="80">
+            <template slot-scope="scope">
+              <p>{{scope.row.checkResult==0?'不符合':(scope.row.checkResult==1?'符合':'')}}</p>
+            </template>
+          </el-table-column>
+          <el-table-column label="隐患数" align="center" prop="dangerNum" show-overflow-tooltip width="80"/>
+          <el-table-column label="整改进度" align="center" prop="rectifySchedule" show-overflow-tooltip width="200"/>
+          <el-table-column label="计划周期" align="center" prop="startTime" show-overflow-tooltip width="270">
+            <template slot-scope="scope">
+              <p>{{scope.row.cycleStartTime}}至{{scope.row.cycleEndTime}}<span style="color:#EE0606;margin-left:15px;" v-if="scope.row.isOverdue==1">已逾期</span></p>
+            </template>
+          </el-table-column>
+          <el-table-column label="检查时间" sortable="custom" align="center" prop="checkTime" show-overflow-tooltip width="157"/>
           <el-table-column label="操作" align="center" prop="deptName" width="230">
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
-                <p class="table-button-p" @click="goAddPage(3)">详情</p>
-                <p class="table-button-p" @click="goAddPage(2)">开始检查</p>
-                <p class="table-button-p">编辑</p>
-                <p class="table-button-p" @click="lookDocumentButton(1,scope.row)">整改报告</p>
-                <p class="table-button-p" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
+                <p class="table-button-p" v-if="scope.row.manageStatus!=0" @click="goAddPage(3)">详情</p>
+                <p class="table-button-p" v-if="scope.row.manageStatus==0">编辑</p>
+                <p class="table-button-p" v-if="scope.row.manageStatus==0" @click="goAddPage(2)">开始检查</p>
+                <p class="table-button-p" v-if="scope.row.manageStatus==2" @click="lookDocumentButton(1,scope.row)">整改报告</p>
+                <p class="table-button-p" v-if="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
                 <p class="table-button-null"></p>
               </div>
             </template>
@@ -114,6 +126,7 @@
 </template>
 
 <script>
+  import { findByCheckPlanId } from '@/api/safetyCheck/index'
   import addPage from './addPage.vue'
   import infoPage from '@/views/safetyCheck/components/infoPage/infoPage.vue'
   import lookDocumentDialog from '@/components/lookDocumentDialog/lookDocumentDialog.vue'
@@ -138,7 +151,7 @@
           pageNum:1,
           pageSize:20,
           buttonType:1,
-          myType:0,
+          isSelf:0,
           timeType:0,
           searchValue:"",
           data1:""
@@ -175,7 +188,7 @@
         }
       },
       topRightClickType(){
-        this.$set(this.queryParams,'myType',this.queryParams.myType==1?0:1);
+        this.$set(this.queryParams,'isSelf',this.queryParams.isSelf==1?0:1);
       },
       //获取数据列表
       getList(){
@@ -199,7 +212,7 @@
           pageSize:20,
           buttonType:1,
           timeType:0,
-          myType:0,
+          isSelf:0,
           searchValue:"",
           data1:""
         });

src/views/safetyCheck/schoolInspection/inspectionManagement/index.vue

@@ -62,9 +62,9 @@
           </el-form-item>
           <div class="form-button-max-big-box">
             <div class="form-button-big-box">
-              <div :class="queryParams.myType==1?'checkDiv':''" style="width:100px;" @click="topRightClickType">
+              <div :class="queryParams.isSelf==1?'checkDiv':''" style="width:100px;" @click="topRightClickType">
                 <p class="text-p">本人发起</p>
-                <p class="el-icon-check icon-p" v-if="queryParams.myType==1"></p>
+                <p class="el-icon-check icon-p" v-if="queryParams.isSelf==1"></p>
               </div>
             </div>
           </div>
@@ -73,25 +73,37 @@
       <div class="content-box">
         <el-table  border :data="tableList" ref="multipleTable" @sort-change="sortChange">
           <el-table-column label="序号" align="center"  type="index" width="60" />
-          <el-table-column label="计划标题" align="center" prop="hardwareNum" show-overflow-tooltip width="250"/>
-          <el-table-column label="实验室" align="center" prop="deptName" show-overflow-tooltip width="220"/>
-          <el-table-column label="学院" align="center" prop="deptName" show-overflow-tooltip width="150"/>
-          <el-table-column label="检查状态" align="center" prop="deptName" show-overflow-tooltip width="90"/>
-          <el-table-column label="检查者" align="center" prop="deptName" show-overflow-tooltip width="100"/>
-          <el-table-column label="检查结果" align="center" prop="deptName" show-overflow-tooltip width="80"/>
-          <el-table-column label="隐患数" align="center" prop="deptName" show-overflow-tooltip width="80"/>
-          <el-table-column label="整改进度" align="center" prop="deptName" show-overflow-tooltip width="200"/>
-          <el-table-column label="计划周期" align="center" prop="deptName" show-overflow-tooltip width="270"/>
-          <el-table-column label="检查时间" sortable align="center" prop="deptName" show-overflow-tooltip width="157"/>
+          <el-table-column label="计划标题" align="center" prop="title" show-overflow-tooltip width="250"/>
+          <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="220"/>
+          <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="150"/>
+          <el-table-column label="检查状态" align="center" prop="manageStatus" show-overflow-tooltip width="90">
+            <template slot-scope="scope">
+              <p :class="scope.row.manageStatus==0?'manageStatus-color-1':(scope.row.manageStatus==1?'manageStatus-color-2':(scope.row.manageStatus==2?'manageStatus-color-3':''))">{{scope.row.manageStatus==0?'待检查':(scope.row.manageStatus==1?'检查中':(scope.row.manageStatus==2?'已检查':''))}}</p>
+            </template>
+          </el-table-column>
+          <el-table-column label="检查者" align="center" prop="checkUser" show-overflow-tooltip width="100"/>
+          <el-table-column label="检查结果" align="center" prop="checkResult" show-overflow-tooltip width="80">
+            <template slot-scope="scope">
+              <p>{{scope.row.checkResult==0?'不符合':(scope.row.checkResult==1?'符合':'')}}</p>
+            </template>
+          </el-table-column>
+          <el-table-column label="隐患数" align="center" prop="dangerNum" show-overflow-tooltip width="80"/>
+          <el-table-column label="整改进度" align="center" prop="rectifySchedule" show-overflow-tooltip width="200"/>
+          <el-table-column label="计划周期" align="center" prop="startTime" show-overflow-tooltip width="270">
+            <template slot-scope="scope">
+              <p>{{scope.row.cycleStartTime}}至{{scope.row.cycleEndTime}}<span style="color:#EE0606;margin-left:15px;" v-if="scope.row.isOverdue==1">已逾期</span></p>
+            </template>
+          </el-table-column>
+          <el-table-column label="检查时间" sortable="custom" align="center" prop="checkTime" show-overflow-tooltip width="157"/>
           <el-table-column label="操作" align="center" prop="deptName" width="230">
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
-                <p class="table-button-p" @click="goAddPage(3)">详情</p>
-                <p class="table-button-p" @click="goAddPage(2)">开始检查</p>
-                <p class="table-button-p">编辑</p>
-                <p class="table-button-p" @click="lookDocumentButton(1,scope.row)">整改报告</p>
-                <p class="table-button-p" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
+                <p class="table-button-p" v-if="scope.row.manageStatus!=0" @click="goAddPage(3)">详情</p>
+                <p class="table-button-p" v-if="scope.row.manageStatus==0">编辑</p>
+                <p class="table-button-p" v-if="scope.row.manageStatus==0" @click="goAddPage(2)">开始检查</p>
+                <p class="table-button-p" v-if="scope.row.manageStatus==2" @click="lookDocumentButton(1,scope.row)">整改报告</p>
+                <p class="table-button-p" v-if="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
                 <p class="table-button-null"></p>
               </div>
             </template>
@@ -114,6 +126,7 @@
 </template>
 
 <script>
+  import { findByCheckPlanId } from '@/api/safetyCheck/index'
   import addPage from './addPage.vue'
   import infoPage from '@/views/safetyCheck/components/infoPage/infoPage.vue'
   import lookDocumentDialog from '@/components/lookDocumentDialog/lookDocumentDialog.vue'
@@ -138,7 +151,7 @@
           pageNum:1,
           pageSize:20,
           buttonType:1,
-          myType:0,
+          isSelf:0,
           timeType:0,
           searchValue:"",
           data1:""
@@ -175,7 +188,7 @@
         }
       },
       topRightClickType(){
-        this.$set(this.queryParams,'myType',this.queryParams.myType==1?0:1);
+        this.$set(this.queryParams,'isSelf',this.queryParams.isSelf==1?0:1);
       },
       //获取数据列表
       getList(){
@@ -199,7 +212,7 @@
           pageSize:20,
           buttonType:1,
           timeType:0,
-          myType:0,
+          isSelf:0,
           searchValue:"",
           data1:""
         });

src/views/secureAccess/whitelist/index.vue

@@ -116,6 +116,7 @@
         this.loading = true;
         whitelistList(this.queryParams).then(response => {
           this.safe_bookList = response.rows;
+          this.total = response.total;
           this.loading = false;
         });
       },
@@ -158,13 +159,16 @@
 
 <style scoped lang="scss">
   .whitelist {
+    flex:1;
     display: flex !important;
     flex-direction: column;
+    overflow: hidden;
     box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);
     .whitelist-page{
       flex:1;
       display: flex;
       flex-direction: column;
+      overflow: hidden;
       padding:11px 20px 20px!important;
       .button-box{
         margin:0 auto;