From bd21ed2505710facd814ef0e020eb36230a09313 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期三, 14 八月 2024 22:32:01 +0800 Subject: [PATCH] update --- /dev/null | 5 -- src/api/ecg/room/index.ts | 14 ++++++ src/views/ecg/room/RoomStatusSetting.vue | 29 +++++++++----- src/components/RoomStatus/src/RoomStatus.vue | 19 ++++----- 4 files changed, 39 insertions(+), 28 deletions(-) diff --git a/src/api/ecg/room/index.ts b/src/api/ecg/room/index.ts index 5cb3175..8a09d4f 100644 --- a/src/api/ecg/room/index.ts +++ b/src/api/ecg/room/index.ts @@ -6,6 +6,7 @@ roomId: number // 璇婂缂栧彿 roomName: string // 璇婂鍚嶇О bedNo: string // 璇婄枟搴婄紪鍙� + onstage: boolean //寮�璇婄姸鎬� } // 璇婂鍜岃瘖鐤楀簥 API @@ -40,8 +41,19 @@ return await request.download({ url: `/clinic/room/export-excel`, params }) }, - // 瀵煎嚭璇婂鍜岃瘖鐤楀簥 Excel + // 鑾峰彇閮ㄩ棬绮剧畝淇℃伅鍒楄〃 ECG 瀛愰儴闂� getSimpleRoomList: async () => { return await request.get({ url: `/clinic/room/simple-list` }) + }, + + // 鑾峰彇璇婂绮剧畝淇℃伅鍒楄〃锛岀敤浜庡尰鐢熼�夋嫨鐧诲綍鐨勮瘖瀹� + getSimpleRoomList2: async () => { + return await request.get({ url: `/clinic/room/list-simple-room` }) + }, + + + // 鑾峰彇璇婂簥Map + getAllBedMap: async () => { + return await request.get({ url: `/clinic/room/list-all-bed` }) } } diff --git a/src/components/RoomStatus/src/RoomStatus.vue b/src/components/RoomStatus/src/RoomStatus.vue index a65f8d4..8d18057 100644 --- a/src/components/RoomStatus/src/RoomStatus.vue +++ b/src/components/RoomStatus/src/RoomStatus.vue @@ -1,6 +1,7 @@ <script lang="ts" setup> -import {BedStatusVO} from "@/views/ecg/room/index"; +import { RoomApi, RoomVO } from '@/api/ecg/room' import {PropType} from "vue"; + defineComponent({ name: 'RoomStatus' @@ -8,22 +9,18 @@ const props = defineProps({ title: { - type: String, - required: true - }, - doctorNum: { type: Number, required: true }, - modelValue: { - type: Array as PropType<BedStatusVO[]>, + bedList: { + type: Array as PropType<RoomVO[]>, required: true } }) const onclick = (item) => { console.error(item); - item.opStatus = !item.opStatus; + item.onstage = !item.onstage; } </script> @@ -31,13 +28,13 @@ <template> <el-card style="width: 180px" shadow="hover" > <template #header>{{title}}</template> - <div v-for="(bedItem, index) in modelValue" :key="index"> - <img v-if="bedItem.opStatus" + <div v-for="(bedItem, index) in bedList" :key="index"> + <img v-if="bedItem.onstage" src="@/assets/room/doctor.png" style="width: 100%" @click = onclick(bedItem) /> - <img v-if="!bedItem.opStatus" + <img v-if="!bedItem.onstage" src="@/assets/room/doctor-off.jpeg" style="width: 100%" @click = onclick(bedItem) diff --git a/src/views/ecg/room/RoomStatusSetting.vue b/src/views/ecg/room/RoomStatusSetting.vue index 98c12e5..14a7bb2 100644 --- a/src/views/ecg/room/RoomStatusSetting.vue +++ b/src/views/ecg/room/RoomStatusSetting.vue @@ -1,20 +1,27 @@ <template> - <RoomStatus title="璇婂206" :doctorNum="3" v-model="bedStatusVo"/> + <div style="display: flex; flex-wrap: wrap;"> + <div v-for="(value2, key) in bedMap" :key="key"> + <RoomStatus :title="key" :bedList="value2"/> + </div> + </div> </template> <script setup lang="ts"> import {RoomStatus} from "@/components/RoomStatus" -import {BedStatusVO} from "@/views/ecg/room/index"; +import { RoomApi, RoomVO } from '@/api/ecg/room' -const bedStatusVo: BedStatusVO[] = reactive([{ - bedNo: "a9", - opStatus: true -}, - { - bedNo: "a18", - opStatus: false - } -]) +const bedMap = ref<Map<number, RoomVO[]>>() // 鍒楄〃鐨勬暟鎹� + +/** 鏌ヨ鍒楄〃 */ +const getList = async () => { + const data = await RoomApi.getAllBedMap() + bedMap.value = data as Map<number, RoomVO[]> +} + +/** 鍒濆鍖� **/ +onMounted(() => { + getList() +}) </script> diff --git a/src/views/ecg/room/index.ts b/src/views/ecg/room/index.ts deleted file mode 100644 index a34c41f..0000000 --- a/src/views/ecg/room/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -export interface BedStatusVO { - bedNo: String; // 璇婄枟搴婂彿 - opStatus: boolean; // 璇婄枟搴婅瘖鐤楃姸鎬� -} - -- Gitblit v1.9.3