From 49206ee0689d44367b9f5de3decf0c3ec02bfb51 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 15 四月 2025 10:56:18 +0800
Subject: [PATCH] update

---
 src/views/ecg/callingscreen/bigscreen.vue |   45 +++++++++++++++++++++++++++------------------
 1 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/views/ecg/callingscreen/bigscreen.vue b/src/views/ecg/callingscreen/bigscreen.vue
index 8411ae9..c6e62aa 100644
--- a/src/views/ecg/callingscreen/bigscreen.vue
+++ b/src/views/ecg/callingscreen/bigscreen.vue
@@ -4,14 +4,17 @@
 import {CallApi, CallVO} from "@/api/ecg/call";
 import {queueStatusConvert} from "@/utils/statusFormatter";
 import {useCheckTypeStore} from "@/store/modules/checkType";
+import {getCheckTypeSeqPrefix} from "../../../utils/checkTypeFormatter";
 
 defineOptions({ name: 'bigscreen' })
 
+const runningIndicator = ref<number>(0)
+
 const checkTypeStore = useCheckTypeStore()
 
-const displayColInfo = ref({})
+const displayColInfo = ref<Map<number, String[]>>(new Map())
 
-const list = ref({});
+const mapColumnVsPatients = ref<Map<number, ScreenQueueVO[]>>(new Map());
 
 let curSpeakPat : CallVO | null = null;
 
@@ -22,13 +25,14 @@
 
 const getList = async () => {
   const data = await ScreenApi.getBigScreenData()
-  list.value = data;
+  mapColumnVsPatients.value = data;
 }
 
 const startScrolling = () => {
   setInterval(() => {
+    runningIndicator.value++;
     getList();
-    if ( curSpeakPat === null ) {
+    if ( curSpeakPat == null ) {
       initiateSpeak()
     }
   }, 5000); // 姣廥绉掓粴鍔ㄤ竴娆�
@@ -48,8 +52,8 @@
 
 const initiateSpeak = async () => {
   curSpeakPat = await CallApi.getNextCall()
-  if (curSpeakPat !== null) {
-    console.info( curSpeakPat )
+  //console.info( "initiateSpeak",  curSpeakPat, curSpeakPat?.called )
+  if (curSpeakPat != null && curSpeakPat.called === 0) {
     speak("璇枫��" + curSpeakPat.patName + "鍒�" + curSpeakPat.roomName + "灏辫瘖");
   }
 }
@@ -98,28 +102,27 @@
 </script>
 
 <template>
-  <div style="height: 100%; display:flex; flex-direction: column">
+  <div style="height: 100%; display:flex; flex-direction: column; height: 100vh; overflow-y: auto; padding-left: 5px; padding-right: 5px">
     <div style="display:flex; justify-content: center; align-items: center; background: var(--el-color-primary-light-7); font-size: 22px; ">
       <img height="40px" src="@/assets/imgs/jinhua.png"/>
-      閲戝崕浜烘皯鍖婚櫌
+      &nbsp;閲戝崕浜烘皯鍖婚櫌&nbsp;
+      <div class="dot" :style="{ backgroundColor: runningIndicator%2 === 0 ? 'green' : 'orange' }"></div>
     </div>
     <div style="display:flex; justify-content:space-around; align-items: flex-start; border: solid 2px var(--el-color-primary-light-7); font-size: 23px; ">
-      <div v-for="[disColId, disNameList] of Object.entries(displayColInfo)" :key="disColId" style="width: 300px; height: 100%; border-left: solid 2px var(--el-color-primary-light-7) ">
+      <div v-for="[disColId, disNameList] of Object.entries(displayColInfo)" :key="disColId" style="flex: 1; flex-basis: 300px; height: 100%; border-left: solid 2px var(--el-color-primary-light-7) ">
         <!--{{disColId}}-->
         <div v-for="(dispName, dispName_index) in disNameList" :key="dispName_index">
           {{dispName}}
         </div>
       </div>
     </div>
-    <div style="display:flex; justify-content:space-around; align-items: flex-start; flex-grow: 1; font-size: 20px">
-      <div v-for="[disColId2, mapSlot] of Object.entries(list)" :key="disColId2" style="width: 300px; height: 100%; border-left: solid 2px var(--el-color-primary-light-7) ">
-        <div v-for="[slotId, slotQueue] of Object.entries(mapSlot)" :key="slotId">
-          <div v-for="(item, index) in slotQueue" :key="index" :class="getItemCssClass(item)">
-            <span style="display:inline-block; width:60px;">{{checkTypeStore.getCheckTypeSeqPrefix(item.bookCheckType)}}{{item.bookSeqNum}}</span>
-            <span style="display:inline-block; width:80px;">{{ nameDesensitize(item.patName) }} </span>
-            <span style="display:inline-block; width:80px;">{{queueStatusConvert(item.status)}} </span>
-            {{item.roomName}}
-          </div>
+    <div style="display:flex; justify-content:space-around; align-items: flex-start; flex-grow: 1; border: solid 2px var(--el-color-primary-light-7); font-size: 20px">
+      <div v-for="[disColId2, columnPatientList] of Object.entries(mapColumnVsPatients)" :key="disColId2" style="flex: 1; flex-basis: 300px; height: 100%; border-left: solid 2px var(--el-color-primary-light-7) ">
+        <div v-for="(item, index) in columnPatientList" :key="index" :class="getItemCssClass(item)">
+          <span style="display:inline-block; width:60px;">{{getCheckTypeSeqPrefix(item.bookCheckType)}}{{item.bookSeqNum}}</span>
+          <span style="display:inline-block; width:80px;">{{ nameDesensitize(item.patName) }} </span>
+          <span style="display:inline-block; width:80px;">{{queueStatusConvert(item.status)}} </span>
+          {{item.roomName}} {{item.bedNo}}
         </div>
       </div>
     </div>
@@ -170,4 +173,10 @@
   background-color: var(--el-color-warning-light-9);
 }
 
+.dot {
+  width: 10px;
+  height: 10px;
+  border-radius: 50%;
+}
+
 </style>

--
Gitblit v1.9.3