zc

src/views/safetyCheck/checkConfiguration/configDialog.vue

@@ -14,7 +14,7 @@
             </el-checkbox-group>
           </div>
           <p v-if="checkType" class="configDialog-content-min-button" @click="configUserButton(2)">配置</p>
-          <div class="configDialog-content-min-text-box">
+          <div class="configDialog-content-min-text-box" v-if="versionField() !== 'xiBeiNongLinDaXue'">
             <p></p>
             <p></p>
             <p>实验室白名单内的老师</p>
@@ -182,24 +182,7 @@
         configDialogType:true,
         configPageType:1,
         checkDataList:[],
-        checkList:[
-          {
-            key:"2",
-            label:"实验室负责人",
-          },
-          {
-            key:"1",
-            label:"实验室安全责任人",
-          },
-          {
-            key:"3",
-            label:"老师",
-          },
-          {
-            key:"4",
-            label:"学生",
-          },
-        ],
+        checkList:[],
         checkType:false,
         /*===================================人员选择相关===================================*/
         deptSelectList:[],
@@ -251,18 +234,30 @@
           setTeacher:false,
           setStudent:false,
         };
-        for(let i=0;i<self.checkDataList.length;i++){
-          if(self.checkDataList[i] == '2'){
-            obj.setSubjectLead = true;
-          }else if(self.checkDataList[i] == '1'){
-            obj.setSubjectSafety = true;
-          }else if(self.checkDataList[i] == '3'){
-            obj.setTeacher = true;
-          }else if(self.checkDataList[i] == '4'){
-            obj.setStudent = true;
+
+        if(this.versionField() === 'xiBeiNongLinDaXue'){
+          for(let i=0;i<self.checkDataList.length;i++){
+            if(self.checkDataList[i] == '2'){
+              obj.setSubjectLead = true;
+            }else if(self.checkDataList[i] == '1'){
+              obj.setSubjectSafety = true;
+            }
+          }
+          obj.sysUserVoList = []
+        }else{
+          for(let i=0;i<self.checkDataList.length;i++){
+            if(self.checkDataList[i] == '2'){
+              obj.setSubjectLead = true;
+            }else if(self.checkDataList[i] == '1'){
+              obj.setSubjectSafety = true;
+            }else if(self.checkDataList[i] == '3'){
+              obj.setTeacher = true;
+            }else if(self.checkDataList[i] == '4'){
+              obj.setStudent = true;
+            }
           }
+          obj.sysUserVoList = obj.setStudent?this.dialogTableList:[]
         }
-        obj.sysUserVoList = obj.setStudent?this.dialogTableList:[]
         if(obj.setStudent){
           if(!obj.sysUserVoList[0]){
             this.msgError('并未勾选任何学生')
@@ -278,22 +273,62 @@
       checkSet(){
         checkSet({staffType:this.configDialogData.staffType}).then(response => {
           let list = [];
-          if(response.data.setSubjectLead){
-            //实验室负责人
-            list.push('2');
-          }
-          if(response.data.setSubjectSafety){
-            //实验室安全责任人
-            list.push('1');
-          }
-          if(response.data.setTeacher){
-            //全部老师
-            list.push('3');
-          }
-          if(response.data.setStudent){
-            //全部学生
-            list.push('4');
-            this.$set(this,'checkType',true);
+          console.log('this.versionField()',this.versionField())
+          if(this.versionField() === 'xiBeiNongLinDaXue'){
+            if(response.data.setSubjectLead){
+              //实验室负责人
+              list.push('2');
+            }
+            if(response.data.setSubjectSafety){
+              //实验室安全责任人
+              list.push('1');
+            }
+            this.$set(this,'checkList',[
+              {
+                key:"2",
+                label:"实验室负责人",
+              },
+              {
+                key:"1",
+                label:"实验室安全责任人",
+              }
+            ]);
+          }else{
+            if(response.data.setSubjectLead){
+              //实验室负责人
+              list.push('2');
+            }
+            if(response.data.setSubjectSafety){
+              //实验室安全责任人
+              list.push('1');
+            }
+            if(response.data.setTeacher){
+              //全部老师
+              list.push('3');
+            }
+            if(response.data.setStudent){
+              //全部学生
+              list.push('4');
+              this.$set(this,'checkType',true);
+            }
+            this.$set(this,'checkList',[
+              {
+                key:"2",
+                label:"实验室负责人",
+              },
+              {
+                key:"1",
+                label:"实验室安全责任人",
+              },
+              {
+                key:"3",
+                label:"老师",
+              },
+              {
+                key:"4",
+                label:"学生",
+              },
+            ]);
           }
           this.$set(this,'checkDataList',list);
           this.$set(this,'dialogTableList',response.data.userStuList);

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

@@ -156,10 +156,11 @@
       </el-form>
     </div>
     <div class="bottom-button-max-box">
-      <p></p>
+      <p class="null-p"></p>
       <p class="reset-button-one" @click="outButton">取消</p>
       <p class="add-button-two-90" @click="upDataButton(1)">保存</p>
       <p class="inquire-button-one" @click="upDataButton(2)">提交</p>
+      <p class="null-p"></p>
     </div>
     <lookImgDialog ref="lookImgDialog"></lookImgDialog>
   </div>
@@ -622,7 +623,7 @@
       p{
         margin-top:20px;
       }
-      p:nth-child(1){
+      .null-p{
         flex:1;
       }
       p:nth-child(2){

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

@@ -38,7 +38,7 @@
              :title="infoDialogData.checkHazardApplyDto.rectifyStatus==1?'已完成':(infoDialogData.checkHazardApplyDto.rectifyStatus==2?'待整改':(infoDialogData.checkHazardApplyDto.rectifyStatus==3?'待复核':(infoDialogData.checkHazardApplyDto.rectifyStatus==4?'暂无法整改':'')))"
              :visible.sync="infoDialogType" v-if="infoDialogType"
              width="1184px" append-to-body>
-    <div class="info-dialog-title-box scrollbar-box">
+    <div class="info-dialog-title-box scrollbar-box" v-if="imgDocumentType == 0">
       <div class="info-dialog-for-title-box" @click="checkTitleButton('info')" :class="infoDialogCheckIndex == 'info'?'info-dialog-for-check':''">
         <p>隐患检查</p>
         <p></p>
@@ -54,7 +54,7 @@
         <p></p>
       </div>
     </div>
-    <div class="info-dialog-content-box scrollbar-box">
+    <div class="info-dialog-content-box scrollbar-box" v-if="imgDocumentType == 0">
       <div class="info-dialog-content-info" v-if="infoDialogCheckIndex == 'info' && imgDocumentType == 0">
         <div class="info-dialog-content-info-top">
           <div class="text-box-box">
@@ -299,42 +299,42 @@
           </div>
         </el-form>
       </div>
-      <div class="info-dialog-content-img" v-if="imgDocumentType == 1">
-        <img :src="imgList[imgIndex].fileUrl">
-        <p class="el-icon-arrow-left left-button-p" @click="infoLeftButton"></p>
-        <p class="el-icon-arrow-right right-button-p" @click="infoRightButton"></p>
-        <p class="bottom-num-text">{{imgIndex+1}} / {{imgList.length}}</p>
-        <p class="out-button" @click="outLook">返回</p>
-      </div>
-      <!--通知书/告知书-->
-      <div class="info-dialog-content-document" v-if="imgDocumentType == 2">
-        <informDom v-if="infoDialogData.rectifyNotice == 1" :propsInformDomData="propsInformDomData"></informDom>
-        <noticeDom v-if="infoDialogData.rectifyNotice == 2" :propsNoticeDomData="propsNoticeDomData"></noticeDom>
-        <p class="out-button" v-if="!fullScreenType" @click="outLook">返回</p>
-        <p class="positionButton" @click="fullScreenButton">{{fullScreenType?'退出':'全屏'}}</p>
-      </div>
-      <!--材料附件(暂时废弃)-->
-      <div class="info-dialog-content-document-list" v-if="imgDocumentType == 3">
-        <div class="left-box">
-          <div class="left-title-box">
-            <img src="@/assets/ZDimages/safetyCheck/icon_dr_wj.png">
-            <p>材料附件</p>
-          </div>
-          <div class="left-for-box scrollbar-box">
-            <p class="left-for-p" v-for="(iframeItem,iframeIndex) in iframeSrcList" :key="iframeIndex"
-               @click="lookDocumentListCheck(iframeIndex)"
-               :class="iframeSrcIndex == iframeIndex?'check-p':''">{{iframeItem.name}}</p>
-          </div>
+    </div>
+    <div class="info-dialog-content-img scrollbar-box" v-if="imgDocumentType == 1">
+      <img :src="imgList[imgIndex].fileUrl">
+      <p class="el-icon-arrow-left left-button-p" @click="infoLeftButton"></p>
+      <p class="el-icon-arrow-right right-button-p" @click="infoRightButton"></p>
+      <p class="bottom-num-text">{{imgIndex+1}} / {{imgList.length}}</p>
+      <p class="out-button" @click="outLook">返回</p>
+    </div>
+    <!--通知书/告知书-->
+    <div class="info-dialog-content-document scrollbar-box" v-if="imgDocumentType == 2">
+      <informDom v-if="infoDialogData.rectifyNotice == 1" :propsInformDomData="propsInformDomData"></informDom>
+      <noticeDom v-if="infoDialogData.rectifyNotice == 2" :propsNoticeDomData="propsNoticeDomData"></noticeDom>
+      <p class="out-button" v-if="!fullScreenType" @click="outLook">关闭</p>
+      <p class="positionButton" @click="fullScreenButton">{{fullScreenType?'退出':'全屏'}}</p>
+    </div>
+    <!--材料附件(暂时废弃)-->
+    <div class="info-dialog-content-document-list" v-if="imgDocumentType == 3">
+      <div class="left-box">
+        <div class="left-title-box">
+          <img src="@/assets/ZDimages/safetyCheck/icon_dr_wj.png">
+          <p>材料附件</p>
         </div>
-        <div class="center-border"></div>
-        <div class="right-box">
-          <iframe
-            class="iframe"
-            :src="iframeSrc" scrolling="auto" frameborder="0">
-          </iframe>
+        <div class="left-for-box scrollbar-box">
+          <p class="left-for-p" v-for="(iframeItem,iframeIndex) in iframeSrcList" :key="iframeIndex"
+             @click="lookDocumentListCheck(iframeIndex)"
+             :class="iframeSrcIndex == iframeIndex?'check-p':''">{{iframeItem.name}}</p>
         </div>
-        <p class="out-button" @click="outLook">返回</p>
       </div>
+      <div class="center-border"></div>
+      <div class="right-box">
+        <iframe
+          class="iframe"
+          :src="iframeSrc" scrolling="auto" frameborder="0">
+        </iframe>
+      </div>
+      <p class="out-button" @click="outLook">返回</p>
     </div>
     <div class="bottom-button-box dialog-footer-box" v-if="infoDialogCheckIndex == 'add'&&imgDocumentType != 1">
       <p class="dialog-footer-button-null"></p>
@@ -1165,177 +1165,188 @@
           }
         }
       }
-      .info-dialog-content-img{
-        padding:30px 70px 0;
-        img{
-          width:1040px;
-        }
-        .left-button-p{
-          cursor: pointer;
-          text-align: center;
-          line-height:30px;
-          color:#fff;
-          font-size:16px;
-          top:440px;
-          left:20px;
-          position: absolute;
-          width:30px;
-          height:30px;
-          background-color: #0045AF;
-          border-radius:50%;
-        }
-        .right-button-p{
-          cursor: pointer;
-          text-align: center;
-          line-height:30px;
-          color:#fff;
-          font-size:16px;
-          position: absolute;
-          top:440px;
-          right:20px;
-          width:30px;
-          height:30px;
-          background-color: #0045AF;
-          border-radius:50%;
-        }
-        .left-button-p:hover{
-          background-color: #0183fa;
-        }
-        .right-button-p:hover{
-          background-color: #0183fa;
-        }
-        .bottom-num-text{
-          text-align: center;
-          line-height: 30px;
-          font-size:16px;
-          position: absolute;
-          bottom:0;
-          width:1026px;
-        }
-        .out-button{
-          width:60px;
-          line-height:30px;
-          color:#999;
-          background-color: #dedede;
-          border-radius:4px;
-          text-align: center;
-          cursor: pointer;
-          position: absolute;
-          top:17px;
-          right:17px;
-          z-index:99999;
-        }
+    }
+    .info-dialog-content-img{
+      padding:30px 70px 0;
+      height:680px;
+      img{
+        width:1040px;
       }
-      .info-dialog-content-document{
-        padding:30px 70px 0;
-        display: flex;
-        flex:1;
-        height:570px;
-        .out-button{
-          width:60px;
-          line-height:30px;
-          color:#999;
-          background-color: #dedede;
-          border-radius:4px;
-          text-align: center;
-          cursor: pointer;
-          position: absolute;
-          top:17px;
-          right:17px;
-          z-index:99999;
-        }
-        .positionButton{
-          position: absolute;
-          top:160px;
-          right: 20px;
-          border:1px solid #0183fa;
-          border-radius:4px;
-          line-height:30px;
-          width:60px;
-          text-align: center;
-          cursor: pointer;
-          color:#0183fa;
-          background-color: #fff;
-        }
-        .positionButton:hover{
-          background-color:#0183fa;
-          color:#fff;
-        }
+      .left-button-p{
+        cursor: pointer;
+        text-align: center;
+        line-height:30px;
+        color:#fff;
+        font-size:16px;
+        top:440px;
+        left:20px;
+        position: absolute;
+        width:30px;
+        height:30px;
+        background-color: #0045AF;
+        border-radius:50%;
       }
-      .info-dialog-content-document-list{
-        padding:30px 70px 0;
+      .right-button-p{
+        cursor: pointer;
+        text-align: center;
+        line-height:30px;
+        color:#fff;
+        font-size:16px;
+        position: absolute;
+        top:440px;
+        right:20px;
+        width:30px;
+        height:30px;
+        background-color: #0045AF;
+        border-radius:50%;
+      }
+      .left-button-p:hover{
+        background-color: #0183fa;
+      }
+      .right-button-p:hover{
+        background-color: #0183fa;
+      }
+      .bottom-num-text{
+        text-align: center;
+        line-height: 30px;
+        font-size:16px;
+        position: absolute;
+        bottom:0;
+        width:1026px;
+      }
+      .out-button{
+        width:60px;
+        line-height:30px;
+        background:#ffffff;
+        border: 1px solid #999;
+        color:#999;
+        border-radius:4px;
+        text-align: center;
+        cursor: pointer;
+        position: absolute;
+        top:80px;
+        right:17px;
+        z-index:99999;
+      }
+      .out-button:hover{
+        background-color:#999;
+        color:#fff;
+      }
+    }
+    .info-dialog-content-document{
+      padding:30px 70px 0;
+      display: flex;
+      flex:1;
+      height:680px;
+      .out-button{
+        width:60px;
+        line-height:30px;
+        background:#ffffff;
+        border: 1px solid #999;
+        color:#999;
+        border-radius:4px;
+        text-align: center;
+        cursor: pointer;
+        position: absolute;
+        top:80px;
+        right:17px;
+        z-index:99999;
+      }
+      .out-button:hover{
+        background-color:#999;
+        color:#fff;
+      }
+      .positionButton{
+        position: absolute;
+        top:80px;
+        right: 90px;
+        border:1px solid #0183fa;
+        border-radius:4px;
+        line-height:30px;
+        width:60px;
+        text-align: center;
+        cursor: pointer;
+        color:#0183fa;
+        background-color: #fff;
+      }
+      .positionButton:hover{
+        background-color:#0183fa;
+        color:#fff;
+      }
+    }
+    .info-dialog-content-document-list{
+      padding:30px 70px 0;
+      display: flex;
+      flex:1;
+      height:680px;
+      overflow: hidden;
+      .left-box{
         display: flex;
-        flex:1;
-        height:570px;
+        flex-direction: column;
         overflow: hidden;
-        .left-box{
+        width:265px;
+        .left-title-box{
+          padding-bottom:20px;
           display: flex;
-          flex-direction: column;
-          overflow: hidden;
-          width:265px;
-          .left-title-box{
-            padding-bottom:20px;
-            display: flex;
-            width:230px;
-            border-bottom:1px dashed #D8D8D8;
-            img{
-              width:16px;
-              height:13px;
-              margin:13px 15px 13px 0;
-            }
-            p{
-              line-height:40px;
-              width:230px;
-              font-size:16px;
-              color:#0183FA;
-            }
+          width:230px;
+          border-bottom:1px dashed #D8D8D8;
+          img{
+            width:16px;
+            height:13px;
+            margin:13px 15px 13px 0;
           }
-          .left-for-box{
-            flex:1;
-            .left-for-p{
-              padding:0 10px;
-              width:230px;
-              line-height:40px;
-              margin-top:10px;
-              font-size:16px;
-              color:#333;
-              display:block;
-              overflow:hidden;
-              text-overflow:ellipsis;
-              white-space:nowrap;
-              cursor: pointer;
-            }
-            .check-p{
-              background-color:rgba(1,131,250,0.2);
-              color:#0183FA;
-            }
+          p{
+            line-height:40px;
+            width:230px;
+            font-size:16px;
+            color:#0183FA;
           }
         }
-        .center-border{
-          border-right:1px dashed #D8D8D8;
-        }
-        .right-box{
+        .left-for-box{
           flex:1;
-          display: flex;
-          margin-left:57px;
-          .iframe{
-            flex:1;
+          .left-for-p{
+            padding:0 10px;
+            width:230px;
+            line-height:40px;
+            margin-top:10px;
+            font-size:16px;
+            color:#333;
+            display:block;
+            overflow:hidden;
+            text-overflow:ellipsis;
+            white-space:nowrap;
+            cursor: pointer;
+          }
+          .check-p{
+            background-color:rgba(1,131,250,0.2);
+            color:#0183FA;
           }
         }
-        .out-button{
-          width:60px;
-          line-height:30px;
-          color:#999;
-          background-color: #dedede;
-          border-radius:4px;
-          text-align: center;
-          cursor: pointer;
-          position: absolute;
-          top:17px;
-          right:17px;
-          z-index:99999;
+      }
+      .center-border{
+        border-right:1px dashed #D8D8D8;
+      }
+      .right-box{
+        flex:1;
+        display: flex;
+        margin-left:57px;
+        .iframe{
+          flex:1;
         }
       }
+      .out-button{
+        width:60px;
+        line-height:30px;
+        color:#999;
+        background-color: #dedede;
+        border-radius:4px;
+        text-align: center;
+        cursor: pointer;
+        position: absolute;
+        top:17px;
+        right:17px;
+        z-index:99999;
+      }
     }
     .bottom-button-box{
       height:60px;

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

@@ -29,14 +29,14 @@
             <el-form-item label="检查结果" prop="checkResult" v-if="addForm.checkResult">
               <p style="background-color: #f5f5f5;color:#333;border-radius:4px;width:690px;padding:0 15px;">{{addForm.checkResult==0?'不符合':(addForm.checkResult==1?'符合':'')}}</p>
             </el-form-item>
-            <div style="display: flex" v-if="addForm.checkResult==0">
-              <el-form-item :label="addForm.rectifyNotice == 1?'整改告知书':'整改通知书'" style="width: 300px">
+            <div style="display: flex">
+              <el-form-item v-if="addForm.checkResult==0" :label="addForm.rectifyNotice == 1?'整改告知书':'整改通知书'" style="width: 300px">
                 <div class="data-button-box">
                   <p class="look-button" @click="lookDocumentButton(1)">查看</p>
                   <p class="download-button" @click="downloadButton">下载</p>
                 </div>
               </el-form-item>
-              <el-form-item label="材料附件" style="width: 300px" v-if="addForm.isAttachment == 1">
+              <el-form-item label="材料附件" style="width: 300px" v-if="addForm.checkResult!=1&&addForm.isAttachment == 1">
                 <div class="data-button-box">
                   <p class="look-button" @click="lookDocumentListButton(1)">查看</p>
                 </div>

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

@@ -205,7 +205,9 @@
           </el-form>
           <el-table  border :data="deptTableListRight">
             <el-table-column label="序号" align="center"  type="index" width="60"/>
-            <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip/>
+            <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip>
+              <template slot-scope="scope">{{scope.row.roomNumber?scope.row.subjectName+'-'+scope.row.roomNumber:scope.row.subjectName}}</template>
+            </el-table-column>
             <el-table-column label="楼栋楼层" align="center" prop="buildName" show-overflow-tooltip width="150"/>
             <el-table-column label="分类分级" align="center" prop="deptName" show-overflow-tooltip width="150">
               <template slot-scope="scope">
@@ -280,7 +282,9 @@
           </el-form>
           <el-table ref="leftSubTable" border :data="subTableListLeft" @selection-change="subChangeLeft" :row-key="getSubRowKeys">
             <el-table-column type="selection" width="50" :reserve-selection="true" align="center"/>
-            <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip/>
+            <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip>
+              <template slot-scope="scope">{{scope.row.roomNumber?scope.row.subjectName+'-'+scope.row.roomNumber:scope.row.subjectName}}</template>
+            </el-table-column>
             <el-table-column label="分类分级" align="center" prop="deptName" show-overflow-tooltip width="140">
               <template slot-scope="scope">
                 <span v-for="item in classTypeList" v-if="item.id == scope.row.typeId">{{item.typeName}}</span>
@@ -356,7 +360,9 @@
           </el-form>
           <el-table ref="rightSubTable" border :data="subTableListRight" @selection-change="subChangeRight" :row-key="getSubRowKeys">
             <el-table-column v-if="!lookInfoType" type="selection" width="50" :reserve-selection="true" align="center"/>
-            <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip/>
+            <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip>
+              <template slot-scope="scope">{{scope.row.roomNumber?scope.row.subjectName+'-'+scope.row.roomNumber:scope.row.subjectName}}</template>
+            </el-table-column>
             <el-table-column label="分类分级" align="center" prop="deptName" show-overflow-tooltip width="140">
               <template slot-scope="scope">
                 <span v-for="item in classTypeList" v-if="item.id == scope.row.typeId">{{item.typeName}}</span>

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

@@ -241,7 +241,9 @@
           </el-form>
           <el-table  border :data="deptTableListRight">
             <el-table-column label="序号" align="center"  type="index" width="60"/>
-            <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip/>
+            <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip>
+              <template slot-scope="scope">{{scope.row.roomNumber?scope.row.subjectName+'-'+scope.row.roomNumber:scope.row.subjectName}}</template>
+            </el-table-column>
             <el-table-column label="楼栋楼层" align="center" prop="buildName" show-overflow-tooltip width="150"/>
             <el-table-column label="分类分级" align="center" prop="deptName" show-overflow-tooltip width="150">
               <template slot-scope="scope">
@@ -316,7 +318,9 @@
           </el-form>
           <el-table ref="leftSubTable" border :data="subTableListLeft" @selection-change="subChangeLeft" :row-key="getSubRowKeys">
             <el-table-column type="selection" width="50" :reserve-selection="true" align="center"/>
-            <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip/>
+            <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip>
+              <template slot-scope="scope">{{scope.row.roomNumber?scope.row.subjectName+'-'+scope.row.roomNumber:scope.row.subjectName}}</template>
+            </el-table-column>
             <el-table-column label="分类分级" align="center" prop="deptName" show-overflow-tooltip width="140">
               <template slot-scope="scope">
                 <span v-for="item in classTypeList" v-if="item.id == scope.row.typeId">{{item.typeName}}</span>
@@ -392,7 +396,9 @@
           </el-form>
           <el-table ref="rightSubTable" border :data="subTableListRight" @selection-change="subChangeRight" :row-key="getSubRowKeys">
             <el-table-column v-if="!lookInfoType" type="selection" width="50" :reserve-selection="true" align="center"/>
-            <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip/>
+            <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip>
+              <template slot-scope="scope">{{scope.row.roomNumber?scope.row.subjectName+'-'+scope.row.roomNumber:scope.row.subjectName}}</template>
+            </el-table-column>
             <el-table-column label="分类分级" align="center" prop="deptName" show-overflow-tooltip width="140">
               <template slot-scope="scope">
                 <span v-for="item in classTypeList" v-if="item.id == scope.row.typeId">{{item.typeName}}</span>

src/views/safetyCheck/startInspection/index.vue

@@ -209,9 +209,10 @@
         </el-form>
       </div>
       <div class="bottom-button-max-box" v-hasPermi="['safety:checkManage_4:edit']">
-        <p></p>
+        <p class="null-p"></p>
         <p class="add-button-two-90" @click="upDataButton(1)">保存</p>
         <p class="inquire-button-one" @click="upDataButton(2)">提交</p>
+        <p class="null-p"></p>
       </div>
       <lookImgDialog ref="lookImgDialog"></lookImgDialog>
     </div>
@@ -592,8 +593,14 @@
       getCheckPlanBySubId(id){
         getCheckPlanBySubId({subId:id}).then(response => {
           this.initializationAddFormData();
-          this.$set(this,'planType',response.data[0]?2:1);
-          this.$set(this,'planList',response.data);
+          let list = [];
+          for(let i=0;i<response.data.length;i++){
+            if(response.data[i].isSelfData == 1){
+              list.push(response.data[i]);
+            }
+          }
+          this.$set(this,'planType',list[0]?2:1);
+          this.$set(this,'planList',list);
         });
       },
       //计划列表选中
@@ -910,7 +917,7 @@
       p{
         margin-top:20px;
       }
-      p:nth-child(1){
+      .null-p{
         flex:1;
       }
       p:nth-child(2){