From 589bcdb26f8e9d3e0d5ef46d27acc901c96d50ea Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 15 四月 2025 15:44:49 +0800
Subject: [PATCH] update
---
src/components/RoomBedSelect/src/RoomBedSelect.vue | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 15 deletions(-)
diff --git a/src/components/RoomBedSelect/src/RoomBedSelect.vue b/src/components/RoomBedSelect/src/RoomBedSelect.vue
index 437055d..43d48e8 100644
--- a/src/components/RoomBedSelect/src/RoomBedSelect.vue
+++ b/src/components/RoomBedSelect/src/RoomBedSelect.vue
@@ -1,17 +1,20 @@
<script lang="ts" setup>
import { RoomVO } from '@/api/ecg/room'
import {PropType} from "vue";
-import {useUserStore} from "@/store/modules/user";
-const emit = defineEmits(['event-haveseat', 'event-leaveseat'])
+import {useCheckTypeStore} from "@/store/modules/checkType";
+import {UserVO} from "@/store/modules/user";
+import {getCheckTypeName} from "../../../utils/checkTypeFormatter";
+
+const emit = defineEmits(['event-haveseat', 'event-leaveseat', 'event-setcurseat'])
defineComponent({
name: 'RoomBedSelect'
})
-//const props = defineProps({
-defineProps({
+const props = defineProps({
+// defineProps({
title: {
- type: String,
+ type: Number,
required: true
},
bedList: {
@@ -21,11 +24,14 @@
curBed: {
type: Object as PropType<RoomVO>,
required: true
+ },
+ curUser: {
+ type: Object as PropType<UserVO>,
+ required: true
}
})
-const userStore = useUserStore()
-const curUser = userStore.getUser
+const checkTypeStore = useCheckTypeStore();
const onHaveSeatclick = (newItem: RoomVO) => {
emit('event-haveseat', newItem)
@@ -33,22 +39,34 @@
const onLeaveSeatclick = (curItem: RoomVO) => {
emit('event-leaveseat', curItem)
}
+const onSetCurSeatclick = (curItem: RoomVO) => {
+ emit('event-setcurseat', curItem)
+}
/** 鍒濆鍖� **/
onMounted(() => {
- //console.info(props.bedList)
+ console.info(props.bedList)
})
</script>
<template>
<el-card style="width: 200px" shadow="hover" >
- <template #header>{{title}}</template>
+ <template #header>{{bedList[0].roomName}}</template>
<div v-for="(bedItem, index) in bedList" :key="index">
<div class="deskwarp">
+
+ <div v-for="(checkType, subIndex) in bedItem.checkTypes" :key="subIndex">
+ {{getCheckTypeName(checkType)}}
+ </div>
+ <div>
+ {{bedItem.opType === 1?"棰嗙敤":""}}
+ {{bedItem.opType === 2?"瀹夎":""}}
+ </div>
+
<img
- v-if="curBed.roomId !== bedItem.roomId || curBed.bedNo !== bedItem.bedNo"
- src="@/assets/room/desk.png"
+ v-if="bedItem.docId === null"
+ src="@/assets/room/open.jpg"
style="width: 100%"
alt="鏃犲尰鐢�"
/>
@@ -58,13 +76,22 @@
style="width: 100%"
alt="鏈夊尰鐢�"
/>
- <div>{{bedItem.bedNo}} {{bedItem.docName}}</div>
+ <div>{{bedItem.bedNo}} {{bedItem.docName}} {{bedItem.status === 30?"-鏆傚仠":""}}</div>
<el-button v-if="bedItem.docId === null" @click = onHaveSeatclick(bedItem)>
鍏ュ骇
</el-button>
- <el-button v-if="bedItem.docId === curUser.id" @click = onLeaveSeatclick(bedItem)>
- 绂诲骇
- </el-button>
+ <div v-if="bedItem.docId === curUser.id">
+ <el-button @click = onLeaveSeatclick(bedItem)>
+ 绂诲骇
+ </el-button>
+ <span v-if="bedItem.roomId === curBed.roomId && bedItem.bedNo === curBed.bedNo" >
+ 褰撳墠
+ </span>
+ <el-button v-else @click = onSetCurSeatclick(bedItem)>
+ 璁句负褰撳墠
+ </el-button>
+ </div>
+ <el-divider/>
</div>
</div>
</el-card>
@@ -94,6 +121,7 @@
display: flex;
flex-direction: column;
align-items: center;
+ /*height: 260px;*/
}
</style>
--
Gitblit v1.9.3