zc

src/api/safetyCheck/index.js

@@ -628,5 +628,27 @@ export function buildBySubList(query) {
   })
 }
 
-
-
+//开展检查-提交
+export function checkManageAdd(data) {
+  return request({
+    url: '/zd-security/checkManage/add',
+    method: 'post',
+    data: data
+  })
+}
+//通知配置-获取通知配置
+export function noticeConfigList(query) {
+  return request({
+    url: '/zd-security/noticeConfig/list',
+    method: 'get',
+    params: query
+  })
+}
+//通知配置-提交通知配置
+export function noticeConfigAdd(data) {
+  return request({
+    url: '/zd-security/noticeConfig/add',
+    method: 'post',
+    data: data
+  })
+}

src/views/comprehensive/message/noticeconfig/index.vue

@@ -97,7 +97,13 @@
         </el-form-item>
       </el-form>
     </div>
-    <div class="button-box">
+    <div class="button-box" v-if="buttonType == 1">
+      <p class="null-p"></p>
+      <p class="inquire-button-one button-p" @click="upExamineForm">
+        提交</p>
+      <p class="null-p"></p>
+    </div>
+    <div class="button-box" v-if="buttonType == 2">
       <p class="null-p"></p>
       <p class="inquire-button-one button-p" @click="upData" v-if="form.id" v-hasPermi="['laboratory:noticeconfig:edit']">
         保存</p>
@@ -110,6 +116,7 @@
 
 <script>
 import { getNoticeconfigInfo, postNoticeconfigInfo, putNoticeconfigInfo } from "@/api/laboratory/noticeconfig";
+import { noticeConfigList, noticeConfigAdd } from '@/api/safetyCheck/index'
 
 export default {
   name: "Noticeconfig",
@@ -150,15 +157,15 @@ export default {
       examineList:[
         {
           label:"短信通知",
-          key:"1",
+          key:'1',
         },
         {
           label:"系统通知",
-          key:"2",
+          key:'2',
         },
         {
           label:"一体机通知",
-          key:"3",
+          key:'3',
         },
       ],
       rectificationType:false,
@@ -192,12 +199,69 @@ export default {
         data2:[],
         data3:[],
       },
+      data1Id:"",
+      data2Id:"",
+      data3Id:"",
     };
   },
   created() {
-    this.getList();
+    if(this.versionField() == 'xiBeiNongLinDaXue'){
+      this.noticeConfigList();
+    }else{
+      this.noticeConfigList();
+      this.getList();
+    }
   },
   methods: {
+    //检查通知
+    noticeConfigList(){
+      noticeConfigList().then( response => {
+        for(let i=0;i<response.data.length;i++){
+          if(response.data[i].noticeType == 1){
+            let data1 = response.data[i].noticeWay.split(',');
+            this.$set(this.examineForm,'data1',data1);
+            this.$set(this,'examineType',data1[2]?true:false);
+            this.$set(this,'data1Id',response.data[i].id);
+          }else if(response.data[i].noticeType == 2){
+            let data2 = response.data[i].noticeWay.split(',');
+            this.$set(this.examineForm,'data2',data2);
+            this.$set(this,'rectificationType',data2[2]?true:false);
+            this.$set(this,'data2Id',response.data[i].id);
+          }else if(response.data[i].noticeType == 3){
+            let data3 = response.data[i].noticeWay.split(',');
+            this.$set(this.examineForm,'data3',data3);
+            this.$set(this,'reviewType',data3[2]?true:false);
+            this.$set(this,'data3Id',response.data[i].id);
+          }
+        }
+      });
+    },
+    //检查通知提交
+    upExamineForm(){
+      let list = [];
+      let obj1 = {
+        id:this.data1Id?this.data1Id:'',
+        noticeType:1,
+        noticeWay:this.examineForm.data1+'',
+      };
+      list.push(obj1);
+      let obj2 = {
+        id:this.data2Id?this.data2Id:'',
+        noticeType:2,
+        noticeWay:this.examineForm.data2+'',
+      };
+      list.push(obj2);
+      let obj3 = {
+        id:this.data3Id?this.data3Id:'',
+        noticeType:3,
+        noticeWay:this.examineForm.data3+'',
+      };
+      list.push(obj3);
+      noticeConfigAdd(list).then( response => {
+        this.msgSuccess(response.msg);
+        this.noticeConfigList();
+      })
+    },
     // 匹配
     examineAll(item){
       let self = this;

src/views/safetyCheck/checkConfiguration/configDialog.vue

@@ -182,14 +182,14 @@
         checkDataList:[],
         checkList:[
           {
-            key:"1",
-            label:"实验室安全责任人",
-          },
-          {
             key:"2",
             label:"实验室负责人",
           },
           {
+            key:"1",
+            label:"实验室安全责任人",
+          },
+          {
             key:"3",
             label:"老师",
           },
@@ -708,5 +708,8 @@
         display: flex;
       }
     }
+    ::v-deep .el-dialog__body{
+      padding: 30px 20px!important;
+    }
   }
 </style>

src/views/safetyCheck/checkItemLibrary/index.vue

@@ -118,7 +118,14 @@
             v-model="addDialogForm.parentId"
             :options="cascaderData"
             :props="{ checkStrictly: true, value: 'id', label: 'labelName',emitPath:false }"
-            @change="cascaderCheck"></el-cascader>
+            @change="cascaderCheck">
+            <template slot-scope="{data}">
+              <el-tooltip :content="data.labelName" v-if="data.labelName.length>22">
+                <p style="max-width:300px;overflow: hidden;text-overflow:ellipsis;white-space:nowrap;">{{data.labelName}}</p>
+              </el-tooltip>
+              <p v-else style="max-width:300px;overflow: hidden;text-overflow:ellipsis;white-space:nowrap;">{{data.labelName}}</p>
+            </template>
+          </el-cascader>
         </el-form-item>
         <el-form-item label="添加序号" prop="code">
           <el-input v-model="addDialogForm.code" placeholder="未选择指标" maxLength="6" disabled style="width:548px;"/>

