From 396fa3839bc63329feab4e2d143a64e944dd106d Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 19 九月 2024 17:15:22 +0800
Subject: [PATCH] 重叫功能 完成
---
src/views/ecg/callingscreen/bigscreen.vue | 50 ++++++++++----------------------------------------
1 files changed, 10 insertions(+), 40 deletions(-)
diff --git a/src/views/ecg/callingscreen/bigscreen.vue b/src/views/ecg/callingscreen/bigscreen.vue
index 7387ef3..a59b1b8 100644
--- a/src/views/ecg/callingscreen/bigscreen.vue
+++ b/src/views/ecg/callingscreen/bigscreen.vue
@@ -1,7 +1,7 @@
<script setup lang="ts">
-import dayjs from 'dayjs'
import {ScreenApi, statusMap, CallingVO} from "@/api/ecg/screen";
+import {CallApi, CallVO} from "@/api/ecg/call";
defineOptions({ name: 'bigscreen' })
@@ -9,9 +9,7 @@
const listWaiting = ref<CallingVO[]>([]) // 鍒楄〃鐨勬暟鎹�
const listPassed = ref<CallingVO[]>([]) //
-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 +21,7 @@
const startScrolling = () => {
setInterval(() => {
getList();
- if ( curSpeakPat === undefined ) {
+ if ( curSpeakPat === null ) {
initiateSpeak()
}
}, 5000); // 姣廥绉掓粴鍔ㄤ竴娆�
@@ -35,35 +33,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 + "灏辫瘖");
}
}
@@ -78,15 +57,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) => {
--
Gitblit v1.9.3