From edc68ed8dee303123a5022be895703f774d4c3cf Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期日, 08 九月 2024 17:26:05 +0800
Subject: [PATCH] update
---
src/api/ecg/screen/index.ts | 2 +-
src/views/ecg/callingscreen/bigscreen.vue | 18 ++++++++----------
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/api/ecg/screen/index.ts b/src/api/ecg/screen/index.ts
index c25f180..0ca8df3 100644
--- a/src/api/ecg/screen/index.ts
+++ b/src/api/ecg/screen/index.ts
@@ -11,7 +11,7 @@
patId: string // 鎮ｈ�呯紪鍙�
patName: string // 鎮ｈ�呭鍚�
patGender: number // 鎮ｈ�呮�у埆
- bookDate: number[] // 棰勭害鏃ユ湡
+ bookDate: Date // 棰勭害鏃ユ湡
bookCheckType: number // 棰勭害妫�鏌ョ被鍨�
seqNum: number // 鎺掗槦搴忓彿
status: number // 10:鎺掗槦涓� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 50:杩囧彿 60:杩囨湡
diff --git a/src/views/ecg/callingscreen/bigscreen.vue b/src/views/ecg/callingscreen/bigscreen.vue
index 223bc03..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' })
@@ -47,11 +48,9 @@
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)
@@ -80,14 +79,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>
--
Gitblit v1.9.3