src/views/safetyCheck/components/addPage/addPage.vue

@@ -23,7 +23,8 @@
               </el-form-item>
             </div>
             <el-form-item label="检查要求" prop="checkDemand">
-              <el-input disabled v-model="addForm.checkDemand" placeholder="未填写" style="width: 690px"/>
+              <p style="background-color: #f5f5f5;color:#333;border-radius:4px;width:690px;padding:10px 15px;font-size:14px;line-height:20px;">{{addForm.checkDemand}}</p>
+              <!--<el-input disabled v-model="addForm.checkDemand" placeholder="未填写" style="width: 690px"/>-->
             </el-form-item>
             <el-form-item label="检查结果" prop="checkResult">
               <el-select v-model="addForm.checkResult" placeholder="请选择检查结果" style="width: 690px">
@@ -441,12 +442,12 @@
         padding:40px 85px 20px;
         display: flex;
         .top-form-left-box{
-          height:317px;
+          min-height:317px;
           width:770px;
           margin-right:90px;
         }
         .top-form-right-box{
-          height:317px;
+          min-height:317px;
           width:534px;
 
         }

src/views/safetyCheck/components/infoPage/infoPage.vue

@@ -23,7 +23,8 @@
               </el-form-item>
             </div>
             <el-form-item label="检查要求" prop="checkDemand">
-              <el-input disabled v-model="addForm.checkDemand" placeholder="未填写" style="width: 690px"/>
+              <p style="background-color: #f5f5f5;color:#333;border-radius:4px;width:690px;padding:10px 15px;font-size:14px;line-height:20px;">{{addForm.checkDemand}}</p>
+              <!--<el-input disabled v-model="addForm.checkDemand" placeholder="未填写" style="width: 690px"/>-->
             </el-form-item>
             <el-form-item label="检查结果" prop="checkResult">
               <p style="background-color: #f5f5f5;color:#333;border-radius:4px;width:690px;padding:0 15px;">{{addForm.checkResult==0?'不符合':(addForm.checkResult==1?'符合':'')}}</p>
@@ -313,12 +314,12 @@
         padding:40px 85px 20px;
         display: flex;
         .top-form-left-box{
-          height:317px;
+          min-height:317px;
           width:770px;
           margin-right:90px;
         }
         .top-form-right-box{
-          height:317px;
+          min-height:317px;
           width:534px;
         }
         .data-button-box{

src/views/safetyCheck/dataStatistics/laboratoryStatistics.vue

@@ -39,19 +39,19 @@
           clearable
           style="width: 200px"/>
       </el-form-item>
-      <el-form-item label="" prop="dateRange" label-width="70px">
-        <el-date-picker
-          :clearable="false"
-          v-model="dateRange"
-          size="small"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
-      </el-form-item>
+      <!--<el-form-item label="" prop="dateRange" label-width="70px">-->
+        <!--<el-date-picker-->
+          <!--:clearable="false"-->
+          <!--v-model="dateRange"-->
+          <!--size="small"-->
+          <!--style="width: 240px"-->
+          <!--value-format="yyyy-MM-dd"-->
+          <!--type="daterange"-->
+          <!--range-separator="-"-->
+          <!--start-placeholder="开始日期"-->
+          <!--end-placeholder="结束日期"-->
+        <!--&gt;</el-date-picker>-->
+      <!--</el-form-item>-->
       <el-form-item>
         <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
         <p class="reset-button-one" @click="resetQuery">重置</p>

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

@@ -99,7 +99,7 @@
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
-                <p class="table-button-p" v-if="scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
+                <p class="table-button-p" v-if="scope.row.manageStatus==0||scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
                 <p class="table-button-p" v-if="scope.row.manageStatus==1" @click="goAddPage(2,scope.row.id)">编辑</p>
                 <p class="table-button-p" v-if="scope.row.manageStatus==0" @click="goAddPage(2,scope.row.id)">开始检查</p>
                 <p class="table-button-p" v-if="scope.row.manageStatus==2" @click="lookDocumentButton(1,scope.row)">整改报告</p>
@@ -168,7 +168,9 @@
       }
     },
     created(){
-
+      if(this.$route.query.id){
+        this.goAddPage(2,this.$route.query.id);
+      }
     },
     mounted(){
       this.listDepartments();
@@ -201,20 +203,21 @@
       },
       //时间排序方法
       sortChange(val){
-        //ascending 上    descending 下    null  无
-        console.log('val',val.order)
-        this.$set(this.queryParams,'timeType',val.order=='ascending'?1:(val.order=='descending'?2:''));
+        if(val.prop == 'checkTime'){
+          this.$set(this.queryParams,'checkTimeSort',val.order=='ascending'?'1':(val.order=='descending'?'2':"0"));
+          this.handleQuery();
+        }
       },
       //范围选择
       topLeftClickType(type){
         if(this.queryParams.manageStatus != type){
           this.$set(this.queryParams,'manageStatus',type);
-          this.getList();
+          this.handleQuery();
         }
       },
       topRightClickType(){
         this.$set(this.queryParams,'isSelf',this.queryParams.isSelf==1?0:1);
-        this.getList();
+        this.handleQuery();
       },
       //获取数据列表
       getList(){

src/views/safetyCheck/laboratorySelfTest/selfInspectionTask/addDialog.vue

@@ -226,9 +226,9 @@
               <el-select v-model="subQueryParamsLeft.typeId" clearable placeholder="选择分类" style="width: 110px">
                 <el-option
                   v-for="item in classTypeList"
-                  :key="item.key"
+                  :key="item.id"
                   :label="item.typeName"
-                  :value="item.key">
+                  :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -236,9 +236,9 @@
               <el-select v-model="subQueryParamsLeft.level" clearable placeholder="选择分级" style="width: 110px">
                 <el-option
                   v-for="item in classifiedList"
-                  :key="item.key"
+                  :key="item.id"
                   :label="item.classifiedName"
-                  :value="item.key">
+                  :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -302,9 +302,9 @@
               <el-select v-model="subQueryParamsRight.typeId" clearable placeholder="选择分类" style="width: 110px">
                 <el-option
                   v-for="item in classTypeList"
-                  :key="item.key"
+                  :key="item.id"
                   :label="item.typeName"
-                  :value="item.key">
+                  :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -312,9 +312,9 @@
               <el-select v-model="subQueryParamsRight.level" clearable placeholder="选择分级" style="width: 110px">
                 <el-option
                   v-for="item in classifiedList"
-                  :key="item.key"
+                  :key="item.id"
                   :label="item.classifiedName"
-                  :value="item.key">
+                  :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>

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

@@ -11,15 +11,15 @@
                 <p class="el-icon-check icon-p" v-if="queryParams.checkStatus==0"></p>
               </div>
               <div :class="queryParams.checkStatus==1?'checkDiv':''" @click="topLeftClickType(1)">
-                <p class="text-p">待检查</p>
+                <p class="text-p">未开始</p>
                 <p class="el-icon-check icon-p" v-if="queryParams.checkStatus==1"></p>
               </div>
               <div :class="queryParams.checkStatus==2?'checkDiv':''" @click="topLeftClickType(2)">
-                <p class="text-p">检查中</p>
+                <p class="text-p">进行中</p>
                 <p class="el-icon-check icon-p" v-if="queryParams.checkStatus==2"></p>
               </div>
               <div :class="queryParams.checkStatus==3?'checkDiv':''" @click="topLeftClickType(3)">
-                <p class="text-p">已检查</p>
+                <p class="text-p">已结束</p>
                 <p class="el-icon-check icon-p" v-if="queryParams.checkStatus==3"></p>
               </div>
             </div>
@@ -206,7 +206,7 @@
       sortChange(val){
         if(val.prop == 'createTime'){
           this.$set(this.queryParams,'createTimeSort',val.order=='ascending'?'1':(val.order=='descending'?'2':'0'));
-          this.getList();
+          this.handleQuery();
         }
       },
       //获取数据列表
@@ -333,6 +333,15 @@
         flex-direction: column;
         padding:20px;
         overflow: hidden;
+        .checkStatus-color-1{
+          color:#0183FA;
+        }
+        .checkStatus-color-2{
+          color:#EE0606;
+        }
+        .checkStatus-color-3{
+          color:#23B303;
+        }
       }
     }
   }

