From 22a9a5fe525fb893ecaa8d4a8bfb65169ce02fc4 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 11 四月 2025 14:52:27 +0800
Subject: [PATCH] update & refactor
---
src/views/ecg/callingscreen/bigscreen.vue | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/views/ecg/callingscreen/bigscreen.vue b/src/views/ecg/callingscreen/bigscreen.vue
index a253078..10768d4 100644
--- a/src/views/ecg/callingscreen/bigscreen.vue
+++ b/src/views/ecg/callingscreen/bigscreen.vue
@@ -4,6 +4,7 @@
import {CallApi, CallVO} from "@/api/ecg/call";
import {queueStatusConvert} from "@/utils/statusFormatter";
import {useCheckTypeStore} from "@/store/modules/checkType";
+import {getCheckTypeSeqPrefix} from "../../../utils/checkTypeFormatter";
defineOptions({ name: 'bigscreen' })
@@ -28,7 +29,7 @@
const startScrolling = () => {
setInterval(() => {
getList();
- if ( curSpeakPat === null ) {
+ if ( curSpeakPat == null ) {
initiateSpeak()
}
}, 5000); // 姣廥绉掓粴鍔ㄤ竴娆�
@@ -48,8 +49,8 @@
const initiateSpeak = async () => {
curSpeakPat = await CallApi.getNextCall()
- if (curSpeakPat !== null) {
- console.info( curSpeakPat )
+ //console.info( "initiateSpeak", curSpeakPat, curSpeakPat?.called )
+ if (curSpeakPat != null && curSpeakPat.called === 0) {
speak("璇枫��" + curSpeakPat.patName + "鍒�" + curSpeakPat.roomName + "灏辫瘖");
}
}
@@ -98,23 +99,23 @@
</script>
<template>
- <div style="height: 100%; display:flex; flex-direction: column">
+ <div style="height: 100%; display:flex; flex-direction: column; height: 100vh; overflow-y: auto; padding-left: 5px; padding-right: 5px">
<div style="display:flex; justify-content: center; align-items: center; background: var(--el-color-primary-light-7); font-size: 22px; ">
<img height="40px" src="@/assets/imgs/jinhua.png"/>
閲戝崕浜烘皯鍖婚櫌
</div>
<div style="display:flex; justify-content:space-around; align-items: flex-start; border: solid 2px var(--el-color-primary-light-7); font-size: 23px; ">
- <div v-for="[disColId, disNameList] of Object.entries(displayColInfo)" :key="disColId" style="width: 300px; height: 100%; border-left: solid 2px var(--el-color-primary-light-7) ">
+ <div v-for="[disColId, disNameList] of Object.entries(displayColInfo)" :key="disColId" style="flex: 1; flex-basis: 300px; height: 100%; border-left: solid 2px var(--el-color-primary-light-7) ">
<!--{{disColId}}-->
<div v-for="(dispName, dispName_index) in disNameList" :key="dispName_index">
{{dispName}}
</div>
</div>
</div>
- <div style="display:flex; justify-content:space-around; align-items: flex-start; flex-grow: 1; font-size: 20px">
- <div v-for="[disColId2, columnPatientList] of Object.entries(mapColumnVsPatients)" :key="disColId2" style="width: 300px; height: 100%; border-left: solid 2px var(--el-color-primary-light-7) ">
+ <div style="display:flex; justify-content:space-around; align-items: flex-start; flex-grow: 1; border: solid 2px var(--el-color-primary-light-7); font-size: 20px">
+ <div v-for="[disColId2, columnPatientList] of Object.entries(mapColumnVsPatients)" :key="disColId2" style="flex: 1; flex-basis: 300px; height: 100%; border-left: solid 2px var(--el-color-primary-light-7) ">
<div v-for="(item, index) in columnPatientList" :key="index" :class="getItemCssClass(item)">
- <span style="display:inline-block; width:60px;">{{checkTypeStore.getCheckTypeSeqPrefix(item.bookCheckType)}}{{item.bookSeqNum}}</span>
+ <span style="display:inline-block; width:60px;">{{getCheckTypeSeqPrefix(item.bookCheckType)}}{{item.bookSeqNum}}</span>
<span style="display:inline-block; width:80px;">{{ nameDesensitize(item.patName) }} </span>
<span style="display:inline-block; width:80px;">{{queueStatusConvert(item.status)}} </span>
{{item.roomName}} {{item.bedNo}}
--
Gitblit v1.9.3