From 43cc8e4bdb26c08074bb2384b8b638c89a441099 Mon Sep 17 00:00:00 2001
From: LiLongLong <13717757313@163.com>
Date: Wed, 15 Jan 2025 18:51:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=80=A5=E8=AF=8A=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Index/Regular/Emergency.vue | 52 ++++++++---------------------------
 src/pages/Index/Regular/Running.vue   |  2 ++
 2 files changed, 14 insertions(+), 40 deletions(-)

diff --git a/src/pages/Index/Regular/Emergency.vue b/src/pages/Index/Regular/Emergency.vue
index da4a011..9819013 100644
--- a/src/pages/Index/Regular/Emergency.vue
+++ b/src/pages/Index/Regular/Emergency.vue
@@ -52,7 +52,7 @@
       </div>
       <div class="project-list">
         
-        <div v-for="(item, index) in projects" :key="index" @click="selectProject(item)" :class="[
+        <div v-for="(item, index) in projects" :style="`background:${item.color}`" :key="index" @click="selectProject(item)" :class="[
           isEmergencyEnabled ? 'project-item' : 'disabled-project-item',
           { 'active-project-item': emergencyPosition.projIds.includes(item.projId) && isEmergencyEnabled },
         ]">
@@ -111,12 +111,12 @@
 
 
 <script setup lang="ts">
-import { ref, onMounted, onUnmounted, onActivated, onDeactivated, watch } from 'vue';
-import { useRouter, useRoute } from 'vue-router'
+import { ref, onMounted, onUnmounted, onActivated, watch } from 'vue';
+import { useRouter } from 'vue-router'
 import { nanoid } from 'nanoid';
 import { insertEmergency } from '@/services/Index/index';
-import { useEmergencyStore, useConsumablesStore } from '@/store';
-import type { ReactionPlate, AddEmergencyInfo } from '@/types/Index';
+import { useEmergencyStore, useConsumablesStore, useDeviceStore } from '@/store';
+import type { AddEmergencyInfo } from '@/types/Index';
 import type { EmergencyPosStateMessage, TubeHolderStateMessage } from '@/websocket/socket';
 import { ElMessage } from 'element-plus';
 import { createWebSocket } from '@/websocket/socket';
@@ -124,27 +124,13 @@ import { getServerInfo } from '@/utils/getServerInfo';
 const ws = createWebSocket(getServerInfo().wsUrl);
 const consumableStore = useConsumablesStore();
 const emergencyStore = useEmergencyStore();
-// const deviceStore = useDeviceStore();
+const deviceStore = useDeviceStore();
 // 急诊位开启/关闭状态
 const isEmergencyEnabled = ref(true);//设置表单是否可输入
 
 // 模拟项目列表数据
-const projects = ref<ReactionPlate[]>([]);
+const projects:any = ref(consumableStore.projectsAvailable);
 
-onMounted(() => {
-  // 延迟加载 projects，确保数据从持久化存储中加载完成
-  loadProject()
-})
-
-const loadProject = ()=>{
-  //@ts-ignore
-  if (consumableStore.consumableData.reactionPlateGroup && consumableStore.consumableData.reactionPlateGroup.length > 0) {
-    projects.value = consumableStore.consumableData.reactionPlateGroup as ReactionPlate[];
-  }
-  console.log('projects.value---', projects.value)
-  //过滤projId为null的数据
-  projects.value = projects.value.filter(item => item.projId)
-}
 
 const bloodTypes = ref([
   {
@@ -225,12 +211,6 @@ const goBack = () => {
   router.go(-1);
 };
 
-const route = useRoute()
-watch(route, (value)=>{
-  console.log('value==route=', value)
-  loadProject()
-})
-
 // 取消和确认事件
 const cancelHandle = () => {
   router.push('/index/regular/consumables');
@@ -241,20 +221,12 @@ const getProjectInfo = (projIds: number[]) => {
 }
 // 确认请求
 const confirmHandle = async () => {
-  //只有设备暂停状态才能添加急诊
-  // if (deviceStore.status !== 'PAUSE') {
-  //   ElMessage.error('设备未暂停，无法添加急诊');
-  //   return
-  // }
+  //设备运行状态不能添加急诊
+  if (deviceStore.deviceState.workState === 'WORKING') {
+    ElMessage.error('设备未暂停，无法添加急诊');
+    return
+  }
   const emergencyInfo = emergencyPosition.value;
-  // if(!emergencyInfo.sampleBarcode){
-  //   ElMessage.error('请输入样本条形码');
-  //   return
-  // }
-  // if(!emergencyInfo.userid){
-  //   ElMessage.error('请输入用户ID');
-  //   return
-  // }
   if (emergencyInfo.projIds.length === 0) {
     ElMessage.error('请选择项目');
     return
diff --git a/src/pages/Index/Regular/Running.vue b/src/pages/Index/Regular/Running.vue
index 69b6cfc..e1c8229 100644
--- a/src/pages/Index/Regular/Running.vue
+++ b/src/pages/Index/Regular/Running.vue
@@ -236,6 +236,7 @@ const emergencyStore = useEmergencyStore();//从急诊页面添加的急诊数
 const router = useRouter()
 // 急诊试管数据
 const emergencyTube = ref(emergencyStore.emergencyInfo)
+console.log('emergencyTube---', emergencyTube)
 const hasEmergencyPosition = ref(emergencyStore.emergencyInfo.isEmergency)
 const emergencyBackground = computed(()=>{
   if(hasEmergencyPosition){
@@ -247,6 +248,7 @@ const emergencyBackground = computed(()=>{
 onMounted(() => {
   // 在页面加载时检查是否有急诊数据传递
   // 初次获取路由参数
+  console.log('runningStore.subTanks---', runningStore.subTanks)
 })
 
 // 页面激活时触发