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/room/RoomLoginSelect.vue | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/src/views/ecg/room/RoomLoginSelect.vue b/src/views/ecg/room/RoomLoginSelect.vue
index 1229835..75bb07c 100644
--- a/src/views/ecg/room/RoomLoginSelect.vue
+++ b/src/views/ecg/room/RoomLoginSelect.vue
@@ -16,11 +16,11 @@
<script setup lang="ts">
import {RoomBedSelect} from "@/components/RoomBedSelect"
import { RoomApi, RoomVO } from '@/api/ecg/room'
-import { queueApi } from '@/api/ecg/queue'
import {useUserStore} from "@/store/modules/user";
import {ElMessage, ElMessageBox} from "element-plus";
import {isStringEmpty} from "@/utils/stringUtil";
import {cloneDeep} from "lodash-es";
+import {DoctorApi} from "@/api/ecg/doctor";
const { push } = useRouter()
defineOptions({ name: 'RoomLoginSelect' })
@@ -47,6 +47,10 @@
getList()
})
+onActivated(() => {
+ getList()
+})
+
const resetPage = () => {
getList()
}
@@ -56,7 +60,6 @@
resetCurSel()
const data = await RoomApi.getOpeningBedMap()
- console.info(data)
bedMap.value = data;
isEmptyOpeningBed.value = true
@@ -73,14 +76,10 @@
}
const haveSeatConfirm = async (newRoomVO: RoomVO) => {
- const tempRoomVO = cloneDeep(newRoomVO)
- tempRoomVO.docId = curUser.id
- tempRoomVO.docName = curUser.nickname
-
if (newRoomVO !== curSel.value) {
let data;
if (curSel.value.docId !== null) {
- data = await queueApi.bedDoctorOff(curSel.value)
+ data = await DoctorApi.bedDoctorOff(curSel.value)
if (data !== 0) {
ElMessage({
message: '鍐呴儴閿欒!' + data,
@@ -93,7 +92,10 @@
curSel.value.docId = null
curSel.value.docName = null
- data = await queueApi.bedDoctorOn(tempRoomVO)
+ const tempRoomVO = cloneDeep(newRoomVO)
+ tempRoomVO.docId = curUser.id
+ tempRoomVO.docName = curUser.nickname
+ data = await DoctorApi.bedDoctorOn(tempRoomVO)
if (data !== 0) {
ElMessage({
message: '鍐呴儴閿欒!' + data,
@@ -102,12 +104,12 @@
});
return
}
- }
- newRoomVO.docId = curUser.id
- newRoomVO.docName = curUser.nickname
- curSel.value = newRoomVO
- userStore.setRoomInfoAction(curSel.value)
+ newRoomVO.docId = curUser.id
+ newRoomVO.docName = curUser.nickname
+ curSel.value = newRoomVO
+ userStore.setRoomInfoAction(curSel.value)
+ }
if (isStringEmpty(route.redirectedFrom?.fullPath))
push({ path: "/"})
@@ -118,8 +120,8 @@
}
const leaveSeatConfirm = async () => {
- if (curSel.value.roomId !== null) {
- let data = await queueApi.bedDoctorOff(curSel.value)
+ if (curSel.value.docId !== null) {
+ let data = await DoctorApi.bedDoctorOff(curSel.value)
if (data !== 0) {
ElMessage({
message: '鍐呴儴閿欒!' + data,
@@ -131,7 +133,6 @@
curSel.value.docId = null
curSel.value.docName = null
- resetCurSel()
}
userStore.clearRoomInfoAction()
--
Gitblit v1.9.3