zc

src/api/safetyCheck/indexTow.js

@@ -243,3 +243,46 @@ export function findGroupList(data) {
     data: data
   })
 }
+
+//通用接口-根据实验室id查询该实验室有关计划
+export function getCheckPlanBySubId(query) {
+  return request({
+    url: '/zd-security/checkManage/getCheckPlanBySubId',
+    method: 'get',
+    params: query
+  })
+}
+
+//开展检查-提交
+export function checkManageAdd(data) {
+  return request({
+    url: '/zd-security/checkManage/add',
+    method: 'post',
+    data: data
+  })
+}
+//获取权限范围(巡查/自查)
+export function getGentle(query){
+  return request({
+    url: '/zd-security/checkSet/getGentle',
+    method: 'get',
+    params: query
+  })
+}
+
+//通用接口-根据实验室id分类查询实验室内设备
+export function getHazardInfoBySubId(query) {
+  return request({
+    url: '/laboratory/hazard/getHazardInfoBySubId',
+    method: 'get',
+    params: query
+  })
+}
+//通用接口-根据选择的设备id生成检查项
+export function getHazardInfoByJoinIds(query) {
+  return request({
+    url: '/security/checkManage/getHazardInfoByJoinIds',
+    method: 'get',
+    params: query
+  })
+}

src/components/lookDocumentDialog/lookDocumentListDialog.vue

@@ -43,18 +43,21 @@
       <div class="center-border"></div>
       <div class="right-box">
         <vue-office-docx
+          style="width:1030px;"
           v-if="officeType === 'docx'&&!officeNullType"
           :src="lookUrl"
           @rendered="renderedHandler"
           @error="errorHandler"
         />
         <vue-office-excel
+          style="width:1030px;"
           v-if="officeType === 'excel'&&!officeNullType"
           :src="lookUrl"
           @rendered="renderedHandler"
           @error="errorHandler"
         />
         <vue-office-pdf
+          style="width:1030px;"
           v-if="officeType === 'pdf'&&!officeNullType"
           :src="lookUrl"
           @rendered="renderedHandler"

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

@@ -1,8 +1,10 @@
 <template>
   <div class="inspectionManagement-addPage" v-loading.fullscreen.lock="loading">
-    <div class="title-max-box">
-      <p class="title-p">{{addPageTitle}}</p>
-      <p class="title-button page-out-common-style-button" @click="outButton">返回</p>
+    <div class="page-top-title-box title-max-box">
+      <p class="page-top-title-name-p" style="margin-left:70px;">{{addPageTitle}}</p>
+      <p class="page-top-title-out-p" @click="outButton">返回</p>
+      <p class="page-top-title-save-p" @click="upDataButton(1)">保存</p>
+      <p class="page-top-title-submit-p" @click="upDataButton(2)">提交</p>
       <img class="position-img" v-if="addForm.checkRange == 1" src="@/assets/ZDimages/safetyCheck/icon_xyxc_qx.png">
       <img class="position-img" v-if="addForm.checkRange == 2" src="@/assets/ZDimages/safetyCheck/icon_xyxc_xy.png">
       <img class="position-img" v-if="addForm.checkRange == 3" src="@/assets/ZDimages/safetyCheck/icon_xyxc_sys.png">
@@ -256,37 +258,30 @@
 
       </el-form>
     </div>
-    <div class="bottom-button-max-box">
-      <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>
+    <fullScreenView :fullScreenViewProps="fullScreenViewProps" ref="fullScreenView"></fullScreenView>
   </div>
 </template>
 
 <script>
+  import fullScreenView from "@/components/fullScreenView/fullScreenView.vue";
   import { getToken } from "@/utils/auth";
-  import lookImgDialog from '@/components/lookImgDialog/lookImgDialog.vue'
   import { findCheckManage,checkOptionList,checkManageUpdate,countHazardNum } from '@/api/safetyCheck/indexTow'