src/views/safetyCheck/laboratorySelfTest/selfInspectionTask/listPage.vue

@@ -94,7 +94,7 @@
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
-                <p class="table-button-p" v-if="scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
+                <p class="table-button-p" v-if="scope.row.manageStatus==0||scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
                 <p class="table-button-p" v-if="scope.row.manageStatus==1" @click="goAddPage(2,scope.row.id)">编辑</p>
                 <p class="table-button-p" v-if="scope.row.manageStatus==0" @click="goAddPage(2,scope.row.id)">开始检查</p>
                 <p class="table-button-p" v-if="scope.row.manageStatus==2" @click="lookDocumentButton(1,scope.row)">整改报告</p>
@@ -203,14 +203,14 @@
       sortChange(val){
         if(val.prop == 'checkTime'){
           this.$set(this.queryParams,'checkTimeSort',val.order=='ascending'?'1':(val.order=='descending'?'2':"0"));
-          this.getList();
+          this.handleQuery();
         }
       },
       //范围选择
       topLeftClickType(type){
         if(this.queryParams.buttonType != type){
           this.$set(this.queryParams,'buttonType',type);
-          this.getList();
+          this.handleQuery();
         }
       },
       //获取数据列表

src/views/safetyCheck/rectificationReport/listPage.vue

@@ -144,7 +144,7 @@
       sortChange(val){
         if(val.prop == 'checkTime'){
           this.$set(this.queryParams,'checkTimeSort',val.order=='ascending'?'1':(val.order=='descending'?'2':"0"));
-          this.getList();
+          this.handleQuery();
         }
       },
       //范围选择

src/views/safetyCheck/safetyHazard/batchAudit.vue

@@ -231,17 +231,17 @@
           this.$set(this.queryParams,'checkTimeOrder',val.order=='ascending'?'1':(val.order=='descending'?'2':''));
           this.$set(this.queryParams,'zgTimeOrder','');
           this.$set(this.queryParams,'zgTermOrder','');
-          this.getList();
+          this.handleQuery();
         }else if(val.prop == 'rectifyTime'){
           this.$set(this.queryParams,'zgTimeOrder',val.order=='ascending'?'1':(val.order=='descending'?'2':''));
           this.$set(this.queryParams,'checkTimeOrder','');
           this.$set(this.queryParams,'zgTermOrder','');
-          this.getList();
+          this.handleQuery();
         }else if(val.prop == 'rectifyDeadline'){
           this.$set(this.queryParams,'zgTermOrder',val.order=='ascending'?'1':(val.order=='descending'?'2':''));
           this.$set(this.queryParams,'checkTimeOrder','');
           this.$set(this.queryParams,'zgTimeOrder','');
-          this.getList();
+          this.handleQuery();
         }
       },
       //获取数据列表

