heyang

src/views/safetyCheck/dataStatistics/checkIndexStatistics.vue

@@ -63,7 +63,7 @@
       </el-form-item>
     </el-form>
     <div class="num-data-box">
-      共搜索到隐患总数 {{numData.sumTotal}}，一级指标隐患总数 {{numData.level1}}，占比 {{numData.percent1}}，二级指标隐患总数 {{numData.level2}}，占比 {{numData.percent2}}，三级指标隐患总数 {{numData.level3}}，占比 {{numData.percent3}}
+      共搜索到隐患总数 {{numData.sumTotal}}，一级指标隐患总数 {{numData.level1}}，占比 {{numData.percent1}}，二级指标隐患总数 {{numData.level2}}，占比 {{numData.percent2}}，三级指标隐患总数 {{numData.level3}}，占比 {{numData.percent3}}，四级指标隐患总数 {{numData.level4}}，占比 {{numData.percent4}}
     </div>
     <el-table  border :data="tableList" ref="multipleTable"
                :row-key="getRowKeys"
@@ -80,6 +80,8 @@
       <el-table-column label="二级指标占比" align="center" prop="percent2" show-overflow-tooltip width="130"/>
       <el-table-column label="三级指标隐患数" align="center" prop="itemsTotal3" show-overflow-tooltip width="130"/>
       <el-table-column label="三级指标占比" align="center" prop="percent3" show-overflow-tooltip width="130"/>
+      <el-table-column label="四级指标隐患数" align="center" prop="itemsTotal4" show-overflow-tooltip width="130"/>
+      <el-table-column label="四级指标占比" align="center" prop="percent4" show-overflow-tooltip width="130"/>
     </el-table>
     <pagination :page-sizes="[20, 30, 40, 50]"
                 v-show="total>0"

src/views/safetyCheck/dataStatistics/inspectContent.vue

@@ -71,7 +71,7 @@
                @select="select" @select-all="selectAll">
       <el-table-column type="selection" width="50" align="center" fixed/>
       <el-table-column label="序号" align="center"  type="index" width="60" fixed/>
-      <el-table-column label="检查内容" align="center" prop="hazardTypeModeName" show-overflow-tooltip width="200" fixed/>
+      <el-table-column label="检查内容" align="center" prop="hazardName" show-overflow-tooltip width="200" fixed/>
       <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="200" fixed/>
       <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="180"/>
       <el-table-column label="隐患总数" align="center" prop="sumTotal" show-overflow-tooltip width="100"/>

src/views/safetyCheck/equipmentConfig/index.vue

@@ -62,7 +62,7 @@
                :close-on-click-modal="false">
       <el-form ref="addDialogForm" :model="addDialogForm" :rules="rules" label-width="120px">
         <el-form-item label="检查内容:" prop="checkLevel">
-          <el-select  v-model="addDialogForm.joinHazardReid" placeholder="请选择检查项" style="width:548px;">
+          <el-select  v-model="addDialogForm.joinHazardReid" placeholder="请选择检查项" :disabled="isDetail" style="width:548px;">
             <el-option
               v-for="item in materialTypeList"
               :key="item.id"
@@ -72,7 +72,7 @@
           </el-select>
         </el-form-item>
         <div class="small_title">对应检查项目</div>
-        <el-form-item label="检查类目" prop="joinCheckOpList">
+        <el-form-item label="检查类目" prop="joinCheckOpList" v-if="!isDetail">
           <el-cascader
             style="width:548px;"
             v-model="addDialogForm.joinCheckOpList"
@@ -179,6 +179,7 @@ export default {
         label: 'labelName'
       },
       cascaderCheckedData:[],//检查类目树回显
+      isDetail:false,
     }
 
   },
@@ -215,8 +216,8 @@ export default {
     handleClick(index,row,doType){
       let _this=this;
       if(doType=='add'){//新增
+        this.isDetail=false;
         this.$set(this,'addDialogType',true);
-
         this.$set(this,'addDialogTitle','新增检查项');
         this.$set(this,'addDialogForm',{
           joinHazardReid:'',
@@ -228,8 +229,17 @@ export default {
           this.$refs.tree.setCheckedKeys([]);
         });
       }else if(doType=='detail'){//详情
-
+        this.isDetail=true;
+        this.$set(this,'addDialogType',true);
+        this.$set(this,'addDialogTitle','编辑检查项');
+        this.getInfo(row.id)
+        this.inspectContentList(row.id)//检查内容
+        this.$nextTick(function () {
+          //Dom更新完毕
+          this.$refs.tree.setCheckedKeys([]);
+        });
       }else if(doType=='edit'){//编辑
+        this.isDetail=false;
         this.$set(this,'addDialogType',true);
         this.$set(this,'addDialogTitle','编辑检查项');
         this.getInfo(row.id)