From ef48f9bce2b2cb0df3c3abb36aab0089ba7df331 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 20 九月 2024 14:59:39 +0800
Subject: [PATCH] 移除 已不用的字段
---
src/views/ecg/callingscreen/bigscreen.vue | 143 +++++++++++++++++++++--------------------------
1 files changed, 64 insertions(+), 79 deletions(-)
diff --git a/src/views/ecg/callingscreen/bigscreen.vue b/src/views/ecg/callingscreen/bigscreen.vue
index 13e79c2..e695ca3 100644
--- a/src/views/ecg/callingscreen/bigscreen.vue
+++ b/src/views/ecg/callingscreen/bigscreen.vue
@@ -1,17 +1,16 @@
<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 {DICT_TYPE} from "@/utils/dict";
defineOptions({ name: 'bigscreen' })
-const listReady = ref<CallingVO[]>([]) // 鍒楄〃鐨勬暟鎹�
-const listWaiting = ref<CallingVO[]>([]) // 鍒楄〃鐨勬暟鎹�
-const listPassed = ref<CallingVO[]>([]) //
+const listReady = ref<ScreenQueueVO[]>([]) // 鍒楄〃鐨勬暟鎹�
+const listWaiting = ref<ScreenQueueVO[]>([]) // 鍒楄〃鐨勬暟鎹�
+const listPassed = ref<ScreenQueueVO[]>([]) //
-let curSpeakPat : CallingVO | undefined = undefined;
-let curSpeakSeqNum : number = 0
-let curWorkDay : Date | undefined = undefined
+let curSpeakPat : CallVO | null = null;
const getList = async () => {
const data = await ScreenApi.getBigScreenData()
@@ -23,7 +22,7 @@
const startScrolling = () => {
setInterval(() => {
getList();
- if ( curSpeakPat === undefined ) {
+ if ( curSpeakPat === null ) {
initiateSpeak()
}
}, 5000); // 姣廥绉掓粴鍔ㄤ竴娆�
@@ -35,35 +34,16 @@
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,76 +60,70 @@
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)
+ );
+ }
}
</script>
<template>
<el-container style="height: 100%;">
- <el-header>閲戝崕浜烘皯鍖婚櫌</el-header>
+ <el-header>
+ <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);">
+ style="width: 100%; height: 100%; border: solid var(--el-color-primary-light-7); font-size: 18px;">
<el-table-column
prop="patName"
label="鎮ｈ�呭鍚�"
- width="80"/>
+ 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) }}
+ <dict-tag :type="DICT_TYPE.ECG_QUEUE_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column
prop="roomName"
label="璇婂"
- width="80"/>
+ width="120"/>
</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-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-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-header height="30px" style="background-color: #98b8e5; line-height: 30px;">杩囧彿鍖�</el-header>
+ <span v-for="(passedItem, index) in listPassed" :key="index">
+ {{nameDesensitize(passedItem.patName) + " " + passedItem.roomName + " "}}
+ </span>
</el-footer>
</el-container>
</el-container>
@@ -158,8 +132,19 @@
</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 +158,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