src/views/safetyCheck/safetyHazard/cannotListPage.vue

@@ -130,9 +130,12 @@
       },
       //时间排序方法
       sortChange(val){
-        //ascending 上    descending 下    null  无
-        console.log('val',val.order)
-        this.$set(this.queryParams,'timeType',val.order=='ascending'?1:(val.order=='descending'?2:''));
+        if(val.prop == 'checkTime'){
+          this.$set(this.queryParams,'checkTimeOrder',val.order=='ascending'?'1':(val.order=='descending'?'2':''));
+          this.$set(this.queryParams,'zgTimeOrder','');
+          this.$set(this.queryParams,'zgTermOrder','');
+          this.handleQuery();
+        }
       },
       //获取数据列表
       getList(){

src/views/safetyCheck/safetyHazard/departmentListPage.vue

@@ -81,7 +81,7 @@
           <el-table-column label="整改期限" sortable="custom" align="center" prop="rectifyDeadline" show-overflow-tooltip width="130"/>
           <el-table-column label="整改状态" align="center" prop="rectifyStatus" show-overflow-tooltip width="110">
             <template slot-scope="scope">
-              <p :class="scope.row.rectifyStatus==1?'rectifyStatusColorA':(scope.row.rectifyStatus==2?'rectifyStatusColorB':(scope.row.rectifyStatus==3?'rectifyStatusColorC':''))">{{scope.row.rectifyStatus==1?'已完成':(scope.row.rectifyStatus==2?'待整改':(scope.row.rectifyStatus==3?'待复核':''))}}</p>
+              <p :class="scope.row.rectifyStatus==1?'rectifyStatusColorA':(scope.row.rectifyStatus==2||scope.row.rectifyStatus==3?'rectifyStatusColorB':'')">{{scope.row.rectifyStatus==1?'已完成':(scope.row.rectifyStatus==2?'待整改':(scope.row.rectifyStatus==3?'待复核':''))}}</p>
             </template>
           </el-table-column>
           <el-table-column label="整改时间" sortable="custom" align="center" prop="rectifyTime" show-overflow-tooltip width="220">
@@ -91,7 +91,7 @@
           </el-table-column>
           <el-table-column label="审核状态" align="center" prop="examineResult" show-overflow-tooltip width="80">
             <template slot-scope="scope">
-              {{scope.row.examineResult == 1?'已通过':(scope.row.examineResult == 2?'已驳回':(scope.row.examineResult == 3?'待审核':''))}}
+              {{scope.row.examineResult == 1?'已通过':(scope.row.examineResult == 0?'已驳回':(scope.row.examineResult == 2?'待审核':''))}}
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" width="80">
@@ -136,9 +136,9 @@
         minPageType:1,
         infoDialogType:false,
         options:[
-          {value:"3",label:"待审核"},
+          {value:"2",label:"待审核"},
           {value:"1",label:"已通过"},
-          {value:"2",label:"已驳回"},
+          {value:"0",label:"已驳回"},
         ],
         queryParams:{
           pageNum:1,
@@ -206,17 +206,17 @@
           this.$set(this.queryParams,'checkTimeOrder',val.order=='ascending'?'1':(val.order=='descending'?'2':''));
           this.$set(this.queryParams,'zgTimeOrder','');
           this.$set(this.queryParams,'zgTermOrder','');
-          this.getList();
+          this.handleQuery();
         }else if(val.prop == 'rectifyTime'){
           this.$set(this.queryParams,'zgTimeOrder',val.order=='ascending'?'1':(val.order=='descending'?'2':''));
           this.$set(this.queryParams,'checkTimeOrder','');
           this.$set(this.queryParams,'zgTermOrder','');
-          this.getList();
+          this.handleQuery();
         }else if(val.prop == 'rectifyDeadline'){
           this.$set(this.queryParams,'zgTermOrder',val.order=='ascending'?'1':(val.order=='descending'?'2':''));
           this.$set(this.queryParams,'checkTimeOrder','');
           this.$set(this.queryParams,'zgTimeOrder','');
-          this.getList();
+          this.handleQuery();
         }
       },
       //获取数据列表

src/views/safetyCheck/safetyHazard/schoolListPage.vue

@@ -81,7 +81,7 @@
           <el-table-column label="整改期限" sortable="custom" align="center" prop="rectifyDeadline" show-overflow-tooltip width="130"/>
           <el-table-column label="整改状态" align="center" prop="rectifyStatus" show-overflow-tooltip width="110">
             <template slot-scope="scope">
-              <p :class="scope.row.rectifyStatus==1?'rectifyStatusColorA':(scope.row.rectifyStatus==2?'rectifyStatusColorB':(scope.row.rectifyStatus==3?'rectifyStatusColorC':''))">{{scope.row.rectifyStatus==1?'已完成':(scope.row.rectifyStatus==2?'待整改':(scope.row.rectifyStatus==3?'待复核':''))}}</p>
+              <p :class="scope.row.rectifyStatus==1?'rectifyStatusColorA':(scope.row.rectifyStatus==2||scope.row.rectifyStatus==3?'rectifyStatusColorB':'')">{{scope.row.rectifyStatus==1?'已完成':(scope.row.rectifyStatus==2?'待整改':(scope.row.rectifyStatus==3?'待复核':''))}}</p>
             </template>
           </el-table-column>
           <el-table-column label="整改时间" sortable="custom" align="center" prop="rectifyTime" show-overflow-tooltip width="220">
@@ -91,7 +91,7 @@
           </el-table-column>
           <el-table-column label="审核状态" align="center" prop="examineResult" show-overflow-tooltip width="80">
             <template slot-scope="scope">
