From b3080cd7524075f55e7fceed69c4f042f1ed12f2 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期日, 01 九月 2024 21:31:04 +0800
Subject: [PATCH] fix bug,  user store reference issue

---
 src/views/ecg/doctor/index.vue |   64 +++++++++++++++++++++----------
 1 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/src/views/ecg/doctor/index.vue b/src/views/ecg/doctor/index.vue
index bf00fc3..a9454cc 100644
--- a/src/views/ecg/doctor/index.vue
+++ b/src/views/ecg/doctor/index.vue
@@ -4,11 +4,13 @@
 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";
 
 const userStore = useUserStore();
 
 const roomBedVO: RoomBedVO = {
     roomId: null,
+    roomName: null,
     bedNo: null
 }
 
@@ -21,7 +23,7 @@
 
 const state = ref<boolean>()
 
-const list = ref<QueueVO[]>([])
+const patientList = ref<QueueVO[]>([])
 
 let timerRunFlag : boolean = false
 const bedControlFlag = ref<boolean>(true);
@@ -30,20 +32,35 @@
 
 const finishNextPatient = async () => {
   finishFlag.value = true
-  list.value = await DoctorApi.finishNextPatient(roomBedVO)
-  patientStat.value = await DoctorApi.getPatientStatistic(roomBedVO)
-  finishFlag.value = false
+  try {
+    patientList.value = await DoctorApi.finishNextPatient(roomBedVO)
+    patientStat.value = await DoctorApi.getPatientStatistic(roomBedVO)
+  } finally {
+    finishFlag.value = false
+  }
 }
 
 const passNextPatient = async () => {
   passFlag.value = true
-  list.value = await DoctorApi.passNextPatient(roomBedVO)
-  patientStat.value = await DoctorApi.getPatientStatistic(roomBedVO)
-  passFlag.value = false
+  try {
+    patientList.value = await DoctorApi.passNextPatient(roomBedVO)
+    patientStat.value = await DoctorApi.getPatientStatistic(roomBedVO)
+  } finally {
+    passFlag.value = false
+  }
 }
 
 const initLoad = async () => {
-  list.value = await DoctorApi.getPatientList(roomBedVO)
+  if (roomBedVO.roomId == null) {
+    ElNotification.error({
+      message: '璇烽噸鏂板氨搴�!',
+      type: 'info',
+      duration: 3000 // 鑷姩鍏抽棴鏃堕棿锛岄粯璁や负3000ms
+    })
+    return
+  }
+
+  patientList.value = await DoctorApi.getPatientList(roomBedVO)
   patientStat.value = await DoctorApi.getPatientStatistic(roomBedVO)
   const queueVO2 = await DoctorApi.bedDoctorGet(roomBedVO)
   if (queueVO2.status === 20)
@@ -54,14 +71,17 @@
 
 const bedControl = async () => {
   bedControlFlag.value = true
-  if (state.value) {
-    await DoctorApi.bedDoctorPause(roomBedVO)
-    state.value = false
-  } else {
-    await DoctorApi.bedDoctorResume(roomBedVO)
-    state.value = true
+  try {
+    if (state.value) {
+      await DoctorApi.bedDoctorPause(roomBedVO)
+      state.value = false
+    } else {
+      await DoctorApi.bedDoctorResume(roomBedVO)
+      state.value = true
+    }
+  } finally {
+    bedControlFlag.value = false
   }
-  bedControlFlag.value = false
 }
 
 const doctorTimer = () => {
@@ -73,21 +93,23 @@
 
 /** 鍒濆鍖� **/
 onMounted(() => {
-  console.info("onMounted - doctor " + userStore.isSetRoom)
+  console.info("onMounted - doctor " + userStore.isSetRoom + " " + userStore.room.roomId)
+  timerRunFlag = false
   bedControlFlag.value = true
   finishFlag.value = true
   passFlag.value = true
 
   if (userStore.isSetRoom) {
     roomBedVO.roomId = userStore.room!.roomId
+    roomBedVO.roomName = userStore.room!.roomName
     roomBedVO.bedNo = userStore.room!.bedNo
+
+    timerRunFlag = true
+    doctorTimer()
   } else {
     roomBedVO.roomId = null
     roomBedVO.bedNo = null
   }
-
-  timerRunFlag = true
-  doctorTimer()
 
   bedControlFlag.value = false
   finishFlag.value = false
@@ -95,7 +117,7 @@
 })
 
 onUnmounted( () =>{
-  console.info("onUnmounted - doctor")
+  console.info("onUnmounted - doctor " + userStore.isSetRoom + " " + userStore.room.roomId)
   timerRunFlag = false
 })
 
@@ -111,7 +133,7 @@
         瑁呮満鐣岄潰
       </el-main>
       <el-aside width="300px" style="background-color: var(--el-color-primary-light-7);">
-        <QueuePanel :queue="list"/>
+        <QueuePanel :queue="patientList"/>
       </el-aside>
     </el-container>
     <el-container style="justify-content: center; margin-top: 30px">

--
Gitblit v1.9.3