heyang лет назад: 2
Родитель
Сommit
5e8b8dff1f
2 измененных файлов с 7 добавлено и 6 удалено
  1. 1 1
      api/index.js
  2. 6 5
      pages_manage/workbench/laboratory/laboratoryInfo.vue

+ 1 - 1
api/index.js

@@ -1856,7 +1856,7 @@ export const controlSwitch = (data) => {
 // 查询实验室排风扇人工还是预案
 export const subjectTriggerModes = (data) => {
     return apiResquest({
-        url: `/laboratory/control/newMsg`+data,
+        url: `/laboratory/control/newMsg/`+data,
         method: 'GET',
     })
 };

+ 6 - 5
pages_manage/workbench/laboratory/laboratoryInfo.vue

@@ -654,6 +654,7 @@ export default {
 	},
     //监听传感器信息
     getMqttSensorData(val){
+		console.log('传感器',val)
       let self = this;
       if(val.subId){
         if(self.itemData.id == val.subId){
@@ -661,7 +662,7 @@ export default {
         }
       }
     },
-	
+
     //监听设备信息
     getMqttDeviceData(val){
       let self = this;
@@ -679,11 +680,11 @@ export default {
             }else if(val[i].hardwareOperate == 'ONLINE'){
               self.itemData.labHardwareVOList[k].state.code = 2;
             }
-			if(self.itemData.labHardwareVOList[k].hardwareTypeEnum.hardwareTypeCode == '2'){
-					self.subjectTriggerModes(self.itemData.labHardwareVOList[k])
-			}
+            if(self.itemData.labHardwareVOList[k].hardwareTypeEnum.hardwareTypeCode == '2' && self.itemData.labHardwareVOList[k].pcType == '0'){
+                self.subjectTriggerModes(self.itemData.labHardwareVOList[k])
+            }
           }
-		  
+
         }
       }
     },