From b9292e1e2d4ee1b461d7724a9d0f5ca27802ed70 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期一, 14 十月 2024 15:38:40 +0800 Subject: [PATCH] bug fix --- src/views/ecg/doctor/index.vue | 37 +++++++++++++++++++++---------------- 1 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/views/ecg/doctor/index.vue b/src/views/ecg/doctor/index.vue index 453c753..0d88b5c 100644 --- a/src/views/ecg/doctor/index.vue +++ b/src/views/ecg/doctor/index.vue @@ -5,7 +5,7 @@ import {useUserStore} from "@/store/modules/user"; import {QueueVO} from "@/api/ecg/queue"; import {ElNotification} from "element-plus"; -import DevInstallPanel from "@/views/ecg/doctor/components/DevInstallPanel.vue"; +import DevReadyPanel from "@/views/ecg/doctor/components/DevReadyPanel.vue"; const userStore = useUserStore(); @@ -39,8 +39,8 @@ const finishNextPatient = async () => { finishFlag.value = true try { - patientList.value = await DoctorApi.finishNextPatient(roomBedVO) - patientStat.value = await DoctorApi.getPatientStatistic(roomBedVO) + patientList.value = await DoctorApi.finishReceiveNextPatient(roomBedVO) + patientStat.value = await DoctorApi.getDevReadyStatistic(roomBedVO) getOnstagePatient() } finally { finishFlag.value = false @@ -51,11 +51,15 @@ 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 } +} + +const callAgain = async () => { + await DoctorApi.callAgainPatient(roomBedVO) } const getOnstagePatient = () => { @@ -80,7 +84,7 @@ patientList.value = await DoctorApi.getPatientList(roomBedVO) getOnstagePatient() - patientStat.value = await DoctorApi.getPatientStatistic(roomBedVO) + patientStat.value = await DoctorApi.getDevReadyStatistic(roomBedVO) const queueVO2 = await DoctorApi.bedDoctorGet(roomBedVO) if (queueVO2.status === 20) state.value = true @@ -138,18 +142,19 @@ timerRunFlag = false }) -const onEvent = () => { - // console.info("onDevRentPanelEvent...") +const onEventDevReady = () => { + //console.info("onDevRentPanelEvent...") + onStagePatient.value.patId = "" +} + +const onEventRecallFinish = () => { + initLoad() } /** 鎮h�呭彉鏇存搷浣� */ -const devInstallPanelRef = ref() +const devReadyPanelRef = ref() const setOnStagePatient = (tempPatient: QueueVO | undefined) => { - devInstallPanelRef.value.setPatient(tempPatient) -} - -const callAgain = () => { - + devReadyPanelRef.value.setPatient(tempPatient) } </script> @@ -157,14 +162,14 @@ <template> <el-container> <el-header style="background-color: var(--el-color-primary-light-7); font-size: 24px"> - <TitlePanel :room="roomBedVO" :patientStatistic="patientStat" /> + <TitlePanel :titleType=0 :room="roomBedVO" :patientStatistic="patientStat" /> </el-header> <el-container style="height: 100%;"> <el-main style="border: solid var(--el-color-primary-light-7)"> - <DevInstallPanel ref="devInstallPanelRef" @success="onEvent"/> + <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"/> + <QueuePanel :queue="patientList" @event_RecallFinish="onEventRecallFinish"/> </el-aside> </el-container> <el-container class="right-bottom"> -- Gitblit v1.9.3