From 174cceb066ae9d0a84c27b37f9e78eecd32c5cc5 Mon Sep 17 00:00:00 2001
From: LiLongLong <13717757313@163.com>
Date: Wed, 15 Jan 2025 13:50:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BF=90=E8=A1=8C=E6=97=B6?=
 =?UTF-8?q?=E6=80=A5=E8=AF=8A=E4=BD=8D=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                              |  3 ---
 src/pages/Index/Regular/Emergency.vue        |  1 -
 src/pages/Index/Regular/Running.vue          | 34 ++++++++++++++--------------
 src/pages/Index/components/TestTube/Tube.vue |  2 +-
 4 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index dc8130f..7b19416 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -7,7 +7,6 @@ export {}
 /* prettier-ignore */
 declare module 'vue' {
   export interface GlobalComponents {
-    Confirm: typeof import('./src/components/dialogs/Confirm.vue')['default']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElDropdown: typeof import('element-plus/es')['ElDropdown']
@@ -15,8 +14,6 @@ declare module 'vue' {
     ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
     ElFooter: typeof import('element-plus/es')['ElFooter']
     ElHeader: typeof import('element-plus/es')['ElHeader']
-    ElIcon: typeof import('element-plus/es')['ElIcon']
-    ElInput: typeof import('element-plus/es')['ElInput']
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElTable: typeof import('element-plus/es')['ElTable']
diff --git a/src/pages/Index/Regular/Emergency.vue b/src/pages/Index/Regular/Emergency.vue
index 12ff451..9d829ac 100644
--- a/src/pages/Index/Regular/Emergency.vue
+++ b/src/pages/Index/Regular/Emergency.vue
@@ -203,7 +203,6 @@ onActivated(() => {
   ws.connect()
   ws.subscribe<TubeHolderStateMessage>('TubeHolderState', handleTubeHolderStateMessage)
   const { emergencyInfo } = emergencyStore.$state
-  console.log('emergencyInfo---', emergencyInfo)
   if(emergencyInfo && emergencyInfo.state){
     const {state, sampleBarcode} = emergencyInfo
     currentInputValue.value = sampleBarcode
diff --git a/src/pages/Index/Regular/Running.vue b/src/pages/Index/Regular/Running.vue
index b915996..2e3b4a7 100644
--- a/src/pages/Index/Regular/Running.vue
+++ b/src/pages/Index/Regular/Running.vue
@@ -50,7 +50,7 @@
             />
             <span v-if="runningStore.optScanModuleState?.state === 'SCANNING'">扫描中</span>
             <span v-else>{{ runningStore.optScanModuleState.userid }}</span>
-            <span style="font-size: 14px">{{ settingTubeStore.bloodTypeKeyMap[runningStore.optScanModuleState.bloodType] }}</span>
+            <span style="font-size: 14px">{{ settingTubeStore.bloodTypeKeyMap[runningStore.optScanModuleState.bloodType].name }}</span>
             <span style="font-size: 16px; font-weight: 600">{{ runningStore.optScanModuleState.projInfo.projShortName }}</span>
           </span>
         </div>
@@ -126,8 +126,8 @@
         <!-- 急诊按钮 -->
         <div
           class="emergency-button"
-          :class="{ disabled: hasEmergencyPosition }"
-          @click="confirmEmergency()"
+          :style="`background:${emergencyBackground}`"
+          @click="!hasEmergencyPosition ? confirmEmergency():null"
         >
           <span>急诊</span>
         </div>
@@ -135,7 +135,7 @@
         <div class="test-tube-rack-area">
           <div class="tube-project-tab">
             <tube-item
-              :tube="sampleTube"
+              :tube="emergencyTube"
               :showNum = "false"
             />
           </div>
@@ -214,8 +214,8 @@ import {
   onActivated,
   computed,
 } from 'vue'
-import { useRouter, useRoute } from 'vue-router'
-import { useConsumablesStore, useDeviceStore, useSettingTestTubeStore } from '@/store'
+import { useRouter } from 'vue-router'
+import { useConsumablesStore, useDeviceStore, useSettingTestTubeStore, useEmergencyStore } from '@/store'
 import { getBloodTypeLabel } from '../utils'
 import {
   PlateDisplay,
@@ -223,8 +223,6 @@ import {
 } from '../components'
 import tubeItem from '../components/TestTube/Tube.vue'
 import BallGrid from '../components/Consumables/BallGrid.vue'
-import { getRunningList } from '@/services/Index/running/running'
-
 import type {
   SubTank,
 } from '@/websocket/socket'
@@ -233,15 +231,17 @@ const consumablesStore = useConsumablesStore()
 const runningStore = useRunningStore()
 const deviceStore = useDeviceStore()
 const settingTubeStore = useSettingTestTubeStore()
+const emergencyStore = useEmergencyStore();//从急诊页面添加的急诊数据
 const router = useRouter()
-// 示例数据
-const sampleTube = {
-  userid: 'user123',
-  projId: [1, 2],
-  bloodType: 'A',
-}
-
-const hasEmergencyPosition = ref(false)
+// 急诊试管数据
+const emergencyTube = ref(emergencyStore.emergencyInfo)
+const hasEmergencyPosition = ref(emergencyStore.emergencyInfo.isEmergency)
+const emergencyBackground = computed(()=>{
+  if(hasEmergencyPosition){
+    return '#c7c7c7'
+  }
+  return ''
+})
 
 onMounted(() => {
   // 在页面加载时检查是否有急诊数据传递
@@ -818,7 +818,7 @@ onUnmounted(() => {
 }
 .scan-main{
   position: fixed;
-  top: 880px;
+  top: 54rem;
   right: 10px;
   padding: 8px 5px;
   background-color: rgb(223, 237, 248);
diff --git a/src/pages/Index/components/TestTube/Tube.vue b/src/pages/Index/components/TestTube/Tube.vue
index c6ff6f9..741c3ec 100644
--- a/src/pages/Index/components/TestTube/Tube.vue
+++ b/src/pages/Index/components/TestTube/Tube.vue
@@ -31,7 +31,7 @@
       </div>
     </div>
 
-    <span v-if="showNum" class="user-id">{{ tube.userid || '-' }}</span>
+    <span v-if="showNum || tube.isEmergency" class="user-id">{{ tube.userid || '-' }}</span>
   </div>
 </template>