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 |  104 +++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 75 insertions(+), 29 deletions(-)

diff --git a/src/views/ecg/doctor/index.vue b/src/views/ecg/doctor/index.vue
index 7d61372..a9454cc 100644
--- a/src/views/ecg/doctor/index.vue
+++ b/src/views/ecg/doctor/index.vue
@@ -3,13 +3,15 @@
 import QueuePanel from "@/views/ecg/doctor/components/QueuePanel.vue";
 import {DoctorApi, PatientStatisticVO, RoomBedVO} from '@/api/ecg/doctor';
 import {useUserStore} from "@/store/modules/user";
-import {queueApi, QueueVO} from "@/api/ecg/queue";
+import {QueueVO} from "@/api/ecg/queue";
+import {ElNotification} from "element-plus";
 
 const userStore = useUserStore();
 
 const roomBedVO: RoomBedVO = {
-    roomId: userStore.room!.roomId,
-    bedNo: userStore.room!.bedNo
+    roomId: null,
+    roomName: null,
+    bedNo: null
 }
 
 const patientStat = ref<PatientStatisticVO>({
@@ -21,58 +23,102 @@
 
 const state = ref<boolean>()
 
-const list = ref<QueueVO[]>([])
+const patientList = ref<QueueVO[]>([])
 
+let timerRunFlag : boolean = false
 const bedControlFlag = ref<boolean>(true);
 const finishFlag = ref<boolean>(true);
 const passFlag = ref<boolean>(true);
 
 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 () => {
-  bedControlFlag.value = true
-  finishFlag.value = true
-  passFlag.value = true
-  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 queueApi.bedDoctorGet(roomBedVO)
+  const queueVO2 = await DoctorApi.bedDoctorGet(roomBedVO)
   if (queueVO2.status === 20)
     state.value = true
   else if (queueVO2.status === 30)
     state.value = false
-
-  bedControlFlag.value = false
-  finishFlag.value = false
-  passFlag.value = false
 }
 
 const bedControl = async () => {
   bedControlFlag.value = true
-  if (state.value) {
-    await queueApi.bedDoctorPause(roomBedVO)
-    state.value = false
-  } else {
-    await queueApi.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 = () => {
+  console.log('doctor ...')
+  initLoad()
+  if (timerRunFlag)
+    setTimeout(doctorTimer, 5000) // five seconds
 }
 
 /** 鍒濆鍖� **/
 onMounted(() => {
-  initLoad()
+  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
+  }
+
+  bedControlFlag.value = false
+  finishFlag.value = false
+  passFlag.value = false
+})
+
+onUnmounted( () =>{
+  console.info("onUnmounted - doctor " + userStore.isSetRoom + " " + userStore.room.roomId)
+  timerRunFlag = false
 })
 
 </script>
@@ -80,14 +126,14 @@
 <template>
   <el-container>
     <el-header style="background-color: var(--el-color-primary-light-7); font-size: 24px">
-      <TitlePanel :patientStatistic="patientStat" />
+      <TitlePanel :room="roomBedVO" :patientStatistic="patientStat" />
     </el-header>
     <el-container>
       <el-main>
         瑁呮満鐣岄潰
       </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