zc

src/views/safetyCheck/collegeInspect/selfInspectionManage/index.vue

@@ -122,10 +122,16 @@
         <div class="page-conten-box page-content-right-bottom-box">
           <el-table class="table-box" v-loading="loading" border :data="dataList">
             <el-table-column label="序号" type="index" width="60"/>
-            <el-table-column label="实验室" prop="subName"  show-overflow-tooltip/>
+            <el-table-column label="实验室" prop="subName"  show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{scope.row.subName}}({{scope.row.roomNum}})</span>
+              </template>
+            </el-table-column>
             <el-table-column label="检查状态" prop="manageStatus" width="150" show-overflow-tooltip>
               <template slot-scope="scope">
-                <span>{{scope.row.manageStatus==0?'待检查':(scope.row.manageStatus==1?'检查中':(scope.row.manageStatus==2?'已检查':''))}}</span>
+                <span :class="scope.row.manageStatus==0?'colorA':(scope.row.manageStatus==1?'colorB':(scope.row.manageStatus==2?'colorC':''))">
+                  {{scope.row.manageStatus==0?'待检查':(scope.row.manageStatus==1?'检查中':(scope.row.manageStatus==2?'已检查':''))}}
+                </span>
               </template>
             </el-table-column>
             <el-table-column label="检查人" prop="checkUserNames" width="230" show-overflow-tooltip/>
@@ -518,6 +524,15 @@
           overflow: hidden;
           flex:1;
           padding:0 20px 20px;
+          .colorA{
+            color:#FA4A04;
+          }
+          .colorB{
+            color:#0484FA;
+          }
+          .colorC{
+            color:#039C06;
+          }
         }
       }
       .table-school-college-toggle-box{

src/views/safetyCheck/components/initiateInspect/initiateInspect.vue

@@ -120,13 +120,13 @@
             <div class="right-text-box">
               <p class="right-text-name-p">检查人</p>
               <div class="right-text-title-box">
-                <p>{{projectData.checkUserName}}-{{projectData.checkUserNumber}}</p>
+                <p>{{projectData.checkUserName}}-{{projectData.checkAccount}}</p>
               </div>
             </div>
             <div class="right-text-box">
               <p class="right-text-name-p" style="width:138px;">检查时间</p>
               <div class="right-text-title-box">
-                <p>{{projectData.checkTime}}</p>
+                <p>{{parseTime(projectData.checkTime,"{y}-{m}-{d} {h}:{i}")}}</p>
               </div>
             </div>
           </div>
@@ -412,6 +412,7 @@
           })
           this.$set(this.addForm, 'checkFlag', response.data.checkFlag?response.data.checkFlag:0)
           this.$set(this.addForm, 'hazardDescribe', response.data.hazardDescribe?response.data.hazardDescribe:'')
+          this.$refs['addForm'].clearValidate();
           this.$nextTick(() => {
             this.$set(this,'loadType',true);
           })
@@ -446,7 +447,7 @@
       //查询隐患发生次数
       securityCheckPhotoGetCheckNumBySub() {
         securityCheckPhotoGetCheckNumBySub({
-          subId: this.projectData.subId,
+          subId: this.initiateInspectData.subId,
           hazardCheckId: this.projectData.hazardCheckPro
         }).then(response => {
           this.$set(this, 'dangersNum', response.data)
@@ -697,6 +698,8 @@
                 let list = this.getCascaderData(JSON.parse(JSON.stringify(maxList)),3)
                 this.$nextTick(()=>{
                   this.$set(this, 'cascaderData', list)
+                  this.$set(this.addForm, 'hazardCheckPro', list[0].children[0].children[0].id)
+                  this.hazardCheckProChange(list[0].children[0].children[0].id);
                 })
               }else{
                 this.$parent.tableButton(6)

src/views/safetyCheck/components/projectAddPage.vue

@@ -423,6 +423,12 @@
             //新增
             //查询全校实验室数量
             this.laboratorySubRelInfoGetAllSubNum();
+            if (this.propsData.rank == 'school'){
+              this.$set(this.dialogForm,'checkRange',1);
+            }else if(this.propsData.rank == 'college'){
+              // this.$set(this.dialogForm,'checkRange',3);
+              // this.$set(this.dialogForm,'subjectNum',this.dialogForm.subIds.length);
+            }
           }
         }
       },

src/views/safetyCheck/schoolInspect/inspectManage/index.vue

@@ -122,10 +122,16 @@
         <div class="page-conten-box page-content-right-bottom-box">
           <el-table class="table-box" v-loading="loading" border :data="dataList">
             <el-table-column label="序号" type="index" width="60"/>
-            <el-table-column label="实验室" prop="subName"  show-overflow-tooltip/>
+            <el-table-column label="实验室" prop="subName"  show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{scope.row.subName}}({{scope.row.roomNum}})</span>
+              </template>
+            </el-table-column>
             <el-table-column label="检查状态" prop="manageStatus" width="150" show-overflow-tooltip>
               <template slot-scope="scope">
-                <span>{{scope.row.manageStatus==0?'待检查':(scope.row.manageStatus==1?'检查中':(scope.row.manageStatus==2?'已检查':''))}}</span>
+                <span :class="scope.row.manageStatus==0?'colorA':(scope.row.manageStatus==1?'colorB':(scope.row.manageStatus==2?'colorC':''))">
+                  {{scope.row.manageStatus==0?'待检查':(scope.row.manageStatus==1?'检查中':(scope.row.manageStatus==2?'已检查':''))}}
+                </span>
               </template>
             </el-table-column>
             <el-table-column label="检查人" prop="checkUserNames" width="230" show-overflow-tooltip/>
@@ -141,7 +147,7 @@
                      v-if='scope.row.manageStatus !=2'
                      @click="tableButton(2,scope.row)"
                      v-hasPermiRouter="['security:checkPlan:detail']"
-                  >开始检查</p>
+                  >检查</p>
                   <p class="table-button-p"
                      v-if='scope.row.manageStatus !=2'
                      @click="tableButton(3,scope.row)"
@@ -518,6 +524,15 @@
           overflow: hidden;
           flex:1;
           padding:0 20px 20px;
+          .colorA{
+            color:#FA4A04;
+          }
+          .colorB{
+            color:#0484FA;
+          }
+          .colorC{
+            color:#039C06;
+          }
         }
       }
       .table-school-college-toggle-box{