From f030d8a9607cef32ee41e01d96817c7e47681602 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 30 五月 2025 15:18:47 +0800
Subject: [PATCH] 11

---
 src/views/ecg/doctor/DevInstall.vue |   53 +++++++++++++++++++++++++++++++++--------------------
 1 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/src/views/ecg/doctor/DevInstall.vue b/src/views/ecg/doctor/DevInstall.vue
index 4597772..6b4866c 100644
--- a/src/views/ecg/doctor/DevInstall.vue
+++ b/src/views/ecg/doctor/DevInstall.vue
@@ -3,22 +3,24 @@
 import DevInstallPanel from "@/views/ecg/doctor/components/DevInstallPanel.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 {useRoomStore} from "@/store/modules/room";
 
-const userStore = useUserStore();
+const roomStore = useRoomStore();
 
 const roomBedVO = ref<RoomBedVO>({
     roomId: null,
     roomName: null,
-    bedNo: null
+    bedNo: null,
+    checkTypes: null,
+    opType: null
 })
 
-const installingPatient = ref<QueueVO>({
+let installingPatient: 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
-})
+}
 
 const patientStat = ref<PatientStatisticVO>({
     finishedNum: 0,
@@ -28,6 +30,7 @@
     queuingNum: 0
 })
 
+const autoCall = ref<boolean>(false);
 const state = ref<boolean>()
 
 const patientList = ref<QueueVO[]>([])
@@ -45,7 +48,7 @@
     getInstallingPatient()
 
     // 鐢ㄤ簬瑙ｅ喅 宸︿晶閲嶇疆鍚� 鑾峰彇褰撳墠 銆愬畨瑁呬腑銆戞偅鑰�
-    setInstallingPatient(installingPatient.value)
+    setInstallingPatient(installingPatient)
   } finally {
     finishFlag.value = false
   }
@@ -67,11 +70,11 @@
 }
 
 const getInstallingPatient = () => {
-  const tempPatient : QueueVO | undefined = patientList.value.find(item => item.status === 36)
-  if (undefined === tempPatient) {
+  const tempPatient : QueueVO | undefined | null = patientList.value.find(item => item.status === 36)
+  if (tempPatient == null) {
     //setInstallingPatient(undefined)
-  } else if (tempPatient.patId !== installingPatient.value.patId) {
-    installingPatient.value= tempPatient
+  } else if (tempPatient.patId !== installingPatient.patId) {
+    installingPatient = tempPatient
     setInstallingPatient(tempPatient)
   }
 }
@@ -125,10 +128,12 @@
   finishFlag.value = true
   passFlag.value = true
 
-  if (userStore.isSetRoom) {
-    roomBedVO.value.roomId = userStore.room!.roomId
-    roomBedVO.value.roomName = userStore.room!.roomName
-    roomBedVO.value.bedNo = userStore.room!.bedNo
+  if (roomStore.isSetRoom) {
+    roomBedVO.value.roomId = roomStore.room!.roomId
+    roomBedVO.value.roomName = roomStore.room!.roomName
+    roomBedVO.value.bedNo = roomStore.room!.bedNo
+    roomBedVO.value.checkTypes = roomStore.room!.checkTypes
+    roomBedVO.value.opType = roomStore.room!.opType
 
     timerRunFlag = true
     doctorTimer()
@@ -149,9 +154,16 @@
 })
 
 const onEventDevInstall = () => {
-   //console.info("onDevInstallPanelEvent...")
-  installingPatient.value.patId = ""
-  initLoad()
+  installingPatient = {
+    bedNo: "", bookCheckType: 0, bookTimeslot: 0, expired: 0, id: 0, jumpFlag: 0, passed: 0,
+    patGender: 0, patId: "", patName: "", roomId: 0, roomName: "", seqNum: 0, status: 0
+  }
+
+  if (autoCall.value) {
+    finishNextPatient()
+  } else {
+    initLoad()
+  }
 }
 
 const onEventRecallFinish = () => {
@@ -169,17 +181,18 @@
 <template>
   <el-container>
     <el-header style="background-color: var(--el-color-primary-light-7); font-size: 24px">
-      <TitlePanel :titleType=1 :room="roomBedVO" :patientStatistic="patientStat" />
+      <TitlePanel :titleType=2 :room="roomBedVO" :patientStatistic="patientStat" />
     </el-header>
     <el-container style="height: 100%;">
       <el-main style="border: solid var(--el-color-primary-light-7)">
         <DevInstallPanel :room="roomBedVO" ref="devInstallPanelRef" @event_dev_install="onEventDevInstall"/>
       </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="鑷姩&nbsp;" 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>
@@ -192,7 +205,7 @@
 .right-bottom {
   position: absolute;
   bottom: 50px;
-  right: 100px;
+  right: 80px;
   //background-color: #f00;
   //color: #fff;
   //padding: 10px;

--
Gitblit v1.9.3