From 8dfce4d85ea0f2445a65b35e50830460a9e07c9e Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 18 十一月 2024 17:57:46 +0800
Subject: [PATCH] 医生允许坐多个工位
---
src/views/ecg/room/RoomLoginSelect.vue | 94 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 74 insertions(+), 20 deletions(-)
diff --git a/src/views/ecg/room/RoomLoginSelect.vue b/src/views/ecg/room/RoomLoginSelect.vue
index b76d0d9..f29fa56 100644
--- a/src/views/ecg/room/RoomLoginSelect.vue
+++ b/src/views/ecg/room/RoomLoginSelect.vue
@@ -2,7 +2,7 @@
<div style="display: flex; flex-direction: column; align-items: center;">
<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" @event-haveseat="haveSeat" @event-leaveseat="leaveSeat"/>
+ <RoomBedSelect :title="key" :bedList="value" :curBed="curSel" :curUser='curUser' @event-haveseat="haveSeat" @event-leaveseat="leaveSeat" @event-setcurseat="setCurSeat"/>
</div>
<el-empty v-if="isEmptyOpeningBed" description="宸ヤ綅娌℃湁寮�鏀�"/>
</div>
@@ -66,21 +66,21 @@
const getList = async () => {
resetCurSel()
- console.info( "getList before" )
+ console.info("getList before")
const data = await RoomApi.getOpeningBedMap()
bedMap.value = data;
- console.info( "getList after " + 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
- roomStore.setRoomInfoAction(curSel.value)
- }
- })
+ isEmptyOpeningBed.value = false
+ const roomVOArray = data[key] as RoomVO[];
+ roomVOArray.forEach((roomVO) => {
+ if (roomVO.docId === curUser.id) {
+ curSel.value = roomVO
+ roomStore.setRoomInfoAction(curSel.value)
+ }
+ })
}
}
@@ -94,19 +94,36 @@
return
}
+ // curSel.value.opType 0 1 2
+ if (curSel.value.opType === 0) {
+ push({path: "/ecg/doc/routine"})
+ }
+ else if (curSel.value.opType === 1) {
+ push({path: "/ecg/doc/dev-ready"})
+ }
+ else if (curSel.value.opType === 2) {
+ push({path: "/ecg/doc/dev-install"})
+ }
+ else {
+ push({path: route.redirectedFrom?.fullPath})
+ }
+
+/*
if (isStringEmpty(route.redirectedFrom?.fullPath))
- push({ path: "/ecg/doctor"})
+ push({ path: "/ecg/doc/dev-ready"})
else if(route.redirectedFrom?.fullPath === "/roomselect" )
- push({ path: "/ecg/doctor"})
+ push({ path: "/ecg/doc/dev-ready"})
else if(route.redirectedFrom?.fullPath === "/ecg/roomselect" )
- push({ path: "/ecg/doctor"})
+ push({ path: "/ecg/doc/dev-ready"})
else
push({ path: route.redirectedFrom?.fullPath})
+*/
}
const haveSeatConfirm = async (newRoomVO: RoomVO) => {
if (newRoomVO !== curSel.value) {
let data;
+/* 淇濈暀杩欏潡閫昏緫
if (curSel.value.docId !== null) {
data = await DoctorApi.bedDoctorOff(curSel.value)
if (data !== 0) {
@@ -118,6 +135,7 @@
return
}
}
+*/
resetCurSel()
await roomStore.clearRoomInfoAction()
@@ -142,18 +160,34 @@
}
// curSel.value.opType 0 1 2
- if (isStringEmpty(route.redirectedFrom?.fullPath)) {
- push({path: "/ecg/doctor"})
+ if (newRoomVO.opType === 0) {
+ push({path: "/ecg/doc/routine"})
}
- else if(route.redirectedFrom?.fullPath === "/roomselect" ) {
- push({path: "/ecg/doctor"})
+ else if (newRoomVO.opType === 1) {
+ push({path: "/ecg/doc/dev-ready"})
}
- else if(route.redirectedFrom?.fullPath === "/ecg/roomselect" ) {
- push({path: "/ecg/doctor"})
+ else if (newRoomVO.opType === 2) {
+ push({path: "/ecg/doc/dev-install"})
}
else {
push({path: route.redirectedFrom?.fullPath})
}
+
+/*
+ // curSel.value.opType 0 1 2
+ if (isStringEmpty(route.redirectedFrom?.fullPath)) {
+ push({path: "/ecg/doc/dev-ready"})
+ }
+ else if(route.redirectedFrom?.fullPath === "/roomselect" ) {
+ push({path: "/ecg/doc/dev-ready"})
+ }
+ else if(route.redirectedFrom?.fullPath === "/ecg/roomselect" ) {
+ push({path: "/ecg/doc/dev-ready"})
+ }
+ else {
+ push({path: route.redirectedFrom?.fullPath})
+ }
+*/
}
const leaveSeatConfirm = async () => {
@@ -204,6 +238,26 @@
});
}
+// 鍚屾椂鍧愪簡澶氫釜宸ヤ綅鏃讹紝璁惧畾褰撳墠浼氳瘽鐨勫伐浣�
+const setCurSeat = (roomVO: RoomVO) => {
+ roomStore.setRoomInfoAction( roomVO )
+ curSel.value = roomVO
+
+ // curSel.value.opType 0 1 2
+ if (roomVO.opType === 0) {
+ push({path: "/ecg/doc/routine"})
+ }
+ else if (roomVO.opType === 1) {
+ push({path: "/ecg/doc/dev-ready"})
+ }
+ else if (roomVO.opType === 2) {
+ push({path: "/ecg/doc/dev-install"})
+ }
+ else {
+ push({path: route.redirectedFrom?.fullPath})
+ }
+}
+
const resetCurSel = () => {
curSel.value.id = null
curSel.value.roomId = null
--
Gitblit v1.9.3