-              {{scope.row.examineResult == 1?'已通过':(scope.row.examineResult == 2?'已驳回':(scope.row.examineResult == 3?'待审核':''))}}
+              {{scope.row.examineResult == 1?'已通过':(scope.row.examineResult == 0?'已驳回':(scope.row.examineResult == 2?'待审核':''))}}
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" width="80">
@@ -136,9 +136,9 @@
         minPageType:1,
         infoDialogType:false,
         options:[
-          {value:"3",label:"待审核"},
+          {value:"2",label:"待审核"},
           {value:"1",label:"已通过"},
-          {value:"2",label:"已驳回"},
+          {value:"0",label:"已驳回"},
         ],
         queryParams:{
           pageNum:1,
@@ -206,17 +206,17 @@
           this.$set(this.queryParams,'checkTimeOrder',val.order=='ascending'?'1':(val.order=='descending'?'2':''));
           this.$set(this.queryParams,'zgTimeOrder','');
           this.$set(this.queryParams,'zgTermOrder','');
-          this.getList();
+          this.handleQuery();
         }else if(val.prop == 'rectifyTime'){
           this.$set(this.queryParams,'zgTimeOrder',val.order=='ascending'?'1':(val.order=='descending'?'2':''));
           this.$set(this.queryParams,'checkTimeOrder','');
           this.$set(this.queryParams,'zgTermOrder','');
-          this.getList();
+          this.handleQuery();
         }else if(val.prop == 'rectifyDeadline'){
           this.$set(this.queryParams,'zgTermOrder',val.order=='ascending'?'1':(val.order=='descending'?'2':''));
           this.$set(this.queryParams,'checkTimeOrder','');
           this.$set(this.queryParams,'zgTimeOrder','');
-          this.getList();
+          this.handleQuery();
         }
       },
       //获取数据列表

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

@@ -124,7 +124,7 @@
         tableList:[],
         total:0,
         optionsOne:[{key:1,label:"校级"},{key:2,label:"院级"}],
-        optionsTwo:[{key:0,label:"启用"},{key:1,label:"停用"}],
+        optionsTwo:[{key:1,label:"启用"},{key:0,label:"停用"}],
       }
     },
     created(){

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

@@ -99,7 +99,7 @@
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
-                <p class="table-button-p" v-if="scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
+                <p class="table-button-p" v-if="scope.row.manageStatus==0||scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
                 <p class="table-button-p" v-if="scope.row.manageStatus==1" @click="goAddPage(2,scope.row.id)">编辑</p>
                 <p class="table-button-p" v-if="scope.row.manageStatus==0" @click="goAddPage(2,scope.row.id)">开始检查</p>
                 <p class="table-button-p" v-if="scope.row.manageStatus==2" @click="lookDocumentButton(1,scope.row)">整改报告</p>
@@ -168,7 +168,9 @@
       }
     },
     created(){
-
+      if(this.$route.query.id){
+        this.goAddPage(2,this.$route.query.id);
+      }
     },
     mounted(){
       this.listDepartments();
@@ -201,20 +203,21 @@
       },
       //时间排序方法
       sortChange(val){
-        //ascending 上    descending 下    null  无
-        console.log('val',val.order)
-        this.$set(this.queryParams,'timeType',val.order=='ascending'?1:(val.order=='descending'?2:''));
+        if(val.prop == 'checkTime'){
+          this.$set(this.queryParams,'checkTimeSort',val.order=='ascending'?'1':(val.order=='descending'?'2':"0"));
+          this.handleQuery();
+        }
       },
       //范围选择
       topLeftClickType(type){
         if(this.queryParams.manageStatus != type){
           this.$set(this.queryParams,'manageStatus',type);
-          this.getList();
+          this.handleQuery();
         }
       },
       topRightClickType(){
         this.$set(this.queryParams,'isSelf',this.queryParams.isSelf==1?0:1);
-        this.getList();
+        this.handleQuery();
       },
       //获取数据列表
       getList(){

src/views/safetyCheck/schoolInspection/inspectionPlan/addDialog.vue

@@ -262,9 +262,9 @@
               <el-select v-model="subQueryParamsLeft.typeId" clearable placeholder="选择分类" style="width: 110px">
                 <el-option
                   v-for="item in classTypeList"
-                  :key="item.key"
+                  :key="item.id"
                   :label="item.typeName"
-                  :value="item.key">
+                  :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -272,9 +272,9 @@
               <el-select v-model="subQueryParamsLeft.level" clearable placeholder="选择分级" style="width: 110px">
                 <el-option
                   v-for="item in classifiedList"
-                  :key="item.key"
+                  :key="item.id"
                   :label="item.classifiedName"
-                  :value="item.key">
+                  :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -338,9 +338,9 @@
               <el-select v-model="subQueryParamsRight.typeId" clearable placeholder="选择分类" style="width: 110px">
                 <el-option
                   v-for="item in classTypeList"
-                  :key="item.key"
+                  :key="item.id"
                   :label="item.typeName"
-                  :value="item.key">
+                  :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -348,9 +348,9 @@
               <el-select v-model="subQueryParamsRight.level" clearable placeholder="选择分级" style="width: 110px">
                 <el-option
                   v-for="item in classifiedList"
-                  :key="item.key"
+                  :key="item.id"
                   :label="item.classifiedName"
-                  :value="item.key">
+                  :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>

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

@@ -11,15 +11,15 @@
                 <p class="el-icon-check icon-p" v-if="queryParams.checkStatus==0"></p>
               </div>
               <div :class="queryParams.checkStatus==1?'checkDiv':''" @click="topLeftClickType(1)">
-                <p class="text-p">待检查</p>
+                <p class="text-p">未开始</p>
                 <p class="el-icon-check icon-p" v-if="queryParams.checkStatus==1"></p>
               </div>
               <div :class="queryParams.checkStatus==2?'checkDiv':''" @click="topLeftClickType(2)">
-                <p class="text-p">检查中</p>
+                <p class="text-p">进行中</p>
                 <p class="el-icon-check icon-p" v-if="queryParams.checkStatus==2"></p>
               </div>
               <div :class="queryParams.checkStatus==3?'checkDiv':''" @click="topLeftClickType(3)">
-                <p class="text-p">已检查</p>
+                <p class="text-p">已结束</p>
                 <p class="el-icon-check icon-p" v-if="queryParams.checkStatus==3"></p>
               </div>
             </div>
@@ -206,7 +206,7 @@
       sortChange(val){
         if(val.prop == 'createTime'){
           this.$set(this.queryParams,'createTimeSort',val.order=='ascending'?'1':(val.order=='descending'?'2':'0'));
-          this.getList();
+          this.handleQuery();
         }
       },
       //获取数据列表

src/views/safetyCheck/schoolInspection/inspectionPlan/listPage.vue

@@ -94,7 +94,7 @@
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
-                <p class="table-button-p" v-if="scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
+                <p class="table-button-p" v-if="scope.row.manageStatus==0||scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
                 <p class="table-button-p" v-if="scope.row.manageStatus==1" @click="goAddPage(2,scope.row.id)">编辑</p>
                 <p class="table-button-p" v-if="scope.row.manageStatus==0" @click="goAddPage(2,scope.row.id)">开始检查</p>
                 <p class="table-button-p" v-if="scope.row.manageStatus==2" @click="lookDocumentButton(1,scope.row)">整改报告</p>
@@ -203,14 +203,14 @@
       sortChange(val){
         if(val.prop == 'checkTime'){
           this.$set(this.queryParams,'checkTimeSort',val.order=='ascending'?'1':(val.order=='descending'?'2':"0"));
-          this.getList();
+          this.handleQuery();
         }
       },
       //范围选择
       topLeftClickType(type){
         if(this.queryParams.manageStatus != type){
           this.$set(this.queryParams,'manageStatus',type);
-          this.getList();
+          this.handleQuery();
         }
       },
       //获取数据列表

src/views/safetyCheck/snapshotManagement/index.vue

@@ -285,11 +285,11 @@
         if(val.prop == 'rectifyTime'){
           this.$set(this.queryParams,'zgTimeOrder',val.order=='ascending'?'1':(val.order=='descending'?'2':''));
           this.$set(this.queryParams,'upTimeOrder','');
-          this.getList();
+          this.handleQuery();
         }else if(val.prop == 'createTime'){
           this.$set(this.queryParams,'upTimeOrder',val.order=='ascending'?'1':(val.order=='descending'?'2':''));
           this.$set(this.queryParams,'zgTimeOrder','');
-          this.getList();
+          this.handleQuery();
         }
       },
       //获取数据列表

