From b9292e1e2d4ee1b461d7724a9d0f5ca27802ed70 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 14 十月 2024 15:38:40 +0800
Subject: [PATCH] bug fix
---
src/views/ecg/room/RoomLoginSelect.vue | 204 +++++++++++++++++++++++++++++++-------------------
1 files changed, 127 insertions(+), 77 deletions(-)
diff --git a/src/views/ecg/room/RoomLoginSelect.vue b/src/views/ecg/room/RoomLoginSelect.vue
index d5180f4..5b619d9 100644
--- a/src/views/ecg/room/RoomLoginSelect.vue
+++ b/src/views/ecg/room/RoomLoginSelect.vue
@@ -2,12 +2,13 @@
<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" @haveSeat="haveSeat" @leaveSeat="leaveSeat"/>
+ <RoomBedSelect :title="key" :bedList="value" :curBed="curSel" @event-haveseat="haveSeat" @event-leaveseat="leaveSeat"/>
</div>
+ <el-empty v-if="isEmptyOpeningBed" description="宸ヤ綅娌℃湁寮�鏀�"/>
</div>
<div>
- <el-button type="primary" @click="haveSeatConfirm">鍏ュ骇纭</el-button>
- <el-button type="primary" @click="leaveSeatConfirm">绂诲骇纭</el-button>
+ <el-button @click="confirmCurSel">纭</el-button>
+ <el-button @click="resetPage">閲嶇疆</el-button>
</div>
</div>
</template>
@@ -15,10 +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} from "element-plus";
+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' })
@@ -28,11 +30,9 @@
const userStore = useUserStore()
const curUser = userStore.getUser
+const isEmptyOpeningBed = ref<boolean>(true);
const bedMap = ref() // 鍒楄〃鐨勬暟鎹�
-
-const originalSel = ref<RoomVO>();
-
-let curSel = ref<RoomVO>({
+const curSel = ref<RoomVO>({
id: null,
roomId: null,
roomName: null,
@@ -40,27 +40,47 @@
status: null,
docId: null,
docName: null
-});
+})
+
+/** 鍒濆鍖� **/
+onMounted(() => {
+ console.info( curUser.id + " onMounted")
+ getList()
+})
+
+onActivated(() => {
+ console.info( curUser.id + " onActivated")
+ getList()
+})
+
+const resetPage = () => {
+ getList()
+}
/** 鏌ヨ鍒楄〃 */
const getList = async () => {
- const data = await RoomApi.getOnstageBedMap()
- bedMap.value = data;
+ resetCurSel()
- for (const key in data) {
- const roomVOArray = data[key] as RoomVO[];
- roomVOArray.forEach((roomVO) => {
- if (roomVO.docId === curUser.id) {
- originalSel.value = roomVO
- curSel.value = roomVO
- return
- }
- } )
- }
+ 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)
+ }
+ })
+ }
}
-const haveSeatConfirm = async () => {
- if (curSel.value.roomId === null) {
+const confirmCurSel = () => {
+ if (curSel.value.docId === null ) {
ElMessage({
message: '璇峰厛閫夋嫨宸ヤ綔鐨勪綅缃�!',
type: 'info',
@@ -69,11 +89,21 @@
return
}
- if (curSel.value !== originalSel.value) {
- console.info(originalSel.value)
+ 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) => {
+ if (newRoomVO !== curSel.value) {
let data;
- if (originalSel.value !== undefined) {
- data = await queueApi.bedDoctorOff(originalSel.value)
+ if (curSel.value.docId !== null) {
+ data = await DoctorApi.bedDoctorOff(curSel.value)
if (data !== 0) {
ElMessage({
message: '鍐呴儴閿欒!' + data,
@@ -83,7 +113,14 @@
return
}
}
- data = await queueApi.bedDoctorOn(curSel.value)
+
+ resetCurSel()
+ userStore.clearRoomInfoAction()
+
+ const tempRoomVO = cloneDeep(newRoomVO)
+ tempRoomVO.docId = curUser.id
+ tempRoomVO.docName = curUser.nickname
+ data = await DoctorApi.bedDoctorOn(tempRoomVO)
if (data !== 0) {
ElMessage({
message: '鍐呴儴閿欒!' + data,
@@ -92,30 +129,30 @@
});
return
}
- originalSel.value = curSel.value
+
+ userStore.setRoomInfoAction(tempRoomVO)
+ newRoomVO.docId = curUser.id
+ newRoomVO.docName = curUser.nickname
+ curSel.value = newRoomVO;
}
- userStore.setRoomInfoAction(curSel.value)
- 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 () => {
- if (curSel.value.roomId !== null) {
- ElMessage({
- message: '璇峰厛绂诲紑宸ヤ綅, 鍐嶇‘璁ょ搴�!',
- type: 'info',
- duration: 3000 // 鑷姩鍏抽棴鏃堕棿锛岄粯璁や负3000ms
- });
- return
- }
-
- if (originalSel.value !== undefined) {
- let data = await queueApi.bedDoctorOff(originalSel.value)
+ if (curSel.value.docId !== null) {
+ let data = await DoctorApi.bedDoctorOff(curSel.value)
if (data !== 0) {
ElMessage({
message: '鍐呴儴閿欒!' + data,
@@ -124,39 +161,52 @@
});
return
}
- originalSel.value = undefined
}
+ resetCurSel()
userStore.clearRoomInfoAction()
-}
-
-const haveSeat = (roomVO: RoomVO) => {
- curSel.value.docId = null
- curSel.value.docName = null
-
- roomVO.docId = curUser.id
- roomVO.docName = curUser.nickname
- curSel.value = roomVO
-}
-const leaveSeat = (roomVO: RoomVO) => {
- curSel.value.docId = null
- curSel.value.docName = null
-
- curSel.value = {
- id: null,
- roomId: null,
- roomName: null,
- bedNo: null,
- status: null,
- docId: null,
- docName: null
- }
-}
-
-/** 鍒濆鍖� **/
-onMounted(() => {
getList()
-})
+}
+
+const haveSeat = async (newRoomVO: RoomVO) => {
+ ElMessageBox.confirm(
+ '鍏ュ骇, 鏄惁缁х画?',
+ '鎻愮ず',
+ {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }
+ ).then(async () => {
+ haveSeatConfirm(newRoomVO)
+ }).catch(() => {
+ });
+}
+
+const leaveSeat = (roomVO: RoomVO) => {
+ ElMessageBox.confirm(
+ '绂诲骇, 鏄惁缁х画?',
+ '鎻愮ず',
+ {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }
+ ).then(() => {
+ leaveSeatConfirm()
+ }).catch(() => {
+ });
+}
+
+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>
--
Gitblit v1.9.3