heyang

src/api/laboratory/subject.js

@@ -231,6 +231,13 @@ export function subjectInfo(id,type) {
     method: 'get',
   })
 }
+// 查询实验室排风扇人工还是预案
+export function subjectTriggerModes(id) {
+  return request({
+    url: '/laboratory/control/newMsg/'+id,
+    method: 'get',
+  })
+}
 //查询实验室门禁
 export function getDetalis(query) {
   return request({

src/views/comprehensive/laboratoryManagement/subject/index.vue

@@ -92,7 +92,14 @@
           <!--传感器-->
           <div class="bottom-max-box" :class="rightButtonType == 4?'overflow-box':''">
             <div class="bottom-sensor-box" v-if="rightButtonType == 1">
-              <p class="top-title"><i>{{checkedSubject.deptName}}</i><i>当前位置：{{checkedSubject.subAddrr.buildName}}{{checkedSubject.subAddrr.floorName}}</i></p>
+              <p class="top-title">
+                <el-tooltip class="item" effect="dark" :content="checkedSubject.deptName" placement="bottom">
+                  <i>{{checkedSubject.deptName}}</i>
+                </el-tooltip>
+                <el-tooltip class="item" effect="dark" :content="checkedSubject.subAddrr.buildName+checkedSubject.subAddrr.floorName" placement="bottom">
+                  <i>当前位置：{{checkedSubject.subAddrr.buildName}}{{checkedSubject.subAddrr.floorName}}</i>
+                </el-tooltip>
+              </p>
               <div class="sensor-for-max-box scrollbar-box" v-if="checkedSubject.sensorFunctionStatusList[0]">
                 <div class="sensor-for-big-box"
                      :class="item.type == 1 ? 'sensor-color-a' : (item.type == 2 ? 'sensor-color-b' : 'sensor-color-c')"
@@ -129,7 +136,14 @@
               <p class="bottom-text" v-if="checkedSubject.sensorFunctionStatusList[0]">数据上报时间：{{checkedSubject.sensorFunctionStatusList[0].sendDate}}</p>
             </div>
             <div class="bottom-switch-box" v-if="rightButtonType == 2">
-              <p class="top-title"><i>{{checkedSubject.deptName}}</i><i>当前位置：{{checkedSubject.subAddrr.buildName}}{{checkedSubject.subAddrr.floorName}}</i></p>
+              <p class="top-title">
+                <el-tooltip class="item" effect="dark" :content="checkedSubject.deptName" placement="bottom">
+                  <i>{{checkedSubject.deptName}}</i>
+                </el-tooltip>
+                <el-tooltip class="item" effect="dark" :content="checkedSubject.subAddrr.buildName+checkedSubject.subAddrr.floorName" placement="bottom">
+                  <i>当前位置：{{checkedSubject.subAddrr.buildName}}{{checkedSubject.subAddrr.floorName}}</i>
+                </el-tooltip>
+              </p>
               <div class="switch-for-max-box" v-show="checkedSubject.VOlist[0]" v-hasPermi="['laboratory:subcontrol:set']">
                 <div class="switch-for-big-box" v-for="(item,index) in checkedSubject.VOlist" :key="index">
                   <div class="switch-for-min-box" v-if="item.hardwareTypeEnum.enumName == 'SWITCH'">
@@ -182,7 +196,14 @@
               <p class="null-text-p" v-show="!checkedSubject.VOlist[0]">暂无物联控制信息，请在更多操作-物联设备配置中进行添加</p>
             </div>
             <div class="bottom-video-box" v-if="rightButtonType == 3">
-              <p class="top-title"><i>{{checkedSubject.deptName}}</i><i>当前位置：{{checkedSubject.subAddrr.buildName}}{{checkedSubject.subAddrr.floorName}}</i></p>
+              <p class="top-title">
+                <el-tooltip class="item" effect="dark" :content="checkedSubject.deptName" placement="bottom">
+                  <i>{{checkedSubject.deptName}}</i>
+                </el-tooltip>
+                <el-tooltip class="item" effect="dark" :content="checkedSubject.subAddrr.buildName+checkedSubject.subAddrr.floorName" placement="bottom">
+                  <i>当前位置：{{checkedSubject.subAddrr.buildName}}{{checkedSubject.subAddrr.floorName}}</i>
+                </el-tooltip>
+              </p>
               <div class="video-for-max-box" v-if="checkedSubject.videoData[0]">
                 <div class="switch-for-big-box" v-for="(item,index) in checkedSubject.videoData" :key="index">
                   <video :id="item.divId" ref="videoRef" autoplay controls  muted width="490px" height="262px"></video>
@@ -193,7 +214,14 @@
               <p class="null-text-p" v-if="!checkedSubject.videoData[0]">暂无视频监控信息，请在更多操作-物联设备配置中进行添加</p>
             </div>
             <div class="bottom-alarm-box" v-if="rightButtonType == 4">
-              <p class="top-title"><i>{{checkedSubject.deptName}}</i><i>当前位置：{{checkedSubject.subAddrr.buildName}}{{checkedSubject.subAddrr.floorName}}</i></p>
+              <p class="top-title">
+                <el-tooltip class="item" effect="dark" :content="checkedSubject.deptName" placement="bottom">
+                  <i>{{checkedSubject.deptName}}</i>
+                </el-tooltip>
+                <el-tooltip class="item" effect="dark" :content="checkedSubject.subAddrr.buildName+checkedSubject.subAddrr.floorName" placement="bottom">
+                  <i>当前位置：{{checkedSubject.subAddrr.buildName}}{{checkedSubject.subAddrr.floorName}}</i>
+                </el-tooltip>
+              </p>
               <div class="alarm-max-box" :class="hardwareData[0]?hardwareData[0].status==3||hardwareData[0].status==4?'BGcolorTypeA':'BGcolorTypeB':''">
                 <img  v-if="hardwareData[0]?hardwareData[0].status == 3:''" src="@/assets/ZDimages/medicUniversity-3_1/img_syslb_znsgbjzx.png" class="alarm-img">
                 <div class="alarm-big-box" v-if="hardwareData[0]">
@@ -238,7 +266,14 @@
               />
             </div>
             <div class="bottom-entrance-box" v-if="rightButtonType == 5">
-              <p class="top-title"><i>{{checkedSubject.deptName}}</i><i>当前位置：{{checkedSubject.subAddrr.buildName}}{{checkedSubject.subAddrr.floorName}}</i></p>
+              <p class="top-title">
+                <el-tooltip class="item" effect="dark" :content="checkedSubject.deptName" placement="bottom">
+                  <i>{{checkedSubject.deptName}}</i>
+                </el-tooltip>
+                <el-tooltip class="item" effect="dark" :content="checkedSubject.subAddrr.buildName+checkedSubject.subAddrr.floorName" placement="bottom">
+                  <i>当前位置：{{checkedSubject.subAddrr.buildName}}{{checkedSubject.subAddrr.floorName}}</i>
+                </el-tooltip>
+              </p>
               <div class="entrance" :class="item.operate.code==2?'BGentrance_l_yes':'BGentrance_l_no'" v-for="(item,index) in entranceList" v-if="item.operate">
                 <img class="entrance_c" v-if="item.operate.code==2" src="@/assets/ZDimages/icon_znmj_zx.png">
                 <img class="entrance_c" v-if="item.operate.code!=2"  src="@/assets/ZDimages/icon_znmj_lx.png">
@@ -289,6 +324,7 @@ import {
   mangerVoice,
   startUrl,
   queryHardByTypeList,
+  subjectTriggerModes,
 } from '@/api/laboratory/subject'
 import { listData} from "@/api/system/dict/data";
 import { filterDept } from "@/api/medicUniversity-3_1/index";
@@ -696,6 +732,22 @@ export default {
 
       })
     },
+    //点击开关按钮开启的时候充电调用硬件状态
+    subjectTriggerModes(row){
+      let self=this;
+      subjectTriggerModes(row.id).then(response => {
+        if(response.code==200){
+          row.hardwareTypeEnum.hardwareTypeCode=response.data.hardwareType.hardwareTypeCode
+          row.triggerModes=response.data.triggerModes
+          for(let b=0;b<self.fanList.length;b++){
+            if(self.fanList[b].dictValue==row.triggerModes){
+              row.dictLabel=self.fanList[b].dictLabel
+            }
+          }
+          console.log(self.checkedSubject.VOlist)
+        }
+      });
+    },
     //开关按钮
     switchChange(row){
       let self=this;
@@ -705,7 +757,14 @@ export default {
       };
       hardWareControl(switchData).then(response => {
         if(response.code==200){
+
           this.msgSuccess("操作成功")
+          //如果是开启的时候调用
+          if(row.state.code==4 && row.hardwareTypeEnum.hardwareTypeCode==2){
+            self.subjectTriggerModes(row)
+          }else{
+            //row.state.code = row.state.code==3?4:(row.state.code==4?3:'')
+          }
         }
       });
 
@@ -1016,7 +1075,7 @@ export default {
           }else{
 
             //硬件
-             //console.log("硬件",data);
+             console.log("硬件",data);
             for (let i = 0; i < data.data.length; i++) {
               if (self.checkedSubject.VOlist) {
                 for (let k = 0; k < self.checkedSubject.VOlist.length; k++) {
@@ -1264,6 +1323,9 @@ export default {
               line-height:18px;
               font-size:16px;
               color: #333;
+              overflow:hidden;
+              white-space: nowrap;
+              text-overflow: ellipsis;
             }
           }
           .null-text-p{