From 01ee694a3bb8048372fc793a8de314d70b688b35 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期日, 18 十月 2026 22:36:21 +0800
Subject: [PATCH] 修改了工位
---
src/views/ecg/doctor/DevInstall.vue | 236 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 200 insertions(+), 36 deletions(-)
diff --git a/src/views/ecg/doctor/DevInstall.vue b/src/views/ecg/doctor/DevInstall.vue
index 823f41a..49e03f2 100644
--- a/src/views/ecg/doctor/DevInstall.vue
+++ b/src/views/ecg/doctor/DevInstall.vue
@@ -7,9 +7,11 @@
import TitlePanel from "@/views/ecg/doctor/components/TitlePanel.vue";
import DevInstallPanel from "@/views/ecg/doctor/components/DevInstallPanel.vue";
import QueuePanel from "@/views/ecg/doctor/components/QueuePanel.vue";
+import DoctorPageLayout from "@/components/DoctorPageLayout/src/DoctorPageLayout.vue";
import {DoctorApi, PatientStatisticVO, RoomBedVO} from '@/api/ecg/doctor';
+import { notifySeatInvalidOnce, isSeatInvalidError, resetSeatInvalidNotify } from '@/utils/seatGuard'
import {QueueVO} from "@/api/ecg/queue";
-import {ElNotification} from "element-plus";
+import {ElMessage, ElMessageBox} from "element-plus";
import {useRoomStore} from "@/store/modules/room";
const roomStore = useRoomStore();
@@ -39,6 +41,8 @@
const state = ref<boolean>()
const patientList = ref<QueueVO[]>([])
+/** 銆愯嚜鍔╄瘖鏂�戞渶杩戜竴娆″彇鏁扮殑璇存槑锛堢┖鍒楄〃鏃舵樉绀猴級 */
+const fetchInfo = ref('')
let timerRunFlag : boolean = false
const bedControlFlag = ref<boolean>(true);
@@ -86,22 +90,126 @@
const initLoad = async () => {
if (roomBedVO.value.roomId == null) {
- ElNotification.error({
- message: '璇烽噸鏂板氨搴�!',
- type: 'info',
- duration: 3000 // 鑷姩鍏抽棴鏃堕棿锛岄粯璁や负3000ms
- })
+ // 銆愭湰闇�姹傘�戞病鏈夊伐浣嶏細鍋滄帀杞骞跺彧鎻愮ず涓�娆★紙鍘熸潵姣� 5 绉掑脊涓�娆★紝鐜板満琛ㄧ幇灏辨槸涓�鐩磋烦锛�
+ timerRunFlag = false
+ notifySeatInvalidOnce()
return
}
- patientList.value = await DoctorApi.getToBeInstalledPatientList(roomBedVO.value)
+ patientList.value = (await DoctorApi.getToBeInstalledPatientList(roomBedVO.value)) || []
+ // 銆愯嚜鍔╄瘖鏂�戣褰曟湰娆″彇鏁版椂闂翠笌鏉℃暟锛堢┖鍒楄〃鏃舵樉绀猴級
+ fetchInfo.value = `鏈�杩戝彇鏁� ${new Date().toLocaleTimeString()} 路 杩斿洖 ${patientList.value.length} 鏉
getInstallingPatient()
patientStat.value = await DoctorApi.getDevInstallStatistic(roomBedVO.value)
- const queueVO2 = await DoctorApi.bedDoctorGet(roomBedVO.value)
- if (queueVO2.status === 20)
+ // 銆愭湰闇�姹傘�慴ed-doctor-get 鏄�愭垜鏄惁杩樺潗鍦ㄨ繖閲屻�戠殑鍒ゅ畾锛氬け璐ヨ鏄庡伐浣嶅凡琚噴鏀� / 浠栦汉鎺ユ墜锛�
+ // 姝ゆ椂鍋滄帀杞骞朵竴娆℃�ф彁绀猴紝閬垮厤姣� 5 绉掑埛涓�娆°�愯閲嶆柊灏卞骇銆戙��
+ let queueVO2: any
+ try {
+ queueVO2 = await DoctorApi.bedDoctorGet(roomBedVO.value)
+ } catch (e: any) {
+ if (isSeatInvalidError(e)) {
+ timerRunFlag = false
+ notifySeatInvalidOnce()
+ return
+ }
+ throw e
+ }
+ // 銆愬姞鍥恒�戞帴鍙e彲鑳借繑鍥� null锛屽師鏉ョ洿鎺ュ彇 .status 浼氭姏寮傚父銆佷腑鏂湰杞悗缁楠�
+ if (queueVO2 && queueVO2.status === 20)
state.value = true
- else if (queueVO2.status === 30)
+ else if (queueVO2 && queueVO2.status === 30)
state.value = false
+ // 闇�姹�3锛氬悓姝�"鍋滄鍊欒瘖"寮�鍏崇姸鎬�
+ await loadStopReady()
+}
+
+// ==================== 闇�姹�3锛氬仠姝㈠�欒瘖寮�鍏� ====================
+// 寮�鍚悗銆愬凡鏈夊�欒瘖鐥呬汉缁х画鍙彿锛屼絾涓嶅啀鏂板鍊欒瘖鐥呬汉銆戯紱鍏抽棴鍚庢仮澶嶃��
+// 娉細瑁呮満宸ヤ綅(opType=2)鏈韩涓嶈繘"鍒嗘祦闃熷垪"锛岃寮�鍏冲瑁呮満宸ヤ綅
+// 涓昏鐢ㄤ簬"鍋滄鎺ユ敹鏂扮殑寰呰鏈烘偅鑰�"鐨勮涔夌粺涓�涓庣姸鎬佸彲瑙併��
+const stopReady = ref<boolean>(false)
+const stopReadyFlag = ref<boolean>(true)
+
+const loadStopReady = async () => {
+ try {
+ stopReady.value = await DoctorApi.getStopReady(roomBedVO.value)
+ } catch (e) {
+ // 鏌ヨ澶辫触涓嶆墦鏂疆璇�
+ } finally {
+ stopReadyFlag.value = false
+ }
+}
+
+const onStopReadyChange = async (val: boolean) => {
+ stopReadyFlag.value = true
+ try {
+ if (val) {
+ await DoctorApi.stopReady(roomBedVO.value)
+ ElMessage.success('宸插仠姝㈠�欒瘖锛氫笉鍐嶆帴鏀舵柊鐨勫�欒瘖鎮h�咃紝宸叉湁鎮h�呬粛鍙甯稿彨鍙�')
+ } else {
+ await DoctorApi.resumeReady(roomBedVO.value)
+ ElMessage.success('宸叉仮澶嶅�欒瘖锛氬紑濮嬫帴鏀舵柊鐨勫�欒瘖鎮h��')
+ }
+ await initLoad()
+ } catch (e) {
+ stopReady.value = !val
+ } finally {
+ stopReadyFlag.value = false
+ }
+}
+
+// ==================== 闇�姹�2锛氭挙閿�鍙彿 / 鎾ら攢瑁呮満瀹屾垚 ====================
+const undoFlag = ref<boolean>(false)
+
+const undoCall = async () => {
+ try {
+ await ElMessageBox.confirm(
+ '纭畾瑕佹挙閿�鏈鍙彿鍚楋紵璇ユ偅鑰呭皢鍥炲埌鍊欒瘖鍖猴紝鍙噸鏂板彨鍙枫��',
+ '鎾ら攢鍙彿',
+ { type: 'warning', confirmButtonText: '纭畾鎾ら攢', cancelButtonText: '鍙栨秷' }
+ )
+ } catch {
+ return
+ }
+ undoFlag.value = true
+ try {
+ const msg = await DoctorApi.undoCallPatient(roomBedVO.value)
+ ElMessage.success(msg || '宸叉挙閿�鍙彿')
+ await initLoad()
+ } finally {
+ undoFlag.value = false
+ }
+}
+
+const undoFinish = async () => {
+ const last = await DoctorApi.lastFinishedPatient(roomBedVO.value)
+ if (!last || !last.patId) {
+ ElMessage.warning('鏈伐浣嶄粖鏃ユ殏鏃犲凡瀹屾垚鐨勬鏌ヨ褰�')
+ return
+ }
+ try {
+ await ElMessageBox.confirm(
+ `纭畾鎾ら攢銆�${last.patName || last.patId}銆嶇殑瀹屾垚鎿嶄綔鍚楋紵璇ユ偅鑰呭皢鍥炲埌鍊欒瘖鍖恒�俙,
+ '鎾ら攢',
+ { type: 'warning', confirmButtonText: '纭畾鎾ら攢', cancelButtonText: '鍙栨秷' }
+ )
+ } catch {
+ return
+ }
+ undoFlag.value = true
+ try {
+ const msg = await DoctorApi.undoFinishPatient({
+ ...roomBedVO.value,
+ patId: last.patId,
+ checkType: last.bookCheckType
+ } as any)
+ ElMessage.success(msg || '宸叉挙閿�')
+ // 銆愭挙閿�鏍囪瘑銆戞挙閿�鍚庣珛鍒诲埛鏂般�屽凡瀹屾垚璁板綍銆嶅垪琛紝璁╄繖鏉¤褰曟樉绀烘垚銆屽凡鎾ら攢銆�
+ devInstallPanelRef.value?.getList?.()
+ await initLoad()
+ } finally {
+ undoFlag.value = false
+ }
}
const bedControl = async () => {
@@ -121,12 +229,44 @@
const doctorTimer = () => {
console.log('doctorTimer ...')
- initLoad()
+ // 銆愬姞鍥恒�戝崟杞彇鏁板け璐ヤ笉鑳藉彉鎴� unhandled rejection锛堝師鏉� `initLoad()` 涓� await 涓� catch锛�
+ // 鏌愯疆鎺ュ彛寮傚父浼氳椤甸潰鍋滃湪鏃ф暟鎹紝鐜板満琛ㄧ幇灏辨槸"鍒楄〃涓�鐩存槸绌虹殑"锛夈��
+ initLoad().catch((e) => console.error('[doctorTimer] 鏈疆鍙栨暟澶辫触锛堝凡蹇界暐锛屼笅涓�杞户缁級', e))
if (timerRunFlag)
setTimeout(doctorTimer, 5000) // five seconds
}
/** 鍒濆鍖� **/
+/**
+ * 銆愪富/鍥磋銆戣窡闅� store 鍒囨崲"姝e湪鏌ョ湅鐨勫伐浣�"锛堝師鏉ュ彧鍦� onMounted 鎷蜂竴娆★紝
+ * 鍒囧埌鍒殑浜哄伐浣嶅洿瑙傚悗鏈〉鏁版嵁涓嶅彉锛屽繀椤诲埛鏂伴〉闈㈡墠鐢熸晥锛夈��
+ */
+watch(
+ () => [roomStore.room?.roomId, roomStore.room?.bedNo],
+ async () => {
+ if (!roomStore.room) return
+ 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
+ // 銆愭湰闇�姹傘�戦噸鏂版嬁鍒板伐浣� -> 澶嶄綅銆愬伐浣嶅け鏁堛�戞彁绀猴紝鍏佽涓嬫鍐嶆彁绀轰竴娆�
+ resetSeatInvalidNotify()
+ // 銆愭湰娆¢渶姹傘�戞崲宸ヤ綅鍚�**鏁撮〉鏁版嵁閮芥崲鎴愭柊宸ヤ綅鐨�**锛�
+ // 鈶� 鍏堟竻绌哄乏渚�"鎮h�呬俊鎭�"锛堥伩鍏嶈繕鏄剧ず涓婁竴涓伐浣嶇殑鎮h�咃級
+ devInstallPanelRef.value?.setPatient?.(undefined)
+ // 鈶� 鍚姩/缁х画鍙栨暟瀹氭椂鍣紙寰呰鍒楄〃銆佺粺璁°�佸綋鍓嶅彨鍙锋偅鑰呫�佸仠姝㈠�欒瘖寮�鍏抽兘浼氬埛鏂帮級
+ if (!timerRunFlag && roomBedVO.value.roomId != null) {
+ timerRunFlag = true
+ doctorTimer()
+ } else if (roomBedVO.value.roomId != null) {
+ await initLoad()
+ }
+ // 鈶� 鍒锋柊銆屽凡瀹屾垚鍒楄〃銆嶏紙闈㈡澘鍐呬細鎸夋柊宸ヤ綅鐨� checkTypes 閲嶆柊杩囨护锛�
+ devInstallPanelRef.value?.getList?.()
+ }
+)
+
onMounted(() => {
timerRunFlag = false
bedControlFlag.value = true
@@ -139,6 +279,7 @@
roomBedVO.value.bedNo = roomStore.room!.bedNo
roomBedVO.value.checkTypes = roomStore.room!.checkTypes
roomBedVO.value.opType = roomStore.room!.opType
+ resetSeatInvalidNotify()
timerRunFlag = true
doctorTimer()
@@ -184,35 +325,58 @@
</script>
<template>
- <el-container>
- <el-header style="background-color: var(--el-color-primary-light-7); font-size: 24px">
+ <!--
+ 甯冨眬浼樺寲锛氬姛鑳芥寜閽浐瀹氬湪椤甸潰搴曢儴锛屼笉鍐嶇敤 position:absolute 娴湪鍐呭涓娿��
+ 璇﹁ components/DoctorPageLayout锛堜笌鍙彿妫�鏌�/璁惧棰嗙敤椤靛叡鐢ㄥ悓涓�甯冨眬锛夈��
+ -->
+ <DoctorPageLayout :bed-switch-enabled="false">
+ <template #header>
<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 :room="roomBedVO" :queue="patientList" @event_RecallFinish="onEventRecallFinish"/>
- </el-aside>
- </el-container>
- <el-container class="right-bottom">
+ </template>
+
+ <DevInstallPanel
+ :room="roomBedVO"
+ ref="devInstallPanelRef"
+ :undo-disabled="undoFlag"
+ :undo-loading="undoFlag"
+ @event_dev_install="onEventDevInstall"
+ @event_undo_finish="undoFinish"
+ />
+
+ <template #aside>
+ <QueuePanel :room="roomBedVO" :queue="patientList" :fetch-info="fetchInfo"
+ @event_RecallFinish="onEventRecallFinish"/>
+ </template>
+
+
+ <!-- 搴曢儴鎺т欢锛氳嚜鍔� + 鍔熻兘鎸夐挳 + 鍋滄鍊欒瘖锛屾暣缁勯潬鍙� -->
+ <template #footer>
+ <!-- 鑷姩 澶嶉�夋 -->
<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>
+ <el-button type="primary" @click="callAgain">閲嶅彨</el-button>
<el-button :disabled="bedControlFlag" type="primary" @click="bedControl">{{state?'鏆傚仠':'鎭㈠'}}</el-button>
- </el-container>
- </el-container>
+ <!-- 闇�姹�3锛氬仠姝㈠�欒瘖寮�鍏筹紙宸叉湁鍊欒瘖鐥呬汉缁х画鍙彿锛屼絾涓嶅啀鏂板鍊欒瘖鐥呬汉锛� -->
+ <el-switch
+ v-model="stopReady"
+ :disabled="stopReadyFlag"
+ active-text="鍋滄鍊欒瘖"
+ inactive-text="姝e父鎺ヨ瘖"
+ inline-prompt
+ style="--el-switch-on-color: #e6a23c"
+ @change="onStopReadyChange"
+ />
+
+ <!-- 闇�姹�2锛氭挙閿�璇偣鍙彿锛堝洖鍒板�欒瘖鍖猴級銆�
+ 闇�姹�11锛氥�屾挙閿�瀹屾垚銆嶅凡鏀瑰悕涓恒�屾挙閿�銆嶏紝骞剁Щ鍒般�屽凡瀹屾垚瑁呮満璁板綍鍒楄〃銆嶇殑鏈�鍓嶉潰銆� -->
+ <el-button :disabled="undoFlag" type="warning" plain @click="undoCall">鎾ら攢鍙彿</el-button>
+ </template>
+ </DoctorPageLayout>
</template>
-<style scoped lang="scss">
-.right-bottom {
- position: absolute;
- bottom: 50px;
- right: 80px;
- //background-color: #f00;
- //color: #fff;
- //padding: 10px;
-}
-</style>
+<!--
+ 鍘熷厛杩欓噷鏈� .right-bottom { position:absolute; bottom:50px; right:80px }锛�
+ 姝f槸"璁板綍鍒楄〃鍙橀暱鍚庣洊浣忓姛鑳芥寜閽�"鐨勬牴鍥狅紙鎸夐挳鑴辩鏂囨。娴併�佷笉鍗犲竷灞�绌洪棿锛夈��
+ 鐜版敼鐢� DoctorPageLayout 鐨� #footer 鎵胯浇锛氭甯告枃妗f祦涓殑鍥哄畾搴曟爮锛屾棤闇�鍋忕Щ銆�
+-->
--
Gitblit v1.9.3