From 49206ee0689d44367b9f5de3decf0c3ec02bfb51 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期二, 15 四月 2025 10:56:18 +0800 Subject: [PATCH] update --- src/views/ecg/doctor/Routine.vue | 41 ++++++++++++++++++++++++++++------------- 1 files changed, 28 insertions(+), 13 deletions(-) diff --git a/src/views/ecg/doctor/Routine.vue b/src/views/ecg/doctor/Routine.vue index 252127f..c85e051 100644 --- a/src/views/ecg/doctor/Routine.vue +++ b/src/views/ecg/doctor/Routine.vue @@ -1,33 +1,39 @@ +<!--甯歌妫�鏌ョ晫闈�--> <script setup lang="ts"> import TitlePanel from "@/views/ecg/doctor/components/TitlePanel.vue"; import QueuePanel from "@/views/ecg/doctor/components/QueuePanel.vue"; import {DoctorApi, PatientStatisticVO, RoomBedVO} from '@/api/ecg/doctor'; -import {useUserStore} from "@/store/modules/user"; import {QueueVO} from "@/api/ecg/queue"; import {ElNotification} from "element-plus"; -import DevReadyPanel from "@/views/ecg/doctor/components/DevReadyPanel.vue"; import RoutinePanel from "@/views/ecg/doctor/components/RoutinePanel.vue"; +import {useRoomStore} from "@/store/modules/room"; -const userStore = useUserStore(); +const roomStore = useRoomStore(); const roomBedVO: RoomBedVO = { roomId: null, roomName: null, - bedNo: null + bedNo: null, + checkTypes: null, + opType: null } const onStagePatient = ref<QueueVO>({ - bedNo: "", bookCheckType: 0, bookTimeslot: 0, expired: 0, id: 0, jumpFlag: 0, passed: 0, - patGender: 0, patId: "", patName: "", roomId: 0, roomName: "", seqNum: 0, status: 0 + id: 0, patId: "", patName: "", patGender: 0, + bookTimeslot: 0, bookCheckType: 0, isVip: 0, seqNum: 0, bookSeqNum: 0, + passed: 0, expired: 0, jumpFlag: 0, + roomId: 0, roomName: "", bedNo: "", status: 0 }) const patientStat = ref<PatientStatisticVO>({ finishedNum: 0, readyNum: 0, + receivedNum: 0, passedNum: 0, queuingNum: 0 }) +const autoCall = ref<boolean>(false); const state = ref<boolean>() const patientList = ref<QueueVO[]>([]) @@ -125,10 +131,12 @@ finishFlag.value = true passFlag.value = true - if (userStore.isSetRoom) { - roomBedVO.roomId = userStore.room!.roomId - roomBedVO.roomName = userStore.room!.roomName - roomBedVO.bedNo = userStore.room!.bedNo + if (roomStore.isSetRoom) { + roomBedVO.roomId = roomStore.room!.roomId + roomBedVO.roomName = roomStore.room!.roomName + roomBedVO.bedNo = roomStore.room!.bedNo + roomBedVO.checkTypes = roomStore.room!.checkTypes + roomBedVO.opType = roomStore.room!.opType timerRunFlag = true doctorTimer() @@ -149,6 +157,12 @@ const onEventRoutine = () => { //console.info("onDevRentPanelEvent...") onStagePatient.value.patId = "" + + if (autoCall.value) { + finishNextPatient() + } else { + initLoad() + } } const onEventRecallFinish = () => { @@ -166,17 +180,18 @@ <template> <el-container> <el-header style="background-color: var(--el-color-primary-light-7); font-size: 24px"> - <TitlePanel :titleType=2 :room="roomBedVO" :patientStatistic="patientStat" /> + <TitlePanel :titleType=0 :room="roomBedVO" :patientStatistic="patientStat" /> </el-header> <el-container style="height: 100%;"> <el-main style="border: solid var(--el-color-primary-light-7)"> <RoutinePanel :room="roomBedVO" ref="routimePanelRef" @event_routine="onEventRoutine"/> </el-main> <el-aside width="400px" style="border: solid var(--el-color-primary-light-7)"> - <QueuePanel :queue="patientList" @event_RecallFinish="onEventRecallFinish"/> + <QueuePanel :room="roomBedVO" :queue="patientList" @event_RecallFinish="onEventRecallFinish"/> </el-aside> </el-container> <el-container class="right-bottom"> + <el-checkbox label="鑷姩 " v-model="autoCall" /> <el-button :disabled="finishFlag" type="primary" @click="finishNextPatient">鍙彿</el-button> <el-button :disabled="passFlag" type="primary" @click="passNextPatient">杩囧彿</el-button> <el-button type="primary" @click="callAgain">閲嶅彨</el-button> @@ -189,7 +204,7 @@ .right-bottom { position: absolute; bottom: 50px; - right: 100px; + right: 80px; //background-color: #f00; //color: #fff; //padding: 10px; -- Gitblit v1.9.3