From 2aaa318673eb822dd55b007ddf9f0bace5bc748a Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 29 八月 2024 14:57:34 +0800
Subject: [PATCH] update
---
src/views/ecg/room/RoomLoginSelect.vue | 138 ++++++++++++++++++++++------------------------
src/api/ecg/room/index.ts | 2
src/permission.ts | 2
3 files changed, 68 insertions(+), 74 deletions(-)
diff --git a/src/api/ecg/room/index.ts b/src/api/ecg/room/index.ts
index eee2ccd..32fdc98 100644
--- a/src/api/ecg/room/index.ts
+++ b/src/api/ecg/room/index.ts
@@ -49,7 +49,7 @@
},
// 鑾峰彇璇婂绮剧畝淇℃伅鍒楄〃锛岀敤浜庡尰鐢熼�夋嫨鐧诲綍鐨勮瘖瀹�
- getOnstageBedMap: async () => {
+ getOpeningBedMap: async () => {
return await request.get({ url: `/clinic/room/list-simple-room` })
},
diff --git a/src/permission.ts b/src/permission.ts
index 748c7d4..3dace6d 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -82,7 +82,7 @@
})
// 鏂板銆愯瘖瀹ら�夋嫨銆戦�昏緫
- if (userStore.getRoles.includes("doctor") && !userStore.getIsSetRoom ) {
+ if (userStore.getRoles.includes("doctor") && !userStore.getRoles.includes("super_admin") && !userStore.getIsSetRoom ) {
next({path: `/roomselect?redirect=${to.fullPath}`})
}
// <<<銆愯瘖瀹ら�夋嫨銆�<<<
diff --git a/src/views/ecg/room/RoomLoginSelect.vue b/src/views/ecg/room/RoomLoginSelect.vue
index e3ccc3f..8c33ae0 100644
--- a/src/views/ecg/room/RoomLoginSelect.vue
+++ b/src/views/ecg/room/RoomLoginSelect.vue
@@ -4,8 +4,12 @@
<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>
</div>
- <el-button @click="confirmCurSel">纭</el-button>
+ <div>
+ <el-button @click="confirmCurSel">纭</el-button>
+ <el-button @click="resetPage">閲嶇疆</el-button>
+ </div>
</div>
</template>
@@ -16,6 +20,7 @@
import {useUserStore} from "@/store/modules/user";
import {ElMessage, ElMessageBox} from "element-plus";
import {isStringEmpty} from "@/utils/stringUtil";
+import {cloneDeep} from "lodash-es";
const { push } = useRouter()
defineOptions({ name: 'RoomLoginSelect' })
@@ -25,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,
@@ -37,40 +40,45 @@
status: null,
docId: null,
docName: null
-});
+})
+
+/** 鍒濆鍖� **/
+onMounted(() => {
+ getList()
+})
+
+const resetPage = () => {
+ getList()
+}
/** 鏌ヨ鍒楄〃 */
const getList = async () => {
- const data = await RoomApi.getOnstageBedMap()
+ const data = await RoomApi.getOpeningBedMap()
+ console.info(data)
bedMap.value = data;
- 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
- }
- } )
- }
+ 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 haveSeatConfirm = async () => {
- if (curSel.value.roomId === null) {
- ElMessage({
- message: '璇峰厛閫夋嫨宸ヤ綔鐨勪綅缃�!',
- type: 'info',
- duration: 3000 // 鑷姩鍏抽棴鏃堕棿锛岄粯璁や负3000ms
- });
- return
- }
+const haveSeatConfirm = async (newRoomVO: RoomVO) => {
+ const tempRoomVO = cloneDeep(newRoomVO)
+ tempRoomVO.docId = curUser.id
+ tempRoomVO.docName = curUser.nickname
- if (curSel.value !== originalSel.value) {
- console.info(originalSel.value)
+ if (newRoomVO !== curSel.value) {
let data;
- if (originalSel.value !== undefined) {
- data = await queueApi.bedDoctorOff(originalSel.value)
+ if (curSel.value.roomId !== null) {
+ data = await queueApi.bedDoctorOff(curSel.value)
if (data !== 0) {
ElMessage({
message: '鍐呴儴閿欒!' + data,
@@ -80,7 +88,7 @@
return
}
}
- data = await queueApi.bedDoctorOn(curSel.value)
+ data = await queueApi.bedDoctorOn(tempRoomVO)
if (data !== 0) {
ElMessage({
message: '鍐呴儴閿欒!' + data,
@@ -89,10 +97,19 @@
});
return
}
- originalSel.value = curSel.value
}
- userStore.setRoomInfoAction(curSel.value)
+ userStore.setRoomInfoAction(tempRoomVO)
+
+ if (curSel.value.roomId !== null) {
+ curSel.value.docId = null
+ curSel.value.docName = null
+ }
+
+ newRoomVO.docId = curUser.id
+ newRoomVO.docName = curUser.nickname
+ curSel.value = newRoomVO
+
if (isStringEmpty(route.redirectedFrom?.fullPath))
push({ path: "/"})
else if(route.redirectedFrom?.fullPath === "/roomselect" )
@@ -103,16 +120,7 @@
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)
+ let data = await queueApi.bedDoctorOff(curSel.value)
if (data !== 0) {
ElMessage({
message: '鍐呴儴閿欒!' + data,
@@ -121,13 +129,24 @@
});
return
}
- originalSel.value = undefined
+
+ curSel.value.docId = null
+ curSel.value.docName = null
+ curSel.value = {
+ id: null,
+ roomId: null,
+ roomName: null,
+ bedNo: null,
+ status: null,
+ docId: null,
+ docName: null
+ }
}
userStore.clearRoomInfoAction()
}
-const haveSeat = (roomVO: RoomVO) => {
+const haveSeat = async (newRoomVO: RoomVO) => {
ElMessageBox.confirm(
'鍏ュ骇, 鏄惁缁х画?',
'鎻愮ず',
@@ -136,16 +155,9 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}
- ).then(() => {
+ ).then(async () => {
console.log('纭');
- curSel.value.docId = null
- curSel.value.docName = null
-
- roomVO.docId = curUser.id
- roomVO.docName = curUser.nickname
- curSel.value = roomVO
-
- haveSeatConfirm()
+ haveSeatConfirm(newRoomVO)
}).catch(() => {
console.log('鍙栨秷');
});
@@ -162,19 +174,6 @@
}
).then(() => {
console.log('纭');
- curSel.value.docId = null
- curSel.value.docName = null
-
- curSel.value = {
- id: null,
- roomId: null,
- roomName: null,
- bedNo: null,
- status: null,
- docId: null,
- docName: null
- }
-
leaveSeatConfirm()
}).catch(() => {
console.log('鍙栨秷');
@@ -199,11 +198,6 @@
else
push({ path: route.redirectedFrom?.fullPath})
}
-
-/** 鍒濆鍖� **/
-onMounted(() => {
- getList()
-})
</script>
--
Gitblit v1.9.3