src/views/safetyCheck/snapshotManagement/listPage.vue

@@ -177,11 +177,11 @@
         if(val.prop == 'rectifyTime'){
           this.$set(this.queryParams,'zgTimeOrder',val.order=='ascending'?'1':(val.order=='descending'?'2':''));
           this.$set(this.queryParams,'upTimeOrder','');
-          this.getList();
+          this.handleQuery();
         }else if(val.prop == 'createTime'){
           this.$set(this.queryParams,'upTimeOrder',val.order=='ascending'?'1':(val.order=='descending'?'2':''));
           this.$set(this.queryParams,'zgTimeOrder','');
-          this.getList();
+          this.handleQuery();
         }
       },
       //获取数据列表

src/views/safetyCheck/startInspection/index.vue

@@ -103,6 +103,7 @@
                   style="width: 500px"
                   v-model="addForm.rectifyDeadline"
                   type="date"
+                  value-format="yyyy-MM-dd"
                   :picker-options="pickerOptions"
                   :clearable="false"
                   placeholder="请选择整改期限">
@@ -208,7 +209,8 @@
   import { getToken } from "@/utils/auth";
   import lookImgDialog from '@/components/lookImgDialog/lookImgDialog.vue'
   import { listDepartments,listbuildings } from "@/api/system/dept";
-  import { buildBySubList,getCheckPlanBySubId,findCheckManage,checkOptionList,checkManageUpdate } from "@/api/safetyCheck/index";
+  import { buildBySubList,getCheckPlanBySubId,findCheckManage,checkOptionList,
+           checkManageUpdate,checkManageAdd,countHazardNum } from "@/api/safetyCheck/index";
   export default {
     name: 'index',
     components: {
@@ -318,6 +320,29 @@
           if (valid) {
             if(this.planType == 1){
               //新计划
+              let obj = JSON.parse(JSON.stringify(this.addForm));
+              if(obj.checkResult === 0){
+                if(!obj.checkHazardDtoList[0]){
+                  this.msgError('请添加隐患检查项')
+                  return
+                }
+                for(let i=0;i<obj.checkHazardDtoList.length;i++){
+                  delete obj.checkHazardDtoList[i].lookType
+                }
+                obj.dangerNum = obj.checkHazardDtoList.length
+              }else{
+                obj.checkHazardDtoList = [];
+              }
+              obj.manageStatus = type
+              obj.cycleStartTime = obj.dateRange[0]
+              obj.cycleEndTime = obj.dateRange[1]
+              obj.subIds = obj.subId;
+              delete obj.subId;
+              delete obj.dateRange
+              checkManageAdd(obj).then(response => {
+                this.msgSuccess(response.msg);
+                this.initializationAddData();
+              });
             }if(this.planType == 2){
               //已有计划修改
               let obj = JSON.parse(JSON.stringify(this.addForm));
@@ -334,9 +359,12 @@
                 obj.checkHazardDtoList = [];
               }
               obj.manageStatus = type
+              obj.cycleStartTime = obj.dateRange[0]
+              obj.cycleEndTime = obj.dateRange[1]
+              delete obj.dateRange
               checkManageUpdate(obj).then(response => {
                 this.msgSuccess(response.msg);
-                this.initializationAddFormData();
+                this.initializationAddData();
               });
             }
           }
@@ -559,6 +587,24 @@
         this.$set(this.addForm,'rectifyDeadline','');
         this.$set(this.addForm,'checkHazardDtoList',[]);
       },