-  import { delUserHaikang } from '@/apiDemo/laboratory/subject'
   export default {
     name: 'addPage',
     props:{
       propsAddData:{},
     },
     components: {
-      lookImgDialog,
+      fullScreenView,
     },
     data(){
       return{
         loading:false,
         uploadImgUrl: this.uploadUrl(), // 上传的图片服务器地址
         headers: {
-          Authorization: "Bearer " + getToken(),
+          Authorization: getToken(),
         },
+        fullScreenViewProps:[],
         //期限时间
         pickerOptions: {
           disabledDate(time) {
@@ -546,11 +541,12 @@
       },
       //查看图片
       lookImg(list,index){
+        let newList = [];
         for(let i=0;i<list.length;i++){
-          list[i].name = list[i].fileName;
-          list[i].url = list[i].fileUrl;
+          newList.push(list[i].fileUrl)
         }
-        this.$refs.lookImgDialog.lookImgDialogOpen(1,list,index);
+        this.$set(this,'fullScreenViewProps',newList);
+        this.$refs['fullScreenView'].initialize(index);
       },
       /*==========上传相关==========*/
       handleAvatarSuccess(res,item) {
@@ -707,20 +703,6 @@
     }
     .title-max-box{
       position: relative;
-      height:90px;
-      display: flex;
-      border-bottom:1px solid #dedede;
-      .title-p{
-        flex:1;
-        color:#0045AF;
-        margin-left:64px;
-        line-height:90px;
-        font-size:16px;
-      }
-      .title-button{
-        width:70px;
-        margin:24px 31px;
-      }
       .position-img{
         width:80px;
         height:80px;

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

@@ -373,7 +373,7 @@
         upDataName:"",
         uploadImgUrl: this.uploadUrl(), // 上传的图片服务器地址
         headers: {
-          Authorization: "Bearer " + getToken(),
+          Authorization: getToken(),
         },
         infoDialogType:false,
         //img 与 document 展示状态

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

@@ -1,8 +1,8 @@
 <template>
   <div class="inspectionManagement-infoPage">
-    <div class="title-max-box">
-      <p class="title-p">检查详情</p>
-      <p class="title-button page-out-common-style-button" @click="outButton">返回</p>
+    <div class="page-top-title-box title-max-box">
+      <p class="page-top-title-name-p" style="margin-left:70px;">检查详情</p>
+      <p class="page-top-title-out-p" @click="outButton">返回</p>
       <img class="position-img" v-if="addForm.checkRange == 1" src="@/assets/ZDimages/safetyCheck/icon_xyxc_qx.png">
       <img class="position-img" v-if="addForm.checkRange == 2" src="@/assets/ZDimages/safetyCheck/icon_xyxc_xy.png">
       <img class="position-img" v-if="addForm.checkRange == 3" src="@/assets/ZDimages/safetyCheck/icon_xyxc_sys.png">
@@ -247,7 +247,7 @@
 
       </el-form>
     </div>
-    <lookImgDialog ref="lookImgDialog"></lookImgDialog>
+    <fullScreenView :fullScreenViewProps="fullScreenViewProps" ref="fullScreenView"></fullScreenView>
     <infoDialog v-if="infoDialogType" :propsInfoDialogData="propsInfoDialogData"></infoDialog>
     <lookDocumentDataDialog v-if="lookDocumentType" :propsLookDocumentData="propsLookDocumentData"></lookDocumentDataDialog>
     <lookDocumentListDialog v-if="lookDocumentListType" :propsLookDocumentListData="propsLookDocumentListData"></lookDocumentListDialog>
@@ -255,8 +255,8 @@
 </template>
 
 <script>
-import { checkOptionList, findCheckManage, getFindByCheckPlanId } from '@/api/safetyCheck/indexTow'
-  import lookImgDialog from '@/components/lookImgDialog/lookImgDialog.vue'
+  import fullScreenView from "@/components/fullScreenView/fullScreenView.vue";
+  import { checkOptionList, findCheckManage, getFindByCheckPlanId } from '@/api/safetyCheck/indexTow'
   import lookDocumentDataDialog from '@/components/lookDocumentDialog/lookDocumentDataDialog.vue'
   import lookDocumentListDialog from '@/components/lookDocumentDialog/lookDocumentListDialog.vue'
   import infoDialog from '@/views/safetyCheck/components/infoDialog/infoDialog.vue'
@@ -267,7 +267,7 @@ import { getToken } from '@/utils/auth'
       propsInfoData:{},
     },
     components: {
-      lookImgDialog,
+      fullScreenView,
       infoDialog,
       lookDocumentDataDialog,
       lookDocumentListDialog
@@ -276,8 +276,9 @@ import { getToken } from '@/utils/auth'
       return{
         uploadImgUrl: this.uploadUrl(), // 上传的图片服务器地址
         headers: {
-          Authorization: "Bearer " + getToken(),
+          Authorization: getToken(),
         },
+        fullScreenViewProps:[],
         //子组件数据
         lookDocumentType:false,
         propsLookDocumentData:{},
@@ -394,11 +395,12 @@ import { getToken } from '@/utils/auth'
       },
       //查看图片
       lookImg(list,index){
+        let newList = [];
         for(let i=0;i<list.length;i++){
-          list[i].name = list[i].fileName;
-          list[i].url = list[i].fileUrl;
+          newList.push(list[i].fileUrl)
         }
-        this.$refs.lookImgDialog.lookImgDialogOpen(1,list,index);
+        this.$set(this,'fullScreenViewProps',newList);
+        this.$refs['fullScreenView'].initialize(index);
       },
       // 单个下载按钮
       downloadButton(){
@@ -465,20 +467,6 @@ import { getToken } from '@/utils/auth'
     }
     .title-max-box{
       position: relative;
-      height:90px;
-      display: flex;
-      border-bottom:1px solid #dedede;
-      .title-p{
-        flex:1;
-        color:#0045AF;
-        margin-left:64px;
-        line-height:90px;
-        font-size:16px;
-      }
-      .title-button{
-        width:70px;
-        margin:24px 31px;
-      }
       .position-img{
         width:80px;
         height:80px;

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

@@ -156,7 +156,7 @@
               <p v-if="lookInfoType" class="page-submit-common-style-button" @click="lookDeptLeftReset" style="width:60px;margin-right:0;">重置</p>
             </el-form-item>
           </el-form>
-          <el-table ref="leftDeptTable" border :data="deptTableListLeft" @select-all="deptChange" @select="deptChange" :row-key="getDeptRowKeys">
+          <el-table class="table-box" ref="leftDeptTable" border :data="deptTableListLeft" @select-all="deptChange" @select="deptChange" :row-key="getDeptRowKeys">
             <el-table-column v-if="!lookInfoType" type="selection" width="50" :reserve-selection="true" align="center"/>
             <el-table-column label="学院" align="center" prop="deptName" show-overflow-tooltip>
               <template slot-scope="scope">
@@ -222,12 +222,14 @@
               <p v-if="lookInfoType" class="page-submit-common-style-button" @click="lookDeptRightReset" style="width:60px;margin-right:0;">重置</p>
             </el-form-item>
           </el-form>
-          <el-table  border :data="deptTableListRight">
+          <el-table class="table-box"  border :data="deptTableListRight">
             <el-table-column label="序号" align="center"  type="index" width="60"/>
-            <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 label="实验室" align="center" prop="subName" show-overflow-tooltip>
+              <template slot-scope="scope">{{scope.row.roomNum?scope.row.subName+'-'+scope.row.roomNum:scope.row.subName}}</template>
+            </el-table-column>
+            <el-table-column label="楼栋楼层" align="center" prop="buildName" show-overflow-tooltip width="150">
+              <template slot-scope="scope">{{scope.row.buildName}}{{scope.row.floorName}}</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">
                 <span>{{scope.row.classTypeNames}}</span>
@@ -235,7 +237,7 @@
                 <span :style="'color:'+scope.row.classLevelColor+';'">{{scope.row.classLevelName}}</span>
               </template>
             </el-table-column>
-            <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="140"/>
+            <el-table-column label="学院" align="center" prop="deptName" show-overflow-tooltip width="140"/>
           </el-table>
           <pagination layout="total, prev, pager, next, jumper"
                       v-show="deptTotalRight>0"
@@ -299,10 +301,10 @@
               <p class="page-submit-common-style-button" @click="subResetQueryLeft" style="width:60px;margin-right:0;">重置</p>
             </el-form-item>
           </el-form>
-          <el-table ref="leftSubTable" border :data="subTableListLeft" @selection-change="subChangeLeft" :row-key="getSubRowKeys">
+          <el-table class="table-box" 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>
-              <template slot-scope="scope">{{scope.row.roomNumber?scope.row.subjectName+'-'+scope.row.roomNumber:scope.row.subjectName}}</template>
+            <el-table-column label="实验室" align="center" prop="subName" show-overflow-tooltip>
+              <template slot-scope="scope">{{scope.row.roomNum?scope.row.subName+'-'+scope.row.roomNum:scope.row.subName}}</template>
             </el-table-column>
             <el-table-column label="分类分级" align="center" prop="deptName" show-overflow-tooltip width="140">
               <template slot-scope="scope">
@@ -311,7 +313,7 @@
                 <span :style="'color:'+scope.row.classLevelColor+';'">{{scope.row.classLevelName}}</span>
               </template>
             </el-table-column>
-            <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="150"/>
+            <el-table-column label="学院" align="center" prop="deptName" show-overflow-tooltip width="150"/>
           </el-table>
           <pagination layout="total, prev, pager, next, jumper"
                       v-show="subTotalLeft>0"
@@ -377,10 +379,10 @@
               <p class="page-submit-common-style-button" @click="subResetQueryRight" style="width:60px;margin-right:0;">重置</p>
             </el-form-item>
           </el-form>
-          <el-table ref="rightSubTable" border :data="subTableListRight" @selection-change="subChangeRight" :row-key="getSubRowKeys">
+          <el-table class="table-box" 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>
-              <template slot-scope="scope">{{scope.row.roomNumber?scope.row.subjectName+'-'+scope.row.roomNumber:scope.row.subjectName}}</template>
+            <el-table-column label="实验室" align="center" prop="subName" show-overflow-tooltip>
+              <template slot-scope="scope">{{scope.row.roomNum?scope.row.subName+'-'+scope.row.roomNum:scope.row.subName}}</template>
             </el-table-column>
             <el-table-column label="分类分级" align="center" prop="deptName" show-overflow-tooltip width="140">
               <template slot-scope="scope">
@@ -389,7 +391,7 @@
                 <span :style="'color:'+scope.row.classLevelColor+';'">{{scope.row.classLevelName}}</span>
               </template>
             </el-table-column>
-            <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="150"/>
+            <el-table-column label="学院" align="center" prop="deptName" show-overflow-tooltip width="150"/>
           </el-table>
           <pagination layout="total, prev, pager, next, jumper"
                       v-show="subTotalRight>0"
@@ -438,7 +440,7 @@
               <p class="page-submit-common-style-button" @click="deviceResetQueryLeft" style="width:60px;">重置</p>
             </el-form-item>
           </el-form>
-          <el-table ref="leftDeviceTable" border :data="deviceTableListLeft" @selection-change="deviceChangeLeft" :row-key="getDeviceRowKeys">
+          <el-table class="table-box" ref="leftDeviceTable" border :data="deviceTableListLeft" @selection-change="deviceChangeLeft" :row-key="getDeviceRowKeys">
             <el-table-column type="selection" width="50" :reserve-selection="true" align="center"/>
             <el-table-column label="名称" align="center" prop="chName" show-overflow-tooltip/>
             <el-table-column label="型号" align="center" prop="code" show-overflow-tooltip width="150"/>
@@ -488,7 +490,7 @@
               <p class="page-submit-common-style-button" @click="deviceResetQueryRight" style="width:60px;">重置</p>
             </el-form-item>
           </el-form>
-          <el-table ref="rightDeviceTable" border :data="deviceTableListRight" @selection-change="deviceChangeRight" :row-key="getDeviceRowKeys">
+          <el-table class="table-box" ref="rightDeviceTable" border :data="deviceTableListRight" @selection-change="deviceChangeRight" :row-key="getDeviceRowKeys">
             <el-table-column type="selection" width="50" :reserve-selection="true" align="center"/>
             <el-table-column label="名称" align="center" prop="chName" show-overflow-tooltip/>
             <el-table-column label="型号" align="center" prop="code" show-overflow-tooltip width="150"/>
@@ -1232,10 +1234,10 @@
             for(let i=0;i<subIdsLeft.length;i++){
               let obj = {
                 subId:subIdsLeft[i].subId,
-                subjectName:subIdsLeft[i].subjectName,
+                subjectName:subIdsLeft[i].subName,
                 typeId:subIdsLeft[i].typeId,
                 levelId:subIdsLeft[i].levelId,
-                collegeName:subIdsLeft[i].collegeName,
+                collegeName:subIdsLeft[i].deptName,
               }
               list.push(obj);
             }

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

@@ -82,13 +82,13 @@
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
-                <p class="table-button-p" v-hasPermi="['security:checkPlan_1:query']"
+                <p class="table-button-p" v-hasPermiRouter="['security:checkPlan_1:query']"
                    v-show="scope.row.checkStatus!=1" @click="addDialogOpen(3,scope.row)">详情</p>
-                <p class="table-button-p" v-hasPermiAnd="['security:checkPlan_1:query','security:checkPlan_1:edit']"
+                <p class="table-button-p" v-hasPermiRouter="['security:checkPlan_1:edit']"
                    v-show="scope.row.checkStatus==1&&scope.row.isSelfData == 1" @click="addDialogOpen(2,scope.row)">编辑</p>
-                <p class="table-button-p" v-hasPermi="['security:checkManage_3:list']"
+                <p class="table-button-p" v-hasPermiRouter="['security:checkManage_3:list']"
                    @click="goPage(2,scope.row)">自查管理</p>
-                <p class="table-button-p" v-hasPermi="['security:checkPlan_1:remove']"
+                <p class="table-button-p" v-hasPermiRouter="['security:checkPlan_1:remove']"
                    v-show="scope.row.checkStatus==1&&scope.row.isSelfData == 1" @click="deleteObj(scope.row)">删除</p>
                 <p class="table-button-p" v-show="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
                 <p class="table-button-null"></p>

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

@@ -96,11 +96,11 @@
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
-                <p class="table-button-p" v-hasPermi="['security:checkManage_3:query']"
+                <p class="table-button-p" v-hasPermiRouter="['security:checkManage_3:query']"
                    v-show="scope.row.manageStatus==0||scope.row.manageStatus==2 && scope.row.isSelfData==1" @click="goAddPage(3,scope.row.id)">详情</p>
-                <p class="table-button-p" v-hasPermiAnd="['security:checkManage_3:query','security:checkManage_3:edit']"
+                <p class="table-button-p" v-hasPermiRouter="['security:checkManage_3:edit']"
                    v-show="scope.row.manageStatus==1 && scope.row.isCheck==1 && scope.row.isSelfData==1" @click="goAddPage(2,scope.row.id)">编辑</p>
-                <p class="table-button-p" v-hasPermiAnd="['security:checkManage_3:query','security:checkManage_3:edit']"
+                <p class="table-button-p" v-hasPermiRouter="['security:checkManage_3:edit']"
                    v-show="scope.row.manageStatus==0 && scope.row.isCheck==1 && scope.row.isSelfData==1" @click="goAddPage(2,scope.row.id)">开始检查</p>
                 <p class="table-button-p"
                    style="color:#999" v-show="scope.row.manageStatus==0 && scope.row.isCheck==0">开始检查</p>
@@ -128,12 +128,18 @@
 </template>
 
 <script>
-  import { listDepartments } from "@/apiDemo/system/dept";
-  import { findByCheckPlanId,getFindByCheckPlanId } from '@/apiDemo/safetyCheck/index'
   import addPage from '@/views/safetyCheck/components/addPage/addPage.vue'
   import infoPage from '@/views/safetyCheck/components/infoPage/infoPage.vue'
   import lookDocumentDataDialog from '@/components/lookDocumentDialog/lookDocumentDataDialog.vue'
   import lookDocumentListDialog from '@/components/lookDocumentDialog/lookDocumentListDialog.vue'
+  //                        V3
+  import {
+    getDeptDropList
+  } from '@/api/commonality/permission'
+  import {
+    findByCheckPlanId,
+    getFindByCheckPlanId,
+  } from '@/api/safetyCheck/indexTow'
   export default {
     name: 'index',
     props:{
@@ -174,7 +180,7 @@
 
     },
     mounted(){
-      this.listDepartments();
+      this.getDeptDropList();
       this.getList();
     },
     methods:{
@@ -294,10 +300,10 @@
         }
       },
       //获取学院列表
-      listDepartments(){
-        listDepartments().then(response => {
-          this.deptSelectList = response.data;
-        });
+      getDeptDropList(){
+        getDeptDropList({ deptName: '', level: 2, deptType: 1 }).then(response => {
+          this.$set(this, 'deptSelectList', response.data)
+        })
       },
     },
   }

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

@@ -1479,7 +1479,7 @@ export default {
           for(let i=0;i<subIdsLeft.length;i++){
             let obj = {
               subId:subIdsLeft[i].subId,
-              subjectName:subIdsLeft[i].subjectName,
+              subjectName:subIdsLeft[i].subName,
               typeId:subIdsLeft[i].typeId,
               levelId:subIdsLeft[i].levelId,
               collegeName:subIdsLeft[i].deptName,

src/views/safetyCheck/startInspection/index.vue

@@ -232,7 +232,7 @@
             </div>
             <div class="dept-table-max-box">
               <div class="device-tip">请选择以下实验室内设备开始检查</div>
-              <el-table  border :data="deviceTableList" @selection-change="deviceChange" :row-key="getRowKeys" height="350">
+              <el-table  border :data="deviceTableList" ref="deviceTableBox" @selection-change="deviceChange" :row-key="getRowKeys" height="350">
                 <el-table-column type="selection" width="50" :reserve-selection="true" align="center"/>
                 <el-table-column label="名称" align="center" prop="chName" show-overflow-tooltip/>
                 <el-table-column label="型号" align="center" prop="code" show-overflow-tooltip />
@@ -354,6 +354,14 @@
 <script>
   import { getToken } from "@/utils/auth";
   import lookImgDialog from '@/components/lookImgDialog/lookImgDialog.vue'
+  //                        V3
+  import {
+    getDeptDropList,
+    systemBuildingGetOptList
+  } from '@/api/commonality/permission'
+  import {
+    laboratorySubRelInfoGetRelList
+  } from '@/api/commonality/noPermission'
   import {
     getCheckPlanBySubId,
     findCheckManage,
@@ -364,15 +372,7 @@
     getGentle,
     getHazardInfoBySubId,
     getHazardInfo, getHazardInfoByJoinIds
-  } from '@/apiDemo/safetyCheck/index'
-  //                        V3
-  import {
-    getDeptDropList,
-    systemBuildingGetOptList
-  } from '@/api/commonality/permission'
-  import {
-    laboratorySubRelInfoGetRelList
-  } from '@/api/commonality/noPermission'
+  } from '@/api/safetyCheck/indexTow'
   export default {
     name: 'index',
     components: {
@@ -991,7 +991,9 @@
       //根据实验室ID查询实验室设备
       getHazardInfoBySubId(id){
         getHazardInfoBySubId({subId:id}).then(response => {
-            this.deviceTableList=response.data;
+          this.$set(this,'deviceTableList',response.data);
+          this.$set(this,'multipleSelection',[]);
+          this.$refs.deviceTableBox.clearSelection();
         });
       },
       //根据设备id生成检查项