From d09fe6aa593b974119628baf5e91bdfd0de7c378 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期四, 10 四月 2025 10:42:26 +0800 Subject: [PATCH] 翻译 设备状态信息 --- src/views/ecg/room/RoomLoginSelect.vue | 98 +++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 78 insertions(+), 20 deletions(-) diff --git a/src/views/ecg/room/RoomLoginSelect.vue b/src/views/ecg/room/RoomLoginSelect.vue index b76d0d9..2acaac3 100644 --- a/src/views/ecg/room/RoomLoginSelect.vue +++ b/src/views/ecg/room/RoomLoginSelect.vue @@ -1,8 +1,8 @@ <template> - <div style="display: flex; flex-direction: column; align-items: center;"> + <div style="display: flex; flex-direction: column; align-items: center; height: 100vh; overflow-y: auto;"> <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> @@ -18,7 +18,6 @@ import { RoomApi, RoomVO } from '@/api/ecg/room' import {useUserStore} from "@/store/modules/user"; import {ElMessage, ElMessageBox} from "element-plus"; -import {isStringEmpty} from "@/utils/stringUtil"; import {cloneDeep} from "lodash-es"; import {DoctorApi} from "@/api/ecg/doctor"; import {useRoomStore} from "@/store/modules/room"; @@ -66,21 +65,26 @@ 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 + isEmptyOpeningBed.value = false + + if (roomStore.getIsSetRoom) { const roomVOArray = data[key] as RoomVO[]; roomVOArray.forEach((roomVO) => { - if (roomVO.docId === curUser.id) { + if (roomVO.docId === curUser.id + && roomVO.roomId === roomStore.room!.roomId + && roomVO.bedNo === roomStore.room!.bedNo) { curSel.value = roomVO roomStore.setRoomInfoAction(curSel.value) } }) + } } } @@ -94,19 +98,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 +139,7 @@ return } } +*/ resetCurSel() await roomStore.clearRoomInfoAction() @@ -142,23 +164,39 @@ } // 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 () => { - if (curSel.value.docId !== null) { - let data = await DoctorApi.bedDoctorOff(curSel.value) +const leaveSeatConfirm = async (roomVO: RoomVO) => { + if (roomVO.docId !== null) { + let data = await DoctorApi.bedDoctorOff(roomVO) if (data !== 0) { ElMessage({ message: '鍐呴儴閿欒!' + data, @@ -199,11 +237,31 @@ type: 'warning' } ).then(() => { - leaveSeatConfirm() + leaveSeatConfirm(roomVO) }).catch(() => { }); } +// 鍚屾椂鍧愪簡澶氫釜宸ヤ綅鏃讹紝璁惧畾褰撳墠浼氳瘽鐨勫伐浣� +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