+      initializationAddData(){
+        this.$set(this,'addForm',{
+          checkRange:3,
+          id:"",
+          subId:"",
+          buildId:"",
+          deptId:"",
+          title:"",
+          checkResult:"",
+          rectifyNotice:"",
+          checkType:"",
+          dateRange:[],
+          rectifyDeadline:"",
+          checkHazardDtoList:[],
+        });
+        this.$set(this,'planType',1);
+        this.$set(this,'planList',[]);
+      },
       //删除检查项
       delCheckHazardDtoList(index){
         let self = this;
@@ -614,6 +660,9 @@
     *{
       font-weight:500;
     }
+    img{
+      user-drag: none;
+    }
     ::v-deep .el-range-editor--small .el-range-separator{
       line-height:32px;
     }
@@ -767,6 +816,15 @@
             right:0;
           }
         }
+        .hazard-check-count-p{
+          display: inline-block;
+          margin-left: 20px;
+          font-size: 14px;
+          line-height: 40px;
+          span{
+            color:#FF0000;
+          }
+        }
       }
     }
     .bottom-button-max-box{

src/views/safetyCheck/worktable/index.vue

@@ -148,6 +148,7 @@
           <div class="min-title-box">
             <p></p>
             <p>检查指标隐患统计</p>
+            <p @click="goPage">查看全部</p>
           </div>
           <hiddenDangerStatisticsEcharts></hiddenDangerStatisticsEcharts>
         </div>
@@ -196,6 +197,8 @@
           lastMonthCount:0,   //上月隐患总数
           monthCount:0,   //本月隐患总数
         },
+        //数据统计页面权限
+        goDataStatistics:false
       }
     },
     created(){
@@ -203,6 +206,7 @@
       this.schoolWorkSubCheck();
       this.hiddenCount();
       this.hiddenDangerRectify();
+      this.setButtonList();
     },
     mounted(){
 
@@ -232,6 +236,34 @@
           this.$set(this,'hiddenDangerRectifyData',response.data);
         });
       },
+      //去数据统计页面
+      goPage(){
+        if(this.goDataStatistics){
+          this.$router.push({ path: '/safetyCheck/dataStatistics' });
+        }else{
+          this.msgError('没有相关权限,请联系管理员')
+        }
+        // safetyCheck/dataStatistics
+      },
+      //权限查找
+      setButtonList() {
+        let localRoute = JSON.parse(localStorage.getItem("routeData"))
+        this.forRouteData('dataStatistics',localRoute);
+      },
+      forRouteData(item,list){
+        let self = this;
+        for(let i=0;i<list.length;i++){
+          if(item == list[i].path){
+            if(item == 'dataStatistics'){
+              self.$set(self,'goDataStatistics',true);
+            }
+          }else{
+            if(list[i].children){
+              self.forRouteData(item,list[i].children)
+            }
+          }
+        }
+      },
     }
   }
 </script>
@@ -477,6 +509,15 @@
           color:#333;
           line-height:24px;
           margin-top:21px;
+          flex:1;
+        }
+        p:nth-child(3){
+          font-size:14px;
+          color:#0183fa;
+          line-height:24px;
+          margin-top:21px;
+          margin-right:20px;
+          cursor: pointer;
         }
       }
     }

src/views/safetyCheck/worktable/toDoListBox.vue

@@ -25,7 +25,8 @@
           <p class="name-p">{{item.subjectName}}-{{item.roomNumber}}</p>
           <p class="type-p" v-if="item.isOverdue == 1">已逾期</p>
           <p class="null-p"></p>
-          <img src="@/assets/ZDimages/safetyCheck/icon_gzt_bg.png">
+          <img v-if="item.isAttachment == 1" @click="lookDocumentListButton(true,item)"
+               src="@/assets/ZDimages/safetyCheck/icon_gzt_bg.png">
         </div>
         <div class="for-title-box">
           <p>{{item.title}}</p>
@@ -37,9 +38,9 @@
         </div>
         <div class="for-time-box">
           <p>计划周期：{{item.cycleStartTime}}至{{item.cycleEndTime}}</p>
-          <p v-if="queryParams.manageStatus == 0" :class="item.checkIsStatus?'':'noButton'">{{item.checkIsStatus?'开始检查':'计划未开始'}}</p>
-          <p v-if="queryParams.manageStatus == 1">编辑</p>
-          <p v-if="queryParams.manageStatus == 2">复核</p>
+          <p v-if="queryParams.manageStatus == 0" :class="item.checkIsStatus?'':'noButton'" @click="goPage(item)">{{item.checkIsStatus?'开始检查':'计划未开始'}}</p>
+          <p v-if="queryParams.manageStatus == 1" @click="goPage(item)">编辑</p>
+          <p v-if="queryParams.manageStatus == 2" @click="addDialogOpen(true,item)">复核</p>
         </div>
         <img class="position-img" v-if="item.checkRange == 1" src="@/assets/ZDimages/safetyCheck/icon_xyxc_qx.png">
         <img class="position-img" v-if="item.checkRange == 2" src="@/assets/ZDimages/safetyCheck/icon_xyxc_xy.png">
