From 348e6bcdc7fa566a48b96dea53d24ec6dda49e1d Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 11 四月 2025 18:06:40 +0800
Subject: [PATCH] update
---
src/views/ecg/room/RoomLoginSelect.vue | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/views/ecg/room/RoomLoginSelect.vue b/src/views/ecg/room/RoomLoginSelect.vue
index f29fa56..2acaac3 100644
--- a/src/views/ecg/room/RoomLoginSelect.vue
+++ b/src/views/ecg/room/RoomLoginSelect.vue
@@ -1,5 +1,5 @@
<template>
- <div style="display: flex; flex-direction: column; align-items: center;">
+ <div style="display: flex; flex-direction: column; align-items: center; height: 100vh; overflow-y: auto;">
<div style="display: flex; flex-wrap: wrap; justify-content: center; margin-bottom: 20px">
<div class=roomwrap v-for="(value, key) in bedMap" :key="key">
<RoomBedSelect :title="key" :bedList="value" :curBed="curSel" :curUser='curUser' @event-haveseat="haveSeat" @event-leaveseat="leaveSeat" @event-setcurseat="setCurSeat"/>
@@ -18,7 +18,6 @@
import { RoomApi, RoomVO } from '@/api/ecg/room'
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";
import {useRoomStore} from "@/store/modules/room";
@@ -74,13 +73,18 @@
isEmptyOpeningBed.value = true
for (const key in data) {
isEmptyOpeningBed.value = false
- const roomVOArray = data[key] as RoomVO[];
- roomVOArray.forEach((roomVO) => {
- if (roomVO.docId === curUser.id) {
- curSel.value = roomVO
- roomStore.setRoomInfoAction(curSel.value)
- }
- })
+
+ if (roomStore.getIsSetRoom) {
+ const roomVOArray = data[key] as RoomVO[];
+ roomVOArray.forEach((roomVO) => {
+ if (roomVO.docId === curUser.id
+ && roomVO.roomId === roomStore.room!.roomId
+ && roomVO.bedNo === roomStore.room!.bedNo) {
+ curSel.value = roomVO
+ roomStore.setRoomInfoAction(curSel.value)
+ }
+ })
+ }
}
}
@@ -190,9 +194,9 @@
*/
}
-const leaveSeatConfirm = async () => {
- if (curSel.value.docId !== null) {
- let data = await DoctorApi.bedDoctorOff(curSel.value)
+const leaveSeatConfirm = async (roomVO: RoomVO) => {
+ if (roomVO.docId !== null) {
+ let data = await DoctorApi.bedDoctorOff(roomVO)
if (data !== 0) {
ElMessage({
message: '鍐呴儴閿欒!' + data,
@@ -233,7 +237,7 @@
type: 'warning'
}
).then(() => {
- leaveSeatConfirm()
+ leaveSeatConfirm(roomVO)
}).catch(() => {
});
}
--
Gitblit v1.9.3