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 | 61 ++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 17 deletions(-)
diff --git a/src/views/ecg/doctor/index.vue b/src/views/ecg/doctor/index.vue
index 4ecc39b..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 DevRentPanel from "@/views/ecg/doctor/components/DevRentPanel.vue";
+import DevReadyPanel from "@/views/ecg/doctor/components/DevReadyPanel.vue";
const userStore = useUserStore();
@@ -39,8 +39,9 @@
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
}
@@ -50,17 +51,24 @@
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 = () => {
const tempPatient : QueueVO | undefined = patientList.value.find(item => item.status === 30)
- if (tempPatient !== undefined) {
+ if (undefined === tempPatient) {
+ setOnStagePatient(undefined)
+ } else if (tempPatient.patId !== onStagePatient.value.patId) {
onStagePatient.value= tempPatient
- //onStagePatient.value.patName = tempPatient.patName
+ setOnStagePatient(tempPatient)
}
}
@@ -76,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
@@ -134,8 +142,19 @@
timerRunFlag = false
})
-const onEvent = () => {
- console.info("onDevRentPanelEvent...")
+const onEventDevReady = () => {
+ //console.info("onDevRentPanelEvent...")
+ onStagePatient.value.patId = ""
+}
+
+const onEventRecallFinish = () => {
+ initLoad()
+}
+
+/** 鎮ｈ�呭彉鏇存搷浣� */
+const devReadyPanelRef = ref()
+const setOnStagePatient = (tempPatient: QueueVO | undefined) => {
+ devReadyPanelRef.value.setPatient(tempPatient)
}
</script>
@@ -143,24 +162,32 @@
<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>
- <el-main>
- <DevRentPanel :patient="onStagePatient" @success="onEvent"/>
+ <el-container style="height: 100%;">
+ <el-main style="border: solid var(--el-color-primary-light-7)">
+ <DevReadyPanel :room="roomBedVO" ref="devReadyPanelRef" @event_dev_ready="onEventDevReady"/>
</el-main>
- <el-aside width="300px" style="background-color: var(--el-color-primary-light-7);">
- <QueuePanel :queue="patientList"/>
+ <el-aside width="400px" style="border: solid var(--el-color-primary-light-7)">
+ <QueuePanel :queue="patientList" @event_RecallFinish="onEventRecallFinish"/>
</el-aside>
</el-container>
- <el-container style="justify-content: center; margin-top: 30px">
+ <el-container class="right-bottom">
<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>
<el-button :disabled="bedControlFlag" type="primary" @click="bedControl">{{state?'鏆傚仠':'鎭㈠'}}</el-button>
</el-container>
</el-container>
</template>
<style scoped lang="scss">
-
+.right-bottom {
+ position: absolute;
+ bottom: 50px;
+ right: 100px;
+ //background-color: #f00;
+ //color: #fff;
+ //padding: 10px;
+}
</style>
--
Gitblit v1.9.3