From 1632528ebfa427ffcbf0404bf9d96dc68d18802c Mon Sep 17 00:00:00 2001
From: zhangjiming <zhangjiming@costrip.cn>
Date: Thu, 16 Jan 2025 13:36:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=B2=E6=AD=A2tank.projInfo=E4=B8=BAnull?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Index/components/Running/SubTank.vue  | 4 ++--
 src/pages/Index/components/Running/TankInfo.vue | 2 +-
 src/websocket/socket.ts                         | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/pages/Index/components/Running/SubTank.vue b/src/pages/Index/components/Running/SubTank.vue
index 8f18dc0..d041134 100644
--- a/src/pages/Index/components/Running/SubTank.vue
+++ b/src/pages/Index/components/Running/SubTank.vue
@@ -22,7 +22,7 @@
     <template v-else>
       <img :src="stateImgMap[item.state]" alt="" width="25" height="25" />
       <span class="project-name">{{
-        item.projInfo.projShortName || '无项目'
+        (item.projInfo || {}).projShortName || '无项目'
       }}</span>
       <span class="barcode">{{ item.userid || '--' }}</span>
       <span class="time">{{ formatRemainTime(item.remainTimeSec) }}</span>
@@ -184,7 +184,7 @@ const getItemStyle = (item: SubTank, index: number) => {
   }
 
   return {
-    backgroundColor: item.projInfo.color, //item.isEmergency ? '#ffeded' : item.projInfo.color, // 急诊位特殊背景
+    backgroundColor: item.projInfo ? item.projInfo.color : '', //item.isEmergency ? '#ffeded' : item.projInfo.color, // 急诊位特殊背景
     borderColor: props.isSelected
       ? 'blue'
       : item.state === 'INCUBATION_COMPLETE'
diff --git a/src/pages/Index/components/Running/TankInfo.vue b/src/pages/Index/components/Running/TankInfo.vue
index bf7daad..6486f8e 100644
--- a/src/pages/Index/components/Running/TankInfo.vue
+++ b/src/pages/Index/components/Running/TankInfo.vue
@@ -5,7 +5,7 @@
         <!-- <span>{{ selectedItem.sampleBarcode || '--' }}</span> -->
         <span>{{ selectedItem.userid || '--' }}</span>
         <span class="project-name">{{
-          selectedItem.projInfo.projName || '无项目'
+          (selectedItem.projInfo || {}).projName || '无项目'
         }}</span>
         <span>{{ selectedItem.lotId || '--' }}</span>
         <span>{{
diff --git a/src/websocket/socket.ts b/src/websocket/socket.ts
index efb9a1e..3b867f2 100644
--- a/src/websocket/socket.ts
+++ b/src/websocket/socket.ts
@@ -87,7 +87,6 @@ export type EmergencyTubeState =
   | 'PENDING'
   | 'RESOURCE_IS_READY'
   | 'PROCESSING'
-  | 'PROCESSED'
   | 'PROCESS_COMPLETE'
   | 'ERROR'
 // 急诊位状态消息
@@ -193,7 +192,7 @@ interface ProjectInfo {
 }
 
 export type SubTankState =
-  | 'EMPTY'
+   'EMPTY'
   | 'RESERVED'
   | 'WAITING_FOR_DROP'
   | 'INCUBATING'