From 3e5fad59bfe090227c929b3e3981dc9bab2977cc Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期六, 14 九月 2024 15:50:21 +0800 Subject: [PATCH] 调整 医生界面 布局 待完善 --- src/views/ecg/callingscreen/bigscreen.vue | 33 ++++++++++++++++++--------------- 1 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/views/ecg/callingscreen/bigscreen.vue b/src/views/ecg/callingscreen/bigscreen.vue index 223bc03..be94ac0 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' }) @@ -33,7 +34,7 @@ }) const onSpeachEndEvent = async (event) => { - console.log("Speech ended" + event); + console.log("Speech ended... " + event.currentTarget.text); await ScreenApi.markCalled(curSpeakPat!.patId) initiateSpeak() } @@ -43,15 +44,13 @@ return undefined; } - // TODO 澶勭悊姣忓ぉ 鍙嶈浆鐨勬儏鍐� + // 澶勭悊姣忓ぉ 鍙嶈浆鐨勬儏鍐� if ( curWorkDay === undefined) { curSpeakSeqNum = 0; curWorkDay = new Date() - } else if (!isSameDate(listReady.value[0].bookDate, curWorkDay)) { + } else if (!isSameDate(dayjs(listReady.value[0].bookDate).toDate(), curWorkDay)) { curSpeakSeqNum = 0; - curWorkDay.setFullYear( listReady.value[0].bookDate[0] ) - curWorkDay.setMonth( listReady.value[0].bookDate[1] ) - curWorkDay.setDate( listReady.value[0].bookDate[2] ) + curWorkDay = dayjs(listReady.value[0].bookDate).toDate() } return listReady.value.find( item => item.status === 30 && item.called === 0 && item.seqNum > curSpeakSeqNum) @@ -62,15 +61,16 @@ if (queuePat !== undefined) { curSpeakPat = queuePat curSpeakSeqNum = curSpeakPat.seqNum - speak(queuePat.patName + queuePat.roomName); + speak("璇枫��" + queuePat.patName + "鍒�" + queuePat.roomName + "灏辫瘖"); } else { curSpeakPat = undefined } } const speak = (msg) => { + console.info("speak " + msg); var speech = new SpeechSynthesisUtterance() - speech.text = msg + speech.text = msg + "銆傘�傘��" + msg + "銆傘�傘��" + msg + "銆傘�傘��" speech.pitch = 1 // 鑾峰彇骞惰缃瘽璇殑闊宠皟(0-2 榛樿1锛屽�艰秺澶ц秺灏栭攼,瓒婁綆瓒婁綆娌�) speech.rate = 0.9 // 鑾峰彇骞惰缃璇濈殑閫熷害(0.1-10 榛樿1锛屽�艰秺澶ц閫熻秺蹇�,瓒婂皬璇�熻秺鎱�) speech.volume = 100 // 鑾峰彇骞惰缃璇濈殑闊抽噺 @@ -80,14 +80,13 @@ speechSynthesis.speak(speech) } -const isSameDate = ( date1: number[], date2 : Date) => { - if ( date1[0] === date2.getFullYear() - && date1[1] === date2.getMonth() - && date1[2] === date2.getDate() ) { +const isSameDate = ( date1: Date, date2 : Date) => { + if (date1.getFullYear() === date2.getFullYear() + && date1.getMonth() === date2.getMonth() + && date1.getDate() === date2.getDate()) return true - } else { + else return false - } } </script> @@ -111,6 +110,10 @@ {{ statusMap.get(scope.row.status) }} </template> </el-table-column> + <el-table-column + prop="roomName" + label="璇婂" + width="80"/> </el-table> </el-aside> <el-container> @@ -150,7 +153,7 @@ </el-footer> </el-container> </el-container> - <el-button @click="speak('璇� 鐗规湕鏅� 鍒颁簩鍙疯瘖瀹� 灏辫瘖')" >鍙彿</el-button> + <el-button @click="speak('娆㈣繋浣跨敤')" >娆㈣繋浣跨敤</el-button> </el-container> </template> -- Gitblit v1.9.3