From ef8b45aea99e31d95773d82f7508449489b6e278 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 12 九月 2024 17:49:26 +0800
Subject: [PATCH] 放弃装机功能
---
src/views/ecg/callingscreen/bigscreen.vue | 73 ++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 28 deletions(-)
diff --git a/src/views/ecg/callingscreen/bigscreen.vue b/src/views/ecg/callingscreen/bigscreen.vue
index 93a9be7..63d3f40 100644
--- a/src/views/ecg/callingscreen/bigscreen.vue
+++ b/src/views/ecg/callingscreen/bigscreen.vue
@@ -1,5 +1,6 @@
<script setup lang="ts">
+import dayjs from 'dayjs'
import {ScreenApi, statusMap, CallingVO} from "@/api/ecg/screen";
defineOptions({ name: 'bigscreen' })
@@ -9,6 +10,8 @@
const listPassed = ref<CallingVO[]>([]) //
let curSpeakPat : CallingVO | undefined = undefined;
+let curSpeakSeqNum : number = 0
+let curWorkDay : Date | undefined = undefined
const getList = async () => {
const data = await ScreenApi.getBigScreenData()
@@ -20,27 +23,10 @@
const startScrolling = () => {
setInterval(() => {
getList();
- console.info("..." + curSpeakPat)
if ( curSpeakPat === undefined ) {
- const queuePat = getNextSpeak()
- if (queuePat !== undefined) {
- console.info("...2" + queuePat)
- curSpeakPat = queuePat
- speak(queuePat.patName + queuePat.roomName);
- } else {
- console.info("...3" )
- curSpeakPat = undefined
- }
+ initiateSpeak()
}
- }, 10000); // 姣廥绉掓粴鍔ㄤ竴娆�
-}
-
-const getNextSpeak = () => {
- if (curSpeakPat === undefined || curSpeakPat === null) {
- return listReady.value.find( item => item.status === 30 && item.called === 0)
- } else {
- return listReady.value.find( item => item.status === 30 && item.called === 0 && item.seqNum > curSpeakPat!.seqNum)
- }
+ }, 5000); // 姣廥绉掓粴鍔ㄤ竴娆�
}
onMounted( () => {
@@ -48,15 +34,37 @@
})
const onSpeachEndEvent = async (event) => {
- console.log("Speech ended 3" + event);
- await ScreenApi.markCalled(curSpeakPat!.patId)
- const queuePat = getNextSpeak()
- if (queuePat !== undefined) {
- curSpeakPat = queuePat
- speak(queuePat.patName + queuePat.roomName);
- } else {
- curSpeakPat = undefined
- }
+ console.log("Speech ended" + event);
+ await ScreenApi.markCalled(curSpeakPat!.patId)
+ initiateSpeak()
+}
+
+const getNextSpeak = () => {
+ if (listReady.value.length === 0) {
+ return undefined;
+ }
+
+ // TODO 澶勭悊姣忓ぉ 鍙嶈浆鐨勬儏鍐�
+ 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 speak = (msg) => {
@@ -71,6 +79,15 @@
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
+}
+
</script>
<template>
--
Gitblit v1.9.3