From 669564c536ae5c0fb1ea2f703ea07cd6b6207124 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 30 八月 2024 13:36:53 +0800
Subject: [PATCH] update
---
src/views/ecg/doctor/components/TitlePanel.vue | 13 +++++--------
src/views/ecg/doctor/index.vue | 16 ++++++++++++----
2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/views/ecg/doctor/components/TitlePanel.vue b/src/views/ecg/doctor/components/TitlePanel.vue
index 3fba55b..c39ed01 100644
--- a/src/views/ecg/doctor/components/TitlePanel.vue
+++ b/src/views/ecg/doctor/components/TitlePanel.vue
@@ -3,18 +3,15 @@
import {useUserStore} from "@/store/modules/user";
import {PatientStatisticVO, RoomBedVO} from "@/api/ecg/doctor";
-const userStore = useUserStore();
-
defineComponent({
name: 'TitlePanel'
})
-const roomBedVO: RoomBedVO = {
- roomId: userStore.room!.roomId,
- bedNo: userStore.room!.bedNo
-}
-
const props = defineProps({
+ room: {
+ type: Object as PropType<RoomBedVO>,
+ required: true
+ },
patientStatistic: {
type: Object as PropType<PatientStatisticVO>,
required: true
@@ -26,7 +23,7 @@
<template>
<div class="mytitle">
<div>
- 璇婂{{roomBedVO.roomId}} 宸ヤ綅{{roomBedVO.bedNo}}
+ 璇婂{{room.roomId}} 宸ヤ綅{{room.bedNo}}
</div>
<div>
宸插氨璇妠{patientStatistic.finishedNum==undefined ? 0 : patientStatistic.finishedNum}}
diff --git a/src/views/ecg/doctor/index.vue b/src/views/ecg/doctor/index.vue
index 86edce1..bf00fc3 100644
--- a/src/views/ecg/doctor/index.vue
+++ b/src/views/ecg/doctor/index.vue
@@ -8,8 +8,8 @@
const userStore = useUserStore();
const roomBedVO: RoomBedVO = {
- roomId: userStore.room!.roomId,
- bedNo: userStore.room!.bedNo
+ roomId: null,
+ bedNo: null
}
const patientStat = ref<PatientStatisticVO>({
@@ -73,10 +73,18 @@
/** 鍒濆鍖� **/
onMounted(() => {
- console.info("onMounted - doctor")
+ console.info("onMounted - doctor " + userStore.isSetRoom)
bedControlFlag.value = true
finishFlag.value = true
passFlag.value = true
+
+ if (userStore.isSetRoom) {
+ roomBedVO.roomId = userStore.room!.roomId
+ roomBedVO.bedNo = userStore.room!.bedNo
+ } else {
+ roomBedVO.roomId = null
+ roomBedVO.bedNo = null
+ }
timerRunFlag = true
doctorTimer()
@@ -96,7 +104,7 @@
<template>
<el-container>
<el-header style="background-color: var(--el-color-primary-light-7); font-size: 24px">
- <TitlePanel :patientStatistic="patientStat" />
+ <TitlePanel :room="roomBedVO" :patientStatistic="patientStat" />
</el-header>
<el-container>
<el-main>
--
Gitblit v1.9.3