Merge branch 'web-v2' of http://192.168.1.43:3000/git/sass-lab-web into web-v2

src/api/laboratory/subject.js

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

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

@@ -403,6 +403,8 @@ export default {
       //字典排风扇数组
       fanList:[],
       selectTriggerList:[],//预案触发下,预案数据存储
+      hardwareTypeCode:'',
+      triggerModes:'',
     }
   },
   created() {
@@ -690,43 +692,32 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(async () => {
-        self.switchChange(row)
-        if(row.state.code==4){
-          this.subjectTriggerModes(row.id)
+        //如果是开启的时候调用
+        if(row.state.code==4 && row.hardwareTypeEnum.hardwareTypeCode==2){
+          self.subjectTriggerModes(row)
+        }else{
+          self.switchChange(row)
         }
+
       }).catch(() => {
 
       })
     },
+
     //点击开关按钮开启的时候充电调用硬件状态
-    subjectTriggerModes(id){
+    subjectTriggerModes(row){
       let self=this;
-      console.log(self.checkedSubject.VOlist)
-      subjectTriggerModes(id).then(response => {
+      subjectTriggerModes(row.id).then(response => {
         if(response.code==200){
-          if (self.checkedSubject.VOlist) {
-            for (let k = 0; k < self.checkedSubject.VOlist.length; k++) {
-              if(self.checkedSubject.VOlist[k].id==response.data.hardwareId){
-                self.checkedSubject.VOlist[k].triggerModes=response.data.triggerModes
-                self.checkedSubject.VOlist[k].hardwareTypeEnum.hardwareTypeCode=response.data.hardwareType.hardwareTypeCode
-              }
-            }
-            for (let i = 0; i < self.checkedSubject.VOlist.length; i++) {
-              if(self.checkedSubject.VOlist[i].hardwareTypeEnum.hardwareTypeCode == '2'){
-                for(let b=0;b<self.fanList.length;b++){
-                  if(self.fanList[b].dictValue==self.checkedSubject.VOlist[i].triggerModes){
-                    self.checkedSubject.VOlist[i].dictLabel=self.fanList[b].dictLabel
-                  }
-                }
-              }
-            }
-          }
+          self.hardwareTypeCode=response.data.hardwareType.hardwareTypeCode
+          self.triggerModes=response.data.triggerModes
+          self.switchChange(row)
         }
       });
     },
     //开关按钮
     switchChange(row){
-
+      let self=this;
       let switchData = {
         id:row.id,
         switchVal:row.state.code==3?'close':(row.state.code==4?'open':'')
@@ -734,9 +725,19 @@ export default {
       hardWareControl(switchData).then(response => {
         if(response.code==200){
           row.state.code = row.state.code==3?4:(row.state.code==4?3:'')
+          if(self.hardwareTypeCode){
+            row.hardwareTypeEnum.hardwareTypeCode=self.hardwareTypeCode
+            row.triggerModes=self.triggerModes
+            for(let b=0;b<self.fanList.length;b++){
+              if(self.fanList[b].dictValue==row.triggerModes){
+                row.dictLabel=self.fanList[b].dictLabel
+              }
+            }
+          }
           this.msgSuccess("操作成功")
         }
       });
+
     },
     //切换实验室展示数据
     rightButtonClick(type){
@@ -911,7 +912,6 @@ export default {
     },
     //保存当前排序
     liveSort(row){
-      console.log("row",row);
       let obj = {
         sort:row.diyOrder
       }
@@ -1179,7 +1179,6 @@ export default {
     let self = this;
     self.videoOff();
     self.offMQTT();
-    console.log("beforeDestroy");
   },
 }
 </script>