From b3080cd7524075f55e7fceed69c4f042f1ed12f2 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期日, 01 九月 2024 21:31:04 +0800 Subject: [PATCH] fix bug, user store reference issue --- src/views/ecg/room/RoomLoginSelect.vue | 190 +++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 158 insertions(+), 32 deletions(-) diff --git a/src/views/ecg/room/RoomLoginSelect.vue b/src/views/ecg/room/RoomLoginSelect.vue index 8c30904..75bb07c 100644 --- a/src/views/ecg/room/RoomLoginSelect.vue +++ b/src/views/ecg/room/RoomLoginSelect.vue @@ -2,11 +2,14 @@ <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" v-model="curSel"/> + <RoomBedSelect :title="key" :bedList="value" :curBed="curSel" @event-haveseat="haveSeat" @event-leaveseat="leaveSeat"/> </div> + <div v-if="isEmptyOpeningBed">"宸ヤ綅娌℃湁寮�鏀�"</div> </div> - <el-button type="primary" @click="roomConfirm">纭</el-button> - <el-button type="primary" @click="test">TEST</el-button> + <div> + <el-button @click="confirmCurSel">纭</el-button> + <el-button @click="resetPage">閲嶇疆</el-button> + </div> </div> </template> @@ -14,39 +17,163 @@ import {RoomBedSelect} from "@/components/RoomBedSelect" import { RoomApi, RoomVO } from '@/api/ecg/room' import {useUserStore} from "@/store/modules/user"; -import {CACHE_KEY, useCache} from "@/hooks/web/useCache"; -import {ElMessage} from "element-plus"; -import {isStringEmpty} from "@/utils/stringUtil" - +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() -const { wsCache } = useCache() defineOptions({ name: 'RoomLoginSelect' }) const route = useRoute(); const userStore = useUserStore() +const curUser = userStore.getUser -const bedMap = ref<Map<String, RoomVO[]>>() // 鍒楄〃鐨勬暟鎹� - +const isEmptyOpeningBed = ref<boolean>(true); +const bedMap = ref() // 鍒楄〃鐨勬暟鎹� const curSel = ref<RoomVO>({ - id: 0, - roomId: 0, - roomName: "", - bedNo: "", - onstage: true - }); + id: null, + roomId: null, + roomName: null, + bedNo: null, + status: null, + docId: null, + docName: null +}) + +/** 鍒濆鍖� **/ +onMounted(() => { + getList() +}) + +onActivated(() => { + getList() +}) + +const resetPage = () => { + getList() +} /** 鏌ヨ鍒楄〃 */ const getList = async () => { - const data = await RoomApi.getOnstageBedMap() - bedMap.value = data as Map<String, RoomVO[]> + resetCurSel() + + const data = await RoomApi.getOpeningBedMap() + bedMap.value = 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 + return + } + } ) + } } -const roomConfirm = () => { - console.info(curSel.value) +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) { + ElMessage({ + message: '鍐呴儴閿欒!' + data, + type: 'info', + duration: 3000 // 鑷姩鍏抽棴鏃堕棿锛岄粯璁や负3000ms + }); + return + } + } + curSel.value.docId = null + curSel.value.docName = null - if (curSel.value.roomId === 0) { + const tempRoomVO = cloneDeep(newRoomVO) + tempRoomVO.docId = curUser.id + tempRoomVO.docName = curUser.nickname + data = await DoctorApi.bedDoctorOn(tempRoomVO) + if (data !== 0) { + ElMessage({ + message: '鍐呴儴閿欒!' + data, + type: 'info', + duration: 3000 // 鑷姩鍏抽棴鏃堕棿锛岄粯璁や负3000ms + }); + return + } + + 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}) +} + +const leaveSeatConfirm = async () => { + if (curSel.value.docId !== null) { + let data = await DoctorApi.bedDoctorOff(curSel.value) + if (data !== 0) { + ElMessage({ + message: '鍐呴儴閿欒!' + data, + type: 'info', + duration: 3000 // 鑷姩鍏抽棴鏃堕棿锛岄粯璁や负3000ms + }); + return + } + + curSel.value.docId = null + curSel.value.docName = null + } + + userStore.clearRoomInfoAction() +} + +const haveSeat = async (newRoomVO: RoomVO) => { + ElMessageBox.confirm( + '鍏ュ骇, 鏄惁缁х画?', + '鎻愮ず', + { + confirmButtonText: '纭畾', + cancelButtonText: '鍙栨秷', + type: 'warning' + } + ).then(async () => { + console.log('纭'); + haveSeatConfirm(newRoomVO) + }).catch(() => { + console.log('鍙栨秷'); + }); +} + +const leaveSeat = (roomVO: RoomVO) => { + ElMessageBox.confirm( + '绂诲骇, 鏄惁缁х画?', + '鎻愮ず', + { + confirmButtonText: '纭畾', + cancelButtonText: '鍙栨秷', + type: 'warning' + } + ).then(() => { + console.log('纭'); + leaveSeatConfirm() + }).catch(() => { + console.log('鍙栨秷'); + }); +} + +const confirmCurSel = () => { + if (curSel.value.docId === null ) { ElMessage({ message: '璇峰厛閫夋嫨宸ヤ綔鐨勪綅缃�!', type: 'info', @@ -58,22 +185,21 @@ 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}) } -const test = () => { - userStore.getRoom; - console.info(userStore.getRoom); - - const userInfo = wsCache.get(CACHE_KEY.USER) - console.info(userInfo); +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 } - -/** 鍒濆鍖� **/ -onMounted(() => { - getList() -}) </script> -- Gitblit v1.9.3