From 2bc74ebfec4a30beddc66fd55be4947e5f7cf498 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 28 八月 2024 15:15:33 +0800
Subject: [PATCH] update
---
src/views/ecg/room/RoomLoginSelect.vue | 2 +-
src/components/RoomBedSelect/src/RoomBedSelect.vue | 19 +++++++++++--------
src/store/modules/user.ts | 10 +++++++---
3 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/components/RoomBedSelect/src/RoomBedSelect.vue b/src/components/RoomBedSelect/src/RoomBedSelect.vue
index a804b87..437055d 100644
--- a/src/components/RoomBedSelect/src/RoomBedSelect.vue
+++ b/src/components/RoomBedSelect/src/RoomBedSelect.vue
@@ -1,14 +1,15 @@
<script lang="ts" setup>
-import { RoomApi, RoomVO } from '@/api/ecg/room'
+import { RoomVO } from '@/api/ecg/room'
import {PropType} from "vue";
import {useUserStore} from "@/store/modules/user";
-const emit = defineEmits(['haveSeat', 'leaveSeat'])
+const emit = defineEmits(['event-haveseat', 'event-leaveseat'])
defineComponent({
name: 'RoomBedSelect'
})
-const props = defineProps({
+//const props = defineProps({
+defineProps({
title: {
type: String,
required: true
@@ -26,16 +27,16 @@
const userStore = useUserStore()
const curUser = userStore.getUser
-const onHaveSeatclick = (newItem) => {
- emit('haveSeat', newItem)
+const onHaveSeatclick = (newItem: RoomVO) => {
+ emit('event-haveseat', newItem)
}
-const onLeaveSeatclick = (curItem) => {
- emit('leaveSeat', curItem)
+const onLeaveSeatclick = (curItem: RoomVO) => {
+ emit('event-leaveseat', curItem)
}
/** 鍒濆鍖� **/
onMounted(() => {
- console.info(props.bedList)
+ //console.info(props.bedList)
})
</script>
@@ -49,11 +50,13 @@
v-if="curBed.roomId !== bedItem.roomId || curBed.bedNo !== bedItem.bedNo"
src="@/assets/room/desk.png"
style="width: 100%"
+ alt="鏃犲尰鐢�"
/>
<img
v-else
src="@/assets/room/desk-doctor.jpeg"
style="width: 100%"
+ alt="鏈夊尰鐢�"
/>
<div>{{bedItem.bedNo}} {{bedItem.docName}}</div>
<el-button v-if="bedItem.docId === null" @click = onHaveSeatclick(bedItem)>
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 8fd7e8d..53f2d69 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -44,7 +44,9 @@
roomId: 0,
roomName: "",
bedNo: "",
- onstage: true
+ status: null,
+ docId: null,
+ docName: null
}
}),
getters: {
@@ -64,7 +66,7 @@
getIsSetRoom(): boolean {
return this.isSetRoom
},
- getRoom(): RoomVO {
+ getRoom(): RoomVO | null {
return this.room
}
},
@@ -151,7 +153,9 @@
roomId: 0,
roomName: "",
bedNo: "",
- onstage: true
+ status: null,
+ docId: null,
+ docName: null
}
}
}
diff --git a/src/views/ecg/room/RoomLoginSelect.vue b/src/views/ecg/room/RoomLoginSelect.vue
index 549d575..e3ccc3f 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" @haveSeat="haveSeat" @leaveSeat="leaveSeat"/>
+ <RoomBedSelect :title="key" :bedList="value" :curBed="curSel" @event-haveseat="haveSeat" @event-leaveseat="leaveSeat"/>
</div>
</div>
<el-button @click="confirmCurSel">纭</el-button>
--
Gitblit v1.9.3