From 348e6bcdc7fa566a48b96dea53d24ec6dda49e1d Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期五, 11 四月 2025 18:06:40 +0800 Subject: [PATCH] update --- src/views/ecg/callingscreen/roomscreen.vue | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/views/ecg/callingscreen/roomscreen.vue b/src/views/ecg/callingscreen/roomscreen.vue index aa10eac..8437e08 100644 --- a/src/views/ecg/callingscreen/roomscreen.vue +++ b/src/views/ecg/callingscreen/roomscreen.vue @@ -1,16 +1,14 @@ <script setup lang="ts"> -import {RoomBedVO, RoomProfileVO} from "@/api/ecg/doctor"; +import {RoomProfileVO} from "@/api/ecg/doctor"; import {RoomApi} from "@/api/ecg/room"; import {ScreenQueueVO, ScreenApi} from "@/api/ecg/screen"; import {CallApi, CallVO} from "@/api/ecg/call"; import {queueStatusConvert} from "../../../utils/statusFormatter"; -import {useCheckTypeStore} from "@/store/modules/checkType"; +import {getCheckTypeName, getCheckTypeSeqPrefix} from "../../../utils/checkTypeFormatter"; defineOptions({ name: 'roomscreen' }) let roomId = ref<number>(0) - -const checkTypeStore = useCheckTypeStore() const checkRelatedPatientList = ref<ScreenQueueVO[]>([]) const installRelatedPatientList = ref<ScreenQueueVO[]>([]) @@ -78,9 +76,10 @@ return; curSpeakPat = await CallApi.getNextInstallCall() - if (curSpeakPat !== null) { - speak("璇枫��" + curSpeakPat.patName + "鍒�" + curSpeakPat.roomName + "瑁呮満"); - } + if (curSpeakPat == null) + return; + + speak("璇枫��" + curSpeakPat.patName + "鍒�" + curSpeakPat.roomName + "瑁呮満"); } const speak = (msg) => { @@ -123,7 +122,7 @@ label="棰勭害搴忓彿" width="60px"> <template #default="scope"> - <span style="display:inline-block; width:60px;">{{checkTypeStore.getCheckTypeSeqPrefix(scope.row.bookCheckType)}}{{scope.row.bookSeqNum}} </span> + <span style="display:inline-block; width:60px;">{{getCheckTypeSeqPrefix(scope.row.bookCheckType)}}{{scope.row.bookSeqNum}} </span> </template> </el-table-column> <el-table-column @@ -139,7 +138,7 @@ label="妫�鏌ラ」鐩�" width="80px"> <template #default="scope"> - <span style="display:inline-block; width:80px;">{{scope.row.bookCheckType && checkTypeStore.getCheckTypeName(scope.row.bookCheckType)}} </span> + <span style="display:inline-block; width:80px;">{{scope.row.bookCheckType && getCheckTypeName(scope.row.bookCheckType)}} </span> </template> </el-table-column> <el-table-column label="鐘舵��" align="center" width="200px"> @@ -162,7 +161,7 @@ label="棰勭害搴忓彿" width="60px"> <template #default="scope"> - <span style="display:inline-block; width:60px;">{{checkTypeStore.getCheckTypeSeqPrefix(scope.row.bookCheckType)}}{{scope.row.bookSeqNum}} </span> + <span style="display:inline-block; width:60px;">{{getCheckTypeSeqPrefix(scope.row.bookCheckType)}}{{scope.row.bookSeqNum}} </span> </template> </el-table-column> <el-table-column @@ -178,7 +177,7 @@ label="妫�鏌ラ」鐩�" width="80px"> <template #default="scope"> - <span style="display:inline-block; width:80px;">{{scope.row.bookCheckType && checkTypeStore.getCheckTypeName(scope.row.bookCheckType)}} </span> + <span style="display:inline-block; width:80px;">{{scope.row.bookCheckType && getCheckTypeName(scope.row.bookCheckType)}} </span> </template> </el-table-column> <el-table-column label="鐘舵��" align="center" width="200px"> -- Gitblit v1.9.3