diff --git a/src/pages/Index/components/Consumables/MoveLiquidArea.vue b/src/pages/Index/components/Consumables/MoveLiquidArea.vue index ec5eb9b..ade82f7 100644 --- a/src/pages/Index/components/Consumables/MoveLiquidArea.vue +++ b/src/pages/Index/components/Consumables/MoveLiquidArea.vue @@ -179,7 +179,7 @@ import BallGrid2 from './BallGrid2.vue' import IdCardInfo from './IdCardInfo.vue' import { ref, watch, reactive, onMounted } from 'vue' import { useRouter } from 'vue-router' -import { useEmergencyStore, useConsumablesStore } from '../../../../store' +import { useEmergencyStore, useConsumablesStore, useDeviceStore } from '../../../../store' import { LiquidState } from '../../../../types/Index/index' import wasteFullIcon from '@/assets/Index/waste-full.svg' import wasteIcon from '@/assets/Index/waste.svg' @@ -198,6 +198,8 @@ const socket = createWebSocket(wsUrl) const emergencyStore = useEmergencyStore() const consumableStore = useConsumablesStore() +const deviceStore = useDeviceStore(); + const visible = ref(false) const openTableModal = () => { visible.value = true @@ -238,6 +240,10 @@ const handleTouchEnd = () => { } } +//设备当前运行状态 +const workState = ref(deviceStore.deviceState.workState) + + let showModal = ref(false) const handleConfirm = () => { showModal.value = false @@ -273,9 +279,18 @@ onMounted(() => { }) let emergencyStatus = ref(false) +if (deviceStore.deviceState.workState === 'WORKING') { + emergencyStatus.value = false; +} //处理急诊状态消息 const handleEmergencyPosState = (data: EmergencyPosStateMessage['data']) => { // data.tube.state = 'PROCESSING' + console.log('设备运行状态---', deviceStore.deviceState.workState) + if (deviceStore.deviceState.workState === 'WORKING') { + emergencyStatus.value = false; + return; + } + let { state } = data.tube //当急诊试管状态是 EMPTY、TO_BE_PROCESSED、PROCESS_COMPLETE、ERROR可以编辑 emergencyStore.setInfo(data.tube)