heyang

src/api/safetyCheck/index.js

@@ -671,6 +671,14 @@ export function findUserList(data) {
     data: data
   })
 }
+//通用接口-设备查询(过滤已选/未选)
+export function findDeviceList(data) {
+  return request({
+    url: '/laboratory/hazard/queryHazardList',
+    method: 'post',
+    data: data
+  })
+}
 
 //通用接口-查询检查项再特定实验室发生历史次数
 export function countHazardNum(query) {

src/views/hazardManagement/hazard/addLaboratory.vue

@@ -21,8 +21,8 @@
           size="small"
         />
       </el-form-item>
-      <el-form-item label="危险源类型：" prop="hazardTypeMode">
-        <el-select v-model="form.hazardTypeMode" placeholder="请选择">
+      <el-form-item label="危险源类型1：" prop="hazardTypeMode">
+        <el-select v-model="form.hazardTypeMode" placeholder="请选择" @change="hazardTypeChange()">
           <el-option :label="item.dictLabel" :value="item.dictValue" v-for="(item,index) in materialTypeList" :key="index"></el-option>
         </el-select>
       </el-form-item>
@@ -176,6 +176,14 @@ export default {
     })
   },
   methods: {
+    hazardTypeChange(){
+      let self=this;
+      this.materialTypeList.forEach(function(item) {
+          if(self.form.hazardTypeMode==item.dictValue){
+            self.form.hazardTypeModeName=item.dictLabel
+          }
+      })
+    },
     //预览
     previewButton(){
       this.$set(this.form,'content',this.$refs.UEditor.text);
@@ -213,6 +221,7 @@ export default {
       getHazard(this.form.id).then(response => {
         this.form = response.data;
         this.form.hazardTypeMode=response.data.hazardTypeMode+''
+        this.form.hazardTypeModeName=response.data.hazardTypeModeName
         this.form.content = unescape(response.data.content);
         this.getType = true;
       });

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

@@ -40,7 +40,7 @@
             </el-form-item>
           </div>
           <div class="top-form-right-box">
-            <el-form-item label="检查类型" prop="checkType">
+            <el-form-item label="检查组织" prop="checkType">
               <p style="background-color: #f5f5f5;width:450px;padding:0 15px;line-height:40px;border-radius:4px;">{{addForm.checkType==1?'校院巡查':(addForm.checkType==2?'实验室自查':'')}}</p>
             </el-form-item>
             <el-form-item label="楼栋" prop="buildName">

src/views/safetyCheck/components/infoDialog/infoDialog.vue

@@ -63,7 +63,7 @@
           </div>
           <div class="text-box-two-box">
             <div>
-              <p>检查类型</p>
+              <p>检查组织</p>
               <p>{{infoDialogData.checkType==1?'校院巡查':(infoDialogData.checkType==2?'实验室自查':'')}}</p>
             </div>
             <div>

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

@@ -44,7 +44,7 @@
             </div>
           </div>
           <div class="top-form-right-box">
-            <el-form-item label="检查类型" prop="checkType">
+            <el-form-item label="检查组织" prop="checkType">
               <p style="background-color: #f5f5f5;color:#333;border-radius:4px;width:450px;padding:0 15px;">{{addForm.checkType==1?'校院巡查':(addForm.checkType==2?'实验室自查':'')}}</p>
             </el-form-item>
             <el-form-item label="楼栋" prop="buildName">

src/views/safetyCheck/equipmentConfig/index.vue

@@ -329,7 +329,6 @@ export default {
           })
           this.addDialogForm.joinCheckOpList=list
           this.cascaderCheckedData=list
-          console.log(this.addDialogForm)
         }
       });
     },
@@ -338,7 +337,6 @@ export default {
       let _this=this;
       checkDeviceList(_this.queryParams).then( response => {
         let res=response.data.records;
-        console.log(response.data.records)
         _this.tableData=res;
         _this.total=response.data.total;
       });

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

@@ -22,7 +22,7 @@
           <el-form-item label="计划标题:" prop="title">
             <el-input :disabled="lookInfoType" v-model="dialogForm.title" placeholder="请输入计划标题" maxLength="30" style="width:450px;"/>
           </el-form-item>
-          <el-form-item label="检查类型:">
+          <el-form-item label="检查组织:">
             <p style="width:450px;background:#f5f5f5;border-radius:4px;padding:0 15px;">实验室自查</p>
           </el-form-item>
           <el-form-item label="任务周期:" prop="dateRange">
@@ -454,7 +454,7 @@
         //提交数据
         dialogForm:{
           title:"",//奥体
-          checkType:"2",//检查类型
+          checkType:"2",//检查组织
           dateRange:[],//时间
           checkRange:"",//检查范围
           checkDemand:"",//检查要点

src/views/safetyCheck/safetyHazard/cannotListPage.vue

@@ -50,7 +50,7 @@
       <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="title" show-overflow-tooltip/>
-        <el-table-column label="检查类型" align="center" prop="deptName" show-overflow-tooltip width="180">
+        <el-table-column label="检查组织" align="center" prop="deptName" show-overflow-tooltip width="180">
           <template slot-scope="scope">
             {{scope.row.hazardType == 1?'校院巡查':(scope.row.hazardType == 2?'实验室自查':'')}}
           </template>

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

@@ -66,6 +66,11 @@
               <p>{{scope.row.checkRange==1?'全校':(scope.row.checkRange==2?'学院':(scope.row.checkRange==3?'实验室':''))}}</p>
             </template>
           </el-table-column>
+          <el-table-column label="检查类型" align="center" prop="checkRange" show-overflow-tooltip width="120">
+            <template slot-scope="scope">
+              <p>{{scope.row.checkCategory==1?'综合检查':(scope.row.checkCategory==2?'专项检查':'-')}}</p>
+            </template>
+          </el-table-column>
           <el-table-column label="计划周期" align="center" prop="cycleStartTime" show-overflow-tooltip width="260">
             <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>

src/views/safetyCheck/startInspection/index.vue

@@ -76,8 +76,8 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="检查类型" prop="checkType">
-                <el-select v-model="addForm.checkType" placeholder="请选择检查类型"
+              <el-form-item label="检查组织" prop="checkType">
+                <el-select v-model="addForm.checkType" placeholder="请选择检查组织"
                            disabled style="width: 500px">
                   <el-option
                     v-for="item in checkTypeList"
@@ -243,7 +243,7 @@
             return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
           }
         },
-        //检查类型
+        //检查组织
         checkTypeList:[{ key:1, label:"校院巡查", },{ key:2, label:"实验室自查", }],
         //学院列表
         deptSelectList:[],
@@ -283,7 +283,7 @@
             { required: true, message: "请选择学院", trigger: "blur" },
           ],
           checkType: [
-            { required: true, message: "请选择检查类型", trigger: "blur" },
+            { required: true, message: "请选择检查组织", trigger: "blur" },
           ],
           dateRange: [
             { required: true, message: "请选择计划周期", trigger: "blur" },