From 1b145b5655fa023032c8713bb2375bccdf0fc314 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 24 十月 2024 11:13:40 +0800
Subject: [PATCH] 领用完成后 立即刷新 患者列表
---
src/views/ecg/callingscreen/bigscreen.vue | 161 +++++++++++++++++++++--------------------------------
1 files changed, 64 insertions(+), 97 deletions(-)
diff --git a/src/views/ecg/callingscreen/bigscreen.vue b/src/views/ecg/callingscreen/bigscreen.vue
index 7387ef3..3858290 100644
--- a/src/views/ecg/callingscreen/bigscreen.vue
+++ b/src/views/ecg/callingscreen/bigscreen.vue
@@ -1,69 +1,53 @@
<script setup lang="ts">
-import dayjs from 'dayjs'
-import {ScreenApi, statusMap, CallingVO} from "@/api/ecg/screen";
+import {ScreenApi, ScreenQueueVO} from "@/api/ecg/screen";
+import {CallApi, CallVO} from "@/api/ecg/call";
+import {queueStatusConvert} from "@/utils/statusFormatter";
defineOptions({ name: 'bigscreen' })
-const listReady = ref<CallingVO[]>([]) // 鍒楄〃鐨勬暟鎹�
-const listWaiting = ref<CallingVO[]>([]) // 鍒楄〃鐨勬暟鎹�
-const listPassed = ref<CallingVO[]>([]) //
+const displayColInfo = ref({})
-let curSpeakPat : CallingVO | undefined = undefined;
-let curSpeakSeqNum : number = 0
-let curWorkDay : Date | undefined = undefined
+const list = ref({});
+
+let curSpeakPat : CallVO | null = null;
+
+const getDisplayColInfo = async () => {
+ const data = await ScreenApi.getDisplayColInfo()
+ displayColInfo.value = data
+}
const getList = async () => {
const data = await ScreenApi.getBigScreenData()
- listReady.value = data[1]
- listWaiting.value = data[2]
- listPassed.value = data[3]
+ list.value = data;
}
const startScrolling = () => {
setInterval(() => {
getList();
- if ( curSpeakPat === undefined ) {
+ if ( curSpeakPat === null ) {
initiateSpeak()
}
}, 5000); // 姣廥绉掓粴鍔ㄤ竴娆�
}
onMounted( () => {
+ getDisplayColInfo()
startScrolling()
})
const onSpeachEndEvent = async (event) => {
console.log("Speech ended... " + event.currentTarget.text);
- await ScreenApi.markCalled(curSpeakPat!.patId)
+ curSpeakPat!.called = 1
+ await CallApi.updateCall(curSpeakPat!)
initiateSpeak()
}
-const getNextSpeak = () => {
- if (listReady.value.length === 0) {
- return undefined;
- }
-
- // 澶勭悊姣忓ぉ 鍙嶈浆鐨勬儏鍐�
- if ( curWorkDay === undefined) {
- curSpeakSeqNum = 0;
- curWorkDay = new Date()
- } else if (!isSameDate(dayjs(listReady.value[0].bookDate).toDate(), curWorkDay)) {
- curSpeakSeqNum = 0;
- curWorkDay = dayjs(listReady.value[0].bookDate).toDate()
- }
-
- return listReady.value.find( item => item.status === 30 && item.called === 0 && item.seqNum > curSpeakSeqNum)
-}
-
-const initiateSpeak = () => {
- const queuePat = getNextSpeak()
- if (queuePat !== undefined) {
- curSpeakPat = queuePat
- curSpeakSeqNum = curSpeakPat.seqNum
- speak("璇枫��" + queuePat.patName + "鍒�" + queuePat.roomName + "灏辫瘖");
- } else {
- curSpeakPat = undefined
+const initiateSpeak = async () => {
+ curSpeakPat = await CallApi.getNextCall()
+ if (curSpeakPat !== null) {
+ console.info( curSpeakPat )
+ speak("璇枫��" + curSpeakPat.patName + "鍒�" + curSpeakPat.roomName + "灏辫瘖");
}
}
@@ -78,15 +62,6 @@
speech.onend = onSpeachEndEvent
speechSynthesis.speak(speech)
-}
-
-const isSameDate = ( date1: Date, date2 : Date) => {
- if (date1.getFullYear() === date2.getFullYear()
- && date1.getMonth() === date2.getMonth()
- && date1.getDate() === date2.getDate())
- return true
- else
- return false
}
const nameDesensitize = (patName) => {
@@ -104,60 +79,48 @@
}
}
+// const listReady = ref<ScreenQueueVO[]>([]) // 鍒楄〃鐨勬暟鎹�
+// const listWaiting = ref<ScreenQueueVO[]>([]) // 鍒楄〃鐨勬暟鎹�
+// const listPassed = ref<ScreenQueueVO[]>([]) //
+
+const getItemCssClass = (item: ScreenQueueVO) => {
+ if (item.status === 5)
+ return "warning-row";
+ else if (item.status === 7)
+ return "warning-row";
+ else
+ return "";
+}
+
</script>
<template>
- <el-container style="height: 100%;">
- <el-header>
- <img
- height="40px"
- src="@/assets/imgs/jinhua.png"
- />
+ <div style="height: 100%; display:flex; flex-direction: column">
+ <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"/>
閲戝崕浜烘皯鍖婚櫌
- </el-header>
- <el-container>
- <el-aside width="500px">
- <el-table
- :data="listReady"
- stripe
- :show-header="false"
- style="width: 100%; height: 100%; border: solid var(--el-color-primary-light-7); font-size: 18px;">
- <el-table-column
- prop="patName"
- label="鎮ｈ�呭鍚�"
- width="80">
- <template #default="scope">
- {{ nameDesensitize(scope.row.patName) }}
- </template>
- </el-table-column>
- <el-table-column label="鐘舵��" align="center" prop="status" width="80">
- <template #default="scope">
- {{ statusMap.get(scope.row.status) }}
- </template>
- </el-table-column>
- <el-table-column
- prop="roomName"
- label="璇婂"
- width="120"/>
- </el-table>
- </el-aside>
- <el-container>
- <el-main style="padding: 0 0 ">
- <el-header height="30px" style="background-color: #98b8e5; line-height: 30px;">绛夊�欏尯</el-header>
- <span v-for="(waitingItem, index) in listWaiting" :key="index">
- {{nameDesensitize(waitingItem.patName) + " "}}
- </span>
- </el-main>
- <el-footer height="100px" style="padding: 0 0">
- <el-header height="30px" style="background-color: #98b8e5; line-height: 30px;">杩囧彿鍖�</el-header>
- <span v-for="(passedItem, index) in listPassed" :key="index">
- {{nameDesensitize(passedItem.patName) + " "}}
- </span>
- </el-footer>
- </el-container>
- </el-container>
- <el-button @click="speak('娆㈣繋浣跨敤')" >娆㈣繋浣跨敤</el-button>
- </el-container>
+ </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) ">
+ <!--{{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)">
+ {{item.seqNum}} {{ nameDesensitize(item.patName) }} {{queueStatusConvert(item.status)}} {{item.roomName}}
+ </div>
+ </div>
+ </div>
+ </div>
+ <div style="display:flex; justify-content: center; align-items: center; background: var(--el-color-primary-light-7);">
+ <el-button @click="speak('娆㈣繋浣跨敤')" >娆㈣繋浣跨敤</el-button>
+ </div>
+ </div>
</template>
<style scoped lang="scss">
@@ -197,4 +160,8 @@
margin-bottom: 40px;
}
+.warning-row {
+ background-color: var(--el-color-warning-light-9);
+}
+
</style>
--
Gitblit v1.9.3