From 9e0a34745697dd854286d0215636ad9d2035c8c6 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期四, 05 九月 2024 23:27:20 +0800 Subject: [PATCH] update --- src/views/ecg/callingscreen/bigscreen.vue | 75 +++++++++++++++++++++++-------------- 1 files changed, 47 insertions(+), 28 deletions(-) diff --git a/src/views/ecg/callingscreen/bigscreen.vue b/src/views/ecg/callingscreen/bigscreen.vue index 93a9be7..223bc03 100644 --- a/src/views/ecg/callingscreen/bigscreen.vue +++ b/src/views/ecg/callingscreen/bigscreen.vue @@ -9,6 +9,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 +22,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 +33,39 @@ }) 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(listReady.value[0].bookDate, curWorkDay)) { + curSpeakSeqNum = 0; + curWorkDay.setFullYear( listReady.value[0].bookDate[0] ) + curWorkDay.setMonth( listReady.value[0].bookDate[1] ) + curWorkDay.setDate( listReady.value[0].bookDate[2] ) + } + + 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 +80,16 @@ speechSynthesis.speak(speech) } +const isSameDate = ( date1: number[], date2 : Date) => { + if ( date1[0] === date2.getFullYear() + && date1[1] === date2.getMonth() + && date1[2] === date2.getDate() ) { + return true + } else { + return false + } +} + </script> <template> -- Gitblit v1.9.3