From 7d16f8200ccbc493fe9e4fe45d0f691e46035aaf Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 29 八月 2024 16:19:28 +0800
Subject: [PATCH] update
---
src/views/ecg/room/RoomLoginSelect.vue | 37 +++++++++++++++++++------------------
src/components/RoomBedSelect/src/RoomBedSelect.vue | 2 +-
2 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/src/components/RoomBedSelect/src/RoomBedSelect.vue b/src/components/RoomBedSelect/src/RoomBedSelect.vue
index 437055d..0237880 100644
--- a/src/components/RoomBedSelect/src/RoomBedSelect.vue
+++ b/src/components/RoomBedSelect/src/RoomBedSelect.vue
@@ -47,7 +47,7 @@
<div v-for="(bedItem, index) in bedList" :key="index">
<div class="deskwarp">
<img
- v-if="curBed.roomId !== bedItem.roomId || curBed.bedNo !== bedItem.bedNo"
+ v-if="bedItem.docId === null"
src="@/assets/room/desk.png"
style="width: 100%"
alt="鏃犲尰鐢�"
diff --git a/src/views/ecg/room/RoomLoginSelect.vue b/src/views/ecg/room/RoomLoginSelect.vue
index 8c33ae0..1229835 100644
--- a/src/views/ecg/room/RoomLoginSelect.vue
+++ b/src/views/ecg/room/RoomLoginSelect.vue
@@ -53,11 +53,13 @@
/** 鏌ヨ鍒楄〃 */
const getList = async () => {
+ resetCurSel()
+
const data = await RoomApi.getOpeningBedMap()
console.info(data)
bedMap.value = data;
- isEmptyOpeningBed.value = true
+ isEmptyOpeningBed.value = true
for (const key in data) {
isEmptyOpeningBed.value = false
const roomVOArray = data[key] as RoomVO[];
@@ -77,7 +79,7 @@
if (newRoomVO !== curSel.value) {
let data;
- if (curSel.value.roomId !== null) {
+ if (curSel.value.docId !== null) {
data = await queueApi.bedDoctorOff(curSel.value)
if (data !== 0) {
ElMessage({
@@ -88,6 +90,9 @@
return
}
}
+ curSel.value.docId = null
+ curSel.value.docName = null
+
data = await queueApi.bedDoctorOn(tempRoomVO)
if (data !== 0) {
ElMessage({
@@ -99,16 +104,10 @@
}
}
- userStore.setRoomInfoAction(tempRoomVO)
-
- if (curSel.value.roomId !== null) {
- curSel.value.docId = null
- curSel.value.docName = null
- }
-
newRoomVO.docId = curUser.id
newRoomVO.docName = curUser.nickname
curSel.value = newRoomVO
+ userStore.setRoomInfoAction(curSel.value)
if (isStringEmpty(route.redirectedFrom?.fullPath))
push({ path: "/"})
@@ -132,15 +131,7 @@
curSel.value.docId = null
curSel.value.docName = null
- curSel.value = {
- id: null,
- roomId: null,
- roomName: null,
- bedNo: null,
- status: null,
- docId: null,
- docName: null
- }
+ resetCurSel()
}
userStore.clearRoomInfoAction()
@@ -199,6 +190,16 @@
push({ path: route.redirectedFrom?.fullPath})
}
+const resetCurSel = () => {
+ curSel.value.id = null
+ curSel.value.roomId = null
+ curSel.value.roomName = null
+ curSel.value.bedNo = null
+ curSel.value.status = null
+ curSel.value.docId = null
+ curSel.value.docName = null
+}
+
</script>
<style scoped lang="scss">
--
Gitblit v1.9.3