diff --git a/src/pages/Index/Index.vue b/src/pages/Index/Index.vue index a2c2487..c948758 100644 --- a/src/pages/Index/Index.vue +++ b/src/pages/Index/Index.vue @@ -157,9 +157,9 @@ -->
- 温度: 高 - 温度: 低 - 温度: 好 + 温度: 高 + 温度: 低 + 温度: 好
@@ -501,10 +501,6 @@ const confirmRestore = () => { const router = useRouter() const route = useRoute() - -const incubateBoxTemperature = computed(() => { - return systemStore.systemInfo?.incubateBoxTemperature || 0 -}) // 获取系统设置 const fetchSettings = async () => { try { @@ -1050,7 +1046,7 @@ const startTest = async () => { return } try { - if (deviceStore.sensorState?.incubateBoxTemperature != incubateBoxTemperature) { + if (deviceStore.sensorState?.incubateBoxTemperatureState !== 'Ready') { warnMessage.value = '温度异常, 禁止测试' showWarnModal.value =true return diff --git a/src/websocket/socket.ts b/src/websocket/socket.ts index ae681b8..846524b 100644 --- a/src/websocket/socket.ts +++ b/src/websocket/socket.ts @@ -289,7 +289,9 @@ interface SensorStateMessage extends BaseMessage { dataType: 'SensorState' data: { pboxTemperature: number //板夹仓温度 + pboxTemperatureState: 'Ready' | 'High' | 'Low' //板夹仓温度状态 incubateBoxTemperature: number // 孵育盘温度 + incubateBoxTemperatureState: 'Ready' | 'High' | 'Low' // 孵育盘温度状态 wasteBinFullFlag: boolean // 废废料仓状态 } timestamp: number