From 7e6bbefe402f0546da6b490dfebe529b4026539c Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 17 十月 2024 15:58:37 +0800
Subject: [PATCH] update
---
src/views/ecg/callingscreen/bigscreen.vue | 192 ++++++++++++++++++++---------------------------
1 files changed, 82 insertions(+), 110 deletions(-)
diff --git a/src/views/ecg/callingscreen/bigscreen.vue b/src/views/ecg/callingscreen/bigscreen.vue
index 13e79c2..da0663c 100644
--- a/src/views/ecg/callingscreen/bigscreen.vue
+++ b/src/views/ecg/callingscreen/bigscreen.vue
@@ -1,69 +1,60 @@
<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({});
+// const listReady = ref<ScreenQueueVO[]>([]) // 鍒楄〃鐨勬暟鎹�
+// const listWaiting = ref<ScreenQueueVO[]>([]) // 鍒楄〃鐨勬暟鎹�
+// const listPassed = ref<ScreenQueueVO[]>([]) //
+
+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]
+ console.info(data)
+ list.value = data;
+ // listReady.value = data[1]
+ // listWaiting.value = data[2]
+ // listPassed.value = data[3]
}
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()
+ console.info( curSpeakPat )
+ if (curSpeakPat !== null) {
+ speak("璇枫��" + curSpeakPat.patName + "鍒�" + curSpeakPat.roomName + "灏辫瘖");
}
}
@@ -80,86 +71,67 @@
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) => {
+ if (patName.length == 2) {
+ //鎴彇name 瀛楃涓叉埅鍙栫涓�涓瓧绗︼紝
+ return patName.substring(0, 1) + '*';
+ } else if (patName.length == 3) {
+ //鎴彇绗竴涓拰绗笁涓瓧绗�
+ return patName.substring(0, 1) + '*' + patName.substring(2, 3);
+ } else if (patName.length > 3) {
+ //鎴彇绗竴涓拰澶т簬绗�4涓瓧绗�
+ return (
+ patName.substring(0, 1) + '*' + '*' + patName.substring(3, patName.length)
+ );
+ }
}
+
+// const listReady = ref<ScreenQueueVO[]>([]) // 鍒楄〃鐨勬暟鎹�
+// const listWaiting = ref<ScreenQueueVO[]>([]) // 鍒楄〃鐨勬暟鎹�
+// const listPassed = ref<ScreenQueueVO[]>([]) //
</script>
<template>
- <el-container style="height: 100%;">
- <el-header>閲戝崕浜烘皯鍖婚櫌</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);">
- <el-table-column
- prop="patName"
- label="鎮ｈ�呭鍚�"
- width="80"/>
- <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="80"/>
- </el-table>
- </el-aside>
- <el-container>
- <el-main style="padding: 0 0 ">
- <el-table
- :data="listWaiting"
- stripe
- :show-header="false"
- style="width: 100%; height: 100%; border: solid var(--el-color-primary-light-7);">
- <el-table-column
- prop="patName"
- label="鎮ｈ�呭鍚�"
- width="80"/>
- <el-table-column label="鐘舵��" align="center" prop="status" width="80">
- <template #default="scope">
- {{ statusMap.get(scope.row.status) }}
- </template>
- </el-table-column>
- </el-table>
- </el-main>
- <el-footer height="100px" style="padding: 0 0">
- <el-table
- :data="listPassed"
- stripe
- :show-header="false"
- style="width: 100%; height: 100%; border: solid var(--el-color-primary-light-7);">
- <el-table-column
- prop="patName"
- label="鎮ｈ�呭鍚�"
- width="80"/>
- <el-table-column label="鐘舵��" align="center" prop="status" width="80">
- <template #default="scope">
- {{ statusMap.get(scope.row.status) }}
- </template>
- </el-table-column>
- </el-table>
- </el-footer>
- </el-container>
- </el-container>
- <el-button @click="speak('娆㈣繋浣跨敤')" >娆㈣繋浣跨敤</el-button>
- </el-container>
+ <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);">
+ <img height="40px" src="@/assets/imgs/jinhua.png"/>
+ 閲戝崕浜烘皯鍖婚櫌
+ </div>
+ <div style="display:flex; justify-content:space-around; align-items: flex-start;">
+ <div v-for="[disColId, disNames] of Object.entries(displayColInfo)" :key="disColId">
+ {{disColId}} {{ disNames }}
+ </div>
+ </div>
+ <div style="display:flex; justify-content:space-around; align-items: flex-start; flex-grow: 1">
+ <div v-for="[disColId2, mapSlot] of Object.entries(list)" :key="disColId2">
+ <div v-for="[slotId, slotQueue] of Object.entries(mapSlot)" :key="slotId">
+ <div v-for="(item, index) in slotQueue" :key="index">
+ {{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">
-.el-header, .el-footer {
+.el-header {
background-color: var(--el-color-primary-light-7);
+ color: #333;
+ text-align: center;
+ line-height: 40px;
+
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.el-footer {
+ //background-color: var(--el-color-primary-light-7);
color: #333;
text-align: center;
line-height: 60px;
@@ -173,7 +145,7 @@
}
.el-main {
- background-color: var(--el-color-primary-light-7);
+ //background-color: var(--el-color-primary-light-7);
color: #333;
text-align: center;
line-height: 160px;
--
Gitblit v1.9.3