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/components/RoomBedSelect/src/RoomBedSelect.vue | 2 +-
src/views/ecg/doctor/index.vue | 7 ++++---
src/store/modules/user.ts | 8 +++++++-
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/components/RoomBedSelect/src/RoomBedSelect.vue b/src/components/RoomBedSelect/src/RoomBedSelect.vue
index 0237880..e5c056e 100644
--- a/src/components/RoomBedSelect/src/RoomBedSelect.vue
+++ b/src/components/RoomBedSelect/src/RoomBedSelect.vue
@@ -58,7 +58,7 @@
style="width: 100%"
alt="鏈夊尰鐢�"
/>
- <div>{{bedItem.bedNo}} {{bedItem.docName}}</div>
+ <div>{{bedItem.bedNo}} {{bedItem.docName}} {{bedItem.status === 30?"-鏆傚仠":""}}</div>
<el-button v-if="bedItem.docId === null" @click = onHaveSeatclick(bedItem)>
鍏ュ骇
</el-button>
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 53f2d69..60867c8 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -90,7 +90,13 @@
// 鍖荤敓鍏ュ骇
async setRoomInfoAction(room: RoomVO) {
// 鏇存柊 store
- this.room = room
+ this.room!.id = room.id
+ this.room!.roomId = room.roomId
+ this.room!.roomName = room.roomName
+ this.room!.bedNo = room.bedNo
+ this.room!.status = room.status
+ this.room!.docId = room.docId
+ this.room!.docName = room.docName
this.isSetRoom = true
// 鏇存柊 cache
diff --git a/src/views/ecg/doctor/index.vue b/src/views/ecg/doctor/index.vue
index bde628d..a9454cc 100644
--- a/src/views/ecg/doctor/index.vue
+++ b/src/views/ecg/doctor/index.vue
@@ -4,7 +4,7 @@
import {DoctorApi, PatientStatisticVO, RoomBedVO} from '@/api/ecg/doctor';
import {useUserStore} from "@/store/modules/user";
import {QueueVO} from "@/api/ecg/queue";
-import {ElMessage, ElNotification} from "element-plus";
+import {ElNotification} from "element-plus";
const userStore = useUserStore();
@@ -93,7 +93,8 @@
/** 鍒濆鍖� **/
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
@@ -116,7 +117,7 @@
})
onUnmounted( () =>{
- console.info("onUnmounted - doctor")
+ console.info("onUnmounted - doctor " + userStore.isSetRoom + " " + userStore.room.roomId)
timerRunFlag = false
})
--
Gitblit v1.9.3