优化

src/pages/Index/Regular/Consumables.vue

@@ -198,23 +198,24 @@ const handleSensorState = (data: SensorStateMessage['data']) => {
 }
 
 //所有的耗材是否都有，如果有一项没有则为false
+//@ts-ignore
 let hasAllConsumables = ref(false)
 //处理耗材状态
 const handleConsumablesState = (data: ConsumablesStateMessage['data']) => {
   if (!isDragging.value) {
     consumableStore.setConsumablesData(data)
-    if(
-        (data.tips && data.tips.length ) &&
-        (data.reactionPlateGroup && data.reactionPlateGroup.length) &&
-        (data.littBottleGroup && data.littBottleGroup.length) && 
-        (data.larBottleGroup && data.larBottleGroup.length)
-      ){
-        hasAllConsumables.value = true;
-      }else{
-        hasAllConsumables.value = false;
-      }
-      //放入全局story 中
-      consumableStore.hasAllConsumables = hasAllConsumables.value
+    // if(
+    //     (data.tips && data.tips.length ) &&
+    //     (data.reactionPlateGroup && data.reactionPlateGroup.length) &&
+    //     (data.littBottleGroup && data.littBottleGroup.length) && 
+    //     (data.larBottleGroup && data.larBottleGroup.length)
+    //   ){
+    //     hasAllConsumables.value = true;
+    //   }else{
+    //     hasAllConsumables.value = false;
+    //   }
+    //   //放入全局story 中
+    //   consumableStore.hasAllConsumables = hasAllConsumables.value
   } else {
     console.log('正在拖动，不更新耗材')
   }

src/pages/Index/Regular/Emergency.vue

@@ -125,7 +125,6 @@ const ws = createWebSocket(getServerInfo().wsUrl);
 const consumableStore = useConsumablesStore();
 const emergencyStore = useEmergencyStore();
 const deviceStore = useDeviceStore();
-console.log('deviceStore---', deviceStore)
 // 急诊位开启/关闭状态
 const isEmergencyEnabled = ref(true);//设置表单是否可输入
 
@@ -133,8 +132,9 @@ const isEmergencyEnabled = ref(true);//设置表单是否可输入
 const projects = ref<ReactionPlate[]>([]);
 onMounted(() => {
   // 延迟加载 projects，确保数据从持久化存储中加载完成
-  if (consumableStore.plates.length > 0) {
-    projects.value = consumableStore.plates as ReactionPlate[];
+  //@ts-ignore
+  if (consumableStore.consumableData.reactionPlateGroup && consumableStore.consumableData.reactionPlateGroup.length > 0) {
+    projects.value = consumableStore.consumableData.reactionPlateGroup as ReactionPlate[];
   }
   //过滤projId为null的数据
   projects.value = projects.value.filter(item => item.projId)

src/pages/Index/Regular/Running.vue

@@ -106,15 +106,15 @@
         </div>
       </div>
 
-      <div
-        v-for="index in 20"
+      <!-- <div
+        v-for="(item, index) in incubationPlates"
         :key="index"
         class="rectangular-item"
-        :style="getRotationStyle(index, index)"
+        :style="getRotationStyle(item, index)"
       >
         {{ index + 1 }}
         <div>空</div>
-      </div>
+      </div> -->
       <div
         v-for="(item, index) in incubationPlates"
         :key="item.sampleId"
@@ -213,21 +213,21 @@
       <div class="row-second">
         <!-- 反应板区域 -->
         <div class="plates-area">
-          <PlateDisplay :projects="consumablesStore.plates" />
+          <PlateDisplay :projects="consumablesStore.consumableData.reactionPlateGroup" />
         </div>
         <!-- 小缓冲液区域 -->
         <div class="little-buffer-liquid">
-          <LittleBufferDisplay :bufferData="consumablesStore.bufferLittles" />
+          <LittleBufferDisplay :bufferData="consumablesStore.consumableData.littBottleGroup" />
         </div>
         <!-- tips 大缓冲液区域 -->
         <div class="tips-and-big-buffer">
           <div class="tips-item">
             <div
               class="tip-fill"
-              :style="getFillStyle(consumablesStore.moveLiquids[0])"
+              :style="getFillStyle(consumablesStore.consumableData.tips[0])"
             ></div>
             <div class="tip-text">
-              {{ consumablesStore.moveLiquids[0].tipNum }}/120
+              {{ consumablesStore.consumableData.tips[0].tipNum }}/120
             </div>
           </div>
           <BallGrid
@@ -235,7 +235,7 @@
             :customColors="true"
             width="160px"
             height="110px"
-            :data="consumablesStore.bufferBig"
+            :data="consumablesStore.consumableData.larBottleGroup"
             :columns="3"
             class="buffer-grid"
           />
@@ -747,6 +747,29 @@ const handleIncubationPlateStateMessage = (
       errors: [],
     },
   ]
+  if(incubationPlates.value.length != 20){
+    let len = 20 - incubationPlates.value.length
+    for(let i = 0; i<len; i++){
+      incubationPlates.value.push({
+        pos: '',
+        state: '',
+        bloodType: '',
+        sampleBarcode: '',
+        userid: '',
+        projInfo: {
+          projId: 0,
+          projName: '',
+          projShortName: '',
+          color: 'white',
+        },
+        sampleId: '',
+        projId: 0,
+        startIncubatedTime: 0,
+        incubatedTimeSec: 0,
+        errors: [],
+      })
+    }
+  }
 }
 
 // 定义方法以更新试管架状态
@@ -889,6 +912,7 @@ const updateProcessedTubeSettings = () => {
 
   processedTubeSettings.value = processTubeSettings(
     tubeSettings,
+    //@ts-ignore
     plateData,
     getBloodTypeLabel,
   )
@@ -1007,7 +1031,7 @@ const toggleSelectItem = (item: Subtank, index: number) => {
 }
 
 //反应板数据
-const plates = ref(consumablesStore.plates)
+const plates = ref(consumablesStore.consumableData.reactionPlateGroup)
 
 //样本数据
 const processedTubeSettings = ref()

src/pages/Index/components/Consumables/MoveLiquidArea.vue

@@ -335,8 +335,15 @@ const router = useRouter()
 // 跳转到添加急诊页面
 let showEmergencyModal = ref(false)
 const addEmergency = () => {
-  //检查是否有耗材，没有耗材时禁止操作
-  if(!consumableStore.hasAllConsumables){
+  //未返回 反应板夹 数组时，直接提示
+  if(!consumableStore.consumableData.reactionPlateGroup){
+    showEmergencyModal.value = true;
+    return
+  }
+  //有反应板夹数据，但无项目时 也要给出提示信息
+  const clonereactionList = [...consumableStore.consumableData.reactionPlateGroup]
+  const hasRactionPlatGroup = clonereactionList.every(item =>  !item.projId)
+  if(hasRactionPlatGroup){
     showEmergencyModal.value = true;
     return
   }

src/pages/Index/components/Consumables/ProjectSelector.vue

@@ -55,7 +55,7 @@
 
 <script setup lang="ts">
 import { ref } from 'vue'
-import type { ConsumableGroupBase } from '../../../../websocket/socket'
+import type { ReactionPlateGroup } from '../../../../websocket/socket'
 import { nanoid } from 'nanoid'
 import { useConsumablesStore, useSettingTestTubeStore } from '../../../../store'
 
@@ -78,7 +78,7 @@ defineExpose({
   clearSelection,
 })
 
-const projects = ref<ConsumableGroupBase[]>(consumables.$state.plates || [])
+const projects = ref<ReactionPlateGroup[]>(consumables.consumableData.reactionPlateGroup || [])
 const bloodType = ref('')
 const selectedProjects = ref<number[]>([]) // 选中项的对象列表
 const bloodTypes = ref([
@@ -95,7 +95,7 @@ const bloodTypes = ref([
 ])
 
 // 获取每个项目的样式
-const getStyle = (item: ConsumableGroupBase) => ({
+const getStyle = (item: ReactionPlateGroup) => ({
   backgroundColor: item.color,
 })
 
@@ -104,7 +104,7 @@ const isSelected = (projId: number) =>
   selectedProjects.value.some((item) => item === projId)
 
 // 切换项目选择状态
-const toggleProject = (project: ConsumableGroupBase) => {
+const toggleProject = (project: ReactionPlateGroup) => {
   if (isSelected(0)) {
     selectedProjects.value = selectedProjects.value.filter((item) => item == 0)
   }

src/pages/Index/components/Running/PlateDisplay.vue

@@ -18,10 +18,10 @@
 </template>
 <script setup lang="ts">
 
-import type { ConsumableGroupBase } from '../../../../websocket/socket'
+import type { ReactionPlateGroup } from '@/websocket/socket'
 
 defineProps<{
-  projects: ConsumableGroupBase[]
+  projects: ReactionPlateGroup[]
 }>()
 
 const getPercentage = (num: number) => {

src/store/modules/consumables.ts

@@ -18,6 +18,7 @@ export const useConsumablesStore = defineStore(
     // const plates = ref<ConsumableGroupBase[]>([])
     // const bufferLittles = ref<LittleBottleGroup[]>([])
     // const bufferBig = ref<LargeBottleGroup[]>([])
+    // @ts-ignore
     const consumableData = ref<ConsumablesStateMessage['data']>({
       tips: [{ tipNum: 0 }, { tipNum: 0 }, { tipNum: 0 }],
       reactionPlateGroup: Array.from({length: 6},() => ({num: 0, isInstall: false})),
@@ -64,7 +65,7 @@ export const useConsumablesStore = defineStore(
 
       updateWasteStatus,
       wasteStatus,
-      hasAllConsumables
+      hasAllConsumables,
     }
   },
   // {

src/websocket/socket.ts

@@ -179,7 +179,8 @@ interface ConsumableGroupBase {
   color: string
   num: number
   isInstall: boolean
-  reserveNum: number
+  reserveNum: number,
+  
 }
 
 export interface ReactionPlateGroup extends Partial<ConsumableGroupBase> {}
@@ -196,7 +197,7 @@ interface TipInfo {
   totalNum?: number
 }
 
-// 耗材状态消息接口
+// 耗材状态消息接口 consumableStore
 interface ConsumablesStateMessage extends BaseMessage {
   type: 'ConsumablesState'
   messageType: 'Report'
@@ -205,7 +206,7 @@ interface ConsumablesStateMessage extends BaseMessage {
     tips: TipInfo[]
     reactionPlateGroup: ReactionPlateGroup[]
     littBottleGroup: LittleBottleGroup[]
-    larBottleGroup: LargeBottleGroup[]
+    larBottleGroup: LargeBottleGroup[],
   }
   timestamp: number
 }