From ec00c0781c1e61c8cc7b3976cedc248dad7a0697 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 19 九月 2024 18:32:40 +0800
Subject: [PATCH] update
---
src/views/ecg/room/RoomLoginSelect.vue | 86 +++++++++++++++++++++++++------------------
1 files changed, 50 insertions(+), 36 deletions(-)
diff --git a/src/views/ecg/room/RoomLoginSelect.vue b/src/views/ecg/room/RoomLoginSelect.vue
index 9e5c25a..5b619d9 100644
--- a/src/views/ecg/room/RoomLoginSelect.vue
+++ b/src/views/ecg/room/RoomLoginSelect.vue
@@ -4,7 +4,7 @@
<div class=roomwrap v-for="(value, key) in bedMap" :key="key">
<RoomBedSelect :title="key" :bedList="value" :curBed="curSel" @event-haveseat="haveSeat" @event-leaveseat="leaveSeat"/>
</div>
- <div v-if="isEmptyOpeningBed">"宸ヤ綅娌℃湁寮�鏀�"</div>
+ <el-empty v-if="isEmptyOpeningBed" description="宸ヤ綅娌℃湁寮�鏀�"/>
</div>
<div>
<el-button @click="confirmCurSel">纭</el-button>
@@ -44,10 +44,12 @@
/** 鍒濆鍖� **/
onMounted(() => {
+ console.info( curUser.id + " onMounted")
getList()
})
onActivated(() => {
+ console.info( curUser.id + " onActivated")
getList()
})
@@ -59,21 +61,42 @@
const getList = async () => {
resetCurSel()
+ console.info( "getList before" )
const data = await RoomApi.getOpeningBedMap()
bedMap.value = data;
+ console.info( "getList after " + data )
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
- userStore.setRoomInfoAction(curSel.value)
- return
- }
- } )
+ if (roomVO.docId === curUser.id) {
+ curSel.value = roomVO
+ userStore.setRoomInfoAction(curSel.value)
+ }
+ })
}
+}
+
+const confirmCurSel = () => {
+ if (curSel.value.docId === null ) {
+ ElMessage({
+ message: '璇峰厛閫夋嫨宸ヤ綔鐨勪綅缃�!',
+ type: 'info',
+ duration: 3000 // 鑷姩鍏抽棴鏃堕棿锛岄粯璁や负3000ms
+ });
+ return
+ }
+
+ if (isStringEmpty(route.redirectedFrom?.fullPath))
+ push({ path: "/ecg/doctor"})
+ else if(route.redirectedFrom?.fullPath === "/roomselect" )
+ push({ path: "/ecg/doctor"})
+ else if(route.redirectedFrom?.fullPath === "/ecg/roomselect" )
+ push({ path: "/ecg/doctor"})
+ else
+ push({ path: route.redirectedFrom?.fullPath})
}
const haveSeatConfirm = async (newRoomVO: RoomVO) => {
@@ -91,6 +114,9 @@
}
}
+ resetCurSel()
+ userStore.clearRoomInfoAction()
+
const tempRoomVO = cloneDeep(newRoomVO)
tempRoomVO.docId = curUser.id
tempRoomVO.docName = curUser.nickname
@@ -104,15 +130,24 @@
return
}
- getList()
+ userStore.setRoomInfoAction(tempRoomVO)
+ newRoomVO.docId = curUser.id
+ newRoomVO.docName = curUser.nickname
+ curSel.value = newRoomVO;
}
- if (isStringEmpty(route.redirectedFrom?.fullPath))
- push({ path: "/"})
- else if(route.redirectedFrom?.fullPath === "/roomselect" )
- push({ path: "/"})
- else
- push({ path: route.redirectedFrom?.fullPath})
+ if (isStringEmpty(route.redirectedFrom?.fullPath)) {
+ push({path: "/ecg/doctor"})
+ }
+ else if(route.redirectedFrom?.fullPath === "/roomselect" ) {
+ push({path: "/ecg/doctor"})
+ }
+ else if(route.redirectedFrom?.fullPath === "/ecg/roomselect" ) {
+ push({path: "/ecg/doctor"})
+ }
+ else {
+ push({path: route.redirectedFrom?.fullPath})
+ }
}
const leaveSeatConfirm = async () => {
@@ -128,6 +163,7 @@
}
}
+ resetCurSel()
userStore.clearRoomInfoAction()
getList()
}
@@ -142,10 +178,8 @@
type: 'warning'
}
).then(async () => {
- console.log('纭');
haveSeatConfirm(newRoomVO)
}).catch(() => {
- console.log('鍙栨秷');
});
}
@@ -159,29 +193,9 @@
type: 'warning'
}
).then(() => {
- console.log('纭');
leaveSeatConfirm()
}).catch(() => {
- console.log('鍙栨秷');
});
-}
-
-const confirmCurSel = () => {
- if (curSel.value.docId === null ) {
- ElMessage({
- message: '璇峰厛閫夋嫨宸ヤ綔鐨勪綅缃�!',
- type: 'info',
- duration: 3000 // 鑷姩鍏抽棴鏃堕棿锛岄粯璁や负3000ms
- });
- return
- }
-
- if (isStringEmpty(route.redirectedFrom?.fullPath))
- push({ path: "/"})
- else if(route.redirectedFrom?.fullPath === "/roomselect" )
- push({ path: "/"})
- else
- push({ path: route.redirectedFrom?.fullPath})
}
const resetCurSel = () => {
--
Gitblit v1.9.3