@@ -47,15 +48,28 @@
       </div>
       <p class="null-p" v-if="!tableList[0]">暂无数据</p>
     </div>
+    <infoDialog v-if="infoDialogType" :propsInfoDialogData="propsInfoDialogData"></infoDialog>
+    <lookDocumentListDialog v-if="lookDocumentListType" :propsLookDocumentListData="propsLookDocumentListData"></lookDocumentListDialog>
   </div>
 </template>
 
 <script>
   import { todoList, tobeReviewed } from '@/api/safetyCheck/index'
+  import lookDocumentListDialog from '@/components/lookDocumentDialog/lookDocumentListDialog.vue'
+  import infoDialog from '@/views/safetyCheck/components/infoDialog/infoDialog.vue'
   export default {
     name: 'toDoListBox',
+    components: {
+      infoDialog,
+      lookDocumentListDialog
+    },
     data(){
       return{
+        //子组件数据
+        infoDialogType:false,
+        propsInfoDialogData:{},
+        lookDocumentListType:false,
+        propsLookDocumentListData:{},
         queryParams:{
           manageStatus:0,
           searchValue:"",
@@ -73,15 +87,63 @@
           },
         ],
         total:0,
+        //跳转巡查权限
+        goInspectionManagement:false,
+        //跳转自查权限
+        goSelfInspectionManagement:false
       }
     },
     created(){
       this.getList();
+      this.setButtonList();
     },
     mounted(){
 
     },
     methods:{
+      goPage(item){
+        //跳转 巡查/自查页面
+        if(item.checkType == 1){
+          //巡查
+          if(this.goInspectionManagement){
+            this.$router.push({
+              path: `/safetyCheck/schoolInspection/inspectionManagement`,
+              query:{
+                id:item.id
+              }
+            })
+          }else{
+            this.msgError('没有相关权限,请联系管理员')
+          }
+        }else if(item.checkType == 2){
+          //自查
+          if(this.goSelfInspectionManagement){
+            this.$router.push({
+              path: `/safetyCheck/laboratorySelfTest/selfInspectionManagement`,
+              query:{
+                id:item.id
+              }
+            })
+          }else{
+            this.msgError('没有相关权限,请联系管理员')
+          }
+        }
+      },
+      //开关详情页面
+      addDialogOpen(type,data){
+        if(this.infoDialogType != type){
+          if(type){
+            let obj = {
+              id:data.hazardId
+            }
+            console.log(obj)
+            this.$set(this,'propsInfoDialogData',obj);
+            this.$set(this,'infoDialogType',type);
+          }else{
+            this.$set(this,'infoDialogType',type);
+          }
+        }
+      },
       titleClickButton(type){
         if(this.queryParams.manageStatus != type){
           this.$set(this.queryParams,'manageStatus',type);
@@ -105,6 +167,40 @@
       handleQuery() {
         this.getList();
       },
+      //查看多个文档
+      lookDocumentListButton(type,item){
+        if(type==1){
+          this.$set(this,'propsLookDocumentListData',{
+            title:"查看附件",
+            list:item.data7
+          });
+          this.$set(this,'lookDocumentListType',true);
+        }else{
+          this.$set(this,'lookDocumentListType',false);
+        }
+      },
+      //权限查找
+      setButtonList() {
+        let localRoute = JSON.parse(localStorage.getItem("routeData"))
+        this.forRouteData('inspectionManagement',localRoute);
+        this.forRouteData('selfInspectionManagement',localRoute);
+      },
+      forRouteData(item,list){
+        let self = this;
+        for(let i=0;i<list.length;i++){
+          if(item == list[i].path){
+            if(item == 'inspectionManagement'){
+              self.$set(self,'goInspectionManagement',true);
+            }else if(item == 'selfInspectionManagement'){
+              self.$set(self,'goSelfInspectionManagement',true);
+            }
+          }else{
+            if(list[i].children){
+              self.forRouteData(item,list[i].children)
+            }
+          }
+        }
+      },
     }
   }
 </script>

src/views/safetyCheck/worktable/worktableButtonBox.vue

@@ -74,31 +74,28 @@
       this.setButtonList();
     },
     methods:{
+      //权限查找
       setButtonList(){
         let self = this;
         let localRoute = JSON.parse(localStorage.getItem("routeData"))
-        for(let i=0;i<localRoute.length;i++){
-          if(localRoute[i].path == '/safetyCheck'){
-            for(let x=0;x<self.buttonList.length;x++){
-              if(localRoute[i].children){
-                for(let o=0;o<localRoute[i].children.length;o++){
-                  if(self.buttonList[x].key == localRoute[i].children[o].path){
-                    self.buttonList[x].type = true;
-                  }else if(localRoute[i].children[o].children) {
-                    for(let z=0;z<localRoute[i].children[o].children.length;z++){
-                      if(self.buttonList[x].key == localRoute[i].children[o].children[z].path){
-                        self.buttonList[x].type = true;
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
+        for(let x=0;x<self.buttonList.length;x++){
+          self.forRouteData(self.buttonList[x],localRoute);
+        }
+      },
+      forRouteData(item,list){
+        let self = this;
+        for(let i=0;i<list.length;i++){
+         if(item.key == list[i].path){
+           item.type = true;
+         }else{
+           if(list[i].children){
+             self.forRouteData(item,list[i].children)
+           }
+         }
         }
       },
       goPage(item){
-        if(!item.type){
+        if(item.type){
           this.$router.push({ path: item.path });
         }else{
           this.msgError('没有相关权限,请联系管理员')