From fe28e1fe081c83b703d5c10b3ebe017a69da9b3d Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期五, 11 四月 2025 16:52:29 +0800 Subject: [PATCH] 大屏 增加 运行 指示圆点 --- src/views/ecg/doctor/index.vue | 62 ++++++++++++++++++++----------- 1 files changed, 40 insertions(+), 22 deletions(-) diff --git a/src/views/ecg/doctor/index.vue b/src/views/ecg/doctor/index.vue index f62627d..b29a0c2 100644 --- a/src/views/ecg/doctor/index.vue +++ b/src/views/ecg/doctor/index.vue @@ -1,18 +1,21 @@ +<!--璁惧棰嗙敤鎿嶄綔鐣岄潰--> <script setup lang="ts"> import TitlePanel from "@/views/ecg/doctor/components/TitlePanel.vue"; import QueuePanel from "@/views/ecg/doctor/components/QueuePanel.vue"; import {DoctorApi, PatientStatisticVO, RoomBedVO} from '@/api/ecg/doctor'; -import {useUserStore} from "@/store/modules/user"; import {QueueVO} from "@/api/ecg/queue"; import {ElNotification} from "element-plus"; import DevReadyPanel from "@/views/ecg/doctor/components/DevReadyPanel.vue"; +import {useRoomStore} from "@/store/modules/room"; -const userStore = useUserStore(); +const roomStore = useRoomStore(); const roomBedVO: RoomBedVO = { roomId: null, roomName: null, - bedNo: null + bedNo: null, + checkTypes: null, + opType: null } const onStagePatient = ref<QueueVO>({ @@ -27,6 +30,7 @@ queuingNum: 0 }) +const autoCall = ref<boolean>(false); const state = ref<boolean>() const patientList = ref<QueueVO[]>([]) @@ -40,8 +44,11 @@ finishFlag.value = true try { patientList.value = await DoctorApi.finishReceiveNextPatient(roomBedVO) - patientStat.value = await DoctorApi.getPatientStatistic(roomBedVO) + patientStat.value = await DoctorApi.getDevReadyStatistic(roomBedVO) getOnstagePatient() + + // 鐢ㄤ簬瑙e喅 宸︿晶閲嶇疆鍚� 鑾峰彇褰撳墠 銆愬氨璇婁腑銆戞偅鑰� + setOnStagePatient(onStagePatient.value) } finally { finishFlag.value = false } @@ -51,7 +58,7 @@ passFlag.value = true try { patientList.value = await DoctorApi.passNextPatient(roomBedVO) - patientStat.value = await DoctorApi.getPatientStatistic(roomBedVO) + patientStat.value = await DoctorApi.getDevReadyStatistic(roomBedVO) getOnstagePatient() } finally { passFlag.value = false @@ -59,15 +66,15 @@ } const callAgain = async () => { - await DoctorApi.callAgainPatient(roomBedVO) + await DoctorApi.callPatientAgain(roomBedVO) } const getOnstagePatient = () => { const tempPatient : QueueVO | undefined = patientList.value.find(item => item.status === 30) if (undefined === tempPatient) { - setOnStagePatient(undefined) + // setOnStagePatient(undefined) } else if (tempPatient.patId !== onStagePatient.value.patId) { - onStagePatient.value= tempPatient + onStagePatient.value = tempPatient setOnStagePatient(tempPatient) } } @@ -82,13 +89,13 @@ return } - patientList.value = await DoctorApi.getPatientList(roomBedVO) + patientList.value = await DoctorApi.getToBeCheckedPatientList(roomBedVO) getOnstagePatient() - patientStat.value = await DoctorApi.getPatientStatistic(roomBedVO) + patientStat.value = await DoctorApi.getDevReadyStatistic(roomBedVO) const queueVO2 = await DoctorApi.bedDoctorGet(roomBedVO) - if (queueVO2.status === 20) + if (queueVO2.status === 20) // 宸ヤ綅鐘舵�� 鏈夊尰鐢� state.value = true - else if (queueVO2.status === 30) + else if (queueVO2.status === 30) // 宸ヤ綅鐘舵�� 鏆傚仠 state.value = false } @@ -121,10 +128,12 @@ finishFlag.value = true passFlag.value = true - if (userStore.isSetRoom) { - roomBedVO.roomId = userStore.room!.roomId - roomBedVO.roomName = userStore.room!.roomName - roomBedVO.bedNo = userStore.room!.bedNo + if (roomStore.isSetRoom) { + roomBedVO.roomId = roomStore.room!.roomId + roomBedVO.roomName = roomStore.room!.roomName + roomBedVO.bedNo = roomStore.room!.bedNo + roomBedVO.checkTypes = roomStore.room!.checkTypes + roomBedVO.opType = roomStore.room!.opType timerRunFlag = true doctorTimer() @@ -144,6 +153,14 @@ const onEventDevReady = () => { //console.info("onDevRentPanelEvent...") + onStagePatient.value.patId = "" + + console.info("autoCall " + autoCall.value) + if (autoCall.value) { + finishNextPatient() + } else { + initLoad() + } } const onEventRecallFinish = () => { @@ -151,9 +168,9 @@ } /** 鎮h�呭彉鏇存搷浣� */ -const devInstallPanelRef = ref() +const devReadyPanelRef = ref() const setOnStagePatient = (tempPatient: QueueVO | undefined) => { - devInstallPanelRef.value.setPatient(tempPatient) + devReadyPanelRef.value.setPatient(tempPatient) } </script> @@ -161,17 +178,18 @@ <template> <el-container> <el-header style="background-color: var(--el-color-primary-light-7); font-size: 24px"> - <TitlePanel :room="roomBedVO" :patientStatistic="patientStat" /> + <TitlePanel :titleType=1 :room="roomBedVO" :patientStatistic="patientStat" /> </el-header> <el-container style="height: 100%;"> <el-main style="border: solid var(--el-color-primary-light-7)"> - <DevReadyPanel :room="roomBedVO" ref="devInstallPanelRef" @event_dev_ready="onEventDevReady"/> + <DevReadyPanel :room="roomBedVO" ref="devReadyPanelRef" @event_dev_ready="onEventDevReady"/> </el-main> <el-aside width="400px" style="border: solid var(--el-color-primary-light-7)"> - <QueuePanel :queue="patientList" @event_RecallFinish="onEventRecallFinish"/> + <QueuePanel :room="roomBedVO" :queue="patientList" @event_RecallFinish="onEventRecallFinish"/> </el-aside> </el-container> <el-container class="right-bottom"> + <el-checkbox label="鑷姩 " v-model="autoCall" /> <el-button :disabled="finishFlag" type="primary" @click="finishNextPatient">鍙彿</el-button> <el-button :disabled="passFlag" type="primary" @click="passNextPatient">杩囧彿</el-button> <el-button type="primary" @click="callAgain">閲嶅彨</el-button> @@ -184,7 +202,7 @@ .right-bottom { position: absolute; bottom: 50px; - right: 100px; + right: 80px; //background-color: #f00; //color: #fff; //padding: 10px; -- Gitblit v1.9.3