From 82a9b56c56ed1890add45f93d0e709e957c13eb3 Mon Sep 17 00:00:00 2001
From: LiLongLong <13717757313@163.com>
Date: Fri, 17 Jan 2025 17:15:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Index/Regular/Emergency.vue                     | 10 ++--------
 src/pages/Index/components/Consumables/MoveLiquidArea.vue |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/pages/Index/Regular/Emergency.vue b/src/pages/Index/Regular/Emergency.vue
index 8370c26..f28f12f 100644
--- a/src/pages/Index/Regular/Emergency.vue
+++ b/src/pages/Index/Regular/Emergency.vue
@@ -337,22 +337,16 @@ watch(isEmergencyEnabled, (newVal) => {
 
 // 处理回显数据
 onMounted(() => {
-  const { emergencyInfo } = emergencyStore.$state
-  //@ts-ignore
-  if (Object.keys(emergencyInfo).length > 0) {
+  const {emergencyInfo} = emergencyStore.$state
+  if (emergencyInfo && Object.keys(emergencyInfo).length > 0) {
     console.log("🚀 ~ onMounted ~ emergencyInfo:", emergencyInfo)
     isEmergencyEnabled.value = true
-    //@ts-ignore
     emergencyPosition.value.bloodType = emergencyInfo.bloodType;
-    //@ts-ignore
     emergencyInfo.projInfo.forEach(item => {
       emergencyPosition.value.projIds.push(item.projId);
     })
-    //@ts-ignore
     emergencyPosition.value.sampleBarcode = emergencyInfo.sampleBarcode;
-    //@ts-ignore
     emergencyPosition.value.userid = emergencyInfo.userid;
-    //@ts-ignore
     bloodType.value = emergencyInfo.bloodType;
     projectName.value = '';
   }
diff --git a/src/pages/Index/components/Consumables/MoveLiquidArea.vue b/src/pages/Index/components/Consumables/MoveLiquidArea.vue
index 7ab9be1..b3e3369 100644
--- a/src/pages/Index/components/Consumables/MoveLiquidArea.vue
+++ b/src/pages/Index/components/Consumables/MoveLiquidArea.vue
@@ -290,7 +290,6 @@ const handleEmergencyPosState = (data: EmergencyPosStateMessage['data']) => {
 
   let { state } = data.tube
   //当急诊试管状态是 EMPTY、TO_BE_PROCESSED、PROCESS_COMPLETE、ERROR可以编辑
-  emergencyStore.setInfo(data.tube)
   if(emergencyStateList.includes(state)){
     emergencyStatus.value = true;
   }else{
@@ -333,6 +332,7 @@ watch(
   () => props.emergencyInfo,
   (newVal) => {
     // 只有当急诊数据存在且不为空或者不是异常状态时，不激活小球
+    console.log('newVal.state===', newVal?.state)
     if (newVal && (newVal.state  == EMERGENCY_STATE.EMPTY || newVal.state  == EMERGENCY_STATE.ERROR)) {
       isActive.value = false // 没有急诊数据时，不激活小球
     } else {//其它状态激活小球