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