From 1446994d504819c367e1ff667360eadb314f9ac6 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期日, 18 十月 2026 16:52:18 +0800
Subject: [PATCH] 修改了诊室工号
---
src/views/ecg/checktype/QueueSequenceForm.vue | 4
src/views/ecg/room/index.vue | 28
src/api/ecg/screen/index.ts | 2
src/views/ecg/doctor/components/BedSwitchSelect.vue | 257 +++
.env.local | 18
src/views/ecg/doctor/components/DevInstallPanel.vue | 78
src/views/ecg/doctor/components/DevReadyPanel.vue | 77
src/utils/statusFormatter.ts | 2
vite.config.ts | 15
src/views/ecg/doctor/components/PatientInfoBlock.vue | 22
src/views/ecg/queue/QueueForm.vue | 4
src/views/ecg/doctor/components/QueuePanel.vue | 207 ++
src/api/ecg/jobrecord/index.ts | 26
src/store/modules/room.ts | 351 +++++
src/views/ecg/appointment/alter.vue | 133 +
src/views/ecg/doctor/components/RoutinePanel.vue | 83
src/views/ecg/appointment/index.vue | 86
src/views/ecg/doctor/DevInstall.vue | 50
src/views/ecg/room/RoomLoginSelect.vue | 634 +++++++-
src/views/ecg/checktype/index.vue | 150 -
nginx.conf | 180 ++
src/api/ecg/room/index.ts | 122 +
src/views/ecg/doctor/Routine.vue | 140 ++
src/views/ecg/room/RoomSetting.vue | 130 +
src/views/ecg/room/RoomForm.vue | 9
src/permission.ts | 65
src/views/ecg/appointment/CheckItemPanel.vue | 31
src/views/ecg/doctor/DevDismantle.vue | 86 +
src/layout/components/CurrentRoomTag.vue | 87 +
src/layout/components/ToolHeader.vue | 3
src/components/DoctorPageLayout/src/DoctorPageLayout.vue | 350 +++++
src/components/RoomBedSelect/src/RoomBedSelect.vue | 61
src/views/ecg/doctor/index.vue | 125 +
src/api/ecg/doctor/index.ts | 25
src/views/ecg/queue/index.vue | 194 +-
src/utils/releaseBed.ts | 2
src/views/ecg/checktype/CheckTypeForm.vue | 36
37 files changed, 3,292 insertions(+), 581 deletions(-)
diff --git a/.env.local b/.env.local
index 005d2f0..ced0a77 100644
--- a/.env.local
+++ b/.env.local
@@ -4,12 +4,24 @@
VITE_DEV=true
# 璇锋眰璺緞
-VITE_BASE_URL='http://localhost:48080'
+#
+# 銆愪负浠�涔堢暀绌恒�慳xios 鐨� baseURL = VITE_BASE_URL + VITE_API_URL锛堣 src/config/axios/config.ts锛夈��
+# 鍘熷�� 'http://localhost:48080' 浼氭嫾鎴愮粷瀵瑰湴鍧� http://localhost:48080/admin-api锛�
+# 浜庢槸娴忚鍣�**鐩磋繛鍚庣銆佺粫杩� vite 鐨� /admin-api 浠g悊**锛�
+# 路 Windows 涓� localhost 浼樺厛瑙f瀽涓� IPv6锛屽悗绔湅鍒扮殑瀹㈡埛绔湴鍧�鏄洖鐜� ::1锛堜笉鏄湰鏈哄眬鍩熺綉IP锛夛紱
+# 路 鍚庢灉锛歴ystem_login_log.user_ip 璁版垚 0:0:0:0:0:0:0:1锛�
+# "鎸塈P鑷姩鍖归厤璇婂宸ヤ綅"锛坋cg.room.select.mode=1/3锛夋案杩滃尮閰嶄笉鍒帮紝
+# 涔熸棤娉曟妸鏈満IP鍐欏叆 clinic_room.ip锛�"閫夋嫨宸ヤ綅妯″紡"楠岃瘉涓嶄簡锛夈��
+# 鐣欑┖鍚� baseURL = "/admin-api"锛堢浉瀵硅矾寰勶級锛岃姹傜粡 vite 浠g悊杞彂锛�
+# 浠g悊宸查厤 xfwd: true锛屼細鎶婄湡瀹炲鎴风IP鍐欏叆 X-Forwarded-For锛屽悗绔嵆鍙嬁鍒版纭殑 IPv4銆�
+# 娉ㄦ剰锛氱敤 **127.0.0.1 鎴� localhost 璁块棶浠嶇劧鏄洖鐜湴鍧�**锛堟棤娉曚綔涓哄伐浣嶆爣璇嗭級锛�
+# 璇风敤鏈満灞�鍩熺綉鍦板潃璁块棶锛屼緥濡� http://192.168.3.15/ 銆�
+VITE_BASE_URL=''
# 鏂囦欢涓婁紶绫诲瀷锛歴erver - 鍚庣涓婁紶锛� client - 鍓嶇鐩磋繛涓婁紶锛屼粎鏀寔 S3 鏈嶅姟
VITE_UPLOAD_TYPE=server
-# 涓婁紶璺緞
-VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
+# 涓婁紶璺緞锛堝悓鏍锋敼涓虹浉瀵硅矾寰勶紝璧� vite 浠g悊锛岄伩鍏嶇洿杩� localhost 涓P锛�
+VITE_UPLOAD_URL='/admin-api/infra/file/upload'
# 鎺ュ彛鍦板潃
VITE_API_URL=/admin-api
diff --git a/nginx.conf b/nginx.conf
new file mode 100644
index 0000000..4d97b21
--- /dev/null
+++ b/nginx.conf
@@ -0,0 +1,180 @@
+
+user nginx;
+worker_processes auto;
+
+error_log /var/log/nginx/error.log notice;
+pid /var/run/nginx.pid;
+
+
+events {
+ worker_connections 1024;
+}
+
+
+http {
+ include /etc/nginx/mime.types;
+ default_type application/octet-stream;
+
+ log_format main '$remote_addr - $remote_user [$time_local] "$request" '
+ '$status $body_bytes_sent "$http_referer" '
+ '"$http_user_agent" "$http_x_forwarded_for"';
+
+ access_log /var/log/nginx/access.log main;
+
+ sendfile on;
+ #tcp_nopush on;
+
+ keepalive_timeout 65;
+
+ #gzip on;
+
+ include /etc/nginx/conf.d/*.conf;
+
+ server {
+ listen 8081;
+ server_name localhost;
+ charset utf-8;
+
+ location / {
+ root /usr/local/smartor/patient/admin;
+ try_files $uri $uri/ /index.html;
+ index index.html index.htm;
+ }
+
+ location /api/{
+ proxy_set_header Host $http_host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header REMOTE-HOST $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_pass http://127.0.0.1:8090;
+ }
+
+ error_page 500 502 503 504 /50x.html;
+ location = /50x.html {
+ root html;
+ }
+ }
+
+ server {
+ listen 8082;
+ server_name localhost;
+ charset utf-8;
+
+ location / {
+ root /usr/local/smartor/patient/doctor;
+ try_files $uri $uri/ /index.html;
+ index index.html index.htm;
+ }
+
+ location /api/{
+ proxy_set_header Host $http_host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header REMOTE-HOST $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_pass http://127.0.0.1:8090;
+ }
+
+ error_page 500 502 503 504 /50x.html;
+ location = /50x.html {
+ root html;
+ }
+ }
+
+ server {
+ listen 8083;
+ server_name localhost;
+ charset utf-8;
+
+ location / {
+ root /usr/local/smartor/patient/patient;
+ try_files $uri $uri/ /index.html;
+ index index.html index.htm;
+ }
+
+ location /api/{
+ proxy_set_header Host $http_host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header REMOTE-HOST $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_pass http://127.0.0.1:8090;
+ }
+
+ error_page 500 502 503 504 /50x.html;
+ location = /50x.html {
+ root html;
+ }
+ }
+
+ server {
+ listen 8084;
+ server_name localhost;
+ charset utf-8;
+
+ location / {
+ root /usr/local/smartor/english/web;
+ try_files $uri $uri/ /index.html;
+ index index.html index.htm;
+ }
+
+ location /api/{
+ proxy_set_header Host $http_host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header REMOTE-HOST $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_pass http://127.0.0.1:8091;
+ }
+
+ error_page 500 502 503 504 /50x.html;
+ location = /50x.html {
+ root html;
+ }
+ }
+server {
+ listen 8085;
+ server_name localhost;
+ charset utf-8;
+
+ location / {
+ root /usr/local/smartor/service/web;
+ try_files $uri $uri/ /index.html;
+ index index.html index.htm;
+ }
+
+ location /api/{
+ proxy_set_header Host $http_host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header REMOTE-HOST $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_pass http://127.0.0.1:8092;
+ }
+
+ error_page 500 502 503 504 /50x.html;
+ location = /50x.html {
+ root html;
+ }
+ }
+server {
+ listen 8086;
+ server_name localhost;
+ charset utf-8;
+
+ location / {
+ root /usr/local/smartor/decision/web;
+ try_files $uri $uri/ /index.html;
+ index index.html index.htm;
+ }
+
+ location /api/{
+ proxy_set_header Host $http_host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header REMOTE-HOST $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_pass http://127.0.0.1:8093;
+ }
+
+ error_page 500 502 503 504 /50x.html;
+ location = /50x.html {
+ root html;
+ }
+ }
+}
diff --git a/src/api/ecg/doctor/index.ts b/src/api/ecg/doctor/index.ts
index 2eec85e..7639477 100644
--- a/src/api/ecg/doctor/index.ts
+++ b/src/api/ecg/doctor/index.ts
@@ -106,6 +106,31 @@
return await request.get({ url: `/ecg/doctor/get-to-be-installed-list`, params })
},
+ /**
+ * 鍙栥�屾湰璇婂鎺掗槦涓紙鏈垎閰嶅伐浣嶏級銆嶆偅鑰呭垪琛ㄣ��
+ *
+ * 鍊欒瘖鍒楄〃鍙惈"宸插垎娴佸埌鏈伐浣�"鐨勬偅鑰咃紙queue.room_id + bed_no 鎸囧悜鏈伐浣嶏級锛�
+ * 鑰�"鎺掗槦涓�(10)"鐨勬偅鑰呰繕娌″垎閰嶅伐浣� 鈥斺�� 澶у睆鑳界湅鍒般�佸伐浣滃彴鍘熷厛鐪嬩笉鍒般��
+ * 杩欎釜鎺ュ彛鎸夋湰宸ヤ綅寮�灞曠殑妫�鏌ラ」鐩妸浠栦滑鏌ュ嚭鏉ワ紝渚涘尰鐢熸墜宸ャ�屾媺鍏ャ�嶃��
+ */
+ getRoomWaitingList: async (params: RoomBedVO) => {
+ return await request.get({ url: `/ecg/doctor/get-room-waiting-list`, params })
+ },
+
+ /** 鎶娿�屾帓闃熶腑銆嶇殑鎮h�呮墜宸ユ媺鍏ユ湰宸ヤ綅锛堝彧鏈夊伐浣嶄富浜鸿兘鎷夛紝鍚庣鏈夌‖鏍¢獙锛� */
+ pullWaitingPatient: async (params: { roomId: any; bedNo: any; id: any }) => {
+ return await request.get({ url: `/ecg/doctor/pull-waiting-patient`, params })
+ },
+
+ /**
+ * 绔嬪嵆琛ヤ汉锛氭墜鍔ㄨЕ鍙戜竴娆℃湰宸ヤ綅鐨勮嚜鍔ㄥ垎娴侊紝骞惰繑鍥炶瘖鏂俊鎭�
+ * 锛堢郴缁熷紑璇婄姸鎬� / 鏄惁鍋滄鍊欒瘖 / 鍊欒瘖涓婇檺 / 琛ヤ汉鍓嶅悗浜烘暟 / 缁撹锛夈��
+ * 鍊欒瘖鍖轰负绌烘椂鐨勮嚜鍔╂帓鏌ワ細涓嶅繀绛夊畾鏃朵换鍔★紝涔熶笉鐢ㄩ噸鍚幓鐚滄槸鍝亾闂ㄩ椄鎸′綇鐨勩��
+ */
+ hurryUpNow: async (params: RoomBedVO) => {
+ return await request.get({ url: `/ecg/doctor/hurry-up-now`, params })
+ },
+
// 鍙栨偅鑰呯粺璁�
getPatientStatistic: async (params: RoomBedVO) => {
return await request.get({ url: `/ecg/doctor/get-patient-statistic`, params })
diff --git a/src/api/ecg/jobrecord/index.ts b/src/api/ecg/jobrecord/index.ts
index 1d1ffe6..2a66a6f 100644
--- a/src/api/ecg/jobrecord/index.ts
+++ b/src/api/ecg/jobrecord/index.ts
@@ -1,4 +1,5 @@
import request from '@/config/axios'
+import { useRoomStore } from '@/store/modules/room'
// 宸ヤ綔璁板綍 VO
export interface JobRecordVO {
@@ -13,6 +14,12 @@
summary: number // 浣滀笟姒傝
remark: string // 澶囨敞
paid: number
+ /**
+ * 銆愭挙閿�鏍囪瘑銆戣鏉″畬鎴愯褰曞搴旂殑鎮h��"褰撴棩闃熷垪鐘舵�佸凡涓嶆槸宸插氨璇�(40)"锛�
+ * 鍗虫鏌ュ畬鎴愯鎾ら攢杩囥�佽繕娌¢噸鏂板畬鎴愩�傚悗绔寜褰撴棩闃熷垪鐘舵�佸姩鎬佽绠楋紝涓嶈惤搴擄紱
+ * 鎮h�呭啀娆″畬鎴愬悗鑷姩鍙樺洖 false銆�
+ */
+ undone?: boolean
// 闇�姹�1锛氭偅鑰呬俊鎭� 18 椤癸紙鍚庣鎸� job_record.rentId 鈫� dev_rent.applyNo 鈫� appointment 鎵归噺鍥炲~锛�
applyNo?: string // 鐢宠缂栧彿
episodeId?: string // 灏辫瘖娴佹按鍙�
@@ -49,9 +56,24 @@
return await request.get({ url: `/ecg/job-record/page`, params })
},
- // 鏌ヨ鐢ㄦ埛鑷繁鐨勫伐浣滆褰曞垎椤�
+ /**
+ * 鏌ヨ宸ヤ綔璁板綍鍒嗛〉锛堥粯璁ゆ煡"鎴戣嚜宸辩殑"锛夈��
+ *
+ * 銆愪富/鍥磋銆戝洿瑙傛椂蹇呴』鏌�**璇ュ伐浣嶄富浜�**鐨勮褰曪紝鍚﹀垯鐪嬪埌鐨勬案杩滄槸鑷繁閭d唤锛堢┖鐨勶級锛�
+ * 杩欓噷缁熶竴娉ㄥ叆"鎴戞鍦ㄧ湅鐨勫伐浣�"鐨勪富浜� docId + roomId/bedNo锛�
+ * 鍚庣浼氭牎楠岃繖涓� docId 纭疄鏄宸ヤ綅褰撳墠鐨勪富浜猴紙涓嶆槸闅忎究鏌ュ埆浜猴級銆�
+ * 鏀惧湪 API 灞傜粺涓�澶勭悊锛�5 涓伐浣滃彴/闈㈡澘鐨勮皟鐢ㄧ偣涓嶇敤鍚勮嚜鏀广��
+ */
getJobRecordDoctorPage: async (params: any) => {
- return await request.get({ url: `/ecg/job-record/doctor-page`, params })
+ const roomStore = useRoomStore()
+ const view = roomStore.getRoom
+ const query: any = { ...(params || {}) }
+ if (!roomStore.getCanOperate && view?.roomId != null && view.bedNo && view.docId != null) {
+ query.docId = view.docId
+ query.roomId = view.roomId
+ query.bedNo = view.bedNo
+ }
+ return await request.get({ url: `/ecg/job-record/doctor-page`, params: query })
},
// 鏌ヨ宸ヤ綔璁板綍璇︽儏
diff --git a/src/api/ecg/room/index.ts b/src/api/ecg/room/index.ts
index d78f8a1..af99804 100644
--- a/src/api/ecg/room/index.ts
+++ b/src/api/ecg/room/index.ts
@@ -6,12 +6,81 @@
roomId: number | null // 璇婂缂栧彿
roomName: string | null // 璇婂鍚嶇О
bedNo: string | null // 璇婄枟搴婄紪鍙�
- ip: string | null // 璇婂IP
+ ip: string | null // 璇婂宸ヤ綅IP
status: number | null //寮�璇婄姸鎬� 0-鍏抽棴 1-鍏抽棴涓� 10-宸插紑閫� 20-鏈夊尰鐢� 30-鏆傚仠
docId: number | null
docName: string | null
checkTypes: number[] | null
opType: number | null
+ occupied?: boolean | null // 璇ュ伐浣嶆槸鍚﹀凡琚尰鐢熷崰鐢紙鎸塈P鍖归厤宸ヤ綅鏃剁敤锛�
+}
+
+// 銆岄�夋嫨宸ヤ綅妯″紡銆�- 鎸夋湰鏈篒P鍖归厤宸ヤ綅鐨勫�欓�夊伐浣�
+export interface RoomSelectBedItem {
+ id: number // 宸ヤ綅涓婚敭 clinic_room.id
+ roomId: number | null
+ roomName: string | null
+ bedNo: string | null
+ ip: string | null
+ docId: number | null
+ docName: string | null
+ opType: number | null
+ checkTypes: number[] | null
+ status: number | null
+ occupied: boolean | null
+ mine: boolean | null
+}
+
+// 銆岄�夋嫨宸ヤ綅妯″紡銆�- 鎸夋湰鏈篒P鍖归厤宸ヤ綅鐨勭粨鏋�
+export interface RoomSelectBedResp {
+ clientIp: string | null // 鍚庣瀹為檯璇嗗埆鍒扮殑鏉ヨIP锛堝凡瑙勮寖鍖栵級
+ ipValid: boolean | null // 璇P鏄惁鍙敤浜庣粦瀹�
+ ipLoopback: boolean | null // 璇P鏄惁鏄湰鏈哄洖鐜紙127.x / ::1锛夆啋 璇存槑娴忚鍣ㄤ笌鏈嶅姟鍦ㄥ悓涓�鍙版満鍣�
+ ipv6: boolean | null // 璇P鏄惁鏄� IPv6锛堟湰绯荤粺宸ヤ綅缁戝畾浠呴噰鐢� IPv4锛�
+ ipBound: boolean | null // 璇P鏄惁宸茬粦瀹氬伐浣�
+ matched: boolean | null // 鏄惁鏈夊彲鐩存帴鍏ュ骇鐨勫伐浣�
+ beds: RoomSelectBedItem[]
+}
+
+/**
+ * 璇P鑳藉惁鐢ㄤ簬鑷姩鍖归厤/缁戝畾宸ヤ綅銆�
+ * **鏈郴缁熷伐浣嶇粦瀹氬彧閲囩敤 IPv4**锛欼Pv6锛堝惈 ::1銆乫e80::銆�2408:: 绛夛級涓�寰嬩笉鍙敤銆�
+ * 绌哄�笺��0.0.0.0銆�127.x 鍚屾牱涓嶅彲鐢紱`::ffff:32.88.65.208` 鐢卞悗绔繕鍘熸垚 IPv4 鍚庡彲鐢ㄣ��
+ */
+export const isUsableSeatIp = (ip?: string | null): boolean => {
+ const v = (ip || '').trim()
+ if (!v || v === '0.0.0.0' || v.startsWith('127.')) return false
+ if (v.includes(':')) return false // IPv6 涓嶉噰鐢�
+ if (!/^(\d{1,3}\.){3}\d{1,3}$/.test(v)) return false
+ return v.split('.').every((seg) => Number(seg) <= 255)
+}
+
+
+/**
+ * 銆屽伐浣嶅叆搴с�嶇粨鏋滐紙鑷姩鍏ュ骇 / 鏌ヨ鎴戠殑宸ヤ綅 鍏辩敤锛夈��
+ *
+ * reason 鍙栧�硷細
+ * - ip_invalid 鏈満IP涓嶅彲鐢紙鍥炵幆/IPv6/鏈寚瀹�/闈炴硶锛�
+ * - nomatch 璇P娌″尮閰嶅埌宸ヤ綅锛堝伐浣嶆病褰旾P 鎴� 宸插叧闂級
+ * - multi 璇P瀵瑰簲澶氫釜绌洪棽宸ヤ綅锛岄渶浜哄伐鐐归��
+ * - occupied 鍖归厤鍒扮殑宸ヤ綅宸茶**浠栦汉**鍗犵敤锛堜笉鎸ゆ帀锛�
+ * - error 鍏ュ骇鍐欏簱鏈敓鏁�
+ */
+export interface RoomSeatResp {
+ seated: boolean
+ reason?: string | null
+ clientIp?: string | null
+ ownerName?: string | null
+ id?: number | null
+ roomId?: number | null
+ roomName?: string | null
+ bedNo?: string | null
+ ip?: string | null
+ status?: number | null
+ docId?: number | null
+ docName?: string | null
+ checkTypes?: number[] | null
+ opType?: number | null
}
export interface MonitorInfo {
@@ -96,6 +165,57 @@
// 鎵嬪姩闂瘖
closeBiz: async () => {
return await request.get({ url: `/clinic/room/close-biz` })
+ },
+
+ /** 銆岄�夋嫨宸ヤ綅妯″紡銆嶆寜鏈満IP鍖归厤宸ヤ綅锛堟ā寮� 1/3锛夛細杩斿洖鍚庣璇嗗埆鍒扮殑IP + 鍊欓�夊伐浣嶏紙宸叉帓搴忥級 */
+ getIpBed: async () => {
+ return await request.get({ url: `/clinic/room/get-ip-bed` })
+ },
+
+ /**
+ * 涓�閿嚜鍔ㄥ叆搴э紙妯″紡 1/3锛夛細鍚庣鎸夋潵璁縄P鍖归厤宸ヤ綅骞剁洿鎺ヨ惤搴с��
+ *
+ * 鐩告瘮鍘熸潵銆実etIpBed 鈫� bindIpToBed 鈫� bedDoctorOn銆嶄笁姝ユ嫾瑁咃紝杩欓噷鍙け璐ヤ竴娆″嵆鍙帓鏌ワ細
+ * 杩斿洖浣撳甫 clientIp 涓� reason锛坕p_invalid / nomatch / multi / occupied / error锛夈��
+ * 鏈嶅姟绔悓鏃朵繚璇侊細涓�涓敤鎴峰彧鍗犱竴涓伐浣嶏紙鍏ュ骇鎴愬姛鍚庨噴鏀惧叾鍏跺畠宸ヤ綅锛夈��
+ */
+ autoSeat: async () => {
+ return await request.post({ url: `/clinic/room/auto-seat` })
+ },
+
+ /** 鏌ヨ褰撳墠鐧诲綍浜哄凡鍏ュ骇鐨勫伐浣嶏紙绯荤粺椤舵爮"褰撳墠宸ヤ綅"鏍囩鐢級 */
+ getMySeat: async () => {
+ return await request.get({ url: `/clinic/room/my-seat` })
+ },
+
+ /**
+ * 瀹㈡埛绔� IP 璇嗗埆璇婃柇锛氳繑鍥炲悇浠g悊澶淬�佺洿杩炲湴鍧�銆佽鑼冨寲缁撴灉銆佹槸鍚︽湇鍔″櫒鑷韩鍦板潃銆佹湇鍔″櫒缃戝崱鍒楄〃涓庣粨璁恒��
+ * 鐜板満鎺掓煡"宸ヤ綅缁戝畾鐨� IP 涓嶅"鐢紙閫夊伐浣嶉〉鐨勩�孖P 璇婃柇銆嶆寜閽級銆�
+ */
+ ipDebug: async () => {
+ return await request.get({ url: `/clinic/room/ip-debug` })
+ },
+
+ /**
+ * 宸ヤ綅鐘舵�佽瘖鏂細杩斿洖璇ュ伐浣�**搴撳唴鍘熷琛�**锛堝惈 bed_no 闀垮害/HEX銆乻tatus銆乨oc_id銆乨eleted锛変笌缁撹銆�
+ * 鐢ㄤ簬鎺掓煡"宸ヤ綅鏄庢槑绌洪棽鍗村叆搴уけ璐ワ紙鎶ョ姸鎬佸紓甯革級"銆�
+ */
+ bedState: async (params: { id?: number | null; roomId?: number | null; bedNo?: string | null }) => {
+ const query: string[] = []
+ if (params?.id != null) query.push(`id=${params.id}`)
+ if (params?.roomId != null) query.push(`roomId=${params.roomId}`)
+ if (params?.bedNo != null) query.push(`bedNo=${encodeURIComponent(params.bedNo)}`)
+ return await request.get({ url: `/clinic/room/bed-state?${query.join('&')}` })
+ },
+
+ /**
+ * 銆岄�夋嫨宸ヤ綅妯″紡銆嶆妸鏈満IP缁戝畾鍒版寚瀹氬伐浣嶏紙妯″紡 2/3锛夈��
+ * force=false 鏃惰嫢璇P宸茬粦鍦ㄥ埆鐨勫伐浣嶏紝杩斿洖 code=409 + 鍐茬獊宸ヤ綅淇℃伅锛岀敱鐣岄潰纭鍚庡啀甯� force=true 瑕嗙洊銆�
+ */
+ bindIpToBed: async (id: number, force = false) => {
+ return await request.post({
+ url: `/clinic/room/bind-ip?id=${id}&force=${force}`
+ })
}
}
diff --git a/src/api/ecg/screen/index.ts b/src/api/ecg/screen/index.ts
index b2ee952..01e55f8 100644
--- a/src/api/ecg/screen/index.ts
+++ b/src/api/ecg/screen/index.ts
@@ -15,7 +15,7 @@
jumpFlag: number //鎻掗槦鏍囪
roomId: number // 璇婂缂栧彿
roomName: string // 璇婂鍚嶇О
- bedNo: string // 璇婄枟搴婄紪鍙�
+ bedNo: string // 璇婂宸ヤ綅缂栧彿
}
// 鍙彿灞� API
diff --git a/src/components/DoctorPageLayout/src/DoctorPageLayout.vue b/src/components/DoctorPageLayout/src/DoctorPageLayout.vue
index 4184c5d..51091de 100644
--- a/src/components/DoctorPageLayout/src/DoctorPageLayout.vue
+++ b/src/components/DoctorPageLayout/src/DoctorPageLayout.vue
@@ -7,13 +7,13 @@
銆屽彨鍙� / 杩囧彿 / 閲嶅彨 / 鏆傚仠 / 鎾ら攢鍙彿銆嶆尅浣忥紱
涓斿灞傚鍣ㄦ病鏈夌‘瀹氶珮搴︼紝涓棿鍖烘棤娉曚骇鐢熸粴鍔紝鍐呭鍙兘涓�璺妸椤甸潰鎾戦暱銆�
- 銆愬竷灞�濂戠害銆戔�斺�旂旱鍚戜笁娈� + 鍙充晶鏍�
+ 銆愬竷灞�濂戠害銆戔�斺�旂旱鍚戜笁娈� + 鍙充晶鏍忥紙涓棿鏈�**鍙嫋鍔ㄥ垎鐣岀嚎**锛�
鈹屸攢鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
鈹� #header 鏍囬鏍忥紙鍥哄畾楂樺害锛屼笉婊氬姩锛� 鈹� flex: none
鈹溾攢鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹攢鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
鈹� #default 涓讳綋锛堟粴鍔ㄥ尯锛� 鈹� #aside 鈹� 浠呬腑闂村尯涓庡彸鏍忓悇鑷粴鍔�
- 鈹� 路 鎮h�呬俊鎭紙鐢卞悇闈㈡澘鍐呴儴 鈹� 锛堢嫭绔嬫粴鍔級鈹�
- 鈹� 璁句负 sticky锛岄拤鍦ㄩ《閮級 鈹� 鈹�
+ 鈹� 路 鎮h�呬俊鎭紙鐢卞悇闈㈡澘鍐呴儴 鈹� 锛堢嫭绔嬫粴鍔級鈹� 涓よ�呬箣闂寸殑绔栫嚎**鍙乏鍙虫嫋鍔�**
+ 鈹� 璁句负 sticky锛岄拤鍦ㄩ《閮級 鈹� 鈹� 浠ヨ皟鏁村彸鏍忓搴�
鈹� 路 宸插畬鎴愯褰曞垪琛紙婊氬姩锛� 鈹� 鈹�
鈹溾攢鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹粹攢鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
鈹� #footer 鍔熻兘鎸夐挳锛堝浐瀹氬簳閮紝姘镐笉琚伄鎸★級 鈹� flex: none
@@ -29,6 +29,7 @@
甯︿笉閫忔槑鑳屾櫙涓庝笂杈规锛屽唴瀹规案杩滀笉浼氶�忚繃鏉ユ垨鐩栦綇瀹冦��
4. 鏍瑰厓绱�**鑷甫涓嶉�忔槑鑳屾櫙**锛氬悇闈㈡澘鍐� sticky 鐨勬偅鑰呬俊鎭嫢涓嶉�忔槑锛�
婊氬姩鍐呭浼氫粠瀹冧笌杈圭紭鐨勭紳闅欓�忓嚭锛屾晠鏁撮〉缁熶竴搴曡壊銆�
+ 5. 銆愭湰娆℃柊澧炪�戝垎鐣岀嚎鍙嫋鍔紙瑙佷笅锛夛紝瀹藉害璁板湪 localStorage 閲岋紝鍒囬〉/鍒锋柊鍚庝繚鎸併��
銆愭彃妲姐��
header 鏍囬鏍忥紙鍙�夛級
@@ -37,19 +38,67 @@
footer 搴曢儴鍔熻兘鎸夐挳锛堝彲閫夛紱鍥哄畾鍦ㄩ〉闈㈠簳閮級
-->
<script setup lang="ts">
-import { onBeforeUnmount, onMounted, ref } from 'vue'
+import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
+import BedSwitchSelect from '@/views/ecg/doctor/components/BedSwitchSelect.vue'
+import { useRoomStore } from '@/store/modules/room'
defineOptions({ name: 'DoctorPageLayout' })
-withDefaults(
+/* ==================== 涓�/鍥磋锛堝彧璇绘ā寮忥級 ==================== */
+
+const roomStore = useRoomStore()
+
+/**
+ * 鏄惁鏄剧ず椤堕儴鎻愮ず鏉°��
+ *
+ * 鍒ゅ畾锛�**鍙褰撳墠涓嶅彲鎿嶄綔**灏辨彁绀� 鈥斺�� 鍚袱绉嶆儏鍐碉細
+ * 鈶� 杩樻病閫夊畾瑕佺湅鍝釜宸ヤ綅锛堟湭鍏ュ骇涔熸病鍥磋锛夛紱
+ * 鈶� 姝e湪鍥磋鍒汉鐨勫伐浣嶏紙鎴戝叆搴х殑 鈮� 鎴戞鍦ㄧ湅鐨勶級銆�
+ */
+const showReadonlyTip = computed(() => !roomStore.getCanOperate)
+const readonlyTipText = computed(() =>
+ roomStore.getViewText ? `銆�${roomStore.getViewText}銆峘 : '锛堝皻鏈�夋嫨宸ヤ綅锛�'
+)
+const readonlyTipPrefix = computed(() =>
+ roomStore.getViewText ? '鍥磋妯″紡锛堝彧璇伙級锛氭鍦ㄦ煡鐪�' : '灏氭湭閫夋嫨宸ヤ綅锛氳鐢ㄥ彸涓婅銆屽伐浣嶃�嶄笅鎷夐�夋嫨瑕佹煡鐪� / 瑕佸叆搴х殑宸ヤ綅'
+)
+
+const props = withDefaults(
defineProps<{
- /** 鍙充晶鏍忓搴� */
+ /** 鍙充晶鏍�**鍒濆/榛樿**瀹藉害锛堟嫋鍔ㄤ箣鍚庝互瀹為檯鎷栧姩鍊间负鍑嗭紱鍙屽嚮鍒嗙晫绾挎仮澶嶈鍊硷級 */
asideWidth?: string
+ /** 鍙充晶鏍忔渶灏忓搴︼紙px锛� */
+ minAsideWidth?: number
+ /** 宸︿晶鍐呭鍖烘渶灏忓搴︼紙px锛夛細宸︿晶鏄洓鍒楁偅鑰呬俊鎭〃鍗曪紝澶獎浼氭姌琛� */
+ minContentWidth?: number
+ /** 璁板繂鎷栧姩缁撴灉鐨� localStorage key锛涗紶绌哄瓧绗︿覆琛ㄧず涓嶈蹇� */
+ storageKey?: string
+ /**
+ * 銆愭湰娆¢渶姹傘�戞槸鍚﹀厑璁稿湪鏍囬鏍忓垏鎹㈠伐浣嶃��
+ * 璁惧棰嗙敤 / 瑁呮満椤典紶 `false`锛氬伐浣嶅浐瀹氾紝涓嶆彁渚涘垏鎹紙鏈叆搴ц�呭嵆鍥磋鑰咃紝鍙锛夈��
+ */
+ bedSwitchEnabled?: boolean
+ /**
+ * 銆愭湰娆¢渶姹傘�戝彲鍒囨崲宸ヤ綅鐨�**浣滀笟绫诲瀷**杩囨护锛�0妫�鏌� 1棰嗙敤 2瑁呮満锛夈��
+ * 鍙彿妫�鏌ラ〉浼� `[0]` 鈫� 涓嬫媺鍙垪妫�鏌ョ被宸ヤ綅锛涗笉浼� = 涓嶈繃婊ゃ��
+ */
+ bedSwitchOpTypes?: number[] | null
}>(),
{
- asideWidth: '400px'
+ asideWidth: '400px',
+ minAsideWidth: 280,
+ minContentWidth: 520,
+ storageKey: 'ecg.doctor.asideWidth',
+ bedSwitchEnabled: true,
+ bedSwitchOpTypes: null
}
)
+
+/** 榛樿瀹藉害锛坧x锛夛細鐢� asideWidth 瑙f瀽鑰屾潵锛岀敤浣滃垵濮嬪�间笌"鍙屽嚮澶嶄綅"鍊� */
+const defaultAsidePx = (() => {
+ const n = parseInt(props.asideWidth, 10)
+ return Number.isFinite(n) && n > 0 ? n : 400
+})()
/**
* 銆愬叧閿�戜笉渚濊禆 CSS `height: 100%` 鐨勮В鏋愶紝鏀逛负**瀹炴祴鐖跺鍣ㄥ彲鐢ㄩ珮搴�**銆�
@@ -71,6 +120,111 @@
const rootRef = ref<HTMLElement>()
const measuredHeight = ref<string | undefined>(undefined)
+// ==================== 鍙充晶鏍忓搴︼紙鍙嫋鍔ㄥ垎鐣岀嚎锛� ====================
+
+/** 涓讳綋琛屽鍣細鎷栧姩鏃剁敤瀹冪畻"鍙充晶鏍忔渶澶氳兘鏈夊瀹�" */
+const bodyRef = ref<HTMLElement>()
+
+/** 鍙充晶鏍忓綋鍓嶅搴︼紙px锛� */
+const asidePx = ref<number>(defaultAsidePx)
+
+/** 鏄惁姝e湪鎷栧姩锛堢敤浜庢崲鍏夋爣銆佺閫変腑锛� */
+const dragging = ref(false)
+
+/**
+ * 鎶婂搴﹀す鍒板悎娉曞尯闂淬��
+ *
+ * 涓婇檺 = 瀹瑰櫒瀹藉害 鈭� 宸︿晶鏈�灏忓搴︼紙淇濊瘉宸︿晶鎮h�呬俊鎭�/璁板綍鍒楄〃涓嶈鎸ゆ病锛夛紱
+ * 涓嬮檺 = minAsideWidth銆傜獥鍙f瀬绐勫鑷翠袱鑰呭啿绐佹椂锛�**浼樺厛淇濊瘉涓嬮檺**锛�
+ * 宸︿晶闈犺嚜韬殑 `min-width:0 + overflow` 浼橀泤闄嶇骇銆�
+ */
+const clampAsidePx = (px: number) => {
+ const bodyPx = bodyRef.value?.clientWidth ?? 0
+ const lower = props.minAsideWidth
+ const upper = bodyPx > 0
+ ? Math.max(lower, bodyPx - props.minContentWidth)
+ : Number.MAX_SAFE_INTEGER
+ return Math.round(Math.min(Math.max(px, lower), upper))
+}
+
+/** 璁颁綇鎷栧姩缁撴灉锛堥殣绉佹ā寮�/绂佺敤瀛樺偍鏃堕潤榛樺拷鐣ワ級 */
+const saveAsidePx = () => {
+ if (!props.storageKey) return
+ try {
+ localStorage.setItem(props.storageKey, String(asidePx.value))
+ } catch {
+ /* ignore */
+ }
+}
+
+/** 璇诲彇涓婃鎷栧姩缁撴灉锛涘繀椤荤瓑 bodyRef 鎸傝浇鍚庢墠鑳� clamp */
+const loadAsidePx = () => {
+ if (!props.storageKey) return
+ try {
+ const v = parseInt(localStorage.getItem(props.storageKey) || '', 10)
+ if (Number.isFinite(v) && v > 0) asidePx.value = clampAsidePx(v)
+ } catch {
+ /* ignore */
+ }
+}
+
+/** 鍙屽嚮鍒嗙晫绾匡細鎭㈠榛樿瀹藉害骞舵竻闄よ蹇� */
+const resetAsideWidth = () => {
+ asidePx.value = clampAsidePx(defaultAsidePx)
+ if (props.storageKey) {
+ try {
+ localStorage.removeItem(props.storageKey)
+ } catch {
+ /* ignore */
+ }
+ }
+}
+
+let startX = 0
+let startPx = 0
+
+/**
+ * 鐢� Pointer Events + setPointerCapture锛�
+ * 鎹曡幏鍚� pointermove/up 閮藉彧鍦ㄥ垎鐣岀嚎涓婅Е鍙戯紝**涓嶉渶瑕�**鍐嶅線 document 涓婃寕/鎽樼洃鍚紝
+ * 涔熷氨涓嶄細鍑虹幇"鎷栧埌 iframe 鎴栫獥鍙e鏉炬墜鍚庣洃鍚畫鐣�"鐨勮�侀棶棰樸��
+ */
+const onSplitterDown = (e: PointerEvent) => {
+ const el = e.currentTarget as HTMLElement | null
+ dragging.value = true
+ startX = e.clientX
+ startPx = asidePx.value
+ el?.setPointerCapture?.(e.pointerId)
+ e.preventDefault()
+}
+
+const onSplitterMove = (e: PointerEvent) => {
+ if (!dragging.value) return
+ // 鍒嗙晫绾垮悜鍙虫嫋锛埼攛>0锛夆啋 鍙充晶鏍忓彉绐勶紝鏁呯敤鍑忔硶
+ asidePx.value = clampAsidePx(startPx - (e.clientX - startX))
+}
+
+const onSplitterUp = (e: PointerEvent) => {
+ if (!dragging.value) return
+ dragging.value = false
+ const el = e.currentTarget as HTMLElement | null
+ el?.releasePointerCapture?.(e.pointerId)
+ saveAsidePx()
+}
+
+/** 閿洏寰皟锛堚啇/鈫� 姣忔 20px锛夛紝鏃犻紶鏍囦篃鑳借皟鏁� */
+const onSplitterKey = (e: KeyboardEvent) => {
+ const step = 20
+ if (e.key === 'ArrowLeft') {
+ asidePx.value = clampAsidePx(asidePx.value + step) // 鍒嗙晫绾垮乏绉� 鈫� 鍙充晶鍙樺
+ } else if (e.key === 'ArrowRight') {
+ asidePx.value = clampAsidePx(asidePx.value - step)
+ } else {
+ return
+ }
+ saveAsidePx()
+ e.preventDefault()
+}
+
let ro: ResizeObserver | undefined
let rafId = 0
@@ -87,6 +241,10 @@
// 鐖剁骇楂樺害涓嶅彲娴嬶紙auto/0锛夋椂淇濈暀 CSS 鍥為��锛屼笉璁惧唴鑱旈珮搴�
measuredHeight.value = inner > 0 ? `${inner}px` : undefined
+
+ // 瀹藉害鍙樺寲锛堝惈绐楀彛缂╂斁锛夋椂閲嶆柊澶逛竴娆″彸鏍忓搴︼紝
+ // 鍚﹀垯鎷栧鍚庢妸绐楀彛缂╁皬锛屽彸渚ф爮鍙兘鎶婂乏渚у唴瀹规尋娌°��
+ asidePx.value = clampAsidePx(asidePx.value)
}
/** 鐢� rAF 鍚堝苟杩炵画瑙﹀彂锛岄伩鍏� ResizeObserver 寰幆鍛婅 */
@@ -100,6 +258,7 @@
onMounted(() => {
measure()
+ loadAsidePx()
const parent = rootRef.value?.parentElement
if (parent && typeof ResizeObserver !== 'undefined') {
ro = new ResizeObserver(scheduleMeasure)
@@ -118,22 +277,65 @@
</script>
<template>
- <div ref="rootRef" class="doctor-page" :style="{ height: measuredHeight }">
- <!-- 鏍囬鏍忥細鍥哄畾楂樺害锛屼笉婊氬姩 -->
+ <div
+ ref="rootRef"
+ class="doctor-page"
+ :class="{ 'is-resizing': dragging }"
+ :style="{ height: measuredHeight }"
+ >
+ <!--
+ 鏍囬鏍忥細鍥哄畾楂樺害锛屼笉婊氬姩銆�
+ 鍙充晶鍥哄畾鏀俱�屽伐浣嶅垏鎹� / 鍥磋銆嶄笅鎷夛紙涓�/鍥磋妯″瀷鐨勫叆鍙o級鈥斺�旀斁鍦ㄥ竷灞�灞傦紝
+ 鍙彿妫�鏌� / 璁惧棰嗙敤 / 瑁呮満 涓夐〉鑷姩閮芥湁锛屼笉鐢ㄥ悇椤甸噸澶嶅姞銆�
+ -->
<div v-if="$slots.header" class="doctor-page__header">
- <slot name="header"></slot>
+ <div class="doctor-page__header-left">
+ <slot name="header"></slot>
+ </div>
+ <BedSwitchSelect :enabled="bedSwitchEnabled" :op-types="bedSwitchOpTypes" />
+ </div>
+
+ <!-- 鍥磋妯″紡锛堝彧璇伙級/ 鏈�夊伐浣� 鎻愮ず鏉★細璁╁尰鐢熶竴鐪肩煡閬�"鐜板湪鍙兘鐪嬶紝涓嶈兘鎿嶄綔" -->
+ <div v-if="showReadonlyTip" class="doctor-page__readonly-tip">
+ <Icon icon="ep:view" class="mr-4px" />
+ {{ readonlyTipPrefix }}{{ roomStore.getViewText ? readonlyTipText : '' }}<template v-if="roomStore.getViewText && roomStore.viewOwnerName">锛屼富浜� {{ roomStore.viewOwnerName }}</template><template v-if="roomStore.getViewText">锛涘闇�鎿嶄綔锛岃鍦ㄥ彸涓婅銆屽伐浣嶃�嶉噷鍏ュ骇鍒拌宸ヤ綅銆�</template>
</div>
<!-- 涓讳綋锛氬崰鎹墿浣欏叏閮ㄩ珮搴︼紱鍐呴儴鍙"鍐呭鍖�"鍜�"鍙虫爮"鍚勮嚜婊氬姩 -->
- <div class="doctor-page__body">
+ <div ref="bodyRef" class="doctor-page__body" :class="{ 'is-readonly': !roomStore.getCanOperate }">
<div class="doctor-page__content">
<slot></slot>
</div>
+ <!--
+ 鍙嫋鍔ㄥ垎鐣岀嚎锛堟湰娆¢渶姹傦級锛�
+ 路 宸﹀彸鎷栧姩 = 璋冩暣鍙充晶鎮h�呮竻鍗曠殑瀹藉害锛�
+ 路 鍙屽嚮 = 鎭㈠榛樿瀹藉害锛堝苟娓呴櫎璁板繂锛夛紱
+ 路 鑱氱劍鍚� 鈫�/鈫� = 姣忔 20px 寰皟锛�
+ 路 瀹藉害璁板繂鍦� localStorage锛屼笁涓伐浣滃彴椤甸潰鍏辩敤鍚屼竴涓� key銆�
+ -->
+ <div
+ v-if="$slots.aside"
+ class="doctor-page__splitter"
+ :class="{ 'is-dragging': dragging }"
+ role="separator"
+ aria-orientation="vertical"
+ :aria-valuenow="asidePx"
+ :aria-valuemin="minAsideWidth"
+ tabindex="0"
+ title="鎷栧姩璋冩暣鍙充晶瀹藉害锛堝弻鍑诲浣嶏級"
+ @pointerdown="onSplitterDown"
+ @pointermove="onSplitterMove"
+ @pointerup="onSplitterUp"
+ @pointercancel="onSplitterUp"
+ @dblclick="resetAsideWidth"
+ @keydown="onSplitterKey"
+ ></div>
+
<div
v-if="$slots.aside"
class="doctor-page__aside"
- :style="{ width: asideWidth, flex: `0 0 ${asideWidth}` }"
+ :style="{ width: `${asidePx}px`, flex: '0 0 auto' }"
>
<slot name="aside"></slot>
</div>
@@ -144,7 +346,7 @@
闇�姹傦細`鑷姩`銆乣鍋滄鍊欒瘖` 涓� `鍙彿/杩囧彿/閲嶅彨/鏆傚仠/鎾ら攢鍙彿` **鍚堟垚涓�缁�**锛�
涓�璧�**闈犲彸**锛堝鐫�鍙充晶鍊欒瘖琛級锛屼笉瑕佽鎷嗘暎鍒板乏杈�/涓棿銆�
-->
- <div v-if="$slots.footer" class="doctor-page__footer">
+ <div v-if="$slots.footer" class="doctor-page__footer" :class="{ 'is-readonly': !roomStore.getCanOperate }">
<div class="doctor-page__footer-right">
<slot name="footer"></slot>
</div>
@@ -168,6 +370,12 @@
background-color: var(--el-bg-color);
}
+/* 鎷栧姩鍒嗙晫绾胯繃绋嬩腑锛氬叏灞�鎹㈡垚宸﹀彸绠ご鍏夋爣锛屽苟绂佹閫変腑鏂囧瓧锛堝惁鍒欎細鎷栧嚭涓�鐗囪摑鑹查�夊尯锛� */
+.doctor-page.is-resizing {
+ cursor: col-resize;
+ user-select: none;
+}
+
/* ---------- 鏍囬鏍� ---------- */
.doctor-page__header {
flex: none;
@@ -175,6 +383,59 @@
padding: 0 12px;
overflow: hidden;
background-color: var(--el-color-primary-light-7);
+ /* 宸︿晶鏍囬锛堝悇椤典紶鍏ョ殑 TitlePanel锛�+ 鍙充晶銆屽伐浣嶅垏鎹� / 鍥磋銆嶄笅鎷� */
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: 8px;
+}
+
+/* 鏍囬鍖哄彲鍘嬬缉锛堝伐浣嶄笅鎷夊浐瀹氶潬鍙筹級 */
+.doctor-page__header-left {
+ flex: 1;
+ min-width: 0;
+ overflow: hidden;
+}
+
+/* ==========================================================================
+ 銆愭湰娆¢渶姹傘�戝伐浣滃彴鎸夐挳缁熶竴灏哄 / 瀛楀彿锛堟柟渚块紶鏍囧嚮涓級
+
+ 鍘熸潵娣风敤 `size="small"`锛�24px / 12px 瀛楋級涓庨粯璁わ紙32px / 14px 瀛楋級锛�
+ 鍚屼竴椤甸噷澶у皬涓嶄竴銆傝繖閲屽仛缁熶竴褰掍竴鍖栵紝**涓嶉�愪釜鏀� size 灞炴��**锛�
+ 褰掍竴鍖栧悗 `--small` 宸叉棤瑙嗚鏁堟灉锛屽悗缁柊澧炴寜閽篃浼氳嚜鍔ㄤ竴鑷淬��
+ ========================================================================== */
+.doctor-page :deep(.el-button),
+.doctor-page :deep(.el-button--small),
+.doctor-page :deep(.el-button--default) {
+ height: 32px;
+ padding: 0 14px;
+ font-size: 14px;
+}
+
+/* 琛ㄦ牸 / 闃熷垪鍒楄〃鍐呯殑琛屽唴鎸夐挳锛氬皬涓�妗o紝閬垮厤鎶婅〃鏍艰鎾戦珮 */
+.doctor-page :deep(.el-table .el-button:not(.is-link)),
+.doctor-page :deep(.queue-list .el-button:not(.is-link)) {
+ height: 28px;
+ padding: 0 10px;
+ font-size: 13px;
+}
+
+/* 閾炬帴寮忔寜閽紙琛ㄥご銆屾挙閿�銆嶃�佸�欓�夊尯銆岀珛鍗宠ˉ浜恒�嶇瓑锛夛細鍙斁澶у瓧鍙凤紝涓嶅姞楂樺害 */
+.doctor-page :deep(.el-button.is-link) {
+ height: auto;
+ padding: 0 4px;
+ font-size: 14px;
+}
+
+/* ---------- 鍥磋妯″紡锛堝彧璇伙級鎻愮ず鏉� ---------- */
+.doctor-page__readonly-tip {
+ flex: none;
+ padding: 4px 12px;
+ font-size: 13px;
+ line-height: 20px;
+ color: var(--el-color-warning);
+ background-color: var(--el-color-warning-light-9);
+ border-bottom: 1px solid var(--el-color-warning-light-7);
}
/* ---------- 涓讳綋 ---------- */
@@ -183,6 +444,20 @@
flex: 1;
/* 鈿狅笍 鍏抽敭锛氫笉鍔� min-height:0锛宖lex 瀛愰」涓嶄細鏀剁缉锛宱verflow 涓嶇敓鏁� */
min-height: 0;
+}
+
+/*
+ 鍥磋妯″紡锛堝彧璇伙級锛氬唴瀹瑰尯閲岀殑**鎸夐挳 / 寮�鍏� / 鍕鹃�夋**涓�寰嬩笉鍙偣銆�
+ 瑕嗙洊鍚勯潰鏉块噷鐨勩�屾鏌ュ畬鎴� / 鏀惧純妫�鏌� / 纭垂 / 棰嗙敤瀹屾垚 / 瑁呮満瀹屾垚 / 鏁版嵁褰曞叆 / 鎾ら攢 鈥︺�嶃��
+ 璇存槑锛�
+ 路 寮圭獥锛堟偅鑰呬俊鎭�佹墦鍗伴瑙堢瓑锛夋槸 teleport 鍑哄幓鐨勶紝涓嶅彈杩欓噷褰卞搷锛屼粛鍙甯告煡鐪嬶紱
+ 路 鏈嶅姟绔繕鏈変竴閬撶‖鏍¢獙锛堥潪宸ヤ綅涓讳汉璋冪敤鍐欐帴鍙d細琚嫆缁濓級锛岃繖閲屽彧鏄綋楠屽眰銆�
+*/
+.doctor-page__body.is-readonly :deep(.el-button),
+.doctor-page__body.is-readonly :deep(.el-switch),
+.doctor-page__body.is-readonly :deep(.el-checkbox) {
+ pointer-events: none;
+ opacity: 0.5;
}
/*
@@ -196,6 +471,9 @@
杩欓噷鐨� `overflow-y: auto` 鍙湪**绌洪棿瀹炲湪涓嶈冻**锛堟偅鑰呬俊鎭� + 鎸夐挳鎶婇珮搴﹀悆鍏夛級鏃剁敓鏁堬紝
浣滀负鍏滃簳锛涙甯告儏鍐典笉浼氬嚭鐜版粴鍔ㄦ潯銆�
娉ㄦ剰蹇呴』淇濈暀 min-height:0锛屽惁鍒� flex 瀛愰」涓嶄細鏀剁缉锛岃褰曞垪琛ㄦ嬁涓嶅埌鍙楅檺楂樺害銆�
+
+ 鈿狅笍 鍙宠竟妗嗗凡鍘绘帀锛氬垎鐣岀嚎鏀圭敱 `.doctor-page__splitter` 鎻愪緵锛�
+ 鍚﹀垯銆�3px 鍙宠竟妗� + 鍒嗙晫绾裤�嶄細骞舵帓鎴愪袱鏉$嚎銆�
*/
.doctor-page__content {
display: flex;
@@ -207,6 +485,42 @@
overflow-y: auto;
overflow-x: hidden;
border: solid var(--el-color-primary-light-7);
+ border-right: none;
+}
+
+/* ---------- 鍙嫋鍔ㄥ垎鐣岀嚎 ---------- */
+/*
+ 鍛戒腑鍖� 6px锛堝ソ鐐逛腑锛夛紝瑙嗚绾� 1px 灞呬腑锛沨over / 鎷栧姩涓姞绮楀彉涓昏壊銆�
+ 娉ㄦ剰锛氬搴︾敱瀹冭嚜宸卞崰浣嶏紝鍥犳鎷栧姩鏃�"鍐呭鍖哄搴�"鐢� flex 鑷姩璁╁嚭锛屾棤闇� JS 鏀瑰乏渚с��
+*/
+.doctor-page__splitter {
+ position: relative;
+ flex: none;
+ width: 6px;
+ cursor: col-resize;
+ background-color: transparent;
+ /* 闃叉鎷栧姩鏃舵祻瑙堝櫒鍋氬師鐢熸嫋鎷�/婊氬姩 */
+ touch-action: none;
+ outline: none;
+
+ &::before {
+ content: '';
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ left: 50%;
+ width: 1px;
+ transform: translateX(-50%);
+ background-color: var(--el-border-color);
+ transition: background-color 0.15s, width 0.15s;
+ }
+
+ &:hover::before,
+ &.is-dragging::before,
+ &:focus-visible::before {
+ width: 2px;
+ background-color: var(--el-color-primary);
+ }
}
/* ---------- 鍙充晶鏍� ---------- */
@@ -238,6 +552,16 @@
}
/*
+ 鍥磋妯″紡锛堝彧璇伙級锛氬簳閮ㄥ姛鑳芥寜閽暣缁勭鐢� 鈥斺��
+ pointer-events:none 鍚屾椂鎸′綇鐐瑰嚮涓庢偓鍋滐紝鍐嶅姞閫忔槑搴﹁"涓嶈兘鐐�"涓�鐪煎彲瑙併��
+ 锛堟湇鍔$鍙︽湁纭牎楠岋細闈炲伐浣嶄富浜鸿皟鐢ㄥ啓鎺ュ彛浼氳鎷掔粷锛屽墠绔鐢ㄥ彧鏄綋楠屽眰銆傦級
+*/
+.doctor-page__footer.is-readonly {
+ pointer-events: none;
+ opacity: 0.55;
+}
+
+/*
鍙充晶鎺т欢缁勶細`鑷姩` 澶嶉�夋 + 鍔熻兘鎸夐挳 + `鍋滄鍊欒瘖` 寮�鍏� **鍚堟垚涓�缁�**锛�
涓�璧烽潬鍙炽�傜敤 gap 缁熶竴闂磋窛锛堝苟娓呮帀 Element Plus 缁欑浉閭� el-button 鐨�
榛樿 margin-left:12px锛屽惁鍒欎細涓� gap 鍙犲姞瀵艰嚧闂磋窛涓嶅潎锛夈��
diff --git a/src/components/RoomBedSelect/src/RoomBedSelect.vue b/src/components/RoomBedSelect/src/RoomBedSelect.vue
index 935b00f..b2ade54 100644
--- a/src/components/RoomBedSelect/src/RoomBedSelect.vue
+++ b/src/components/RoomBedSelect/src/RoomBedSelect.vue
@@ -30,7 +30,20 @@
})
// 璇ュ簥浣嶆槸鍚﹀凡鐢卞綋鍓嶅尰鐢熷叆搴�
-const isMine = computed(() => props.bed.docId != null && props.bed.docId === props.curUser.id)
+// 娉細鐢ㄥ瓧绗︿覆姣旇緝锛岄伩鍏嶅悗绔繑鍥� number / 鍓嶇 userId 涓� string 鏃惰鍒わ紙"1" !== 1锛�
+const isMine = computed(
+ () => props.bed.docId != null && String(props.bed.docId) === String(props.curUser.id)
+)
+// 璇ュ簥浣嶆槸鍚�**琚埆浜�**鍗犵敤锛氭鏃朵笉鍏佽鍏ュ骇锛堜笉鎸ゆ帀姝e湪鎿嶄綔鐨勪汉锛�
+const occupiedByOther = computed(
+ () => props.bed.docId != null && String(props.bed.docId) !== String(props.curUser.id)
+)
+// 鍗犵敤鎯呭喌鏂囨锛氱┖闂� / 鎴戠殑宸ヤ綅 / 宸插叆搴э細寮犱笁锛堟嬁涓嶅埌濮撳悕鏃舵樉绀虹紪鍙凤級
+const seatStateText = computed(() => {
+ if (props.bed.docId == null) return '绌洪棽'
+ if (isMine.value) return '鎴戠殑宸ヤ綅'
+ return props.bed.docName ? `宸插叆搴э細${props.bed.docName}` : `宸插叆搴э紙缂栧彿 ${props.bed.docId}锛塦
+})
// 璇ュ簥浣嶆槸鍚﹀氨鏄綋鍓嶄細璇濅娇鐢ㄤ腑鐨勫伐浣�
const isCurSeat = computed(
() => props.bed.roomId === props.curBed.roomId && props.bed.bedNo === props.curBed.bedNo
@@ -77,6 +90,17 @@
{{ bed.bedNo }} {{ bed.docName }} {{ bed.status === 30 ? "-鏆傚仠" : "" }}
</div>
+ <!--
+ 鍗犵敤鎯呭喌锛堟湰娆¢渶姹傦級锛氫竴鐪肩湅鍑鸿繖涓伐浣嶆槸"绌洪棽 / 鎴戠殑 / 鍒汉鐨�"銆�
+ 鍘熸潵鍗$墖鍙湪鍥剧墖涓庡鍚嶄笂浣撶幇锛屽埆浜哄崰浜嗕篃鐪嬩笉鍑烘潵锛屼細鍑虹幇"鐐逛簡鍏ュ骇鍗磋鍚庣鎷掔粷"鐨勫洶鎯戙��
+ -->
+ <div
+ class="bed-card__seat"
+ :class="occupiedByOther ? 'is-occupied' : isMine ? 'is-mine' : 'is-free'"
+ >
+ {{ seatStateText }}
+ </div>
+
<div class="bed-card__meta">
<span v-for="(checkType, subIndex) in bed.checkTypes" :key="subIndex">
{{ getCheckTypeName(checkType) }}
@@ -86,7 +110,20 @@
</div>
<div class="bed-card__actions">
- <el-button v-if="!isMine" @click="onHaveSeatclick(bed)"> 鍏ュ骇 </el-button>
+ <!-- 宸茶**鍒汉**鍗犵敤鏃剁鐢ㄣ�屽叆搴с�嶏紙涓嶆尋鎺夋鍦ㄦ搷浣滅殑浜猴級锛屽苟鐢� tooltip 璇存槑鍘熷洜 -->
+ <el-tooltip
+ v-if="!isMine"
+ :content="
+ occupiedByOther
+ ? `璇ュ伐浣嶇敱銆�${bed.docName || '鍏朵粬鍖荤敓'}銆嶆搷浣滀腑锛屼笉鑳藉叆搴э紙涓嶆尋鎺夋鍦ㄦ搷浣滅殑浜猴級`
+ : '鍏ュ骇鍒拌宸ヤ綅'
+ "
+ placement="top"
+ >
+ <span>
+ <el-button :disabled="occupiedByOther" @click="onHaveSeatclick(bed)"> 鍏ュ骇 </el-button>
+ </span>
+ </el-tooltip>
<template v-else>
<el-button @click="onLeaveSeatclick(bed)"> 绂诲骇 </el-button>
<span v-if="isCurSeat" class="bed-card__current">褰撳墠</span>
@@ -192,6 +229,26 @@
text-align: center;
}
+ /* 鍗犵敤鎯呭喌锛氱┖闂�=缁裤�佹垜鐨�=涓昏壊銆佽鍒汉鍗�=姗欙紙閰嶅悎绂佺敤鍏ュ骇鎸夐挳锛� */
+ &__seat {
+ font-size: 13px;
+ font-weight: 600;
+ line-height: 1.3;
+ text-align: center;
+
+ &.is-free {
+ color: var(--el-color-success);
+ }
+
+ &.is-occupied {
+ color: var(--el-color-warning);
+ }
+
+ &.is-mine {
+ color: var(--el-color-primary);
+ }
+ }
+
&__actions {
display: flex;
flex-wrap: wrap;
diff --git a/src/layout/components/CurrentRoomTag.vue b/src/layout/components/CurrentRoomTag.vue
new file mode 100644
index 0000000..6b7fcb3
--- /dev/null
+++ b/src/layout/components/CurrentRoomTag.vue
@@ -0,0 +1,87 @@
+<!--
+ 绯荤粺椤舵爮銆屽綋鍓嶅伐浣� / 鍥磋瀵硅薄銆嶆爣绛撅紙涓�/鍥磋妯″瀷锛�
+
+ 鏄剧ず涓夌鐘舵�侊細
+ 路 鎴戝湪鐪嬭嚜宸辩殑宸ヤ綅 鈫� 缁胯壊 `璇婂锛�1鍙烽棬璇� 路 A1` 锛堝彲鎿嶄綔锛�
+ 路 鎴戝湪鍥磋鍒汉鐨勫伐浣� 鈫� 姗欒壊 `鍥磋锛�2鍙烽棬璇� 路 B1锛堜富浜� 寮犱笁锛塦 锛堝彧璇伙級
+ 路 灏氭湭閫夋嫨宸ヤ綅 鈫� 鐏拌壊 `鏈�夋嫨宸ヤ綅`
+
+ 浜や簰锛�**鐐瑰嚮**锛堜笉璁哄摢绉嶇姸鎬侊級鈫� 鎵撳紑銆岃瘖瀹ゅ伐浣嶉�夋嫨銆嶉〉銆�
+ 鏁版嵁浠ュ悗绔负鍑嗭紙`GET /clinic/room/my-seat` 鍙�"鎴戝叆搴х殑宸ヤ綅"锛夛紝鍒锋柊/鏂版爣绛鹃〉涔熷噯纭��
+-->
+<script setup lang="ts">
+import { computed, onMounted } from 'vue'
+import { useRouter } from 'vue-router'
+import { useRoomStore } from '@/store/modules/room'
+
+defineOptions({ name: 'CurrentRoomTag' })
+
+const roomStore = useRoomStore()
+const router = useRouter()
+
+/** 鎴戞槸鍚︽鍦ㄧ湅鑷繁鍏ュ骇鐨勫伐浣嶏紙= 鍙搷浣滐級 */
+const canOperate = computed(() => roomStore.getCanOperate)
+/** 鏄惁閫夋嫨浜嗚鐪嬬殑宸ヤ綅 */
+const hasView = computed(() => roomStore.getIsSetRoom && !!roomStore.getViewText)
+
+const tagType = computed(() => {
+ if (!hasView.value) return 'info'
+ return canOperate.value ? 'success' : 'warning'
+})
+
+const tagText = computed(() => {
+ if (!hasView.value) return '鏈�夋嫨宸ヤ綅'
+ if (canOperate.value) return `璇婂锛�${roomStore.getViewText}`
+ const owner = roomStore.viewOwnerName
+ return `鍥磋锛�${roomStore.getViewText}${owner ? `锛堜富浜� ${owner}锛塦 : '锛堝彧璇伙級'}`
+})
+
+const tooltip = computed(() => {
+ if (!hasView.value) return '灏氭湭閫夋嫨宸ヤ綅锛岀偣鍑婚�夋嫨瑕佹煡鐪�/鍏ュ骇鐨勫伐浣�'
+ if (canOperate.value) return `褰撳墠宸ヤ綅锛�${roomStore.getViewText}锛堢偣鍑诲垏鎹㈠伐浣嶏級`
+ const mine = roomStore.getSeatText
+ return `鍥磋妯″紡锛堝彧璇伙級锛氭鍦ㄦ煡鐪嬨��${roomStore.getViewText}銆峘
+ + (roomStore.viewOwnerName ? `锛屼富浜� ${roomStore.viewOwnerName}` : '')
+ + (mine ? `锛涙垜鍏ュ骇鐨勫伐浣嶏細${mine}` : '锛涙垜杩樻病鏈夊叆搴�')
+ + '銆傜偣鍑诲彲鍒囨崲宸ヤ綅'
+})
+
+/** 鐐瑰嚮 鈫� 鎵撳紑銆岃瘖瀹ゅ伐浣嶉�夋嫨銆嶉〉锛堟湭閫�=鍘婚�夛紱宸查��=鍘诲垏鎹級 */
+const onClick = () => {
+ router.push({ path: '/roomselect' })
+}
+
+onMounted(async () => {
+ // 鏌ヨ涓�娆★細宸插叆搴у垯琛ラ綈"鎴戝叆搴х殑宸ヤ綅"锛堝苟鎶� room 瀵归綈鍒版垜鐨勫伐浣嶏級锛屾湭鍏ュ骇鍒欐樉绀�"鏈�夋嫨宸ヤ綅"
+ await roomStore.fetchMySeat()
+})
+</script>
+
+<template>
+ <el-tooltip :content="tooltip" placement="bottom">
+ <el-tag class="current-room-tag" :type="tagType" :effect="canOperate ? 'light' : 'plain'" @click="onClick">
+ <Icon :icon="canOperate ? 'ep:office-building' : 'ep:view'" class="mr-4px" />
+ {{ tagText }}
+ </el-tag>
+ </el-tooltip>
+</template>
+
+<style scoped lang="scss">
+.current-room-tag {
+ margin-right: 12px;
+ max-width: 360px;
+ font-weight: 600;
+ cursor: pointer;
+ /* 銆愭湰娆¢渶姹傘�戦《鏍�"褰撳墠宸ヤ綅"淇℃伅瀛楀彿鍔犲ぇ锛氬師鏉ョ户鎵� el-tag 榛樿 12px 鍋忓皬 */
+ font-size: 15px;
+ height: 30px;
+ line-height: 28px;
+ padding: 0 10px;
+}
+
+/* 鍥炬爣鍚屾鏀惧ぇ锛坋l-tag 鍐呯殑 Icon 榛樿璺熼殢瀛楀彿锛岃繖閲屾樉寮忔寚瀹氭洿绋筹級 */
+.current-room-tag :deep(.el-icon) {
+ font-size: 16px;
+ margin-right: 5px;
+}
+</style>
diff --git a/src/layout/components/ToolHeader.vue b/src/layout/components/ToolHeader.vue
index d742503..0c860d3 100644
--- a/src/layout/components/ToolHeader.vue
+++ b/src/layout/components/ToolHeader.vue
@@ -7,6 +7,7 @@
import { SizeDropdown } from '@/layout/components/SizeDropdown'
import { LocaleDropdown } from '@/layout/components/LocaleDropdown'
import RouterSearch from '@/components/RouterSearch/index.vue'
+import CurrentRoomTag from '@/layout/components/CurrentRoomTag.vue'
import { useAppStore } from '@/store/modules/app'
import { useDesign } from '@/hooks/web/useDesign'
@@ -58,6 +59,8 @@
</div>
) : undefined}
<div class="h-full flex items-center">
+ {/* 褰撳墠鍏ュ骇鐨勮瘖瀹ゅ伐浣嶏紙闇�姹傦細椤舵爮鍙锛屾湭鍏ュ骇鍙偣鍑诲幓閫夛級 */}
+ <CurrentRoomTag />
{screenfull.value ? (
<Screenfull class="custom-hover" color="var(--top-header-text-color)"></Screenfull>
) : undefined}
diff --git a/src/permission.ts b/src/permission.ts
index ad7ab58..fcdd1b2 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -19,6 +19,56 @@
const { loadStart, loadDone } = usePageLoading()
+/**
+ * 銆岄�夋嫨宸ヤ綅妯″紡銆嶇殑璺宠浆鍒ゅ畾锛�0/1/2/3锛夈��
+ *
+ * - 0 鎸夐渶瑕佸己鍒堕�夋嫨宸ヤ綅锛氭湭鍏ュ骇 鈫� 寮哄埗鍘婚�夊伐浣嶉〉
+ * - 1 鐧诲綍IP鍖归厤宸ヤ綅锛氬厛鎸夋湰鏈篒P鑷姩鍖归厤骞惰嚜鍔ㄥ叆搴э紱鍖归厤涓嶅埌 鈫� 鎸� 0锛堝幓閫夊伐浣嶉〉锛屽甫鍘熷洜锛�
+ * - 2 鐧诲綍鏃舵墜鍔ㄩ�夋嫨宸ヤ綅锛氬己鍒跺幓閫夊伐浣嶉〉锛屽苟鍦ㄧ‘璁ゆ椂鎶婃湰鏈篒P鍐欏叆鎵�閫夊伐浣嶏紙鍐橧P鍦ㄩ�夊伐浣嶉〉閲屽仛锛�
+ * - 3 鎸夌郴缁熼粯璁ゅ鐞嗭細璇P鏈粦瀹氳繃宸ヤ綅 鈫� 鎸� 2锛堥�変竴娆″苟璁颁綇IP锛夛紱宸茬粦瀹� 鈫� 鎸� 1锛涘尮閰嶄笉鍒� 鈫� 鎸� 0
+ *
+ * @returns true 琛ㄧず宸叉斁琛岋紙鏃犻渶璺宠浆锛夛紝false 琛ㄧず宸茬粡鍙戣捣璺宠浆
+ */
+const checkRoomSelect = async (
+ to: { path: string; fullPath: string },
+ next: (v?: any) => void
+): Promise<boolean> => {
+ const userStore = useUserStoreWithOut()
+ const roomStore = useRoomStoreWithOut()
+
+ // 闈炲尰鐢熻鑹层�佹垨宸插叆搴� 鈫� 涓嶅共棰�
+ const isDoctor =
+ userStore.getRoles.includes('doctor') && !userStore.getRoles.includes('super_admin')
+ if (!isDoctor || roomStore.getIsSetRoom || to.path === '/roomselect') {
+ // 鐜板満鎺掓煡鐢細璇存槑"涓轰粈涔堣繖娆℃病鏈夎嚜鍔ㄥ叆搴�"锛坅dmin 绛夐潪鍖荤敓瑙掕壊鎸夎璁′笉鑷姩鍏ュ骇锛�
+ // 闇�瑕佺偣椤舵爮鐨勩�屾湭鍏ュ骇銆嶆爣绛捐繘閫夊伐浣嶉〉鎵嬪姩閫変竴娆★級
+ if (!isDoctor) {
+ console.info('[room] 褰撳墠瑙掕壊闈炲尰鐢燂紙roles=' + userStore.getRoles.join(',') + '锛夛紝璺宠繃鎸塈P鑷姩鍏ュ骇')
+ }
+ return true
+ }
+
+ const mode = await roomStore.loadRoomSelectMode()
+
+ // 妯″紡 1 / 3锛氬厛灏濊瘯鎸夋湰鏈篒P鑷姩鍖归厤骞惰嚜鍔ㄥ叆搴э紙鎴愬姛灏辩洿鎺ヨ繘锛�
+ if (mode === 1 || mode === 3) {
+ const res = await roomStore.tryAutoSeatByIp()
+ if (res.seated) {
+ return true
+ }
+ // 銆愪富/鍥磋路鏈闇�姹傘�戞病鑷姩鍏ュ骇涔�**涓嶅啀寮哄埗璺�"閫夊伐浣嶉〉"**锛�
+ // 鍏佽浠�"鏈叆搴� / 鍥磋"韬唤杩涘叆宸ヤ綔鍙帮紙鍙锛夛紝鐢卞伐浣滃彴椤堕儴鐨勩�屽伐浣嶃�嶄笅鎷�
+ // 閫夋嫨瑕佹煡鐪嬶紙鍥磋锛夋垨瑕佸叆搴х殑宸ヤ綅銆傝嫢涓�寰嬪脊鍥為�夊伐浣嶉〉锛屽氨姘歌繙鏃犳硶鍥磋鍒汉銆�
+ console.info('[room] 鏈嚜鍔ㄥ叆搴э紙' + (res.reason || 'nomatch') + '锛夛紝鎸�"鍙洿瑙�"鏀捐')
+ return true
+ }
+
+ // 妯″紡 0 / 2锛氬師鏉ュ己鍒跺幓閫夊伐浣嶉〉锛涙湰娆″悓鏍锋斁琛岋紝鐞嗙敱鍚屼笂锛堢敱椤堕儴涓嬫媺閫夋嫨宸ヤ綅锛夈��
+ // 閫夊伐浣嶉〉浠嶅彲浠庨《鏍忓伐浣嶆爣绛� / 椤堕儴涓嬫媺杩涘叆銆�
+ console.info('[room] 閫夋嫨宸ヤ綅妯″紡=' + mode + '锛氫笉寮哄埗璺抽�夊伐浣嶉〉锛屽厑璁歌繘鍏ュ悗鑷閫夋嫨/鍥磋')
+ return true
+}
+
const parseURL = (
url: string | null | undefined
): { basePath: string; paramsObject: { [key: string]: string } } => {
@@ -102,7 +152,6 @@
// 鑾峰彇鎵�鏈夊瓧鍏�
const dictStore = useDictStoreWithOut()
const userStore = useUserStoreWithOut()
- const roomStore = useRoomStoreWithOut()
const checkTypeStore = useCheckTypeStoreWithOut()
const permissionStore = usePermissionStoreWithOut()
if (!dictStore.getIsSetDict) {
@@ -114,11 +163,8 @@
if (userStore.getIsSetUser) {
- // <<<銆愯瘖瀹ら�夋嫨銆�<<<
- if (to.path !== '/roomselect' &&
- userStore.getRoles.includes("doctor") && !userStore.getRoles.includes("super_admin")
- && !roomStore.getIsSetRoom) {
- next({ path: `/roomselect?redirect=${to.fullPath}` })
+ // <<<銆愯瘖瀹ら�夋嫨銆戞寜銆岄�夋嫨宸ヤ綅妯″紡銆嶅弬鏁帮紙0/1/2/3锛夊喅瀹氭槸鍚﹀己鍒堕�夋嫨宸ヤ綅 >>>
+ if (!(await checkRoomSelect(to, next))) {
return
}
@@ -136,11 +182,8 @@
router.addRoute(route as unknown as RouteRecordRaw) // 鍔ㄦ�佹坊鍔犲彲璁块棶璺敱琛�
})
- // <<<銆愯瘖瀹ら�夋嫨銆�<<<
- if (to.path !== '/roomselect' &&
- userStore.getRoles.includes("doctor") && !userStore.getRoles.includes("super_admin")
- && !roomStore.getIsSetRoom) {
- next({ path: `/roomselect?redirect=${to.fullPath}` })
+ // <<<銆愯瘖瀹ら�夋嫨銆戞寜銆岄�夋嫨宸ヤ綅妯″紡銆嶅弬鏁帮紙0/1/2/3锛夊喅瀹氭槸鍚﹀己鍒堕�夋嫨宸ヤ綅 >>>
+ if (!(await checkRoomSelect(to, next))) {
return
}
diff --git a/src/store/modules/room.ts b/src/store/modules/room.ts
index 74fe57b..9ae973d 100644
--- a/src/store/modules/room.ts
+++ b/src/store/modules/room.ts
@@ -1,15 +1,65 @@
import { store } from '@/store'
import { defineStore } from 'pinia'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
-import {RoomVO} from "@/api/ecg/room";
+import { RoomApi, RoomVO, RoomSeatResp } from "@/api/ecg/room";
+import { DoctorApi } from "@/api/ecg/doctor";
+import { getConfigKey } from '@/api/infra/config'
+import { useUserStore } from '@/store/modules/user'
const { wsCache } = useCache("sessionStorage")
+/** 鍙傛暟 key锛氶�夋嫨宸ヤ綅妯″紡锛堜笌鍚庣 Constants.ECG_ROOM_SELECT_MODE_KEY 涓�鑷达級 */
+const ROOM_SELECT_MODE_KEY = 'ecg.room.select.mode'
+
+/**
+ * 閫夋嫨宸ヤ綅妯″紡锛�
+ * 0 = 鎸夐渶瑕佸己鍒堕�夋嫨宸ヤ綅锛�=鍘熻涓猴級
+ * 1 = 鐧诲綍IP鍖归厤宸ヤ綅锛堝尮閰嶄笉鍒版寜 0 鎵ц锛�
+ * 2 = 鐧诲綍鏃舵墜鍔ㄩ�夋嫨宸ヤ綅锛屽苟鍐欏叆鏈満IP
+ * 3 = 鎸夌郴缁熼粯璁ゅ鐞嗭紙璇P鏈粦瀹氳繃鈫掓寜2閫変竴娆″苟璁颁綇IP锛涘凡缁戝畾鈫掓寜1鑷姩鍖归厤锛涘尮閰嶄笉鍒扳啋鎸�0锛�
+ */
+export type RoomSelectMode = 0 | 1 | 2 | 3
+
+/** 鑷姩鍖归厤宸ヤ綅鐨勭粨鏋滐紝渚涜矾鐢卞畧鍗垎鏀敤 */
+export interface AutoSeatResult {
+ /** 鏄惁宸叉垚鍔熷叆搴� */
+ seated: boolean
+ /** 鍚庣璇嗗埆鍒扮殑鏈満IP */
+ clientIp: string | null
+ /**
+ * 鏈叆搴у師鍥狅紙seated=true 鏃舵棤鎰忎箟锛夛細
+ * - nomatch锛氳IP娌″尮閰嶅埌宸ヤ綅
+ * - occupied锛氬尮閰嶅埌浣嗗叏琚粬浜哄崰鐢�
+ * - multi锛�**璇P瀵瑰簲澶氫釜鍙�夊伐浣�**锛屾棤娉曞彧鍑璉P纭畾锛岄渶瑕佷汉宸ョ偣閫�
+ * - ip_invalid锛氭湰鏈篒P涓嶅彲鐢紙鍥炵幆 / IPv6 / 鏈寚瀹� / 闈炴硶锛夛紝涓嶈兘浣滀负宸ヤ綅鏍囪瘑
+ * - ip_is_server锛氳瘑鍒埌鐨勬槸**鏈嶅姟鍣ㄨ嚜韬湴鍧�**锛堝湪鏈嶅姟鍣ㄤ笂/杩滅▼妗岄潰閲岃闂紝鎴栦唬鐞嗚鐩栦簡瀹㈡埛绔湴鍧�锛�
+ * - error锛氭帴鍙e紓甯告垨鍏ュ骇鍐欏簱鏈敓鏁�
+ */
+ reason?: 'nomatch' | 'occupied' | 'multi' | 'ip_invalid' | 'ip_is_server' | 'error'
+ /** 琚崰鐢ㄦ椂鐨勫崰鐢ㄤ汉锛屼究浜庢彁绀� */
+ occupiedBy?: string | null
+}
+
interface RoomInfoVO {
- // 鍖荤敓璇婂閫夋嫨
+ // 鍖荤敓璇婂閫夋嫨锛�= 褰撳墠**鏌ョ湅**鐨勫伐浣嶏細鐪嬭嚜宸卞氨鏄嚜宸卞叆搴х殑锛岀湅鍒汉灏辨槸鍥磋瀵硅薄锛�
isSetRoom: boolean
room: RoomVO
+ // 閫夋嫨宸ヤ綅妯″紡锛�-1 琛ㄧず杩樻病鍙栧埌锛�
+ roomSelectMode: number
+ /**
+ * 褰撳墠鐧诲綍浜�**宸插叆搴�**鐨勫伐浣嶏紙绯荤粺椤舵爮鏄剧ず鐢紱鏈叆搴т负 null锛夈��
+ *
+ * 涓� `room` 鐨勫尯鍒細`room` 鏄�"鎴戞鍦ㄧ湅鍝釜宸ヤ綅"锛堝洿瑙傛椂鏄埆浜虹殑宸ヤ綅锛夛紝
+ * 鑰� `currentSeat` 鏄�"鎴戝叆搴у湪鍝釜宸ヤ綅"锛堟湇鍔$ clinic_room.doc_id = 鎴戯級銆�
+ * 涓よ�呯浉鍚� 鈫� 鍙搷浣滐紱涓嶅悓 鈫� 鍙鍥磋銆�
+ */
+ currentSeat: RoomSeatResp | null
+ /** 褰撳墠鏌ョ湅宸ヤ綅鐨勪富浜虹殑濮撳悕锛堝洿瑙傛椂鐢ㄤ簬鎻愮ず"姝e湪鍥磋 X锛堜富浜� 寮犱笁锛�"锛� */
+ viewOwnerName: string | null
+ /** 褰撳墠鏌ョ湅鐨勫伐浣嶇幇鍦ㄦ槸鍚�**鏃犱汉鎿嶄綔**锛堜富浜哄凡绂诲骇锛涘彧鎻愮ず锛屼笉鑷姩鎺ョ锛� */
+ viewTargetVacant: boolean
}
+
export const useRoomStore = defineStore('current-room', {
state: (): RoomInfoVO => ({
@@ -26,7 +76,15 @@
docName: null,
checkTypes: null,
opType: null
- }
+ },
+ // 閫夋嫨宸ヤ綅妯″紡锛�-1 = 灏氭湭浠庡悗绔彇鍒�
+ roomSelectMode: -1,
+ // 褰撳墠鍏ュ骇鐨勫伐浣嶏紙椤舵爮鏄剧ず锛涙湭鍏ュ骇涓� null锛�
+ currentSeat: null,
+ // 姝e湪鏌ョ湅鐨勫伐浣嶇殑涓讳汉濮撳悕锛堝洿瑙傛彁绀虹敤锛�
+ viewOwnerName: null,
+ // 姝e湪鏌ョ湅鐨勫伐浣嶇幇鍦ㄦ槸鍚︽棤浜烘搷浣滐紙涓讳汉宸茬搴� 鈫� 鍙彁绀猴紝涓嶈嚜鍔ㄦ帴绠★級
+ viewTargetVacant: false
}),
getters: {
// 鍖荤敓璇婂閫夋嫨
@@ -35,6 +93,45 @@
},
getRoom(): RoomVO | null {
return this.room
+ },
+ /** 褰撳墠鍏ュ骇鐨勫伐浣嶏紙鍙兘涓� null = 鏈叆搴э級 */
+ getCurrentSeat(): RoomSeatResp | null {
+ return this.currentSeat
+ },
+ /**
+ * 銆愪富/鍥磋銆戝綋鍓嶆槸鍚�**鍙互鎿嶄綔涓氬姟**銆�
+ *
+ * 鍒ゅ畾锛氭垜鍏ュ骇鐨勫伐浣� == 鎴戞鍦ㄧ湅鐨勫伐浣嶏紙鏈嶅姟绔彟鏈変竴閬撶‖鏍¢獙锛歞oc_id 蹇呴』鏄垜锛夈��
+ * 涓� false 鏃跺墠绔簲绂佺敤鎵�鏈夊啓鎿嶄綔鎸夐挳锛岀晫闈㈡樉绀�"鍥磋妯″紡 路 鍙"銆�
+ */
+ getCanOperate(): boolean {
+ const seat = this.currentSeat
+ const view = this.room
+ if (!seat || !seat.seated || !view || view.roomId == null || !view.bedNo) {
+ return false
+ }
+ return String(seat.roomId) === String(view.roomId) && String(seat.bedNo) === String(view.bedNo)
+ },
+ /** 褰撳墠鏄惁鍦�**鍥磋鍒汉鐨勫伐浣�**锛堟湁搴т絾鐪嬬殑涓嶆槸鑷繁閭e骇锛屾垨娌″骇鍙湅鍒汉锛� */
+ getIsViewingOther(): boolean {
+ return this.isSetRoom && !this.getCanOperate
+ },
+ /**
+ * 椤舵爮灞曠ず鏂囨锛歚1鍙烽棬璇� 路 A1`锛涙湭鍏ュ骇杩斿洖绌轰覆锛堢敱缁勪欢鏄剧ず"鏈叆搴�"锛夈��
+ * 璇婂鍚嶄负绌烘椂閫�鍖栦负鍙樉绀哄伐浣嶅彿锛岄伩鍏嶅嚭鐜� `undefined 路 A1`銆�
+ */
+ getSeatText(): string {
+ const seat = this.currentSeat
+ if (!seat || !seat.seated) return ''
+ const name = seat.roomName || `璇婂${seat.roomId ?? ''}`
+ return seat.bedNo ? `${name} 路 ${seat.bedNo}` : name
+ },
+ /** 椤舵爮"褰撳墠鏌ョ湅鐨勫伐浣�"鏂囨锛堝洿瑙傛椂鐢ㄥ畠锛岃�屼笉鏄垜鑷繁鍏ュ骇鐨勫伐浣嶏級 */
+ getViewText(): string {
+ const view = this.room
+ if (!view || view.roomId == null || !view.bedNo) return ''
+ const name = view.roomName || `璇婂${view.roomId}`
+ return `${name} 路 ${view.bedNo}`
}
},
actions: {
@@ -51,6 +148,23 @@
this.room!.checkTypes = room.checkTypes
this.room!.opType = room.opType
this.isSetRoom = true
+ // 銆愪富/鍥磋銆戣繖鏉¤矾寰勯兘鏄�"鎴戝叆搴х殑宸ヤ綅"锛堝叆搴� / 鎭㈠鎴戠殑宸ヤ綅 / 鑷姩鍏ュ骇 / 閫夊伐浣嶉〉鍥炲~锛夛紝
+ // 鍥犳鎶� currentSeat 涓�璧疯涓� 鈥斺�� 鍚﹀垯 getCanOperate 浼氳鍒や负"鏃犲骇鍙"銆�
+ this.currentSeat = {
+ seated: true,
+ id: room.id ?? null,
+ roomId: room.roomId ?? null,
+ roomName: room.roomName ?? null,
+ bedNo: room.bedNo ?? null,
+ ip: room.ip ?? null,
+ status: room.status ?? null,
+ docId: room.docId ?? null,
+ docName: room.docName ?? null,
+ checkTypes: room.checkTypes ?? null,
+ opType: room.opType ?? null
+ } as RoomSeatResp
+ this.viewOwnerName = room.docName ?? null
+ this.viewTargetVacant = false
// 銆愪慨澶嶃�戝啓鍏ョ紦瀛橈紙sessionStorage锛夈��
//
@@ -62,7 +176,47 @@
// 鎵嶅惎鍔ㄥ彇鏁板畾鏃跺櫒 鈬� **椤甸潰涓�鐗囩┖鐧斤紝鐪嬭捣鏉ュ儚"娌″姞杞芥帓闃熺梾浜�"**锛�
// 路 瑙掕壊涓� doctor 鐨勭敤鎴疯繕浼氳璺敱瀹堝崼寮瑰洖 /roomselect 閲嶆柊閫夎瘖瀹ゃ��
// 杩欓噷鏀逛负**鏃犳潯浠跺啓鍏�**锛涙仮澶嶈鏂囦欢鏈熬鐨� setupRoomStorePersistence()銆�
- wsCache.set(CACHE_KEY.ROOM, { isSetRoom: true, room: this.room })
+ wsCache.set(CACHE_KEY.ROOM, { isSetRoom: true, room: this.room, currentSeat: this.currentSeat })
+ },
+ /**
+ * 銆愪富/鍥磋銆戞妸"鎴戞鍦ㄧ湅鐨勫伐浣�"鍒囧埌鍒汉锛堟垨鍒囧洖鑷繁锛夆�斺��**涓嶆敼鎴戠殑鍏ュ骇宸ヤ綅**銆�
+ *
+ * 鍥磋灏辨槸闈犺繖涓姩浣滃疄鐜扮殑锛歚room`锛堢湅璋侊級涓� `currentSeat`锛堟垜鍧愬摢锛夊垎绂伙紝
+ * 涓よ�呬笉鍚屾椂 {@link getCanOperate} 涓� false 鈫� 鐣岄潰鍙锛屾湇鍔$鍙︽湁涓�閬撶‖鏍¢獙銆�
+ *
+ * @param bed 瑕佹煡鐪嬬殑宸ヤ綅锛堟潵鑷伐浣嶅垪琛級
+ * @param ownerName 璇ュ伐浣嶅綋鍓嶄富浜虹殑濮撳悕锛堟棤涓绘椂浼� null锛�
+ */
+ async setViewTargetAction(bed: RoomVO, ownerName?: string | null) {
+ this.room!.id = bed.id ?? null
+ this.room!.roomId = bed.roomId ?? null
+ this.room!.roomName = bed.roomName ?? null
+ this.room!.bedNo = bed.bedNo ?? null
+ this.room!.ip = bed.ip ?? null
+ this.room!.status = bed.status ?? null
+ this.room!.docId = bed.docId ?? null
+ this.room!.docName = bed.docName ?? null
+ this.room!.checkTypes = bed.checkTypes ?? null
+ this.room!.opType = bed.opType ?? null
+ this.isSetRoom = true
+ this.viewOwnerName = ownerName ?? bed.docName ?? null
+ this.viewTargetVacant = bed.docId == null
+ wsCache.set(CACHE_KEY.ROOM, { isSetRoom: true, room: this.room, currentSeat: this.currentSeat })
+ },
+ /**
+ * 銆愪富/鍥磋銆戝埛鏂�"鎴戞鍦ㄧ湅鐨勫伐浣�"鐨勬渶鏂扮姸鎬侊紙鐢ㄤ簬鍙戠幇涓讳汉宸茬搴э級銆�
+ *
+ * 鍙洿鏂� docId/docName 涓� vacant 鏍囪锛屼笉鏀瑰彉"鎴戝湪鐪嬪摢涓伐浣�"銆�
+ * 鎸夌‘璁ゅ彛寰勶細涓讳汉绂诲骇鍚�**鍙彁绀恒�佷笉鑷姩鎺ョ**銆�
+ */
+ refreshViewTargetState(bed: RoomVO) {
+ if (!this.room || String(this.room.roomId) !== String(bed.roomId) || this.room.bedNo !== bed.bedNo) {
+ return
+ }
+ this.room.docId = bed.docId ?? null
+ this.room.docName = bed.docName ?? null
+ this.viewOwnerName = bed.docName ?? null
+ this.viewTargetVacant = bed.docId == null
},
// 鍖荤敓绂诲骇
async clearRoomInfoAction() {
@@ -76,6 +230,10 @@
this.room.docName = null
this.isSetRoom = false
+ // 椤舵爮鏍囩鍚屾娓呯┖锛堢搴у悗鏄剧ず"鏈叆搴�"锛�
+ this.currentSeat = null
+ this.viewOwnerName = null
+ this.viewTargetVacant = false
// 娓呯紦瀛橈紙涓庝笂闈㈢殑鍐欏叆瀵瑰簲锛岄伩鍏嶄笅娆″惎鍔ㄦ妸宸茬搴х殑璇婂鎭㈠鍑烘潵锛�
wsCache.delete(CACHE_KEY.ROOM)
@@ -94,8 +252,193 @@
if (cached?.isSetRoom && cached?.room?.roomId != null && cached?.room?.bedNo != null) {
this.room = { ...this.room, ...cached.room }
this.isSetRoom = true
+ // 銆愪富/鍥磋銆戣繛"鎴戝叆搴х殑宸ヤ綅"涓�璧锋仮澶嶏細鍚﹀垯鍒锋柊鍚� getCanOperate 浼氳鍒や负鍙
+ if (cached?.currentSeat) {
+ this.currentSeat = cached.currentSeat
+ this.viewOwnerName = cached.currentSeat.docName ?? null
+ // 鈿狅笍銆愭湰娆′慨澶嶃��**涓嶆妸"鍥磋瀵硅薄"甯﹀埌涓嬩竴娆℃墦寮�**锛�
+ // 缂撳瓨閲岀殑 room 鑻ヤ笌鎴戝叆搴х殑宸ヤ綅涓嶆槸鍚屼竴涓紝璇存槑涓婃鍦ㄥ洿瑙傚埆浜恒��
+ // 鑻ョ収鍘熸牱鎭㈠锛屽埛鏂板悗宸ヤ綔鍙颁細涓�鐩存樉绀�**鍒汉宸ヤ綅鐨勯槦鍒�**锛堢湅鐫�鍍�"鎮h�呭垪琛ㄧ┖浜�"锛夛紝
+ // 鑰屽尰鐢熶互涓哄湪鐪嬭嚜宸辩殑宸ヤ綅 鈥斺�� 鐜板満鍙嶉鐨�"鍒楄〃鏁翠釜鏄┖鐨�"寰堝彲鑳藉氨鏄繖涓��
+ // 鍥磋鏄�"褰撳墠浼氳瘽閲岀殑涓存椂閫夋嫨"锛屽埛鏂�/閲嶅紑涓�寰嬪洖鍒版垜鑷繁鐨勫伐浣嶃��
+ const seat = cached.currentSeat
+ const cachedIsMine =
+ String(cached.room.roomId) === String(seat.roomId) && cached.room.bedNo === seat.bedNo
+ if (!cachedIsMine) {
+ this.room = {
+ ...this.room,
+ id: seat.id ?? null,
+ roomId: seat.roomId ?? null,
+ roomName: seat.roomName ?? null,
+ bedNo: seat.bedNo ?? null,
+ ip: seat.ip ?? null,
+ status: seat.status ?? null,
+ docId: seat.docId ?? null,
+ docName: seat.docName ?? null,
+ checkTypes: seat.checkTypes ?? null,
+ opType: seat.opType ?? null
+ }
+ this.viewOwnerName = seat.docName ?? null
+ this.viewTargetVacant = false
+ console.info('[room] 涓婃鍦ㄥ洿瑙傚叾浠栧伐浣嶏紝鏈鎵撳紑鍥炲埌鎴戣嚜宸辩殑宸ヤ綅', this.room)
+ }
+ }
}
},
+
+ /* ==================== 閫夋嫨宸ヤ綅妯″紡锛�0/1/2/3锛� ==================== */
+
+ /** 璇诲彇銆岄�夋嫨宸ヤ綅妯″紡銆嶅弬鏁帮細浼氳瘽鍐呭彧鍙栦竴娆★紱鍙栦笉鍒版垨闈炴硶涓�寰嬫寜 0锛堝師琛屼负锛夛紝閬垮厤褰卞搷瀛橀噺閮ㄧ讲 */
+ async loadRoomSelectMode(force = false): Promise<number> {
+ if (!force && this.roomSelectMode >= 0) {
+ return this.roomSelectMode
+ }
+ let mode = 0
+ try {
+ const v = await getConfigKey(ROOM_SELECT_MODE_KEY)
+ const n = Number(v)
+ if ([0, 1, 2, 3].includes(n)) {
+ mode = n
+ }
+ } catch (e) {
+ mode = 0
+ }
+ this.roomSelectMode = mode
+ return mode
+ },
+
+ /**
+ * 妯″紡 1/3锛氭寜鏈満IP鑷姩鍖归厤骞惰嚜鍔ㄥ叆搴с��
+ *
+ * 銆愭湰娆′慨澶嶃�戞敼涓�**璋冪敤鍚庣涓�涓帴鍙�**锛坄POST /clinic/room/auto-seat`锛夊畬鎴�
+ * 銆屽尮閰� 鈫� 鍒ゅ畾 鈫� 钀藉骇銆嶏紝涓嶅啀鐢卞墠绔嫾 `getIpBed 鈫� bindIpToBed 鈫� bedDoctorOn` 涓夋锛�
+ * 鍘熸潵浠讳竴姝ュけ璐ラ兘鍙兘鍥炶惤"鎵嬮�夊伐浣�"锛岀幇鍦鸿〃鐜板氨鏄�"鐧诲綍鍚庢病鏈夎嚜鍔ㄥ叆搴�"涓旂湅涓嶅嚭鍘熷洜銆�
+ * 鐜板湪鍚庣鐩存帴杩斿洖 `reason`锛坕p_invalid / nomatch / multi / occupied / error锛変笌璇嗗埆鍒扮殑 IP銆�
+ *
+ * 鍖归厤绛栫暐锛堝悗绔疄鐜帮紝涓庡師鍓嶇閫昏緫涓�鑷达級锛�
+ * 路 宸茬粡鏄垜鐨勫伐浣� 鈫� 骞傜瓑鎭㈠锛堝埛鏂�/閲嶈繘/涓婃娌℃甯哥搴ч兘璧拌繖鏉★級锛�
+ * 路 绌洪棽鍊欓��**鎭板ソ 1 涓�** 鈫� 鍏ュ骇锛堟湇鍔$鍚屾椂淇濊瘉"涓�涓敤鎴峰彧鍗犱竴涓伐浣�"锛夛紱
+ * 路 绌洪棽鍊欓��**澶氫釜** 鈫� 涓嶆搮鑷叆搴э紙reason='multi'锛夛紝浜や汉宸ョ偣閫夛紱
+ * 路 鍏ㄨ浠栦汉鍗犵敤 鈫� reason='occupied' + 鍗犵敤浜哄鍚嶏紙**涓嶆尋鎺�**宸插湪鎿嶄綔鐨勪汉锛夈��
+ */
+ async tryAutoSeatByIp(): Promise<AutoSeatResult> {
+ try {
+ const resp: any = (await RoomApi.autoSeat()) || {}
+ const clientIp: string | null = resp.clientIp ?? null
+ if (resp.seated) {
+ await this.setRoomInfoAction({
+ id: resp.id ?? null,
+ roomId: resp.roomId ?? null,
+ roomName: resp.roomName ?? null,
+ bedNo: resp.bedNo ?? null,
+ ip: resp.ip ?? null,
+ status: resp.status ?? null,
+ docId: resp.docId ?? null,
+ docName: resp.docName ?? null,
+ checkTypes: resp.checkTypes ?? null,
+ opType: resp.opType ?? null
+ } as RoomVO)
+ // 椤舵爮"褰撳墠宸ヤ綅"鏍囩鐢�
+ this.currentSeat = resp as RoomSeatResp
+ console.info('[room] 鎸塈P鑷姩鍏ュ骇鎴愬姛', resp)
+ return { seated: true, clientIp }
+ }
+ console.info('[room] 鎸塈P鑷姩鍏ュ骇鏈垚鍔燂紝杞汉宸ラ�夊伐浣�', resp)
+ return {
+ seated: false,
+ clientIp,
+ reason: (resp.reason || 'nomatch') as AutoSeatResult['reason'],
+ occupiedBy: resp.ownerName ?? null
+ }
+ } catch (e) {
+ console.error('[tryAutoSeatByIp] 鑷姩鍏ュ骇鎺ュ彛寮傚父', e)
+ return { seated: false, clientIp: null, reason: 'error' }
+ }
+ },
+
+ /**
+ * 鏌ヨ骞惰褰�"褰撳墠鐧诲綍浜哄凡鍏ュ骇鐨勫伐浣�"锛堢郴缁熼《鏍忔樉绀虹敤锛夈��
+ *
+ * 鍦烘櫙锛氬埛鏂伴〉闈� / 鏂板紑鏍囩椤� / 鐩存帴杩涚郴缁燂紝鍐呭瓨閲岀殑 `currentSeat` 鍙兘鏄┖鐨勶紝
+ * 浣嗗悗绔煡閬撴垜鏄摢涓伐浣嶇殑涓讳汉 鈥斺�� 鏌ヤ竴娆″氨鑳借椤舵爮涓庡悇椤甸潰鍙e緞涓�鑷淬��
+ *
+ * 銆愪富/鍥磋銆戞敞鎰忥細**鍙湁鍦ㄦ垜杩樻病閫�"瑕佺湅鐨勫伐浣�"銆佹垨鎴戠湅鐨勫氨鏄嚜宸卞伐浣嶆椂**锛�
+ * 鎵嶆妸鏌ョ湅鐩爣涔熷榻愬埌鎴戠殑宸ヤ綅锛涘惁鍒欎細鎶婃鍦ㄥ洿瑙傜殑瀵硅薄瑕嗙洊鎺夛紙鍥磋灏辨病娉曠敤浜嗭級銆�
+ */
+ async fetchMySeat(): Promise<RoomSeatResp | null> {
+ try {
+ const resp: any = (await RoomApi.getMySeat()) || {}
+ if (!resp.seated) {
+ this.currentSeat = null
+ return null
+ }
+ this.currentSeat = resp as RoomSeatResp
+ const noViewTarget = !this.isSetRoom || this.room.roomId == null || !this.room.bedNo
+ const viewingMyself =
+ !noViewTarget &&
+ String(this.room.roomId) === String(resp.roomId) &&
+ String(this.room.bedNo) === String(resp.bedNo)
+ if (!noViewTarget && !viewingMyself) {
+ // 姝e湪鍥磋鍒汉 鈫� 鍙洿鏂�"鎴戝叆搴х殑宸ヤ綅"锛屼笉鍔ㄦ煡鐪嬬洰鏍�
+ console.info('[room] 鏌ヨ鍒版垜鍏ュ骇鐨勫伐浣嶏紙褰撳墠姝e湪鍥磋浠栦汉锛屼笉鍒囨崲鏌ョ湅鐩爣锛�', resp)
+ return this.currentSeat
+ }
+ await this.setRoomInfoAction({
+ id: resp.id ?? null,
+ roomId: resp.roomId ?? null,
+ roomName: resp.roomName ?? null,
+ bedNo: resp.bedNo ?? null,
+ ip: resp.ip ?? null,
+ status: resp.status ?? null,
+ docId: resp.docId ?? null,
+ docName: resp.docName ?? null,
+ checkTypes: resp.checkTypes ?? null,
+ opType: resp.opType ?? null
+ } as RoomVO)
+ console.info('[room] 鏌ヨ鍒板綋鍓嶅叆搴у伐浣�', resp)
+ return this.currentSeat
+ } catch (e) {
+ console.error('[fetchMySeat] 鏌ヨ褰撳墠宸ヤ綅澶辫触', e)
+ return null
+ }
+ },
+
+ /**
+ * 鍏ュ骇锛坆ed-doctor-on锛�+ 鍐欏叆浼氳瘽銆傛娊鍑烘潵缁欍�屾墜鍔ㄩ�夋嫨銆嶅拰銆屾寜IP鑷姩鍖归厤銆嶅叡鐢ㄣ��
+ * @returns 鏄惁鍏ュ骇鎴愬姛
+ */
+ async seatRoom(bed: Partial<RoomVO>): Promise<boolean> {
+ const userStore = useUserStore()
+ const curUser: any = userStore.getUser || {}
+ const tempRoomVO: RoomVO = {
+ id: bed.id ?? null,
+ roomId: bed.roomId ?? null,
+ roomName: bed.roomName ?? null,
+ bedNo: bed.bedNo ?? null,
+ ip: bed.ip ?? null,
+ status: bed.status ?? null,
+ docId: curUser.id ?? null,
+ docName: curUser.nickname ?? null,
+ checkTypes: bed.checkTypes ?? null,
+ opType: bed.opType ?? null
+ }
+ const data = await DoctorApi.bedDoctorOn(tempRoomVO)
+ if (data !== 0) {
+ console.warn('[seatRoom] bedDoctorOn 杩斿洖闈� 0锛�', data)
+ return false
+ }
+ await this.setRoomInfoAction(tempRoomVO)
+ return true
+ },
+
+ /**
+ * 妯″紡 2/3锛氭妸鏈満IP鍐欏埌鎸囧畾宸ヤ綅銆�
+ * @returns { code, conflict, msg } 鈥斺�� code=409 琛ㄧず璇P宸茬粦鍦ㄥ埆鐨勫伐浣嶏紙conflict=true锛夛紝闇�纭鍚庡甫 force 閲嶈皟
+ */
+ async bindCurrentIp(bedId: number, force = false): Promise<any> {
+ const resp: any = await RoomApi.bindIpToBed(bedId, force)
+ return resp || {}
+ }
}
})
diff --git a/src/utils/releaseBed.ts b/src/utils/releaseBed.ts
index 54619f7..b3b3524 100644
--- a/src/utils/releaseBed.ts
+++ b/src/utils/releaseBed.ts
@@ -2,7 +2,7 @@
import { getAccessToken } from '@/utils/auth'
/**
- * 閫�鍑虹郴缁熸椂鑷姩閲婃斁璇婄枟搴婁綅锛堥渶姹傦細鍖荤敓甯稿繕璁般�岀搴с�嶅氨閫�鍑虹郴缁燂級銆�
+ * 閫�鍑虹郴缁熸椂鑷姩閲婃斁璇婂宸ヤ綅锛堥渶姹傦細鍖荤敓甯稿繕璁般�岀搴с�嶅氨閫�鍑虹郴缁燂級銆�
*
* 鑳屾櫙
* ----
diff --git a/src/utils/statusFormatter.ts b/src/utils/statusFormatter.ts
index 5dbfd98..997a9a1 100644
--- a/src/utils/statusFormatter.ts
+++ b/src/utils/statusFormatter.ts
@@ -56,7 +56,7 @@
else if (15 === status)
return '宸插彫鍥�';
else if (20 === status)
- return '鍊欒瘖涓�';
+ return '鍑嗗涓�'; // 2026-10-16锛氬師銆屽�欒瘖涓�嶇粺涓�鏀瑰悕涓恒�屽噯澶囦腑銆嶏紙涓庡瓧鍏� ecg_queue_status 涓�鑷达級
else if (30 === status)
return '灏辫瘖涓�';
else if (33 === status)
diff --git a/src/views/ecg/appointment/CheckItemPanel.vue b/src/views/ecg/appointment/CheckItemPanel.vue
index 86355cb..63c379c 100644
--- a/src/views/ecg/appointment/CheckItemPanel.vue
+++ b/src/views/ecg/appointment/CheckItemPanel.vue
@@ -9,7 +9,7 @@
import { cloneDeep } from 'lodash-es'
import { hiprint } from 'vue-plugin-hiprint'
import { calGender, getBookBeginTime } from '@/utils'
-import { getCheckTypeName } from '@/utils/checkTypeFormatter'
+import { getCheckTypeName, getCheckTypeSeqPrefix } from '@/utils/checkTypeFormatter'
defineComponent({
name: 'CheckItemPanel'
@@ -29,7 +29,21 @@
const checkTypeTimeslotList = ref<QueueSequenceVO>()
const bookTimeSlotVip = ref<number>()
-const bookSeqNum = ref<number>()
+/**
+ * 鏈绛惧埌鎷垮埌鐨勬帓闃熷彿锛堝彿缁熶竴鍚庣敱鍚庣鍐欏叆 queue.seq_num锛屽苟鐢辩‘璁ゆ帴鍙g洿鎺ヨ繑鍥烇級銆�
+ *
+ * 璇存槑锛氬彉閲忓悕浠� bookSeqNum 鏀逛负 seqNum 鈥斺�� 鍙峰凡缁忕粺涓�锛岀郴缁熼噷涓嶅啀鏈� book_seq_num 杩欎竴璺��
+ * 棰勭害瀵硅薄涓婄殑 `bookSeqNum` 瀛楁鍚嶄繚鐣欙紙鎺ュ彛瀛楁涓嶅姩锛夛紝鍊兼潵婧愪篃宸叉敼涓� queue.seq_num锛�
+ * 浠呭湪"璇ラ绾﹀凡缁忔帓杩囬槦"鏃剁敤浜庡洖鏄俱��
+ */
+const seqNum = ref<number>()
+
+/** 鎺掗槦鍙锋樉绀烘枃妗堬細妫�鏌ラ」鐩墠缂� + 鍙凤紙鍙锋寜妫�鏌ラ」鐩悇鑷紪鍙凤紝蹇呴』闈犲墠缂�鍖哄垎锛� */
+const seqNumText = computed(() => {
+ const num = seqNum.value ?? props.appointment?.bookSeqNum
+ if (num === undefined || num === null || num === '') return ''
+ return `${getCheckTypeSeqPrefix(props.appointment?.bookCheckType)}${num}`
+})
const _confirmAppointment = async () => {
if (!isCurrentDay(props.appointment.bookDate)) {
@@ -44,7 +58,7 @@
tempAppointment.bookTimeslot = bookTimeSlotVip.value
}
const data = await AppointmentApi.confirmAppointmentVip(tempAppointment)
- bookSeqNum.value = data
+ seqNum.value = data
// 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
emit('event_appoint_confirm')
_printNote()
@@ -79,7 +93,7 @@
tempAppointment.bookTimeslot = bookTimeSlotVip.value
}
const data = await AppointmentApi.confirmAppointmentVip(tempAppointment)
- bookSeqNum.value = data
+ seqNum.value = data
// 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
emit('event_appoint_confirm')
_printNote()
@@ -100,7 +114,7 @@
})
} else {
const data = await AppointmentApi.confirmAppointment(props.appointment)
- bookSeqNum.value = data
+ seqNum.value = data
// 鍙戦�佹搷浣滄垚鍔熺殑浜嬩欢
emit('event_appoint_confirm')
// _printNote()
@@ -206,15 +220,14 @@
}
})
- // 鍙充晶 Pane 杈撳嚭
- const _bookSeqNum = bookSeqNum.value ?? props.appointment?.bookSeqNum
+ // 鍙充晶 Pane 杈撳嚭锛氭帓闃熷彿锛堝墠缂� + 鍙凤紝涓庡睆涓婃樉绀轰竴鑷达級
panel.addPrintText({
options: {
width: 130,
height: 20,
top: 7,
left: 170,
- title: '' + _bookSeqNum,
+ title: seqNumText.value,
textAlign: 'center',
fontSize: 30,
fontFamily: '寰蒋闆呴粦',
@@ -268,7 +281,7 @@
:disabled="item.queueVipNo === item.queueVipFull"
/>
</el-select>
- {{ bookSeqNum ?? appointment.bookSeqNum }}
+ {{ seqNumText }}
<el-divider />
<el-button
@click="_confirmAppointment"
diff --git a/src/views/ecg/appointment/alter.vue b/src/views/ecg/appointment/alter.vue
index 12d3f32..141439d 100644
--- a/src/views/ecg/appointment/alter.vue
+++ b/src/views/ecg/appointment/alter.vue
@@ -98,12 +98,7 @@
<!-- 鍒楄〃 -->
<ContentWrap>
<el-table v-loading="loading" :data="appointmentList" :stripe="true" :show-overflow-tooltip="true">
- <el-table-column label="鐢宠鍗曞彿" align="center" prop="applyNo" min-width="110px" />
- <el-table-column label="妫�鏌ラ」鐩�" align="center" prop="bookCheckType" min-width="120px">
- <template #default="scope">
- {{ getCheckTypeName(scope.row.bookCheckType) }}
- </template>
- </el-table-column>
+ <el-table-column label="鐢宠鍗曞彿" align="center" prop="applyNo" min-width="110px" />
<el-table-column label="鎮h�呯紪鍙�" align="center" prop="patId" />
<el-table-column label="濮撳悕" align="center" min-width="160px">
<template #default="scope">
@@ -111,44 +106,46 @@
<dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.patGender" />
<dict-tag :type="DICT_TYPE.ECG_PAT_SOURCE" :value="scope.row.patSrc" />
</template>
- </el-table-column>
- <el-table-column label="灏辫瘖鍙�" align="center" prop="episodeId" min-width="110px" />
- <el-table-column label="澶氳��" align="center" width="110px">
+ </el-table-column> <el-table-column label="妫�鏌ラ」鐩�" align="center" prop="bookCheckType" min-width="120px">
<template #default="scope">
- <dict-tag :type="DICT_TYPE.ECG_TOLERANCE" :value="scope.row.tolerance ?? 0" />
+ {{ getCheckTypeName(scope.row.bookCheckType) }}
</template>
- </el-table-column>
- <el-table-column label="绉戝鍚嶇О" align="center" prop="patDeptDesc" />
- <el-table-column label="鐥呭尯" align="center" prop="patWardDesc" />
- <el-table-column label="搴婂彿" align="center" prop="patBedNo" />
- <!--
- <el-table-column label="缂磋垂" align="center" prop="paid">
- <template #default="scope">
- {{scope.row.paid == 1 ? "宸蹭粯" : ""}}
- </template>
- </el-table-column>
--->
- <el-table-column label="棰勭害鏃ユ湡" align="center" prop="bookDate" :formatter="dateFormatter2" width="120px" />
+ </el-table-column> <el-table-column label="棰勭害鏃ユ湡" align="center" prop="bookDate" :formatter="dateFormatter2"
+ width="120px" />
<el-table-column label="棰勭害鏃堕棿娈�" align="center" prop="bookTimeslot" width="100px">
<template #default="scope">
<dict-tag :type="DICT_TYPE.ECG_BOOK_TIMESLOT" :value="scope.row.bookTimeslot" />
</template>
</el-table-column>
- <el-table-column label="寮�鍗曟椂闂�" align="center" prop="createTime" :formatter="dateFormatter2" width="110px" />
- <el-table-column label="寮�鍗曞尰鐢�" align="center" prop="doctor" width="110px" /><!-- 闇�姹�1锛氬尰鍢卞彿锛圚IS observationRequest.id.item[root=2.16.156.10011.1.28]锛夈��
- 璇ヨ妭鐐瑰湪瑙勮寖涓潪蹇呴』椤癸紝鍘嗗彶鏁版嵁锛堟柊澧炲垪涔嬪墠閲囬泦鐨勶級涓虹┖锛屾樉绀� '-'銆� -->
- <el-table-column label="鍖诲槺鍙�" align="center" prop="doctorAdviceNo" min-width="110px">
+ <el-table-column label="澶氳��" align="center" width="110px">
<template #default="scope">
- {{ scope.row.doctorAdviceNo || '-' }}
+ <dict-tag :type="DICT_TYPE.ECG_TOLERANCE" :value="scope.row.tolerance ?? 0" />
+ </template>
+ </el-table-column> <el-table-column label="缂磋垂" align="center" prop="paid">
+ <template #default="scope">
+ {{ scope.row.paid == 1 ? "宸蹭粯" : "" }}
</template>
</el-table-column>
+ <el-table-column label="灏辫瘖鍙�" align="center" prop="episodeId" min-width="110px" />
<el-table-column label="闂ㄨ瘖鍙�" align="center" min-width="140px">
<template #default="scope">
<span>{{ resolveCardNo(scope.row).value }}</span>
<el-tag v-if="resolveCardNo(scope.row).from" size="small" type="info" effect="plain" class="ml-1">
{{ resolveCardNo(scope.row).from }}
</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="绉戝鍚嶇О" align="center" prop="patDeptDesc" min-width="120px" />
+ <el-table-column label="鐥呭尯" align="center" prop="patWardDesc" />
+ <el-table-column label="搴婂彿" align="center" prop="patBedNo" />
+ <el-table-column label="寮�鍗曟椂闂�" align="center" prop="createTime" :formatter="dateFormatter2" width="110px" />
+ <el-table-column label="寮�鍗曞尰鐢�" align="center" prop="doctor" width="110px" />
+ <!-- 闇�姹�1锛氬尰鍢卞彿锛圚IS observationRequest.id.item[root=2.16.156.10011.1.28]锛夈��
+ 璇ヨ妭鐐瑰湪瑙勮寖涓潪蹇呴』椤癸紝鍘嗗彶鏁版嵁锛堟柊澧炲垪涔嬪墠閲囬泦鐨勶級涓虹┖锛屾樉绀� '-'銆� -->
+ <el-table-column label="鍖诲槺鍙�" align="center" prop="doctorAdviceNo" min-width="110px">
+ <template #default="scope">
+ {{ scope.row.doctorAdviceNo || '-' }}
</template>
</el-table-column>
<el-table-column label="鐧昏鏃堕棿" align="center" min-width="150px">
@@ -159,44 +156,33 @@
</el-table-column>
<el-table-column label="璺濅粖澶╂暟" align="center" width="90px">
<template #default="scope">{{ formatDaysFromOrder(scope.row.doctorTime) || '-' }}</template>
- </el-table-column>
- <el-table-column label="鏉ユ簮" align="center" width="90px">
- <template #default="scope">
- <dict-tag v-if="scope.row.patSrc !== undefined && scope.row.patSrc !== null" :type="DICT_TYPE.ECG_PAT_SOURCE"
- :value="scope.row.patSrc" />
- <span v-else>-</span>
- </template>
- </el-table-column>
- <el-table-column label="鎬у埆" align="center" width="70px">
- <template #default="scope">
- <!-- 1鐢�/2濂筹紱0 鎴栫己澶憋紙HIS 鏈彁渚涳紝瀹炴祴搴撲腑鏈� 2123 琛�=0锛夋樉绀�"鏈煡" -->
- <dict-tag v-if="scope.row.patGender === 1 || scope.row.patGender === 2" :type="DICT_TYPE.SYSTEM_USER_SEX"
- :value="scope.row.patGender" />
- <span v-else>鏈煡</span>
- </template>
- </el-table-column>
+ </el-table-column>
+ <el-table-column label="韬唤璇佸彿" align="center" prop="patIdentityId" />
<el-table-column label="鍑虹敓鏃ユ湡" align="center" prop="patBirthday" :formatter="dateFormatter2" width="110px" />
- <el-table-column label="鎵嬫満" align="center" prop="patMobile" />
<el-table-column label="骞撮緞" align="center" width="80px">
<template #default="scope">{{ formatAge(scope.row.patBirthday) || '-' }}</template>
- </el-table-column>
- <!-- <el-table-column label="鐢佃瘽" align="center" prop="patPhone" />-->
- <!-- <el-table-column label="韬唤璇佸彿" align="center" prop="patIdentityId" />-->
+ </el-table-column>
<!-- <el-table-column label="绉戝浠g爜" align="center" prop="patDeptCode" /> -->
+ <el-table-column label="鎵嬫満" align="center" prop="patMobile" />
<el-table-column label="鍦板潃" align="center" prop="patAddr" />
<!-- <el-table-column label="鐥呭尯浠g爜" align="center" prop="patWardCode" /> -->
- <el-table-column label="鎿嶄綔" fixed="right" align="center" min-width="220px">
+ <!-- 鎿嶄綔鍒楋細鎸夐挳鏍峰紡 + 鍥哄畾鍦ㄥ垪琛ㄦ渶鍚庝綅缃紙fixed="right" 鍗冲缁堣创鍦ㄦ渶鍙充晶锛� -->
+ <el-table-column label="鎿嶄綔" fixed="right" align="center" width="240px">
<template #default="scope">
- <el-button link type="primary" @click="openForm('update', scope.row.id)"
+ <el-button type="primary" plain size="small" @click="openForm('update', scope.row.id)"
v-hasPermi="['ecg:appointment:update']">
缂栬緫
</el-button>
- <el-button link type="primary" @click="statusalter(scope.row)" v-hasPermi="['ecg:appointment:update']">
+ <el-button type="primary" plain size="small" class="status-edit-btn" @click="statusalter(scope.row)"
+ v-hasPermi="['ecg:appointment:update']">
+ <!-- 鐘舵�佹爣绛惧唴宓屽湪鎸夐挳閲岋細鐢变笅鏂� scoped 鏍峰紡鎶� el-tag 鍘嬫垚銆岄�忔槑搴� + 涓庢寜閽悓楂樸�嶏紝
+ 鍚﹀垯鏍囩鑷甫鐧藉簳涓庡唴杈硅窛锛屼細鏄惧緱鑳屾櫙涓嶉�忔槑涓旇秴鍑烘寜閽珮搴� -->
<dict-tag v-if="scope.row.status !== null && scope.row.status !== undefined && scope.row.status !== ''"
:type="DICT_TYPE.ECG_STATUS" :value="scope.row.status" />
- <div v-else>鐘舵�佺紪杈�</div>
+ <span v-else>鐘舵�佺紪杈�</span>
</el-button>
- <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['ecg:appointment:delete']">
+ <el-button type="danger" plain size="small" @click="handleDelete(scope.row.id)"
+ v-hasPermi="['ecg:appointment:delete']">
鍒犻櫎
</el-button>
</template>
@@ -387,3 +373,46 @@
getList()
})
</script>
+
+<style scoped lang="scss">
+/**
+ * 銆岀姸鎬佷慨鏀广�嶆寜閽唴宓岀殑 el-tag 浼樺寲銆�
+ *
+ * 銆愰棶棰� 1銆戞爣绛捐秴鍑烘寜閽珮搴︺�佽儗鏅笉閫忔槑锛�
+ * el-tag 鑷甫 height:24px + padding:0 9px + 娴呰壊鑳屾櫙锛�
+ * 鑰� size="small" 鐨勬寜閽唴瀹瑰尯鍙湁 22px 楂樸�佷笖鎸夐挳鏈韩宸叉湁 padding锛�
+ * 浜庢槸鏍囩鏃㈡瘮鎸夐挳楂橈紝鍙堢洊鍑轰竴鍧椾笉閫忔槑鐨勬祬鑹插簳銆�
+ * 鈫� 鎶婃爣绛惧帇鎴愩�岄�忔槑搴� + 鏃犲唴杈硅窛 + 涓庢寜閽悓楂樸�嶏紝瑙嗚涓婂彧鏄寜閽噷鐨勪竴娈垫枃瀛椼��
+ *
+ * 銆愰棶棰� 2銆戦紶鏍囨偓鍋滄椂鎸夐挳涓婄殑鏂囧瓧鐪嬩笉瑙侊細
+ * Element Plus 鐨� plain 涓昏壊鎸夐挳 hover 鏃朵細鍙樻垚**瀹炲績钃濆簳 + 鐧藉瓧**锛�
+ * --el-button-hover-bg-color: var(--el-color-primary);
+ * --el-button-hover-text-color: var(--el-color-white);
+ * 鑰岃繖閲屽師鍏堟妸鏍囩鏂囧瓧**鍐欐**鎴� color: var(--el-color-primary)锛堣摑鑹诧級锛�
+ * 鍙犲姞瀹炲績钃濆簳 鈬� 钃濆簳钃濆瓧锛屾枃瀛楁秷澶便��
+ * 鈫� 鏀逛负 `color: inherit`锛岃鏍囩鏂囧瓧濮嬬粓璺熼殢鎸夐挳鐨勬枃瀛楄壊锛�
+ * 鈥� 甯告�侊細鎸夐挳钃濆瓧 鈫� 鏍囩钃濆瓧锛岄厤娴呰摑搴曪紙--el-button-bg-color锛夊姣旀竻鏅�
+ * 鈥� hover锛氭寜閽櫧瀛� 鈫� 鏍囩鐧藉瓧锛岄厤瀹炲績钃濆簳瀵规瘮娓呮櫚
+ */
+.status-edit-btn {
+ :deep(.el-tag) {
+ height: 20px;
+ line-height: 18px;
+ padding: 0;
+ margin: 0;
+ // 鑳屾櫙/杈规鍔� !important锛�
+ // 路 甯歌鎯呭喌 el-tag 鐢� CSS 鍙橀噺 --el-tag-bg-color 涓婅壊锛堟牱寮忚〃瑙勫垯鍗冲彲瑕嗙洊锛�
+ // 路 浣� ElTag 鍦ㄦ敹鍒� color 灞炴�ф椂浼氬啓鎴�**鍐呰仈** background-color锛�
+ // 鍐呰仈鏍峰紡浼樺厛绾ч珮浜庢牱寮忚〃锛屽彧鏈� !important 鑳藉帇浣�
+ background-color: transparent !important;
+ border-color: transparent !important;
+ // 鍏抽敭锛氳窡闅忔寜閽殑鏂囧瓧鑹诧紝涓嶈鍐嶅啓姝婚鑹诧紝鍚﹀垯 hover 鏃朵細涓庤儗鏅悓鑹茶�屻�屾秷澶便��
+ color: inherit !important;
+ font-size: 12px;
+ }
+ // 鏍囩鍐呯殑鏂囧瓧涓庡浘鏍囦篃涓嶉渶瑕侀澶栬竟璺�
+ :deep(.el-tag .el-tag__content) {
+ padding: 0;
+ }
+}
+</style>
diff --git a/src/views/ecg/appointment/index.vue b/src/views/ecg/appointment/index.vue
index 48bb190..ca116bd 100644
--- a/src/views/ecg/appointment/index.vue
+++ b/src/views/ecg/appointment/index.vue
@@ -84,8 +84,41 @@
<!-- 鍒楄〃 -->
<ContentWrap>
<el-table v-loading="loading" :data="appointmentList" :stripe="true" :show-overflow-tooltip="true">
- <el-table-column label="鐢宠鍙�" align="center" prop="applyNo" min-width="110px" />
- <el-table-column label="鎮h�呯紪鍙�" align="center" prop="patId" />
+ <el-table-column label="鐢宠鍗曞彿" align="center" prop="applyNo" min-width="110px" />
+ <el-table-column label="鎮h�呯紪鍙�" align="center" prop="patId" />
+ <el-table-column label="濮撳悕" align="center" min-width="160px">
+ <template #default="scope">
+ {{ scope.row.patName }} <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.patGender" />
+ <dict-tag :type="DICT_TYPE.ECG_PAT_SOURCE" :value="scope.row.patSrc" />
+ </template>
+ </el-table-column>
+ <el-table-column label="妫�鏌ラ」鐩�" align="center" prop="bookCheckType" min-width="140px">
+ <template #default="scope">
+ {{ getCheckTypeName(scope.row.bookCheckType) }}
+ </template>
+ </el-table-column>
+ <el-table-column label="棰勭害鏃ユ湡" align="center" prop="bookDate" :formatter="dateFormatter2" width="120px" />
+ <el-table-column label="棰勭害鏃堕棿娈�" align="center" prop="bookTimeslot" width="100px">
+ <template #default="scope">
+ <dict-tag :type="DICT_TYPE.ECG_BOOK_TIMESLOT" :value="scope.row.bookTimeslot" />
+ </template>
+ </el-table-column>
+
+ <!-- 闇�姹�1锛氱姸鎬� -->
+ <!-- 娉ㄦ剰锛氬繀椤绘樉寮忓垽绌猴紝涓嶈兘鐢� v-if="scope.row.status" 鈥斺��
+ 鐘舵�� '0'锛堟湭鐧昏锛夋槸鍚堟硶鍊硷紝鐪熷�煎垽鏂細鎶婂畠璇垽涓�"鏃犳暟鎹�"鑰屾樉绀� '-' -->
+ <el-table-column label="鐘舵��" align="center" prop="status" width="110px">
+ <template #default="scope">
+ <dict-tag v-if="scope.row.status !== null && scope.row.status !== undefined && scope.row.status !== ''"
+ :type="DICT_TYPE.ECG_STATUS" :value="scope.row.status" />
+ <span v-else>-</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="缂磋垂" align="center" prop="paid">
+ <template #default="scope">
+ {{ scope.row.paid == 1 ? "宸蹭粯" : "" }}
+ </template>
+ </el-table-column>
<el-table-column label="灏辫瘖鍙�" align="center" prop="episodeId" min-width="110px" />
<!-- 鏈垪鏍囩鐢便�屽氨璇婂崱鍙枫�嶆敼涓恒�岄棬璇婂彿銆嶏紙缁忕‘璁わ級銆傚師鍥狅紙璇﹁銆婇儴缃叉竻鍗曘��5.1锛夛細
HIS 鍦ㄥ崱鍙锋Ы浣嶄紶绌猴紝medical_card 鍏ㄥ簱 159,116 琛�**鏃犱竴闈炵┖**锛�
@@ -99,39 +132,6 @@
<el-tag v-if="resolveCardNo(scope.row).from" size="small" type="info" effect="plain" class="ml-1">
{{ resolveCardNo(scope.row).from }}
</el-tag>
- </template>
- </el-table-column>
- <el-table-column label="濮撳悕" align="center" min-width="160px">
- <template #default="scope">
- {{ scope.row.patName }} <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.patGender" />
- <dict-tag :type="DICT_TYPE.ECG_PAT_SOURCE" :value="scope.row.patSrc" />
- </template>
- </el-table-column>
-
- <el-table-column label="棰勭害鏃ユ湡" align="center" prop="bookDate" :formatter="dateFormatter2" width="120px" />
- <el-table-column label="棰勭害鏃堕棿娈�" align="center" prop="bookTimeslot" width="100px">
- <template #default="scope">
- <dict-tag :type="DICT_TYPE.ECG_BOOK_TIMESLOT" :value="scope.row.bookTimeslot" />
- </template>
- </el-table-column>
- <el-table-column label="妫�鏌ラ」鐩�" align="center" prop="bookCheckType" min-width="120px">
- <template #default="scope">
- {{ getCheckTypeName(scope.row.bookCheckType) }}
- </template>
- </el-table-column>
- <el-table-column label="缂磋垂" align="center" prop="paid">
- <template #default="scope">
- {{ scope.row.paid == 1 ? "宸蹭粯" : "" }}
- </template>
- </el-table-column>
- <!-- 闇�姹�1锛氱姸鎬� -->
- <!-- 娉ㄦ剰锛氬繀椤绘樉寮忓垽绌猴紝涓嶈兘鐢� v-if="scope.row.status" 鈥斺��
- 鐘舵�� '0'锛堟湭鐧昏锛夋槸鍚堟硶鍊硷紝鐪熷�煎垽鏂細鎶婂畠璇垽涓�"鏃犳暟鎹�"鑰屾樉绀� '-' -->
- <el-table-column label="鐘舵��" align="center" prop="status" width="110px">
- <template #default="scope">
- <dict-tag v-if="scope.row.status !== null && scope.row.status !== undefined && scope.row.status !== ''"
- :type="DICT_TYPE.ECG_STATUS" :value="scope.row.status" />
- <span v-else>-</span>
</template>
</el-table-column>
<!-- 闇�姹�1锛氬勾榫勶紙搴撲腑鏃犳鍒楋紝鐢辩敓鏃ュ疄鏃惰绠楋級 -->
@@ -157,23 +157,25 @@
</template>
</el-table-column>
<el-table-column label="鐧昏鏃堕棿" align="center" prop="registerDate" />
- <el-table-column label="绉戝浠g爜" align="center" prop="patDeptCode" />
- <el-table-column label="绉戝鍚嶇О" align="center" prop="patDeptDesc" />
- <el-table-column label="鐥呭尯浠g爜" align="center" prop="patWardCode" />
+ <!-- <el-table-column label="绉戝浠g爜" align="center" prop="patDeptCode" /> -->
+ <el-table-column label="绉戝鍚嶇О" align="center" prop="patDeptDesc" min-width="120px"/>
+ <!-- <el-table-column label="鐥呭尯浠g爜" align="center" prop="patWardCode" /> -->
<el-table-column label="鐥呭尯鍚嶇О" align="center" prop="patWardDesc" />
<el-table-column label="搴婂彿" align="center" prop="patBedNo" />
<el-table-column label="鐢熸棩" align="center" prop="patBirthday" :formatter="dateFormatter2" width="110px" />
<el-table-column label="鎵嬫満" align="center" prop="patMobile" />
<!-- <el-table-column label="鐢佃瘽" align="center" prop="patPhone" />-->
<!-- <el-table-column label="韬唤璇佸彿" align="center" prop="patIdentityId" />-->
- <el-table-column label="鍦板潃" align="center" prop="patAddr" />
- <el-table-column label="鎿嶄綔" align="center" min-width="120px">
+ <el-table-column label="鍦板潃" align="center" prop="patAddr" min-width="150px"/>
+ <!-- 鎿嶄綔鍒楋細鎸夐挳鏍峰紡 + 鍥哄畾鍦ㄥ垪琛ㄦ渶鍙充晶 -->
+ <el-table-column label="鎿嶄綔" fixed="right" align="center" width="160px">
<template #default="scope">
- <el-button link type="primary" @click="openForm('update', scope.row.id)"
+ <el-button type="primary" plain size="small" @click="openForm('update', scope.row.id)"
v-hasPermi="['ecg:appointment:update']">
缂栬緫
</el-button>
- <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['ecg:appointment:delete']">
+ <el-button type="danger" plain size="small" @click="handleDelete(scope.row.id)"
+ v-hasPermi="['ecg:appointment:delete']">
鍒犻櫎
</el-button>
</template>
diff --git a/src/views/ecg/checktype/CheckTypeForm.vue b/src/views/ecg/checktype/CheckTypeForm.vue
index 8e2badf..798839e 100644
--- a/src/views/ecg/checktype/CheckTypeForm.vue
+++ b/src/views/ecg/checktype/CheckTypeForm.vue
@@ -17,12 +17,12 @@
>
<el-row :gutter="20">
<el-col :span="12">
- <el-form-item label="妫�鏌ラ」鐩悕绉�" prop="name">
+ <el-form-item label="椤圭洰鍚嶇О" prop="name">
<el-input v-model="formData.name" placeholder="璇疯緭鍏ユ鏌ラ」鐩悕绉�" />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="妫�鏌ラ」鐩��" prop="value">
+ <el-form-item label="椤圭洰缂栫爜" prop="value">
<el-input v-model="formData.value" placeholder="璇疯緭鍏ユ鏌ラ」鐩��" />
</el-form-item>
</el-col>
@@ -38,13 +38,19 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍏佽鍑嗗涓汉鏁�" prop="readyNum">
- <el-input v-model="formData.readyNum" placeholder="璇疯緭鍏ュ厑璁稿噯澶囦腑浜烘暟" />
+ <el-form-item label="鍊欒瘖鍑嗗浜烘暟" prop="readyNum">
+ <!--
+ 銆愭湰娆¤鏄庛�戣繖涓�煎喅瀹氳妫�鏌ラ」鐩湪宸ヤ綅涓娿�屽�欒瘖鍖恒�嶇殑瀹归噺涓婇檺锛�
+ 绯荤粺鑷姩鎶娿�屾帓闃熶腑銆嶇殑鎮h�呮惉杩涖�屽�欒瘖鍖恒�嶆椂锛屾渶澶氭惉鍒拌繖涓汉鏁般��
+ **濉� 0 = 涓嶈嚜鍔ㄥ垎娴�**锛堟帓闃熶腑鐨勬偅鑰呬笉浼氫富鍔ㄨ繘鍊欒瘖鍖猴紝闇�鍦ㄥ伐浣嶅�欒瘖鍖虹敤銆屾媺鍏ャ�嶆墜鍔ㄨˉ浜猴級銆�
+ 澶氫釜妫�鏌ラ」鐩殑宸ヤ綅锛屽彇鍏朵腑**鏈�澶у��**銆�
+ -->
+ <el-input v-model="formData.readyNum" placeholder="鍊欒瘖鍖鸿嚜鍔ㄨˉ浜轰笂闄愶紱0=涓嶈嚜鍔ㄥ垎娴侊紙闈犳墜鍔ㄦ媺鍏ワ級" />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="闇�瑕佽澶囬鐢�" prop="needDevReady">
+ <el-form-item label="璁惧棰嗙敤" prop="needDevReady">
<el-switch v-model="formData.needDevReady" :active-value="1" :inactive-value="0" />
</el-form-item>
</el-col>
@@ -55,7 +61,7 @@
</el-col>
<el-col :span="12">
- <el-form-item label="鍙彿鍒�" prop="callingColumn">
+ <el-form-item label="澶у睆鏄剧ず鍒�" prop="callingColumn">
<el-input v-model="formData.callingColumn" placeholder="璇疯緭鍏ュ彨鍙峰垪" />
</el-form-item>
</el-col>
@@ -66,25 +72,25 @@
</el-col>
<el-col :span="12">
- <el-form-item label="鏃舵棰勭害瑙勫畾浜烘暟" prop="timeslotBookNum">
+ <el-form-item label="鏃舵棰勭害浜烘暟" prop="timeslotBookNum">
<el-input v-model="formData.timeslotBookNum" placeholder="璇疯緭鍏ユ椂娈甸绾﹁瀹氫汉鏁�" />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="姣忔椂娈甸鐣欎汉鏁�" prop="timeslotReservedNum">
+ <el-form-item label="鏃舵棰勭暀浜烘暟" prop="timeslotReservedNum">
<el-input v-model="formData.timeslotReservedNum" placeholder="璇疯緭鍏ユ瘡鏃舵棰勭暀浜烘暟" />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="棰勭害娉ㄦ剰浜嬮」" prop="notes">
+ <el-form-item label="娉ㄦ剰浜嬮」" prop="notes">
<el-input v-model="formData.notes" placeholder="璇疯緭鍏ラ绾︽敞鎰忎簨椤�" />
</el-form-item>
</el-col>
<!-- 鈫撯啌鈫� 浠ヤ笅涓夐」鎸夎姹傘�屽崟鍗犱竴琛屻�� 鈫撯啌鈫� -->
<el-col :span="24">
- <el-form-item label="鏄剧ず鎮h�呮潯鐮�" prop="displayBarcode">
+ <el-form-item label="鎮h�呮潯鐮佹樉绀�" prop="displayBarcode">
<el-checkbox-group v-model="formData.displayBarcode">
<el-checkbox
v-for="(dict, index) in getIntDictOptions(DICT_TYPE.ECG_PAT_SOURCE)"
@@ -98,8 +104,8 @@
<!-- 闇�姹傦細鎺掗槦搴忓彿瑙勫垯锛堢鍒版椂濡備綍缁欐偅鑰呮帓闃熷簭鍙凤級 -->
<el-col :span="24">
- <el-form-item label="鎺掗槦搴忓彿瑙勫垯" prop="seqRule">
- <el-select v-model="formData.seqRule" placeholder="璇烽�夋嫨鎺掗槦搴忓彿瑙勫垯" class="w-full">
+ <el-form-item label="鎺掗槦瑙勫垯" prop="seqRule">
+ <el-select v-model="formData.seqRule" placeholder="璇烽�夋嫨鎮h�呮帓闃熷簭鍙风敓鎴愯鍒�" class="w-full">
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.ECG_SEQ_RULE)"
:key="dict.value"
@@ -108,9 +114,9 @@
/>
</el-select>
<div class="text-12px text-gray-500 leading-5 mt-1">
- 棰勭害鍙凤細鐢ㄩ绾︾郴缁熶笅鍙戠殑鍙凤紝绛惧埌涓嶅啀鍒嗛厤锛�<br />
- 绛惧埌搴忓彿锛氬綋澶╁悓妫�鏌ラ」鐩唴杩炵画閫掑锛堢 1 涓鍒�=1 鍙凤級锛屾瘡 9 涓彿棰勭暀 1 涓粰鍔犳�ワ紱<br />
- 鏃舵鍙凤細鎸夐绾︽椂闂存缁欏彿锛�<b>涓嶉�夋椂榛樿姝ら」</b>锛屼笌鏀归�犲墠琛屼负涓�鑷达級銆�
+ 鎸夐绾﹀彿锛氱敤棰勭害绯荤粺涓嬪彂鐨勫彿锛岀鍒颁笉鍐嶅垎閰嶏紱<br />
+ 鎸夌鍒伴『搴忥細褰撳ぉ鍚屾鏌ラ」鐩唴杩炵画閫掑锛堢 1 涓鍒�=1 鍙凤級锛屾瘡 9 涓彿棰勭暀 1 涓粰鍔犳�ワ紱<br />
+ 鎸夋椂娈靛垎閰嶏細鎸夐绾︽椂闂存缁欏彿锛�<b>涓嶉�夋椂榛樿姝ら」</b>锛屼笌鏀归�犲墠琛屼负涓�鑷达級銆�
</div>
</el-form-item>
</el-col>
diff --git a/src/views/ecg/checktype/QueueSequenceForm.vue b/src/views/ecg/checktype/QueueSequenceForm.vue
index 25f1ca5..6b43610 100644
--- a/src/views/ecg/checktype/QueueSequenceForm.vue
+++ b/src/views/ecg/checktype/QueueSequenceForm.vue
@@ -125,7 +125,7 @@
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="140px" fixed="right">
+ <el-table-column label="鎿嶄綔" align="center" width="160px" fixed="right">
<template #default="scope">
<el-button
link
@@ -214,7 +214,6 @@
defineOptions({ name: 'QueueSequenceForm' })
const message = useMessage() // 娑堟伅寮圭獥
-
const dialogVisible = ref(false) // 涓诲脊绐�
const loading = ref(false) // 鍒楄〃鍔犺浇涓�
const list = ref<QueueSequenceVO[]>([]) // 鏌愭鏌ラ」鐩笅鐨勫叏閮ㄦ椂娈�
@@ -222,7 +221,6 @@
const checkTypeName = ref<string>('') // 妫�鏌ラ」鐩悕绉帮紙浠呯敤浜庡睍绀猴級
const changedRows = ref<Set<number>>(new Set()) // 宸茶鏀瑰姩浣嗘湭淇濆瓨鐨勮 id
const savingId = ref<number>() // 姝e湪淇濆瓨鐨勮 id
-
const dialogTitle = computed(
() => `棰勭害鏃舵缁存姢${checkTypeName.value ? ' - ' + checkTypeName.value : ''}`
)
diff --git a/src/views/ecg/checktype/index.vue b/src/views/ecg/checktype/index.vue
index 0dac641..a34e9ec 100644
--- a/src/views/ecg/checktype/index.vue
+++ b/src/views/ecg/checktype/index.vue
@@ -1,40 +1,23 @@
<template>
<ContentWrap>
<!-- 鎼滅储宸ヤ綔鏍� -->
- <el-form
- class="-mb-15px"
- :model="queryParams"
- ref="queryFormRef"
- :inline="true"
- label-width="80px"
- >
+ <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="80px">
<el-form-item label="椤圭洰鍚嶇О" prop="name">
- <el-input
- v-model="queryParams.name"
- placeholder="璇疯緭鍏ユ鏌ラ」鐩悕绉�"
- clearable
- @keyup.enter="handleQuery"
- class="!w-240px"
- />
- </el-form-item>
+ <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ユ鏌ラ」鐩悕绉�" clearable @keyup.enter="handleQuery"
+ class="!w-240px" />
+ </el-form-item>
<el-form-item>
- <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 鎼滅储</el-button>
- <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 閲嶇疆</el-button>
- <el-button
- type="primary"
- plain
- @click="openForm('create')"
- v-hasPermi="['ecg:check-type:create']"
- >
+ <el-button @click="handleQuery">
+ <Icon icon="ep:search" class="mr-5px" /> 鎼滅储
+ </el-button>
+ <el-button @click="resetQuery">
+ <Icon icon="ep:refresh" class="mr-5px" /> 閲嶇疆
+ </el-button>
+ <el-button type="primary" plain @click="openForm('create')" v-hasPermi="['ecg:check-type:create']">
<Icon icon="ep:plus" class="mr-5px" /> 鏂板
</el-button>
- <el-button
- type="success"
- plain
- @click="handleExport"
- :loading="exportLoading"
- v-hasPermi="['ecg:check-type:export']"
- >
+ <el-button type="success" plain @click="handleExport" :loading="exportLoading"
+ v-hasPermi="['ecg:check-type:export']">
<Icon icon="ep:download" class="mr-5px" /> 瀵煎嚭
</el-button>
</el-form-item>
@@ -45,77 +28,67 @@
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<!-- 闇�姹�9锛氫笉鍐嶆樉绀烘暟鎹簱 id锛涙敼涓烘樉绀�**鍙紪杈�**鐨勩�屾帓搴忓簭鍙枫�嶏紙瓒婂皬瓒婇潬鍓嶏級 -->
- <el-table-column label="鎺掑簭搴忓彿" align="center" prop="sort" width="130px">
+ <el-table-column label="搴忓彿" align="center" prop="sort" width="130px">
<template #default="scope">
- <el-input-number
- v-model="scope.row.sort"
- :min="0"
- :controls="false"
- size="small"
- style="width: 100%"
- @change="handleSortChange(scope.row)"
- />
+ <el-input-number v-model="scope.row.sort" :min="0" :controls="false" size="small" style="width: 100%"
+ @change="handleSortChange(scope.row)" />
</template>
</el-table-column>
- <el-table-column label="椤圭洰鍚嶇О" align="center" prop="name" width="180px"/>
- <el-table-column label="椤圭洰鍊�" align="center" prop="value" />
- <el-table-column label="鍊欒瘖浜烘暟" align="center" prop="readyNum" />
-<!-- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" :formatter="dateFormatter" width="180px />-->
- <el-table-column label="闇�瑕佽澶囬鐢�" align="center" prop="needDevReady">
- <template #default="scope">
- {{scope.row.needDevReady === 0 ? "涓嶉渶瑕�":"闇�瑕�"}}
- </template>
- </el-table-column>
- <el-table-column label="鍙彿鍒�" align="center" prop="callingColumn" />
- <el-table-column label="鏄剧ず鎮h�呮潯鐮�" align="center" prop="displayBarcode" />
- <el-table-column label="闇�瑕佺‘璐�" align="center" prop="expenseRecognition" />
- <el-table-column label="鏃舵棰勭害浜烘暟" align="center" prop="timeslotBookNum" />
- <el-table-column label="鏃舵棰勭暀浜烘暟" align="center" prop="timeslotReservedNum" />
- <el-table-column label="棰勭害娉ㄦ剰浜嬮」" align="center" prop="notes" />
- <el-table-column label="搴忓彿鍓嶇紑" align="center" prop="seqPrefix" />
- <el-table-column label="浜插拰椤圭洰" align="center" prop="affinityCheckTypes" >
+ <el-table-column label="椤圭洰鍚嶇О" align="center" prop="name" width="180px" />
+ <el-table-column label="椤圭洰缂栫爜" align="center" prop="value" />
+ <el-table-column label="浜插拰椤圭洰" align="center" prop="affinityCheckTypes">
<template #default="scope">
<div v-for="(checkType, subIndex) in scope.row.affinityCheckTypes" :key="subIndex">
- {{getCheckTypeName(checkType)}}
+ {{ getCheckTypeName(checkType) }}
</div>
</template>
</el-table-column>
+ <!-- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" :formatter="dateFormatter" width="180px />-->
+ <el-table-column label="璁惧棰嗙敤" align="center" prop="needDevReady">
+ <template #default="scope">
+ {{ scope.row.needDevReady === 0 ? "涓嶉渶瑕�" : "闇�瑕�" }}
+ </template>
+ </el-table-column>
+ <!-- 闇�姹傦細搴撻噷瀛樼殑鏄� 0/1锛岀洿鎺ユ覆鏌撲細鏄剧ず鏁板瓧锛岃繖閲屾寜涓枃灞曠ず锛堜笌涓婁竴鍒椼�岃澶囬鐢ㄣ�嶅啓娉曚竴鑷达級 -->
+ <el-table-column label="闇�瑕佺‘璐�" align="center" prop="expenseRecognition">
+ <template #default="scope">
+ {{ scope.row.expenseRecognition === 1 ? "闇�瑕�" : "涓嶉渶瑕�" }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鏃舵棰勭害浜烘暟" align="center" prop="timeslotBookNum" />
+ <el-table-column label="鏃舵棰勭暀浜烘暟" align="center" prop="timeslotReservedNum" />
+ <!-- 鎺掗槦瑙勫垯锛坈heck_type.seq_rule锛夛細搴撻噷鏄� 0/1/2锛屾寜瀛楀吀 ecg_seq_rule 鏄剧ず涓枃锛�
+ 鏈厤缃�(null) 鏃跺悗绔寜銆屾椂娈靛彿銆嶅鐞嗭紝杩欓噷鏄惧紡鎻愮ず锛岄伩鍏嶅嚭鐜扮┖鐧藉崟鍏冩牸 -->
+ <el-table-column label="鎺掗槦瑙勫垯" align="center" prop="seqRule">
+ <template #default="scope">
+ <span v-if="scope.row.seqRule === null || scope.row.seqRule === undefined">鏃舵鍙凤紙榛樿锛�</span>
+ <dict-tag v-else :type="DICT_TYPE.ECG_SEQ_RULE" :value="scope.row.seqRule" />
+ </template>
+ </el-table-column>
+ <el-table-column label="搴忓彿鍓嶇紑" align="center" prop="seqPrefix" />
+ <el-table-column label="鍊欒瘖浜烘暟" align="center" prop="readyNum" />
+ <el-table-column label="澶у睆鏄剧ず鍒�" align="center" prop="callingColumn" />
+ <!-- <el-table-column label="鎮h�呮潯鐮�" align="center" prop="displayBarcode" /> -->
+ <el-table-column label="娉ㄦ剰浜嬮」" align="center" prop="notes" />
<el-table-column label="鎿嶄綔" align="center" min-width="200px" fixed="right">
<template #default="scope">
- <el-button
- link
- type="primary"
- @click="openQueueSequenceForm(scope.row)"
- v-hasPermi="['ecg:check-type:update']"
- >
- 棰勭害鏃舵
- </el-button>
- <el-button
- link
- type="primary"
- @click="openForm('update', scope.row.id)"
- v-hasPermi="['ecg:check-type:update']"
- >
+ <el-button link type="primary" @click="openForm('update', scope.row.id)"
+ v-hasPermi="['ecg:check-type:update']">
缂栬緫
</el-button>
- <el-button
- link
- type="danger"
- @click="handleDelete(scope.row.id)"
- v-hasPermi="['ecg:check-type:delete']"
- >
+ <el-button link type="primary" @click="openQueueSequenceForm(scope.row)"
+ v-hasPermi="['ecg:check-type:update']">
+ 棰勭害鏃舵
+ </el-button>
+ <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['ecg:check-type:delete']">
鍒犻櫎
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 鍒嗛〉 -->
- <Pagination
- :total="total"
- v-model:page="queryParams.pageNo"
- v-model:limit="queryParams.pageSize"
- @pagination="getList"
- />
+ <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+ @pagination="getList" />
</ContentWrap>
<!-- 琛ㄥ崟寮圭獥锛氭坊鍔�/淇敼 -->
@@ -126,22 +99,21 @@
</template>
<script setup lang="ts">
-import {dateFormatter, dateFormatter2} from '@/utils/formatTime'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
import download from '@/utils/download'
import { CheckTypeApi, CheckTypeVO } from '@/api/ecg/checktype'
+import { DICT_TYPE } from '@/utils/dict'
import CheckTypeForm from './CheckTypeForm.vue'
import QueueSequenceForm from './QueueSequenceForm.vue'
-import {useCheckTypeStore} from "@/store/modules/checkType";
-import {getCheckTypeName} from "../../../utils/checkTypeFormatter";
+import { useCheckTypeStore } from "@/store/modules/checkType";
+import { getCheckTypeName } from "../../../utils/checkTypeFormatter";
/** 妫�鏌ラ」鐩� 鍒楄〃 */
defineOptions({ name: 'CheckType' })
const message = useMessage() // 娑堟伅寮圭獥
const { t } = useI18n() // 鍥介檯鍖�
-
const checkTypeStore = useCheckTypeStore();
-
const loading = ref(true) // 鍒楄〃鐨勫姞杞戒腑
const list = ref<CheckTypeVO[]>([]) // 鍒楄〃鐨勬暟鎹�
const total = ref(0) // 鍒楄〃鐨勬�婚〉鏁�
@@ -226,7 +198,7 @@
message.success(t('common.delSuccess'))
// 鍒锋柊鍒楄〃
await getList()
- } catch {}
+ } catch { }
}
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
diff --git a/src/views/ecg/doctor/DevDismantle.vue b/src/views/ecg/doctor/DevDismantle.vue
index 5272561..5dc9076 100644
--- a/src/views/ecg/doctor/DevDismantle.vue
+++ b/src/views/ecg/doctor/DevDismantle.vue
@@ -75,10 +75,19 @@
<el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
</el-form>
- <el-button @click="submitForm" type="primary" :disabled="formLoading">鎷嗘満瀹屾垚</el-button>
- <el-button @click="resetForm()">閲� 缃�</el-button>
- <el-button @click="loseDismantle" :disabled="formLoading">閬� 澶�</el-button>
- <el-button @click="damageDismantle" :disabled="formLoading">鎹� 姣�</el-button>
+ <!-- 銆愭湰娆¢渶姹傘�戞搷浣滃姛鑳藉尯锛氫笌鍏跺畠涓変釜宸ヤ綔鍙板悓娆惧鍣紙娴呬富鑹插簳 + 宸︿晶涓昏壊绔栨潯锛� -->
+ <div class="patient-actions">
+ <el-button @click="submitForm" type="primary" :disabled="formLoading">鎷嗘満瀹屾垚</el-button>
+ <el-button @click="resetForm()">閲� 缃�</el-button>
+ <el-button @click="loseDismantle" :disabled="formLoading">閬� 澶�</el-button>
+ <el-button @click="damageDismantle" :disabled="formLoading">鎹� 姣�</el-button>
+ </div>
+
+ <!-- 銆愭湰娆¢渶姹傘�戞搷浣滃姛鑳藉尯涓庡凡瀹屾垚璁板綍涔嬮棿鐨勬爣棰樻爮锛堜笌妫�鏌�/棰嗙敤/瑁呮満涓変釜宸ヤ綔鍙板悓娆撅級 -->
+ <div class="records-title">
+ <span class="records-title__bar"></span>
+ <span class="records-title__text">宸插畬鎴愬垪琛�</span>
+ </div>
<!-- 鍖荤敓鎷嗘満鍒楄〃 -->
<ContentWrap>
@@ -400,6 +409,75 @@
</script>
<style scoped lang="scss">
+/*
+ 銆愭湰娆¢渶姹傘�戞寜閽粺涓�灏哄 / 瀛楀彿锛堜笌鍏跺畠涓変釜宸ヤ綔鍙颁竴鑷达紱鏈〉涓嶄娇鐢� DoctorPageLayout锛�
+ 鏅�氭寜閽� 32px / 14px 瀛楋紱琛ㄦ牸鍐呰鍐呮寜閽� 28px / 13px 瀛楋紱閾炬帴寮忔寜閽彧鏀惧ぇ瀛楀彿銆�
+*/
+.patient-actions :deep(.el-button) {
+ height: 32px;
+ padding: 0 14px;
+ font-size: 14px;
+}
+
+.el-table :deep(.el-button:not(.is-link)) {
+ height: 28px;
+ padding: 0 10px;
+ font-size: 13px;
+}
+
+.patient-actions :deep(.el-button.is-link),
+.el-table :deep(.el-button.is-link) {
+ height: auto;
+ padding: 0 4px;
+ font-size: 14px;
+}
+
+/*
+ 銆愭湰娆¢渶姹傘�戞搷浣滃姛鑳藉尯锛氫笌妫�鏌�/棰嗙敤/瑁呮満涓変釜宸ヤ綔鍙板畬鍏ㄤ竴鑷� 鈥斺��
+ 鏋佹祬涓昏壊搴� + 缁嗚竟妗� + 宸︿晶 3px 涓昏壊绔栨潯锛堜笌銆屽凡瀹屾垚鍒楄〃銆嶆爣棰樻潯鍚屾璇█锛夈��
+*/
+.patient-actions {
+ display: flex;
+ flex: none;
+ flex-wrap: wrap;
+ gap: 8px;
+ align-items: center;
+ padding: 8px 10px;
+ margin: 2px 0 10px;
+ background-color: var(--el-color-primary-light-9);
+ border: 1px solid var(--el-color-primary-light-7);
+ border-left: 3px solid var(--el-color-primary);
+ border-radius: 4px;
+
+ /* Element Plus 缁欑浉閭� el-button 榛樿鍔犱簡 margin-left:12px锛屼細涓� gap 鍙犲姞锛屾竻鎺� */
+ :deep(.el-button + .el-button) {
+ margin-left: 0;
+ }
+}
+
+/* 銆愭湰娆¢渶姹傘�戙�屽凡瀹屾垚鍒楄〃銆嶆爣棰樻爮锛氫笌妫�鏌�/棰嗙敤/瑁呮満涓変釜宸ヤ綔鍙板畬鍏ㄤ竴鑷�
+ 锛堝乏渚т富鑹茬珫绾� + 14px 鍔犵矖锛岀揣鍑戦珮搴︿笉鎸ゅ帇琛ㄦ牸锛� */
+.records-title {
+ display: flex;
+ align-items: center;
+ flex: none;
+ gap: 6px;
+ padding: 2px 0 6px;
+
+ &__bar {
+ width: 3px;
+ height: 14px;
+ background-color: var(--el-color-primary);
+ border-radius: 2px;
+ }
+
+ &__text {
+ font-size: 14px;
+ font-weight: 600;
+ color: var(--el-text-color-primary);
+ }
+}
+
/* ==========================================================================
闇�姹傦細琛ㄥ崟鍐呭鎸ゅ崰浜嗕笅鏂硅褰曡〃鏍肩殑绌洪棿 鈥斺�� 鍘嬬缉琛岄棿璺濄��
Element Plus 榛樿 `.el-form-item { margin-bottom: 18px }`锛�
diff --git a/src/views/ecg/doctor/DevInstall.vue b/src/views/ecg/doctor/DevInstall.vue
index 95f6ed4..0e5a846 100644
--- a/src/views/ecg/doctor/DevInstall.vue
+++ b/src/views/ecg/doctor/DevInstall.vue
@@ -40,6 +40,8 @@
const state = ref<boolean>()
const patientList = ref<QueueVO[]>([])
+/** 銆愯嚜鍔╄瘖鏂�戞渶杩戜竴娆″彇鏁扮殑璇存槑锛堢┖鍒楄〃鏃舵樉绀猴級 */
+const fetchInfo = ref('')
let timerRunFlag : boolean = false
const bedControlFlag = ref<boolean>(true);
@@ -95,13 +97,16 @@
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)
+ // 銆愬姞鍥恒�戞帴鍙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()
@@ -188,6 +193,8 @@
checkType: last.bookCheckType
} as any)
ElMessage.success(msg || '宸叉挙閿�')
+ // 銆愭挙閿�鏍囪瘑銆戞挙閿�鍚庣珛鍒诲埛鏂般�屽凡瀹屾垚璁板綍銆嶅垪琛紝璁╄繖鏉¤褰曟樉绀烘垚銆屽凡鎾ら攢銆�
+ devInstallPanelRef.value?.getList?.()
await initLoad()
} finally {
undoFlag.value = false
@@ -211,12 +218,42 @@
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
+ // 銆愭湰娆¢渶姹傘�戞崲宸ヤ綅鍚�**鏁撮〉鏁版嵁閮芥崲鎴愭柊宸ヤ綅鐨�**锛�
+ // 鈶� 鍏堟竻绌哄乏渚�"鎮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
@@ -278,7 +315,7 @@
甯冨眬浼樺寲锛氬姛鑳芥寜閽浐瀹氬湪椤甸潰搴曢儴锛屼笉鍐嶇敤 position:absolute 娴湪鍐呭涓娿��
璇﹁ components/DoctorPageLayout锛堜笌鍙彿妫�鏌�/璁惧棰嗙敤椤靛叡鐢ㄥ悓涓�甯冨眬锛夈��
-->
- <DoctorPageLayout>
+ <DoctorPageLayout :bed-switch-enabled="false">
<template #header>
<TitlePanel :titleType=2 :room="roomBedVO" :patientStatistic="patientStat" />
</template>
@@ -293,7 +330,8 @@
/>
<template #aside>
- <QueuePanel :room="roomBedVO" :queue="patientList" @event_RecallFinish="onEventRecallFinish"/>
+ <QueuePanel :room="roomBedVO" :queue="patientList" :fetch-info="fetchInfo"
+ @event_RecallFinish="onEventRecallFinish"/>
</template>
diff --git a/src/views/ecg/doctor/Routine.vue b/src/views/ecg/doctor/Routine.vue
index e7c327c..5545c0b 100644
--- a/src/views/ecg/doctor/Routine.vue
+++ b/src/views/ecg/doctor/Routine.vue
@@ -16,13 +16,19 @@
const roomStore = useRoomStore()
-const roomBedVO: RoomBedVO = {
+/**
+ * 褰撳墠宸ヤ綅淇℃伅銆�
+ *
+ * 銆愭湰娆¢渶姹傘�戝繀椤绘槸**鍝嶅簲寮�**瀵硅薄锛氬垏鎹㈠伐浣嶆椂椤甸潰浼氭妸瀹冩敼鎴愭柊宸ヤ綅鐨勫�硷紝
+ * 鑻ユ槸鏅�氬璞★紝宸ヤ綅鍚嶇О/妫�鏌ラ」鐩瓑鏄剧ず涓嶄細閲嶇粯锛堢湅璧锋潵鍍�"娌℃崲杩囨潵"锛夈��
+ */
+const roomBedVO = reactive<RoomBedVO>({
roomId: null,
roomName: null,
bedNo: null,
checkTypes: null,
opType: null
-}
+})
const setappointmentId = ref<string>('');
let onStagePatient: QueueVO = {
id: 0,
@@ -55,6 +61,10 @@
const state = ref<boolean>()
const patientList = ref<QueueVO[]>([])
+/** 銆愭湰璇婂鏈垎閰嶃�戞湰宸ヤ綅妫�鏌ョ被鍨嬩笅銆佽繕娌″垎閰嶅伐浣嶇殑"鎺掗槦涓�"鎮h�咃紙鍙墜宸ユ媺鍏ワ級 */
+const roomWaitingList = ref<QueueVO[]>([])
+/** 銆愯嚜鍔╄瘖鏂�戞渶杩戜竴娆″彇鏁扮殑璇存槑锛堢┖鍒楄〃鏃舵樉绀猴級 */
+const fetchInfo = ref('')
let timerRunFlag: boolean = false
const bedControlFlag = ref<boolean>(true)
@@ -145,6 +155,8 @@
checkType: last.bookCheckType
} as any)
ElMessage.success(msg || '宸叉挙閿�')
+ // 銆愭挙閿�鏍囪瘑銆戞挙閿�鍚庣珛鍒诲埛鏂般�屽凡瀹屾垚璁板綍銆嶅垪琛紝璁╄繖鏉¤褰曟樉绀烘垚銆屽凡鎾ら攢銆�
+ routimePanelRef.value?.getList?.()
await initLoad()
} finally {
undoFlag.value = false
@@ -220,6 +232,75 @@
}
}
+/**
+ * 銆愭湰璇婂鏈垎閰嶃�戝姞杞�"鏈伐浣嶆鏌ョ被鍨嬩笅銆佽繕娌″垎閰嶅伐浣嶇殑鎺掗槦涓偅鑰�"銆�
+ *
+ * 鍊欒瘖鍒楄〃鎸� room_id + bed_no 鏌ワ紝鍙惈宸插垎娴佸埌鏈伐浣嶇殑浜猴紱鑰�"鎺掗槦涓�(10)"鐨勪汉 bed_no 涓虹┖
+ * 锛堝ぇ灞忎細鏄剧ず銆佸伐浣滃彴鍘熷厛鐪嬩笉鍒帮級鈥斺�旂幇鍦哄弽棣堢殑"鎮h�呭垪琛ㄦ病鍙栧埌鎮h�呬俊鎭�"灏辨槸杩欎釜銆�
+ * 杩欓噷鎶婁粬浠崟鐙彇鍥炴潵灞曠ず锛屽伐浣嶄富浜哄彲涓�閿�屾媺鍏ャ�嶃��
+ *
+ * 澶辫触涓嶅奖鍝嶄富娴佺▼锛堝彧鎵撴棩蹇楋級锛氳繖涓尯鍧楀彧鎻愪緵渚垮埄锛屼笉鏄繀闇�鏁版嵁銆�
+ */
+const loadRoomWaitingList = async () => {
+ if (roomBedVO.roomId == null) return
+ try {
+ roomWaitingList.value = (await DoctorApi.getRoomWaitingList(roomBedVO)) || []
+ } catch (e) {
+ console.warn('[loadRoomWaitingList] 鍙栨湰璇婂鏈垎閰嶆偅鑰呭け璐�', e)
+ }
+}
+
+/** 銆屾媺鍏ャ�嶏細鎶婃帓闃熶腑鐨勬偅鑰呮墜宸ュ垎鍒版湰宸ヤ綅锛堝悗绔牎楠岋細蹇呴』鏄湰宸ヤ綅涓讳汉 + 妫�鏌ラ」鐩尮閰嶏級 */
+const onEventPullWaiting = async (item: any) => {
+ try {
+ await ElMessageBox.confirm(
+ `鎶娿��${item.patName || ''}銆嶆媺鍏ユ湰宸ヤ綅锛�${roomBedVO.roomName || ''} ${roomBedVO.bedNo || ''}锛夛紵`,
+ '鎷夊叆鎺掗槦鎮h��',
+ { confirmButtonText: '鎷夊叆', cancelButtonText: '鍙栨秷', type: 'warning' }
+ )
+ } catch {
+ return
+ }
+ try {
+ const data = await DoctorApi.pullWaitingPatient({
+ roomId: roomBedVO.roomId,
+ bedNo: roomBedVO.bedNo,
+ id: item.id
+ })
+ if (data !== 'success' && data !== undefined && data !== null && data !== '') {
+ // 鍚庣閿欒鐮佷細鎶涘嚭寮傚父锛堝"宸茶鍏朵粬宸ヤ綅鎷夊叆"锛夛紝璧板埌杩欓噷鐨勬甯歌繑鍥炴槸 success
+ console.warn('[onEventPullWaiting] 杩斿洖锛�', data)
+ }
+ ElMessage.success(`宸叉妸銆�${item.patName || ''}銆嶆媺鍏ユ湰宸ヤ綅`)
+ } catch (e) {
+ // 鎺ュ彛寮傚父锛堝惈閿欒鐮佹彁绀猴級鐢卞叏灞�鎷︽埅鍣ㄦ彁绀猴紝杩欓噷鍙渶鍒锋柊鍒楄〃
+ console.warn('[onEventPullWaiting] 鎷夊叆澶辫触', e)
+ }
+ await initLoad()
+}
+
+/**
+ * 銆岀珛鍗宠ˉ浜恒�嶏細鎵嬪姩瑙﹀彂涓�娆℃湰宸ヤ綅鐨勮嚜鍔ㄥ垎娴侊紝骞舵妸鍚庣杩斿洖鐨�"涓轰粈涔堟病琛�/琛ヤ簡鍑犱汉"灞曠ず鍑烘潵銆�
+ *
+ * 绯荤粺鍙湪銆愬紑璇娿�戙�佹湰宸ヤ綅鏈紑銆愬仠姝㈠�欒瘖銆戙�佸�欒瘖浜烘暟鏈揪涓婇檺鏃舵墠浼氳嚜鍔ㄨˉ浜猴紱
+ * 杩欎笁閬撻棬闂稿師鍏堥兘鏄潤榛樼殑锛岀幇鍦哄彧鑳界湅鍒�"鎺掗槦鐨勪汉灏辨槸涓嶈繘鍊欒瘖鍖�"銆�
+ */
+const onEventHurryUp = async () => {
+ try {
+ const data: any = await DoctorApi.hurryUpNow(roomBedVO)
+ const lines = Object.entries(data || {})
+ .map(([k, v]) => `${k}锛�${v === null || v === undefined || v === '' ? '锛堢┖锛�' : v}`)
+ .join('\n')
+ await ElMessageBox.alert(lines, '绔嬪嵆琛ヤ汉 路 璇婃柇缁撴灉', {
+ confirmButtonText: '鐭ラ亾浜�',
+ type: data?.鏈琛ュ叆 > 0 ? 'success' : 'warning'
+ })
+ } catch (e: any) {
+ ElMessage({ message: '绔嬪嵆琛ヤ汉澶辫触锛�' + (e?.message || e), type: 'warning', duration: 4000 })
+ }
+ await initLoad()
+}
+
const initLoad = async () => {
if (roomBedVO.roomId == null) {
ElNotification.error({
@@ -230,12 +311,17 @@
return
}
- patientList.value = await DoctorApi.getToBeCheckedPatientList(roomBedVO)
+ patientList.value = (await DoctorApi.getToBeCheckedPatientList(roomBedVO)) || []
+ // 銆愯嚜鍔╄瘖鏂�戣褰曟湰娆″彇鏁版椂闂翠笌鏉℃暟锛堢┖鍒楄〃鏃舵樉绀猴紝渚夸簬鍖哄垎"杞娌¤窇/鍚庣娌℃暟鎹�"锛�
+ fetchInfo.value = `鏈�杩戝彇鏁� ${new Date().toLocaleTimeString()} 路 杩斿洖 ${patientList.value.length} 鏉
+ // 銆愭湰璇婂鏈垎閰嶃�戞湰宸ヤ綅妫�鏌ョ被鍨嬩笅銆佽繕娌″垎閰嶅伐浣嶇殑"鎺掗槦涓�"鎮h�咃紙鍙墜宸ユ媺鍏ワ級
+ loadRoomWaitingList()
getOnstagePatient()
patientStat.value = await DoctorApi.getPatientStatistic(roomBedVO)
const queueVO2 = await DoctorApi.bedDoctorGet(roomBedVO)
- if (queueVO2.status === 20) state.value = true
- else if (queueVO2.status === 30) state.value = false
+ // 銆愬姞鍥恒�戞帴鍙e彲鑳借繑鍥� null锛屽師鏉ョ洿鎺ュ彇 .status 浼氭姏寮傚父銆佷腑鏂湰杞悗缁楠�
+ if (queueVO2 && queueVO2.status === 20) state.value = true
+ else if (queueVO2 && queueVO2.status === 30) state.value = false
// 闇�姹�3锛氬悓姝�"鍋滄鍊欒瘖"寮�鍏崇姸鎬侊紙鍏朵粬鍖荤敓/鍏朵粬缁堢鏀瑰姩鍚庢湰绔篃鑳界湅鍒帮級
await loadStopReady()
}
@@ -257,9 +343,43 @@
const doctorTimer = () => {
console.log('doctorTimer ...')
- initLoad()
+ // 銆愬姞鍥恒�戝崟杞彇鏁板け璐ヤ笉鑳藉彉鎴� unhandled rejection锛�
+ // 鍘熸潵鐩存帴 `initLoad()`锛堜笉 await銆佷笉 catch锛夛紝涓�鏃︽煇杞帴鍙e紓甯革紝閿欒琚悶鎺夈��
+ // 椤甸潰鍋滃湪鏃ф暟鎹紙鐜板満琛ㄧ幇灏辨槸"鎮h�呭垪琛ㄤ竴鐩存槸绌虹殑"锛岃�屽簱閲屾湁鎮h�咃級銆�
+ initLoad().catch((e) => console.error('[doctorTimer] 鏈疆鍙栨暟澶辫触锛堝凡蹇界暐锛屼笅涓�杞户缁級', e))
if (timerRunFlag) setTimeout(doctorTimer, 5000) // five seconds
}
+
+/**
+ * 銆愪富/鍥磋銆戣窡闅� store 鍒囨崲"姝e湪鏌ョ湅鐨勫伐浣�"銆�
+ *
+ * roomBedVO 鍘熸潵鍙湪 onMounted 鏃朵粠 store 鎷蜂竴娆� 鈫� 鐢ㄩ《閮ㄣ�屽伐浣嶃�嶄笅鎷夊垏鍒板埆鐨勪汉宸ヤ綅锛堝洿瑙傦級鍚庯紝
+ * 鏈〉鏁版嵁涓嶄細璺熺潃鍙橈紝蹇呴』鍒锋柊椤甸潰鎵嶇敓鏁堛�傝繖閲� watch 涓�涓嬪嵆鍙嵆鏃剁敓鏁�
+ * 锛堝彇鏁板畾鏃跺櫒浼氱珛鍒绘媺鍒版柊宸ヤ綅鐨勬暟鎹級銆�
+ */
+watch(
+ () => [roomStore.room?.roomId, roomStore.room?.bedNo],
+ async () => {
+ if (!roomStore.room) return
+ 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
+ // 銆愭湰娆¢渶姹傘�戞崲宸ヤ綅鍚�**鏁撮〉鏁版嵁閮芥崲鎴愭柊宸ヤ綅鐨�**锛�
+ // 鈶� 鍏堟竻绌哄乏渚�"鎮h�呬俊鎭�"锛堥伩鍏嶈繕鏄剧ず涓婁竴涓伐浣嶇殑鎮h�咃級
+ routimePanelRef.value?.setPatient?.(undefined)
+ // 鈶� 鍚姩/缁х画鍙栨暟瀹氭椂鍣紙鍊欒瘖鍒楄〃銆佺粺璁°�佸綋鍓嶅彨鍙锋偅鑰呫�佸仠姝㈠�欒瘖寮�鍏抽兘浼氬埛鏂帮級
+ if (!timerRunFlag && roomBedVO.roomId != null) {
+ timerRunFlag = true
+ doctorTimer()
+ } else if (roomBedVO.roomId != null) {
+ await initLoad()
+ }
+ // 鈶� 鍒锋柊銆屽凡瀹屾垚鍒楄〃銆嶏紙闈㈡澘鍐呬細鎸夋柊宸ヤ綅鐨� checkTypes 閲嶆柊杩囨护锛�
+ routimePanelRef.value?.getList?.()
+ }
+)
/** 鍒濆鍖� **/
onMounted(() => {
@@ -352,7 +472,7 @@
路 銆屽彨鍙�/杩囧彿/閲嶅彨/鏆傚仠/鎾ら攢鍙彿銆嶇瓑鎸夐挳杩� #footer锛屽浐瀹氬湪搴曢儴锛屾案涓嶈璁板綍鍒楄〃閬尅
璇﹁ components/DoctorPageLayout銆�
-->
- <DoctorPageLayout>
+ <DoctorPageLayout :bed-switch-op-types="[0]">
<template #header>
<TitlePanel :titleType="0" :room="roomBedVO" :patientStatistic="patientStat" />
</template>
@@ -368,7 +488,11 @@
/>
<template #aside>
- <QueuePanel :room="roomBedVO" :queue="patientList" @event_RecallFinish="onEventRecallFinish" />
+ <QueuePanel :room="roomBedVO" :queue="patientList" :waiting-list="roomWaitingList"
+ :fetch-info="fetchInfo"
+ @event_RecallFinish="onEventRecallFinish"
+ @event_PullWaiting="onEventPullWaiting"
+ @event_HurryUp="onEventHurryUp" />
</template>
<!-- 搴曢儴鎺т欢锛氳嚜鍔� + 鍔熻兘鎸夐挳 + 鍋滄鍊欒瘖锛屾暣缁勯潬鍙� -->
diff --git a/src/views/ecg/doctor/components/BedSwitchSelect.vue b/src/views/ecg/doctor/components/BedSwitchSelect.vue
new file mode 100644
index 0000000..02e54ae
--- /dev/null
+++ b/src/views/ecg/doctor/components/BedSwitchSelect.vue
@@ -0,0 +1,257 @@
+<!--
+ 宸ヤ綔鍙伴《閮ㄣ�屽伐浣嶅垏鎹� / 鍥磋銆嶄笅鎷夛紙涓�/鍥磋妯″瀷鐨勫叆鍙o級
+
+ 涓轰粈涔堟斁鍦ㄨ繖閲岋細鍖荤敓鍦ㄥ伐浣滃彴閲屽共娲绘椂锛屾渶鑷劧鐨勮瘔姹傛槸"椤轰究鐪嬩竴鐪煎埆鐨勮瘖瀹ゅ湪鍋氫粈涔�"銆�
+ 涓嬫媺鍒楀嚭鎵�鏈�**宸插紑鏀�**宸ヤ綅锛屽苟鏍囧嚭鐩稿鎴戠殑韬唤锛�
+
+ 路 鎴戠殑宸ヤ綅 鈫� 鍒囧洖鑷繁锛堝彲鎿嶄綔锛�
+ 路 绌洪棽 鈫� 璇㈤棶鍚庡叆搴э紙鎴愪负涓讳汉锛涙湇鍔$浼氳嚜鍔ㄩ噴鏀炬垜鍘熸潵鐨勫伐浣嶏級
+ 路 宸插叆搴э細寮犱笁 鈫� **鍥磋**锛堝彧璇伙紝涓嶈兘鏀瑰埆浜虹殑鏁版嵁锛�
+
+ 鍥磋鍙敼"鎴戝湪鐪嬪摢涓伐浣�"锛坮oomStore.room锛夛紝**涓嶅姩鎴戝叆搴х殑宸ヤ綅**锛坮oomStore.currentSeat锛夛紱
+ 涓よ�呬笉鍚屾椂 `getCanOperate` 涓� false 鈫� 椤甸潰鍙銆傛湇鍔$鍙︽湁纭牎楠岋紙doc_id 蹇呴』鏄垜锛夈��
+-->
+<script setup lang="ts">
+import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
+import { useRouter } from 'vue-router'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { RoomApi, RoomVO } from '@/api/ecg/room'
+import { useRoomStore } from '@/store/modules/room'
+
+defineOptions({ name: 'BedSwitchSelect' })
+
+const router = useRouter()
+const roomStore = useRoomStore()
+
+/**
+ * 銆愭湰娆¢渶姹傘�戝伐浣嶅垏鎹㈢殑鑼冨洿鎺у埗锛�
+ * 路 鍙彿妫�鏌ラ〉锛歚opTypes=[0]` 鈫� 涓嬫媺鍙垪**妫�鏌ョ被**宸ヤ綅锛�
+ * 路 璁惧棰嗙敤 / 瑁呮満椤碉細`enabled=false` 鈫� 宸ヤ綅鍥哄畾锛�= 褰撳墠鏌ョ湅鐨勫伐浣嶏級锛屼笉鎻愪緵鍒囨崲銆�
+ * 涓変釜椤甸潰閫氳繃 DoctorPageLayout 閫忎紶銆�
+ */
+const props = withDefaults(
+ defineProps<{
+ /** 鏄惁鍏佽鍒囨崲宸ヤ綅锛坒alse 鏃跺彧鏄剧ず"鍥哄畾宸ヤ綅"鏍囩锛� */
+ enabled?: boolean
+ /** 鍙垏鎹㈠伐浣嶇殑浣滀笟绫诲瀷杩囨护锛坣ull/绌� = 涓嶈繃婊わ級锛�0妫�鏌� 1棰嗙敤 2瑁呮満 */
+ opTypes?: number[] | null
+ }>(),
+ { enabled: true, opTypes: null }
+)
+
+const beds = ref<RoomVO[]>([])
+const loading = ref(false)
+let timer: number | undefined
+
+const canOperate = computed(() => roomStore.getCanOperate)
+const dropdownText = computed(() => {
+ if (!roomStore.getIsSetRoom || !roomStore.getViewText) return '閫夋嫨宸ヤ綅'
+ return canOperate.value
+ ? roomStore.getViewText
+ : `鍥磋 ${roomStore.getViewText}`
+})
+
+const isSameBed = (a?: { roomId?: any; bedNo?: any } | null, b?: RoomVO | null) =>
+ !!a && !!b && String(a.roomId) === String(b.roomId) && String(a.bedNo) === String(b.bedNo)
+
+const isMySeat = (bed: RoomVO) => isSameBed(roomStore.getCurrentSeat, bed)
+const isViewing = (bed: RoomVO) => isSameBed(roomStore.getRoom, bed)
+
+/**
+ * 鎸� `opTypes` 杩囨护宸ヤ綅锛坣ull/绌� = 涓嶈繃婊わ級銆�
+ *
+ * 銆愭湰娆¢渶姹傘�戝彨鍙锋鏌ラ〉鍙厑璁稿垏鍒�**妫�鏌ョ被**宸ヤ綅锛坥pType=0锛夛紱
+ * 棰嗙敤/瑁呮満椤典笉鎻愪緵鍒囨崲锛坄enabled=false`锛夛紝姝ゅ嚱鏁板彧鏈嶅姟浜庡墠鑰呫��
+ */
+const filterBeds = (all: RoomVO[]): RoomVO[] => {
+ const types = props.opTypes
+ if (!Array.isArray(types) || types.length === 0) return all
+ return all.filter((b) => types.some((t) => Number(t) === Number(b.opType)))
+}
+
+/** 鍥哄畾宸ヤ綅鐨勫彧璇绘枃妗堬紙`enabled=false` 鏃舵樉绀猴級 */
+const fixedText = computed(() => {
+ const text = roomStore.getViewText
+ if (!text) return '鏈�夋嫨宸ヤ綅'
+ return canOperate.value ? text : `鍥磋 ${text}`
+})
+
+/** 姣忎釜宸ヤ綅鐨勮韩浠芥枃妗� */
+const bedLabel = (bed: RoomVO) => {
+ const name = `${bed.roomName || ''} 路 ${bed.bedNo || ''}`
+ if (isMySeat(bed)) return `${name}锛堟垜鐨勫伐浣嶏級`
+ if (bed.docId == null) return `${name}锛堢┖闂诧紝鍙叆搴э級`
+ return `${name}锛堝凡鍏ュ骇锛�${bed.docName || '鍏朵粬鍖荤敓'}锛屽彧璇诲洿瑙傦級`
+}
+
+const loadBeds = async () => {
+ try {
+ loading.value = true
+ const map: any = await RoomApi.getOpeningBedMap()
+ const all: RoomVO[] = []
+ for (const key in map || {}) {
+ const arr = map[key]
+ if (Array.isArray(arr)) all.push(...arr)
+ }
+ beds.value = all
+ // 銆愭湰娆¢渶姹傘�戞寜浣滀笟绫诲瀷杩囨护"鍙垏鎹㈢殑宸ヤ綅"锛堝彨鍙锋鏌ラ〉鍙垪妫�鏌ョ被宸ヤ綅锛�
+ const visible = filterBeds(all)
+ beds.value = visible
+ // 姝e湪鍥磋鏃堕『渚垮埛鏂�"涓讳汉鏄惁宸茬寮�"锛堝彧鎻愮ず锛屼笉鑷姩鎺ョ锛�
+ const cur = roomStore.getRoom
+ if (cur?.roomId != null && cur.bedNo) {
+ // 娉ㄦ剰锛氱敤**鍏ㄩ噺** all 鍘绘壘褰撳墠宸ヤ綅锛堝畠鍙兘涓嶅湪杩囨护鍚庣殑鍒楄〃閲岋級
+ const latest = all.find((b) => isSameBed(cur, b))
+ if (latest) {
+ roomStore.refreshViewTargetState(latest)
+ } else {
+ // 姝e湪鐪嬬殑宸ヤ綅宸蹭笉鍦�"宸插紑鏀惧伐浣�"鍒楄〃閲岋紙琚叧闂�/鍒犻櫎锛夆啋 鑷姩鍥炲埌鎴戣嚜宸辩殑宸ヤ綅锛�
+ // 鍚﹀垯椤甸潰浼氫竴鐩存煡涓�涓笉瀛樺湪宸ヤ綅鐨勬暟鎹紙琛ㄧ幇灏辨槸"鎮h�呭垪琛ㄤ竴鐩存槸绌虹殑"锛夈��
+ const seat = roomStore.getCurrentSeat
+ if (seat?.seated && !isSameBed(cur, seat)) {
+ console.warn('[BedSwitchSelect] 姝e湪鏌ョ湅鐨勫伐浣嶅凡涓嶅彲鐢紝鍒囧洖鎴戠殑宸ヤ綅', cur)
+ await roomStore.setRoomInfoAction({
+ id: seat.id ?? null,
+ roomId: seat.roomId ?? null,
+ roomName: seat.roomName ?? null,
+ bedNo: seat.bedNo ?? null,
+ ip: seat.ip ?? null,
+ status: seat.status ?? null,
+ docId: seat.docId ?? null,
+ docName: seat.docName ?? null,
+ checkTypes: seat.checkTypes ?? null,
+ opType: seat.opType ?? null
+ } as RoomVO)
+ ElMessage({
+ message: `鍘熸煡鐪嬬殑宸ヤ綅宸蹭笉鍙敤锛屽凡鍒囧洖鎴戠殑宸ヤ綅锛�${seat.roomName || ''} ${seat.bedNo || ''}`,
+ type: 'warning',
+ duration: 5000
+ })
+ }
+ }
+ }
+ } catch (e) {
+ console.warn('[BedSwitchSelect] 鍔犺浇宸ヤ綅鍒楄〃澶辫触', e)
+ } finally {
+ loading.value = false
+ }
+}
+
+/** 閫変腑涓�涓伐浣� */
+const onPick = async (bed: RoomVO) => {
+ // 鈶� 鎴戠殑宸ヤ綅 鈫� 鍒囧洖鑷繁
+ if (isMySeat(bed)) {
+ await roomStore.setRoomInfoAction(bed)
+ ElMessage.success(`宸插垏鍥炴垜鐨勫伐浣嶏細${bed.roomName || ''} ${bed.bedNo || ''}`)
+ return
+ }
+ // 鈶� 绌洪棽 鈫� 璇㈤棶鍚庡叆搴�
+ if (bed.docId == null) {
+ const mine = roomStore.getSeatText
+ try {
+ await ElMessageBox.confirm(
+ `鍏ュ骇鍒般��${bed.roomName || ''} / ${bed.bedNo || ''}銆嶏紵` +
+ (mine ? `锛堜細閫�鍑哄師鏉ョ殑銆�${mine}銆嶏級` : ''),
+ '鍏ュ骇纭',
+ { confirmButtonText: '鍏ュ骇', cancelButtonText: '鍙栨秷', type: 'warning' }
+ )
+ } catch {
+ return
+ }
+ const ok = await roomStore.seatRoom(bed)
+ if (!ok) {
+ ElMessage({ message: '鍏ュ骇澶辫触锛氳宸ヤ綅鍙兘宸茶浠栦汉鍗犵敤锛屾垨鐘舵�佷笉鍏佽锛堝凡鍏抽棴锛�', type: 'warning', duration: 4000 })
+ } else {
+ await roomStore.fetchMySeat()
+ ElMessage.success(`宸插叆搴э細${bed.roomName || ''} ${bed.bedNo || ''}`)
+ }
+ return
+ }
+ // 鈶� 宸茶鍒汉鍗犵敤 鈫� 鍥磋锛堝彧璇伙級
+ await roomStore.setViewTargetAction(bed, bed.docName)
+ ElMessage({
+ message: `姝e湪鍥磋銆�${bed.roomName || ''} / ${bed.bedNo || ''}銆嶏紙涓讳汉 ${bed.docName || '鍏朵粬鍖荤敓'}锛夛紝鍙鏌ョ湅`,
+ type: 'info',
+ duration: 4000
+ })
+}
+
+onMounted(async () => {
+ await loadBeds()
+ // 30s 杞锛氬埛鏂板崰鐢ㄧ姸鎬侊紝骞跺彂鐜�"涓讳汉宸茬寮�"锛堝彧鎻愮ず锛屼笉鑷姩鎺ョ锛�
+ timer = window.setInterval(loadBeds, 30000)
+})
+
+onBeforeUnmount(() => {
+ if (timer) window.clearInterval(timer)
+})
+</script>
+
+<template>
+ <div class="bed-switch">
+ <!--
+ 銆愭湰娆¢渶姹傘�戦鐢� / 瑁呮満椤典笉鎻愪緵鍒囨崲锛氬伐浣嶅浐瀹氫负"褰撳墠鏌ョ湅鐨勫伐浣�"锛�
+ 杩欓噷鍙樉绀轰竴涓彧璇绘爣绛撅紱瑕佹崲宸ヤ綅璇峰埌椤舵爮宸ヤ綅鏍囩 鈫� 閫夊伐浣嶉〉銆�
+ -->
+ <el-tooltip v-if="!enabled" content="鏈伐浣滃彴宸ヤ綅鍥哄畾锛涘闇�鏌ョ湅鍏跺畠宸ヤ綅锛岃鐐归《鏍忓伐浣嶆爣绛捐繘鍏ャ�岄�夊伐浣嶉〉銆�" placement="bottom">
+ <el-tag :type="canOperate ? 'primary' : 'warning'" effect="plain" class="bed-switch__fixed">
+ <Icon :icon="canOperate ? 'ep:office-building' : 'ep:view'" class="mr-4px" />
+ 宸ヤ綅锛歿{ fixedText }}
+ <span class="bed-switch__fixed-tip">锛堝浐瀹氾級</span>
+ </el-tag>
+ </el-tooltip>
+
+ <el-dropdown v-else trigger="click" :disabled="loading" @command="onPick">
+ <el-button size="small" :type="canOperate ? 'primary' : 'warning'" plain>
+ <Icon :icon="canOperate ? 'ep:office-building' : 'ep:view'" class="mr-4px" />
+ {{ dropdownText }}
+ <Icon icon="ep:arrow-down" class="ml-4px" />
+ </el-button>
+ <template #dropdown>
+ <el-dropdown-menu>
+ <el-dropdown-item
+ v-for="bed in beds"
+ :key="`${bed.roomId}-${bed.bedNo}`"
+ :command="bed"
+ :class="{ 'is-current': isViewing(bed) }"
+ >
+ {{ bedLabel(bed) }}
+ </el-dropdown-item>
+ <el-dropdown-item v-if="beds.length === 0" disabled>鏆傛棤宸插紑鏀惧伐浣�</el-dropdown-item>
+ <el-dropdown-item divided @click="router.push({ path: '/roomselect' })">
+ 鍘汇�岄�夊伐浣嶉〉銆嶁��
+ </el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
+
+ <!-- 涓讳汉宸茬寮�锛氬彧鎻愮ず锛屼笉鑷姩鎺ョ锛堟寜纭鍙e緞锛� -->
+ <el-tag v-if="!canOperate && roomStore.viewTargetVacant" type="info" size="small" class="ml-8px">
+ 璇ュ伐浣嶇幇鏃犱汉鎿嶄綔锛屽闇�鎿嶄綔璇峰埌閫夊伐浣嶉〉鍏ュ骇
+ </el-tag>
+ </div>
+</template>
+
+<style scoped lang="scss">
+.bed-switch {
+ display: flex;
+ align-items: center;
+ flex: none;
+}
+
+/* 銆愭湰娆¢渶姹傘�戝浐瀹氬伐浣嶇殑鍙鏍囩锛堥鐢� / 瑁呮満椤碉級 */
+.bed-switch__fixed {
+ font-weight: 600;
+}
+
+.bed-switch__fixed-tip {
+ margin-left: 2px;
+ font-weight: 400;
+ color: var(--el-text-color-secondary);
+}
+
+:deep(.el-dropdown-menu__item.is-current) {
+ color: var(--el-color-primary);
+ font-weight: 600;
+}
+</style>
diff --git a/src/views/ecg/doctor/components/DevInstallPanel.vue b/src/views/ecg/doctor/components/DevInstallPanel.vue
index 77c7038..fbd7d95 100644
--- a/src/views/ecg/doctor/components/DevInstallPanel.vue
+++ b/src/views/ecg/doctor/components/DevInstallPanel.vue
@@ -43,6 +43,11 @@
</div>
<!-- 鍖荤敓瑁呮満鍒楄〃 -->
+ <!-- 銆愭湰娆¢渶姹傘�戞搷浣滃姛鑳藉尯涓庡凡瀹屾垚璁板綍涔嬮棿鐨勬爣棰樻爮 -->
+ <div class="records-title">
+ <span class="records-title__bar"></span>
+ <span class="records-title__text">宸插畬鎴愬垪琛�</span>
+ </div>
<div class="records-host">
<ContentWrap class="records-wrap">
<el-table
@@ -69,7 +74,9 @@
</el-table-column>
<el-table-column label="瑁呮満鎯呭喌" align="center" prop="lost">
<template #default="scope">
- <span v-if="scope.row.jobType === 10">"宸茶鏈�"</span>
+ <!-- 銆愭湰闇�姹傘�戝畬鎴愯鎾ら攢杩囷細璇ユ潯璁板綍鏄剧ず銆屽凡鎾ら攢銆嶏紱鍐嶆瀹屾垚鏃跺悗绔� undone 鑷姩鍙樺洖 false -->
+ <el-tag v-if="scope.row.undone" type="danger" size="small">宸叉挙閿�</el-tag>
+ <span v-else-if="scope.row.jobType === 10">"宸茶鏈�"</span>
<span v-if="scope.row.jobType === 35">"宸叉斁寮�"</span>
</template>
</el-table-column>
@@ -213,6 +220,10 @@
formData.value.doctor = queueVO?.doctor
formData.value.doctorTime = queueVO?.doctorTime
formData.value.patSrc = queueVO?.patSrc
+ // 銆愭湰娆′慨澶嶃�戞潯鐮�/鎵撳嵃灏忕エ渚濊禆 patDetails锛堝惈 source/appointmentId锛夛紝
+ // 闃熷垪琛屾湰灏卞甫鐫�瀹冿紱鍘熷厛鍙湪 getFreeRentInfo() 鏌ュ埌"寰呮鏌ュ崟"鏃舵墠璧嬪�硷紝
+ // 瀵艰嚧缁濆ぇ澶氭暟鎯呭喌涓� patDetails 涓� undefined 鈫� 鏉$爜涓嶆樉绀恒��
+ formData.value.patDetails = queueVO?.patDetails
formData.value.patMobile = queueVO?.patMobile
formData.value.patPhone = queueVO?.patPhone
formData.value.patWardDesc = queueVO?.patWardDesc
@@ -225,7 +236,7 @@
getReadyRentInfo(formData.value) // 鑾峰彇棰嗙敤淇℃伅
copyBarcode()
}
-defineExpose({ setPatient }) // 鎻愪緵 setPatient 鏂规硶锛岀敤浜庤缃偅鑰�
+defineExpose({ setPatient, getList: () => getList() }) // 鎻愪緵 setPatient 鏂规硶锛岀敤浜庤缃偅鑰�
/** 鎻愪氦琛ㄥ崟 */
@@ -467,9 +478,17 @@
if (!formData.value.checkType)
return ""
- const displayBarcode: number[] = checkTypeStore.getCheckTypeDispBarCode(formData.value.checkType!)
- if (formData.value.patDetails == null || formData.value.patDetails.source == null ||
- !displayBarcode.includes(formData.value.patDetails.source))
+ // 銆愭湰娆′慨澶嶃�戙�屾偅鑰呮潯鐮佹樉绀恒�嶆湭閰嶇疆锛坣ull/绌猴級鈫� 涓嶆樉绀猴紙鎸夌幇鍦虹‘璁ゅ彛寰勶級
+ const displayBarcode: number[] | undefined = checkTypeStore.getCheckTypeDispBarCode(formData.value.checkType!)
+ if (displayBarcode == null || displayBarcode.length === 0)
+ return ""
+
+ // 銆愭湰娆′慨澶嶃�戞潵婧愪紭鍏堝彇 patDetails.source锛岀己澶辨椂鍥為��鍒板钩閾虹殑 patSrc
+ // 锛堝師鏉ョ洿鎺ュ彇 patDetails.source锛宲atDetails 缂哄け鏃� `.includes` 杩樹細鎶涘紓甯革級
+ const patSource = formData.value.patDetails?.source ?? formData.value.patSrc
+ if (patSource == null)
+ return ""
+ if (!displayBarcode.map(Number).includes(Number(patSource)))
return ""
return getBarcode()
@@ -479,13 +498,14 @@
if (!formData.value.checkType)
return ""
- const patSource = formData.value.patDetails?.source
+ const patSource = formData.value.patDetails?.source ?? formData.value.patSrc
if (patSource == null)
return ""
- if (1 === patSource || 2 === patSource)
+ // 闂ㄨ瘖/鎬ヨ瘖 鈫� 鐢宠鍗曞彿锛涗綇闄�/浣撴 鈫� 灏辫瘖娴佹按鍙�
+ if (1 === Number(patSource) || 2 === Number(patSource))
return formData.value.applyNo ?? ""
- else if (3 === patSource || 4 === patSource)
+ else if (3 === Number(patSource) || 4 === Number(patSource))
return formData.value.episodeId ?? ""
return ""
@@ -505,6 +525,28 @@
</script>
<style scoped lang="scss">
+
+/* 銆愭湰娆¢渶姹傘�戙�屽凡瀹屾垚鍒楄〃銆嶆爣棰樻爮锛氬乏渚т富鑹茬珫绾� + 鍔犵矖灏忔爣棰橈紝绱у噾楂樺害涓嶆尋鍘嬭〃鏍� */
+.records-title {
+ display: flex;
+ align-items: center;
+ flex: none;
+ gap: 6px;
+ padding: 2px 0 6px;
+
+ &__bar {
+ width: 3px;
+ height: 14px;
+ background-color: var(--el-color-primary);
+ border-radius: 2px;
+ }
+
+ &__text {
+ font-size: 14px;
+ font-weight: 600;
+ color: var(--el-text-color-primary);
+ }
+}
/* ==========================================================================
闇�姹傦細琛ㄥ崟鍐呭鎸ゅ崰浜嗕笅鏂硅褰曡〃鏍肩殑绌洪棿 鈥斺�� 鍘嬬缉琛岄棿璺濄��
Element Plus 榛樿 `.el-form-item { margin-bottom: 18px }`锛�
@@ -556,15 +598,21 @@
.patient-actions {
display: flex;
flex: none;
- flex-wrap: nowrap;
+ /* 鎸夐挳澶氭椂鍏佽鎹㈣锛岄伩鍏嶆尋鍦ㄤ竴琛岋紙妫�鏌ラ〉鏈�澶� 6 涓寜閽級 */
+ flex-wrap: wrap;
gap: 8px;
align-items: center;
- /* 涓婁笅鐣欑櫧 + 鍒嗛殧绾匡紝褰㈡垚鐙珛鍔熻兘鍧� */
- padding: 6px 4px;
- margin-bottom: 6px;
- background-color: var(--el-bg-color);
- border-top: 1px solid var(--el-border-color-lighter);
- border-bottom: 1px solid var(--el-border-color-lighter);
+ /*
+ 銆愭湰娆¢渶姹傘�戞搷浣滃姛鑳藉尯鍋氫竴鐐硅瑙夊尯鍒嗭紝鏂逛究鍖荤敓涓�鐪煎畾浣嶏細
+ 鏋佹祬鐨勪富鑹插簳 + 缁嗚竟妗� + 宸︿晶 3px 涓昏壊绔栨潯锛堜笌銆屸枎宸插畬鎴愬垪琛ㄣ�嶆爣棰樻潯鍚屾璇█锛夈��
+ 鍙仛"绋嶆湁鍖哄垎"锛屼笉鏀规寜閽湰韬殑灏哄/棰滆壊/椤哄簭銆�
+ */
+ padding: 8px 10px;
+ margin: 2px 0 10px;
+ background-color: var(--el-color-primary-light-9);
+ border: 1px solid var(--el-color-primary-light-7);
+ border-left: 3px solid var(--el-color-primary);
+ border-radius: 4px;
/* Element Plus 缁欑浉閭� el-button 榛樿鍔犱簡 margin-left:12px锛屼細涓� gap 鍙犲姞锛屾竻鎺� */
:deep(.el-button + .el-button) {
diff --git a/src/views/ecg/doctor/components/DevReadyPanel.vue b/src/views/ecg/doctor/components/DevReadyPanel.vue
index 6860dea..e740c11 100644
--- a/src/views/ecg/doctor/components/DevReadyPanel.vue
+++ b/src/views/ecg/doctor/components/DevReadyPanel.vue
@@ -74,6 +74,11 @@
</div>
<!-- 鍖荤敓瑁呮満鍒楄〃 -->
+ <!-- 銆愭湰娆¢渶姹傘�戞搷浣滃姛鑳藉尯涓庡凡瀹屾垚璁板綍涔嬮棿鐨勬爣棰樻爮 -->
+ <div class="records-title">
+ <span class="records-title__bar"></span>
+ <span class="records-title__text">宸插畬鎴愬垪琛�</span>
+ </div>
<div class="records-host">
<ContentWrap class="records-wrap">
<el-table
@@ -105,7 +110,9 @@
</el-table-column>
<el-table-column label="棰嗙敤鎯呭喌" align="center" prop="cancelled" >
<template #default="scope">
- <span v-if="scope.row.jobType === 5">"宸查鐢�"</span>
+ <!-- 銆愭湰闇�姹傘�戝畬鎴愯鎾ら攢杩囷細璇ユ潯璁板綍鏄剧ず銆屽凡鎾ら攢銆嶏紱鍐嶆瀹屾垚鏃跺悗绔� undone 鑷姩鍙樺洖 false -->
+ <el-tag v-if="scope.row.undone" type="danger" size="small">宸叉挙閿�</el-tag>
+ <span v-else-if="scope.row.jobType === 5">"宸查鐢�"</span>
<span v-if="scope.row.jobType === 30">"宸叉斁寮�"</span>
</template>
</el-table-column>
@@ -416,6 +423,10 @@
formData.value.doctor = queueVO?.doctor
formData.value.doctorTime = queueVO?.doctorTime
formData.value.patSrc = queueVO?.patSrc
+ // 銆愭湰娆′慨澶嶃�戞潯鐮�/鎵撳嵃灏忕エ渚濊禆 patDetails锛堝惈 source/appointmentId锛夛紝
+ // 闃熷垪琛屾湰灏卞甫鐫�瀹冿紱鍘熷厛鍙湪 getFreeRentInfo() 鏌ュ埌"寰呮鏌ュ崟"鏃舵墠璧嬪�硷紝
+ // 瀵艰嚧缁濆ぇ澶氭暟鎯呭喌涓� patDetails 涓� undefined 鈫� 鏉$爜涓嶆樉绀恒��
+ formData.value.patDetails = queueVO?.patDetails
formData.value.patMobile = queueVO?.patMobile
formData.value.patPhone = queueVO?.patPhone
formData.value.patWardDesc = queueVO?.patWardDesc
@@ -428,7 +439,7 @@
getFreeRentInfo(formData.value) // 寰呮鏌ョ殑淇℃伅 @ dev_rent 琛�
copyBarcode()
}
-defineExpose({ setPatient }) // 鎻愪緵 setPatient 鏂规硶锛岀敤浜庤缃偅鑰�
+defineExpose({ setPatient, getList: () => getList() }) // 鎻愪緵 setPatient 鏂规硶锛岀敤浜庤缃偅鑰�
const loading = ref(true) // 鍒楄〃鐨勫姞杞戒腑
@@ -635,14 +646,17 @@
if (formData.value.checkType == null)
return ""
- if (formData.value.patDetails?.source == null)
- return ""
-
- const displayBarcode: number[] = checkTypeStore.getCheckTypeDispBarCode(formData.value.checkType)
+ // 銆愭湰娆′慨澶嶃�戙�屾偅鑰呮潯鐮佹樉绀恒�嶆湭閰嶇疆锛坣ull/绌猴級鈫� 涓嶆樉绀猴紙鎸夌幇鍦虹‘璁ゅ彛寰勶級
+ const displayBarcode: number[] | undefined = checkTypeStore.getCheckTypeDispBarCode(formData.value.checkType)
if (displayBarcode == null || displayBarcode.length === 0)
return ""
- if (!displayBarcode.includes( formData.value.patDetails.source ))
+ // 銆愭湰娆′慨澶嶃�戞潵婧愪紭鍏堝彇 patDetails.source锛岀己澶辨椂鍥為��鍒板钩閾虹殑 patSrc
+ const patSource = formData.value.patDetails?.source ?? formData.value.patSrc
+ if (patSource == null)
+ return ""
+
+ if (!displayBarcode.map(Number).includes(Number(patSource)))
return ""
return getBarcode()
@@ -652,13 +666,14 @@
if (formData.value.checkType == null)
return ""
- const patSource = formData.value.patDetails?.source
+ const patSource = formData.value.patDetails?.source ?? formData.value.patSrc
if (patSource == null)
return ""
- if (1 === patSource || 2 === patSource)
+ // 闂ㄨ瘖/鎬ヨ瘖 鈫� 鐢宠鍗曞彿锛涗綇闄�/浣撴 鈫� 灏辫瘖娴佹按鍙�
+ if (1 === Number(patSource) || 2 === Number(patSource))
return formData.value.applyNo??""
- else if (3 === patSource || 4 === patSource)
+ else if (3 === Number(patSource) || 4 === Number(patSource))
return formData.value.episodeId??""
return ""
@@ -682,6 +697,28 @@
</script>
<style scoped lang="scss">
+
+/* 銆愭湰娆¢渶姹傘�戙�屽凡瀹屾垚鍒楄〃銆嶆爣棰樻爮锛氬乏渚т富鑹茬珫绾� + 鍔犵矖灏忔爣棰橈紝绱у噾楂樺害涓嶆尋鍘嬭〃鏍� */
+.records-title {
+ display: flex;
+ align-items: center;
+ flex: none;
+ gap: 6px;
+ padding: 2px 0 6px;
+
+ &__bar {
+ width: 3px;
+ height: 14px;
+ background-color: var(--el-color-primary);
+ border-radius: 2px;
+ }
+
+ &__text {
+ font-size: 14px;
+ font-weight: 600;
+ color: var(--el-text-color-primary);
+ }
+}
/* ==========================================================================
闇�姹傦細琛ㄥ崟鍐呭鎸ゅ崰浜嗕笅鏂硅褰曡〃鏍肩殑绌洪棿 鈥斺�� 鍘嬬缉琛岄棿璺濄��
Element Plus 榛樿 `.el-form-item { margin-bottom: 18px }`锛�
@@ -733,15 +770,21 @@
.patient-actions {
display: flex;
flex: none;
- flex-wrap: nowrap;
+ /* 鎸夐挳澶氭椂鍏佽鎹㈣锛岄伩鍏嶆尋鍦ㄤ竴琛岋紙妫�鏌ラ〉鏈�澶� 6 涓寜閽級 */
+ flex-wrap: wrap;
gap: 8px;
align-items: center;
- /* 涓婁笅鐣欑櫧 + 鍒嗛殧绾匡紝褰㈡垚鐙珛鍔熻兘鍧� */
- padding: 6px 4px;
- margin-bottom: 6px;
- background-color: var(--el-bg-color);
- border-top: 1px solid var(--el-border-color-lighter);
- border-bottom: 1px solid var(--el-border-color-lighter);
+ /*
+ 銆愭湰娆¢渶姹傘�戞搷浣滃姛鑳藉尯鍋氫竴鐐硅瑙夊尯鍒嗭紝鏂逛究鍖荤敓涓�鐪煎畾浣嶏細
+ 鏋佹祬鐨勪富鑹插簳 + 缁嗚竟妗� + 宸︿晶 3px 涓昏壊绔栨潯锛堜笌銆屸枎宸插畬鎴愬垪琛ㄣ�嶆爣棰樻潯鍚屾璇█锛夈��
+ 鍙仛"绋嶆湁鍖哄垎"锛屼笉鏀规寜閽湰韬殑灏哄/棰滆壊/椤哄簭銆�
+ */
+ padding: 8px 10px;
+ margin: 2px 0 10px;
+ background-color: var(--el-color-primary-light-9);
+ border: 1px solid var(--el-color-primary-light-7);
+ border-left: 3px solid var(--el-color-primary);
+ border-radius: 4px;
/* Element Plus 缁欑浉閭� el-button 榛樿鍔犱簡 margin-left:12px锛屼細涓� gap 鍙犲姞锛屾竻鎺� */
:deep(.el-button + .el-button) {
diff --git a/src/views/ecg/doctor/components/PatientInfoBlock.vue b/src/views/ecg/doctor/components/PatientInfoBlock.vue
index da162af..84d8aed 100644
--- a/src/views/ecg/doctor/components/PatientInfoBlock.vue
+++ b/src/views/ecg/doctor/components/PatientInfoBlock.vue
@@ -31,7 +31,7 @@
formatDateTime,
resolveCardNo
} from '@/utils/patientInfo'
-import { getCheckTypeName } from '@/utils/checkTypeFormatter'
+import { getCheckTypeName, getCheckTypeSeqPrefix } from '@/utils/checkTypeFormatter'
const props = defineProps<{
/** 鎮h��/鎺掗槦/棰勭害/绉熻祦 鏁版嵁瀵硅薄锛堝舰鎬佸吋瀹癸紝瑙佹枃浠跺ご璇存槑锛� */
@@ -77,6 +77,21 @@
const phone = computed(() =>
pick(d.value.patMobile, d.value.patPhone, pd.value.mobile) ?? '-'
)
+
+/**
+ * 鎺掗槦鍙锋樉绀烘枃妗堬紙鏈渶姹傦細鍙风粺涓�锛夈��
+ * 路 鍙 `seq_num`锛堢鍒版椂鍒嗛厤銆佷箣鍚庝笉鍙橈級锛�**涓嶅啀鍥炶惤 bookSeqNum**锛堣鍙峰凡鍋滅敤锛夛紱
+ * 路 鏄剧ず涓恒�屾鏌ラ」鐩墠缂� + 鍙枫�嶁�斺�� 鍙锋寜妫�鏌ラ」鐩悇鑷紪鍙凤紝涓嶅悓椤圭洰涔嬮棿浼氬嚭鐜扮浉鍚屾暟瀛楋紝
+ * 蹇呴』闈� `check_type.seq_prefix` 鍖哄垎锛堜緥锛欰12 / 12锛夈��
+ */
+const seqNumText = computed(() => {
+ const seq = pick(d.value.seqNum)
+ if (seq === undefined) return '-'
+ return `${getCheckTypeSeqPrefix(d.value[checkField.value])}${seq}`
+})
+
+/** 鏄惁鍔犳�ワ紙HIS 鍔犳�� jjbz=J 鎴栦汉宸ユ彃闃熷叡鐢� jump_flag锛夛細鍖荤敓渚ц鏄剧溂鎻愮ず */
+const isJump = computed(() => Number(d.value.jumpFlag) === 1)
const ward = computed(() => pick(d.value.patWardDesc, pd.value.wardDesc) ?? '-')
// 娉ㄦ剰锛歞.bedNo 鍦� queue 閲屾槸銆愯瘖鐤楀簥/宸ヤ綅鍙枫�戯紝鐪熸鐨勭梾搴婂彿鏄� patBedNo / patDetails.bedNo
const patBed = computed(() => pick(d.value.patBedNo, pd.value.bedNo) ?? '-')
@@ -100,8 +115,9 @@
<span class="pi-item">鎮h�呯紪鍙凤細{{ d.patId || '-' }}</span>
<span class="pi-item">灏辫瘖鍙凤細{{ d.episodeId || '-' }}</span>
<span v-if="showSeqNum" class="pi-item">
- 鎺掗槦搴忓彿锛歿{ pick(d.seqNum, d.bookSeqNum) ?? '-' }}
+ 鎺掗槦搴忓彿锛歿{ seqNumText }}
</span>
+ <span v-if="isJump" class="pi-item pi-warn">锛堝姞鎬ワ級</span>
<span v-if="d.status !== undefined && d.status !== null && statusDict" class="pi-item">
鐘舵�侊細<dict-tag :type="statusDict" :value="d.status" />
</span>
@@ -121,7 +137,7 @@
</el-col>
<el-col v-if="showSeqNum" :span="colSpan">
<el-form-item label="鎺掗槦搴忓彿">
- {{ pick(d.seqNum, d.bookSeqNum) ?? '-' }}
+ {{ seqNumText }}
</el-form-item>
</el-col><el-col :span="colSpan">
<!-- 鏍囩鐢便�屽氨璇婂崱鍙枫�嶆敼涓恒�岄棬璇婂彿銆嶏紙缁忕‘璁わ紝璇﹁銆婇儴缃叉竻鍗曘��5.1锛夛細
diff --git a/src/views/ecg/doctor/components/QueuePanel.vue b/src/views/ecg/doctor/components/QueuePanel.vue
index 2562362..5598be0 100644
--- a/src/views/ecg/doctor/components/QueuePanel.vue
+++ b/src/views/ecg/doctor/components/QueuePanel.vue
@@ -2,15 +2,15 @@
import {defineComponent, PropType} from "vue";
import { QueueVO } from '@/api/ecg/queue'
import {DICT_TYPE} from "@/utils/dict";
-import {PatientVO, DoctorApi, RoomBedVO} from "@/api/ecg/doctor";
-import {getCheckTypeName, getCheckTypeSeqPrefix} from "../../../../utils/checkTypeFormatter";
+import { PatientVO, DoctorApi, RoomBedVO } from "@/api/ecg/doctor";
+import { getCheckTypeName, getCheckTypeSeqPrefix } from "../../../../utils/checkTypeFormatter";
+import { useRoomStore } from '@/store/modules/room'
defineComponent({
name: 'QueuePanel'
})
-const emit = defineEmits(['event_RecallFinish']) // 瀹氫箟 success 浜嬩欢锛岀敤浜庢搷浣滄垚鍔熷悗鐨勫洖璋�
-
+const emit = defineEmits(['event_RecallFinish', 'event_PullWaiting', 'event_HurryUp']) // 瀹氫箟 success 浜嬩欢锛岀敤浜庢搷浣滄垚鍔熷悗鐨勫洖璋�
const message = useMessage() // 娑堟伅寮圭獥
const props = defineProps({
@@ -21,8 +21,38 @@
room: {
type: Object as PropType<RoomBedVO>,
required: true
+ },
+ /**
+ * 銆愭湰璇婂鏈垎閰嶃�戞湰宸ヤ綅妫�鏌ョ被鍨嬩笅銆�**杩樻病鍒嗛厤宸ヤ綅**鐨�"鎺掗槦涓�"鎮h�呫��
+ * 鍊欒瘖鍒楄〃鐪嬩笉鍒颁粬浠紙鍒楄〃鎸� room_id+bed_no 鏌ワ級锛屼絾澶у睆鑳界湅鍒� 鈥斺�� 鍖荤敓鍙湪姝ゆ墜宸ャ�屾媺鍏ャ�嶃��
+ */
+ waitingList: {
+ type: Array as PropType<QueueVO[]>,
+ default: () => []
+ },
+ /**
+ * 銆愯嚜鍔╄瘖鏂��"鏈�杩戜竴娆″彇鏁�"鐨勮鏄庯紝渚嬪 `鏈�杩戝彇鏁� 12:03:45 杩斿洖 0 鏉銆�
+ * 绌哄垪琛ㄦ椂鏄剧ず锛氭椂闂翠笉鍒锋柊=杞娌″湪璺戯紱杩斿洖 0 鏉�=鍚庣纭疄娌℃暟鎹��
+ */
+ fetchInfo: {
+ type: String,
+ default: ''
}
})
+
+/** 銆愪富/鍥磋銆戝綋鍓嶆槸鍚﹀彲鎿嶄綔锛歠alse 琛ㄧず姝e湪鍥磋鍒汉鐨勫伐浣嶏紙鍒楄〃鏄埆浜虹殑闃熷垪锛� */
+const roomStore = useRoomStore()
+const canOperate = computed(() => roomStore.getCanOperate)
+
+/** 鎷夊叆鎺掗槦涓殑鎮h�咃紙鐖堕〉闈㈣礋璐h皟鎺ュ彛銆佸埛鏂板垪琛級 */
+const pullWaiting = (item: any) => {
+ emit('event_PullWaiting', item)
+}
+
+/** 绔嬪嵆琛ヤ汉锛堢埗椤甸潰璐熻矗璋冩帴鍙e苟鎶�"缁撹"灞曠ず鍑烘潵锛� */
+const hurryUp = () => {
+ emit('event_HurryUp')
+}
const recall = async (item) => {
const patientVO: PatientVO = {
@@ -46,41 +76,99 @@
}
/**
- * 闇�姹傦細鍙充晶鎮h�呭垪琛ㄨ鎶娿�屽氨璇婁腑 / 宸茶繃鍙� / 鍊欒瘖涓�嶇敤涓嶅悓棰滆壊鍖哄垎锛屾柟渚垮尰鐢熻瘑鍒��
+ * 闇�姹傦細鍙充晶鎮h�呭垪琛ㄨ鎶娿�屽氨璇婁腑 / 鍑嗗涓�(鍘熷�欒瘖涓�) / 杩囧彿銆嶇敤涓嶅悓棰滆壊鍖哄垎锛屾柟渚垮尰鐢熻瘑鍒��
*
- * 棰滆壊鏂规锛堝乏渚ц壊鏉� + 娴呰壊搴� + 宸︿晶绔栫嚎锛夛細
- * 路 灏辫瘖涓�(30) 鈥斺�� 钃濊壊锛堜富鑹诧級 锛氭鍦ㄧ湅鐨勬偅鑰咃紝鏈�閱掔洰
- * 路 宸茶繃鍙�(3/5) 鈥斺�� 绾㈣壊 锛氶渶瑕佸叧娉紙鍙兘宸查敊杩囧彨鍙凤級
- * 路 鍊欒瘖涓�(20/15) 鈥斺�� 缁胯壊 锛氭甯哥瓑寰�
- * 路 鍏朵粬 鈥斺�� 鐏拌壊 锛氭帓闃熶腑/浜插拰/宸查鐢�/瀹夎涓瓑
+ * 棰滆壊鏂规锛�**鍙敤鏂囧瓧棰滆壊**锛屼笉鍐嶆湁鏁磋鑳屾櫙鑹诧紝涔熸病鏈夎棣栬壊鏉★級锛�
+ * 路 灏辫瘖涓�(30) 鈥斺�� 钃濊壊锛堜富鑹诧級 + 濮撳悕鍔犵矖 锛氭鍦ㄧ湅鐨勬偅鑰咃紝鏈�閱掔洰
+ * 路 杩囧彿(3/5) 鈥斺�� 绾㈣壊 + 濮撳悕鍔犵矖 锛氶渶瑕佸叧娉紙鍙兘宸查敊杩囧彨鍙凤級
+ * 路 鍑嗗涓�(20/15) 鈥斺�� 缁胯壊 锛氭甯哥瓑寰咃紙20=鍑嗗涓紝鍘�"鍊欒瘖涓�"锛�
+ * 路 鍏朵粬 鈥斺�� 鐏拌壊 锛氭帓闃熶腑/浜插拰/宸查鐢�/瀹夎涓瓑
*
* 涔嬫墍浠ヤ笉鍙潬 dict-tag 鐨勬枃瀛楋細鍖荤敓鎵竴鐪煎垪琛ㄦ椂瑕佽兘**蹇�熷畾浣�**褰撳墠灏辫瘖鑰呬笌杩囧彿鑰咃紝
- * 棰滆壊姣旀枃瀛楁洿蹇��
+ * 棰滆壊姣旀枃瀛楁洿蹇�傛敼鎴�"鏂囧瓧鏌撹壊"鏄洜涓烘暣琛屽簳鑹蹭細璁╁垪琛ㄦ樉寰楀緢鑺便�佷篃鍘嬫帀浜嗚涓庤鐨勫尯鍒嗗害銆�
*/
const rowClass = (item: any): string => {
const st = Number(item?.status)
if (st === 30) return 'row-onstage' // 灏辫瘖涓�
if (st === 3 || st === 5) return 'row-passed' // 宸茶繃鍙凤紙鍚�"宸茶繃鍙�-鎺掗槦"锛�
- if (st === 20 || st === 15) return 'row-ready' // 鍊欒瘖涓� / 宸插彫鍥�
+ if (st === 20 || st === 15) return 'row-ready' // 鍑嗗涓�(鍘熷�欒瘖涓�) / 宸插彫鍥�
return 'row-other'
}
</script>
<template>
<div class="queue-list">
+ <!--
+ 绌哄垪琛ㄦ彁绀猴紙鏈鏂板锛夛細鎶�"杩欎唤鍒楄〃灞炰簬鍝釜宸ヤ綅銆佹垜鏄粈涔堣韩浠�"鐩存帴鍐欏嚭鏉ャ��
+ 鐜板満鍑虹幇杩�"鎮h�呭垪琛ㄦ槸绌虹殑"锛屽厜鐪嬬┖鍒楄〃鏃犳硶鍒ゆ柇鏄帓闃熺湡鐨勬病浜恒�佽繕鏄湅閿欎簡宸ヤ綅
+ 锛堝洿瑙傚埆浜虹殑宸ヤ綅 / 鎹簡宸ヤ綅浣嗘偅鑰呰繕鍦ㄥ師宸ヤ綅锛夈��
+ -->
+ <div v-if="!queue || queue.length === 0" class="queue-empty">
+ <div class="queue-empty__title">鏆傛棤鍊欒瘖鎮h��</div>
+ <div class="queue-empty__meta">
+ 褰撳墠鍒楄〃锛歿{ room?.roomName || '鈥�' }} 路 {{ room?.bedNo || '鈥�' }}
+ <template v-if="!canOperate">锛�<b>鍥磋妯″紡 路 鍙</b>锛岃繖鏄粬浜哄伐浣嶇殑闃熷垪锛�</template>
+ <template v-else>锛堟垜鐨勫伐浣嶏級</template>
+ </div>
+ <!-- 鑷姪璇婃柇锛氫竴鐪肩湅鍑�"杞娌¤窇"锛堟椂闂翠笉鍔級杩樻槸"鍚庣杩斿洖 0 鏉�" -->
+ <div v-if="fetchInfo" class="queue-empty__meta">{{ fetchInfo }}</div>
+ <!--
+ 鍊欒瘖鍖轰负绌烘椂鐨勮嚜鏁戝叆鍙o細
+ 绯荤粺**鍙湁鍦ㄣ�愬紑璇娿�戠姸鎬併�佷笖鏈伐浣嶆病寮�銆愬仠姝㈠�欒瘖銆戙�佷笖鍊欒瘖浜烘暟鏈揪涓婇檺**鏃舵墠浼氳嚜鍔ㄨˉ浜猴紱
+ 鐐硅繖閲岀珛鍒昏Е鍙戜竴娆″苟鐩存帴鍛婅瘔浣犺鍝亾闂ㄩ椄鎸′綇浜嗭紙鍚庣杩斿洖"缁撹"锛夈��
+ -->
+ <div class="queue-empty__meta">
+ 绯荤粺鍙湪銆愬紑璇娿�戙�佹湰宸ヤ綅鏈紑銆愬仠姝㈠�欒瘖銆戙�佷笖鍊欒瘖浜烘暟鏈揪涓婇檺鏃舵墠浼氳嚜鍔ㄨˉ浜猴紱
+ <template v-if="canOperate">
+ <el-button link type="primary" @click="hurryUp">绔嬪嵆琛ヤ汉锛堝苟鏌ョ湅鍘熷洜锛�</el-button>
+ </template>
+ </div>
+ </div>
<div
v-for="(item, index) in queue"
:key="index"
class="queue-row"
:class="rowClass(item)"
>
- <span class="col-seq"> {{item.seqNum}} </span>
- <span class="col-bookseq"> {{getCheckTypeSeqPrefix(item.bookCheckType)}}{{item.bookSeqNum}} </span>
+ <!--
+ 鎺掗槦鍙凤紙鏈渶姹傦級锛氱粺涓�鏄剧ず銆屾鏌ラ」鐩墠缂� + seq_num銆嶏紝涓嶅啀鏄剧ず bookSeqNum銆�
+ 鍓嶇紑鏉ヨ嚜 check_type.seq_prefix 鈥斺�� 鍙风幇鍦ㄦ槸**鎸夋鏌ラ」鐩悇鑷紪鍙�**锛屼笉鍚屾鏌ラ」鐩箣闂�
+ 浼氬嚭鐜扮浉鍚屾暟瀛楋紝蹇呴』闈犲墠缂�鍖哄垎锛堜緥锛欰12 / 12锛夈��
+ 鍔犳��(jump_flag=1)鍦ㄥ彿鍓嶉潰鍔犵孩鑹层�屾�ャ�嶅瓧锛屽尰鐢熶竴鐪煎彲瑙併��
+ -->
+ <span class="col-seq">
+ <span v-if="Number(item.jumpFlag) === 1" class="jump-badge">鎬�</span>
+ {{ getCheckTypeSeqPrefix(item.bookCheckType) }}{{ item.seqNum }}
+ </span>
<span class="col-name"> {{item.patName}}{{item.passed === 0 ? "":"*"}} </span>
<dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="item.patGender" />
{{getCheckTypeName(item.bookCheckType)}}
<dict-tag :type="DICT_TYPE.ECG_QUEUE_STATUS" :value="item.status" />
<el-button v-if="item.status === 5 || item.status === 7" size="small" @click="recall(item)"> 鍙洖 </el-button>
+ </div>
+
+ <!--
+ 銆愭湰璇婂鏈垎閰嶃�戞湰宸ヤ綅妫�鏌ョ被鍨嬩笅銆佽繕娌″垎閰嶅伐浣嶇殑"鎺掗槦涓�"鎮h�呫��
+ 涓轰粈涔堥渶瑕侊細鍊欒瘖鍒楄〃鎸� room_id + bed_no 鏌ワ紝鍙惈"宸插垎娴佸埌鏈伐浣�"鐨勪汉锛�
+ 鑰�"鎺掗槦涓�(10)"鐨勪汉 bed_no 鏄┖鐨� 鈥斺�� 澶у睆鑳界湅鍒颁粬浠紝宸ヤ綔鍙板師鍏堢湅涓嶅埌锛�
+ 鍖荤敓浼氫互涓�"鎮h�呭垪琛ㄦ病鍙栧埌鏁版嵁"銆傝繖閲屽垪鍑烘潵锛屽伐浣嶄富浜哄彲涓�閿�屾媺鍏ャ�嶃��
+ -->
+ <div v-if="waitingList && waitingList.length > 0" class="room-waiting">
+ <div class="room-waiting__title">
+ 鏈瘖瀹ゆ帓闃熶腑锛堟湭鍒嗛厤宸ヤ綅锛墈{ waitingList.length }} 浜�
+ </div>
+ <div v-for="(item, index) in waitingList" :key="'w' + index" class="room-waiting__row">
+ <span class="col-seq">
+ <span v-if="Number(item.jumpFlag) === 1" class="jump-badge">鎬�</span>
+ {{ getCheckTypeSeqPrefix(item.bookCheckType) }}{{ item.seqNum }}
+ </span>
+ <span class="col-name"> {{ item.patName }} </span>
+ {{ getCheckTypeName(item.bookCheckType) }}
+ <template v-if="canOperate">
+ <el-button size="small" type="primary" plain @click="pullWaiting(item)"> 鎷夊叆 </el-button>
+ </template>
+ <span v-else class="room-waiting__readonly">锛堝彧璇伙級</span>
+ </div>
</div>
</div>
</template>
@@ -94,61 +182,116 @@
padding-left: 5px;
}
+/* 绌哄垪琛ㄦ彁绀猴紙鏈鏂板锛夛細鎶�"杩欎唤鍒楄〃灞炰簬鍝釜宸ヤ綅銆佹垜鏄粈涔堣韩浠�"鍐欐竻妤氾紝
+ 閬垮厤鎶�"鐪嬮敊浜嗗伐浣嶏紙鍥磋/鍒囨崲杩囷級"褰撴垚"鎺掗槦娌′汉"銆� */
+.queue-empty {
+ padding: 18px 8px;
+ text-align: center;
+
+ &__title {
+ font-size: 15px;
+ color: var(--el-text-color-secondary);
+ }
+
+ &__meta {
+ margin-top: 6px;
+ font-size: 13px;
+ line-height: 1.6;
+ color: var(--el-text-color-placeholder);
+ }
+}
+
+/*
+ 銆屾湰璇婂鎺掗槦涓紙鏈垎閰嶅伐浣嶏級銆嶅垎鍖猴紙鏈鏂板锛夛細
+ 涓庝笂闈㈢殑鍊欒瘖鍒楄〃鐢ㄤ竴鏉℃祬鑹插垎闅旂嚎 + 灏忔爣棰樺尯鍒嗗紑锛岃瑙変笂鏄庣‘"杩欎簺浜鸿繕娌¤繘鏈伐浣�"銆�
+*/
+.room-waiting {
+ margin-top: 10px;
+ padding-top: 8px;
+ border-top: 1px dashed var(--el-border-color);
+
+ &__title {
+ margin-bottom: 4px;
+ font-size: 13px;
+ font-weight: 600;
+ color: var(--el-color-primary);
+ }
+
+ &__row {
+ padding: 3px 6px;
+ margin-bottom: 3px;
+ color: var(--el-text-color-regular);
+ }
+
+ &__readonly {
+ font-size: 12px;
+ color: var(--el-text-color-placeholder);
+ }
+}
+
+/*
+ 琛屾牱寮忥紙鏈闇�姹傦級锛�
+ 路 鍘绘帀鏁磋鑳屾櫙鑹诧紝涔熷幓鎺夎棣栭偅鏉� 4px 鑹叉潯 鈥斺�� 鐘舵�佸彧闈�**鏂囧瓧棰滆壊**鍖哄垎锛�
+ 路 鍥犳杩欓噷鍙繚鐣欓棿璺�/鍦嗚锛岄鑹茶鍒欏叏閮ㄤ笅娌夊埌涓嬮潰鐨� .row-* 閲屻��
+*/
.queue-row {
padding: 3px 6px;
margin-bottom: 3px;
- border-left: 4px solid transparent;
border-radius: 3px;
line-height: 22px;
+ background-color: transparent;
}
/* 灏辫瘖涓細钃濊壊锛堜富鑹诧級鈥斺�� 褰撳墠姝e湪澶勭悊鐨勬偅鑰� */
.row-onstage {
- background-color: var(--el-color-primary-light-8);
- border-left-color: var(--el-color-primary);
+ color: var(--el-color-primary);
.col-name {
font-weight: 700;
- color: var(--el-color-primary);
}
}
-/* 宸茶繃鍙凤細绾㈣壊 鈥斺�� 闇�鎻愰啋鍖荤敓娉ㄦ剰 */
+/* 杩囧彿锛氱孩鑹� 鈥斺�� 闇�鎻愰啋鍖荤敓娉ㄦ剰 */
.row-passed {
- background-color: var(--el-color-danger-light-8);
- border-left-color: var(--el-color-danger);
+ color: var(--el-color-danger);
.col-name {
font-weight: 600;
- color: var(--el-color-danger);
}
}
-/* 鍊欒瘖涓� / 宸插彫鍥烇細缁胯壊 鈥斺�� 姝e父绛夊緟 */
+/* 鍑嗗涓�(鍘�"鍊欒瘖涓�") / 宸插彫鍥烇細缁胯壊 鈥斺�� 姝e父绛夊緟 */
.row-ready {
- background-color: var(--el-color-success-light-8);
- border-left-color: var(--el-color-success);
+ color: var(--el-color-success);
}
/* 鍏朵粬鐘舵�侊細鐏拌壊锛屽急鍖栨樉绀� */
.row-other {
- background-color: var(--el-fill-color-light);
- border-left-color: var(--el-border-color);
color: var(--el-text-color-secondary);
}
.col-seq,
-.col-bookseq,
.col-name {
display: inline-block;
}
+/* 鍙� + 鍓嶇紑 + 鍙兘鐨勩�屾�ャ�嶆爣璁帮紝缁欒冻瀹藉害閬垮厤涓庡鍚嶆尋鍦ㄤ竴璧� */
.col-seq {
- width: 30px;
-}
-.col-bookseq {
- width: 40px;
+ width: 78px;
}
.col-name {
width: 70px;
}
+
+/* 鍔犳�ユ爣璁帮細绾㈠簳鐧藉瓧锛岀揣璐村湪鎺掗槦鍙峰墠闈� */
+.jump-badge {
+ display: inline-block;
+ padding: 0 3px;
+ margin-right: 2px;
+ border-radius: 2px;
+ background-color: var(--el-color-danger);
+ color: #fff;
+ font-size: 11px;
+ line-height: 15px;
+ vertical-align: 1px;
+}
</style>
diff --git a/src/views/ecg/doctor/components/RoutinePanel.vue b/src/views/ecg/doctor/components/RoutinePanel.vue
index cc50adb..de37be3 100644
--- a/src/views/ecg/doctor/components/RoutinePanel.vue
+++ b/src/views/ecg/doctor/components/RoutinePanel.vue
@@ -22,7 +22,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="鎮h�呭鍚�" prop="patName">
- <el-input v-model="formData.episodeId" placeholder="璇疯緭鍏ユ偅鑰呭鍚�" />
+ <el-input v-model="formData.patName" placeholder="璇疯緭鍏ユ偅鑰呭鍚�" />
</el-form-item>
</el-col>
</el-row>
@@ -62,6 +62,11 @@
锛堟浘灏濊瘯璁� el-table 鍐呴儴婊氬姩浠ュ浐瀹氳〃澶达紝浣嗘湰椤圭洰 Element Plus 2.7.0 涓�
height/maxHeight 鍧囨湭鐢熸晥锛屽凡鍥為��锛岃瑙併�婇儴缃叉竻鍗曘��5.3.15銆傦級
-->
+ <!-- 銆愭湰娆¢渶姹傘�戞搷浣滃姛鑳藉尯涓庡凡瀹屾垚璁板綍涔嬮棿鐨勬爣棰樻爮 -->
+ <div class="records-title">
+ <span class="records-title__bar"></span>
+ <span class="records-title__text">宸插畬鎴愬垪琛�</span>
+ </div>
<div class="records-host">
<ContentWrap class="records-wrap">
<el-table
@@ -92,7 +97,9 @@
</el-table-column>
<el-table-column label="妫�鏌ョ姸鎬�" align="center" prop="lost">
<template #default="scope">
- <span v-if="scope.row.jobType === 60">宸叉鏌�</span>
+ <!-- 銆愭湰闇�姹傘�戝畬鎴愯鎾ら攢杩囷細璇ユ潯璁板綍鏄剧ず銆屽凡鎾ら攢銆嶏紱鍐嶆瀹屾垚鏃跺悗绔� undone 鑷姩鍙樺洖 false -->
+ <el-tag v-if="scope.row.undone" type="danger" size="small">宸叉挙閿�</el-tag>
+ <span v-else-if="scope.row.jobType === 60">宸叉鏌�</span>
<span v-if="scope.row.jobType === 50">宸叉斁寮�</span>
</template>
</el-table-column>
@@ -218,6 +225,10 @@
formData.value.seqNum = queueVO?.seqNum
formData.value.status = queueVO?.status
formData.value.patSrc = queueVO?.patSrc
+ // 銆愭湰娆′慨澶嶃�戞潯鐮�/鎵撳嵃灏忕エ渚濊禆 patDetails锛堝惈 source/appointmentId锛夛紝
+ // 闃熷垪琛屾湰灏卞甫鐫�瀹冿紱鍘熷厛鍙湪 getFreeRentInfo() 鏌ュ埌"寰呮鏌ュ崟"鏃舵墠璧嬪�硷紝
+ // 瀵艰嚧缁濆ぇ澶氭暟鎯呭喌涓� patDetails 涓� undefined 鈫� 鏉$爜涓嶆樉绀恒��
+ formData.value.patDetails = queueVO?.patDetails
formData.value.patMobile = queueVO?.patMobile
formData.value.patPhone = queueVO?.patPhone
formData.value.patWardDesc = queueVO?.patWardDesc
@@ -230,7 +241,7 @@
getFreeRentInfo(formData.value)
copyBarcode()
}
-defineExpose({ setPatient }) // 鎻愪緵 setPatient 鏂规硶锛岀敤浜庤缃偅鑰�
+defineExpose({ setPatient, getList: () => getList() }) // 鎻愪緵 setPatient 鏂规硶锛岀敤浜庤缃偅鑰�
const { t } = useI18n() // 鍥介檯鍖�
const message = useMessage() // 娑堟伅寮圭獥
@@ -594,13 +605,16 @@
const getDisplayBarcode = (): string => {
if (formData.value.checkType == null) return ''
- const displayBarcode: number[] = checkTypeStore.getCheckTypeDispBarCode(formData.value.checkType!)
- if (
- formData.value.patDetails == null ||
- formData.value.patDetails.source == null ||
- !displayBarcode.includes(formData.value.patDetails.source)
- )
- return ''
+ // 銆愭湰娆′慨澶嶃�戙�屾偅鑰呮潯鐮佹樉绀恒�嶆湭閰嶇疆锛坣ull/绌猴級鈫� 涓嶆樉绀猴紙鎸夌幇鍦虹‘璁ゅ彛寰勶級
+ const displayBarcode: number[] | undefined = checkTypeStore.getCheckTypeDispBarCode(formData.value.checkType!)
+ if (displayBarcode == null || displayBarcode.length === 0) return ''
+
+ // 銆愭湰娆′慨澶嶃�戞潵婧愪紭鍏堝彇 patDetails.source锛岀己澶辨椂鍥為��鍒板钩閾虹殑 patSrc銆�
+ // 鍘熸潵鍙 patDetails.source锛岃�� patDetails 鍘熷厛鍙湪"鑳芥煡鍒板緟妫�鏌ュ崟"鏃舵墠琚祴鍊硷紝
+ // 澶у鏁版儏鍐典笅鏄� undefined 鈫� 鏉$爜姘歌繙涓嶆樉绀恒��
+ const patSource = formData.value.patDetails?.source ?? formData.value.patSrc
+ if (patSource == null) return ''
+ if (!displayBarcode.map(Number).includes(Number(patSource))) return ''
return getBarcode()
}
@@ -608,11 +622,12 @@
const getBarcode = (): string => {
if (formData.value.checkType == null) return ''
- const patSource = formData.value.patDetails?.source
+ const patSource = formData.value.patDetails?.source ?? formData.value.patSrc
if (patSource == null) return ''
- if (1 === patSource || 2 === patSource) return formData.value.applyNo ?? ''
- else if (3 === patSource || 4 === patSource) return formData.value.episodeId ?? ''
+ // 闂ㄨ瘖/鎬ヨ瘖 鈫� 鐢宠鍗曞彿锛涗綇闄�/浣撴 鈫� 灏辫瘖娴佹按鍙�
+ if (1 === Number(patSource) || 2 === Number(patSource)) return formData.value.applyNo ?? ''
+ else if (3 === Number(patSource) || 4 === Number(patSource)) return formData.value.episodeId ?? ''
return ''
}
@@ -630,6 +645,28 @@
</script>
<style scoped lang="scss">
+
+/* 銆愭湰娆¢渶姹傘�戙�屽凡瀹屾垚鍒楄〃銆嶆爣棰樻爮锛氬乏渚т富鑹茬珫绾� + 鍔犵矖灏忔爣棰橈紝绱у噾楂樺害涓嶆尋鍘嬭〃鏍� */
+.records-title {
+ display: flex;
+ align-items: center;
+ flex: none;
+ gap: 6px;
+ padding: 2px 0 6px;
+
+ &__bar {
+ width: 3px;
+ height: 14px;
+ background-color: var(--el-color-primary);
+ border-radius: 2px;
+ }
+
+ &__text {
+ font-size: 14px;
+ font-weight: 600;
+ color: var(--el-text-color-primary);
+ }
+}
/* ==========================================================================
闇�姹傦細琛ㄥ崟鍐呭鎸ゅ崰浜嗕笅鏂硅褰曡〃鏍肩殑绌洪棿 鈥斺�� 鍘嬬缉琛岄棿璺濄��
Element Plus 榛樿 `.el-form-item { margin-bottom: 18px }`锛�
@@ -681,15 +718,21 @@
.patient-actions {
display: flex;
flex: none;
- flex-wrap: nowrap;
+ /* 鎸夐挳澶氭椂鍏佽鎹㈣锛岄伩鍏嶆尋鍦ㄤ竴琛岋紙妫�鏌ラ〉鏈�澶� 6 涓寜閽級 */
+ flex-wrap: wrap;
gap: 8px;
align-items: center;
- /* 涓婁笅鐣欑櫧 + 鍒嗛殧绾匡紝褰㈡垚鐙珛鍔熻兘鍧� */
- padding: 6px 4px;
- margin-bottom: 6px;
- background-color: var(--el-bg-color);
- border-top: 1px solid var(--el-border-color-lighter);
- border-bottom: 1px solid var(--el-border-color-lighter);
+ /*
+ 銆愭湰娆¢渶姹傘�戞搷浣滃姛鑳藉尯鍋氫竴鐐硅瑙夊尯鍒嗭紝鏂逛究鍖荤敓涓�鐪煎畾浣嶏細
+ 鏋佹祬鐨勪富鑹插簳 + 缁嗚竟妗� + 宸︿晶 3px 涓昏壊绔栨潯锛堜笌銆屸枎宸插畬鎴愬垪琛ㄣ�嶆爣棰樻潯鍚屾璇█锛夈��
+ 鍙仛"绋嶆湁鍖哄垎"锛屼笉鏀规寜閽湰韬殑灏哄/棰滆壊/椤哄簭銆�
+ */
+ padding: 8px 10px;
+ margin: 2px 0 10px;
+ background-color: var(--el-color-primary-light-9);
+ border: 1px solid var(--el-color-primary-light-7);
+ border-left: 3px solid var(--el-color-primary);
+ border-radius: 4px;
/* Element Plus 缁欑浉閭� el-button 榛樿鍔犱簡 margin-left:12px锛屼細涓� gap 鍙犲姞锛屾竻鎺� */
:deep(.el-button + .el-button) {
diff --git a/src/views/ecg/doctor/index.vue b/src/views/ecg/doctor/index.vue
index a8ee93a..1091031 100644
--- a/src/views/ecg/doctor/index.vue
+++ b/src/views/ecg/doctor/index.vue
@@ -17,13 +17,19 @@
const roomStore = useRoomStore();
-const roomBedVO: RoomBedVO = {
+/**
+ * 褰撳墠宸ヤ綅淇℃伅銆�
+ *
+ * 銆愭湰娆¢渶姹傘�戝繀椤绘槸**鍝嶅簲寮�**瀵硅薄锛氬垏鎹㈠伐浣嶆椂椤甸潰浼氭妸瀹冩敼鎴愭柊宸ヤ綅鐨勫�硷紝
+ * 鑻ユ槸鏅�氬璞★紝宸ヤ綅鍚嶇О/妫�鏌ラ」鐩瓑鏄剧ず涓嶄細閲嶇粯锛堢湅璧锋潵鍍�"娌℃崲杩囨潵"锛夈��
+ */
+const roomBedVO = reactive<RoomBedVO>({
roomId: null,
roomName: null,
bedNo: null,
checkTypes: null,
opType: null
-}
+})
let onStagePatient: QueueVO = {
bedNo: "", bookCheckType: 0, bookTimeslot: 0, expired: 0, id: 0, jumpFlag: 0, passed: 0,
@@ -41,6 +47,10 @@
const state = ref<boolean>()
const patientList = ref<QueueVO[]>([])
+/** 銆愭湰璇婂鏈垎閰嶃�戞湰宸ヤ綅妫�鏌ョ被鍨嬩笅銆佽繕娌″垎閰嶅伐浣嶇殑"鎺掗槦涓�"鎮h�咃紙鍙墜宸ユ媺鍏ワ級 */
+const roomWaitingList = ref<QueueVO[]>([])
+/** 銆愯嚜鍔╄瘖鏂�戞渶杩戜竴娆″彇鏁扮殑璇存槑锛堢┖鍒楄〃鏃舵樉绀猴級 */
+const fetchInfo = ref('')
let timerRunFlag : boolean = false
const bedControlFlag = ref<boolean>(true);
@@ -151,6 +161,8 @@
checkType: last.bookCheckType
} as any)
ElMessage.success(msg || '宸叉挙閿�')
+ // 銆愭挙閿�鏍囪瘑銆戞挙閿�鍚庣珛鍒诲埛鏂般�屽凡瀹屾垚璁板綍銆嶅垪琛紝璁╄繖鏉¤褰曟樉绀烘垚銆屽凡鎾ら攢銆�
+ devReadyPanelRef.value?.getList?.()
await initLoad()
} finally {
undoFlag.value = false
@@ -171,6 +183,64 @@
}
}
+/**
+ * 銆愭湰璇婂鏈垎閰嶃�戝姞杞�"鏈伐浣嶆鏌ョ被鍨嬩笅銆佽繕娌″垎閰嶅伐浣嶇殑鎺掗槦涓偅鑰�"銆�
+ * 鍊欒瘖鍒楄〃鎸� room_id + bed_no 鏌ワ紝鐪嬩笉鍒�"鎺掗槦涓�(10)"锛坆ed_no 涓虹┖锛夌殑浜猴紱
+ * 杩欓噷鍗曠嫭鍙栧洖鏉ュ睍绀猴紝宸ヤ綅涓讳汉鍙竴閿�屾媺鍏ャ�嶃�傚け璐ュ彧鎵撴棩蹇楋紝涓嶅奖鍝嶄富娴佺▼銆�
+ */
+const loadRoomWaitingList = async () => {
+ if (roomBedVO.roomId == null) return
+ try {
+ roomWaitingList.value = (await DoctorApi.getRoomWaitingList(roomBedVO)) || []
+ } catch (e) {
+ console.warn('[loadRoomWaitingList] 鍙栨湰璇婂鏈垎閰嶆偅鑰呭け璐�', e)
+ }
+}
+
+/** 銆屾媺鍏ャ�嶏細鎶婃帓闃熶腑鐨勬偅鑰呮墜宸ュ垎鍒版湰宸ヤ綅锛堝悗绔牎楠岋細蹇呴』鏄湰宸ヤ綅涓讳汉 + 妫�鏌ラ」鐩尮閰嶏級 */
+const onEventPullWaiting = async (item: any) => {
+ try {
+ await ElMessageBox.confirm(
+ `鎶娿��${item.patName || ''}銆嶆媺鍏ユ湰宸ヤ綅锛�${roomBedVO.roomName || ''} ${roomBedVO.bedNo || ''}锛夛紵`,
+ '鎷夊叆鎺掗槦鎮h��',
+ { confirmButtonText: '鎷夊叆', cancelButtonText: '鍙栨秷', type: 'warning' }
+ )
+ } catch {
+ return
+ }
+ try {
+ await DoctorApi.pullWaitingPatient({
+ roomId: roomBedVO.roomId,
+ bedNo: roomBedVO.bedNo,
+ id: item.id
+ })
+ ElMessage.success(`宸叉妸銆�${item.patName || ''}銆嶆媺鍏ユ湰宸ヤ綅`)
+ } catch (e) {
+ console.warn('[onEventPullWaiting] 鎷夊叆澶辫触', e)
+ }
+ await initLoad()
+}
+
+/**
+ * 銆岀珛鍗宠ˉ浜恒�嶏細鎵嬪姩瑙﹀彂涓�娆℃湰宸ヤ綅鐨勮嚜鍔ㄥ垎娴侊紝骞舵妸鍚庣杩斿洖鐨�"涓轰粈涔堟病琛�/琛ヤ簡鍑犱汉"灞曠ず鍑烘潵銆�
+ * 绯荤粺鍙湪銆愬紑璇娿�戙�佹湰宸ヤ綅鏈紑銆愬仠姝㈠�欒瘖銆戙�佸�欒瘖浜烘暟鏈揪涓婇檺鏃舵墠浼氳嚜鍔ㄨˉ浜恒��
+ */
+const onEventHurryUp = async () => {
+ try {
+ const data: any = await DoctorApi.hurryUpNow(roomBedVO)
+ const lines = Object.entries(data || {})
+ .map(([k, v]) => `${k}锛�${v === null || v === undefined || v === '' ? '锛堢┖锛�' : v}`)
+ .join('\n')
+ await ElMessageBox.alert(lines, '绔嬪嵆琛ヤ汉 路 璇婃柇缁撴灉', {
+ confirmButtonText: '鐭ラ亾浜�',
+ type: data?.鏈琛ュ叆 > 0 ? 'success' : 'warning'
+ })
+ } catch (e: any) {
+ ElMessage({ message: '绔嬪嵆琛ヤ汉澶辫触锛�' + (e?.message || e), type: 'warning', duration: 4000 })
+ }
+ await initLoad()
+}
+
const initLoad = async () => {
if (roomBedVO.roomId == null) {
ElNotification.error({
@@ -181,13 +251,18 @@
return
}
- patientList.value = await DoctorApi.getToBeCheckedPatientList(roomBedVO)
+ patientList.value = (await DoctorApi.getToBeCheckedPatientList(roomBedVO)) || []
+ // 銆愯嚜鍔╄瘖鏂�戣褰曟湰娆″彇鏁版椂闂翠笌鏉℃暟锛堢┖鍒楄〃鏃舵樉绀猴紝渚夸簬鍖哄垎"杞娌¤窇/鍚庣娌℃暟鎹�"锛�
+ fetchInfo.value = `鏈�杩戝彇鏁� ${new Date().toLocaleTimeString()} 路 杩斿洖 ${patientList.value.length} 鏉
+ // 銆愭湰璇婂鏈垎閰嶃�戞湰宸ヤ綅妫�鏌ョ被鍨嬩笅銆佽繕娌″垎閰嶅伐浣嶇殑"鎺掗槦涓�"鎮h�咃紙鍙墜宸ユ媺鍏ワ級
+ loadRoomWaitingList()
getOnstagePatient()
patientStat.value = await DoctorApi.getDevReadyStatistic(roomBedVO)
const queueVO2 = await DoctorApi.bedDoctorGet(roomBedVO)
- if (queueVO2.status === 20) // 宸ヤ綅鐘舵�� 鏈夊尰鐢�
+ // 銆愬姞鍥恒�戞帴鍙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()
@@ -210,10 +285,40 @@
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.roomId = roomStore.room.roomId
+ roomBedVO.roomName = roomStore.room.roomName
+ roomBedVO.bedNo = roomStore.room.bedNo
+ roomBedVO.checkTypes = roomStore.room.checkTypes
+ roomBedVO.opType = roomStore.room.opType
+ // 銆愭湰娆¢渶姹傘�戞崲宸ヤ綅鍚�**鏁撮〉鏁版嵁閮芥崲鎴愭柊宸ヤ綅鐨�**锛�
+ // 鈶� 鍏堟竻绌哄乏渚�"鎮h�呬俊鎭�"锛堥伩鍏嶈繕鏄剧ず涓婁竴涓伐浣嶇殑鎮h�咃級
+ devReadyPanelRef.value?.setPatient?.(undefined)
+ // 鈶� 鍚姩/缁х画鍙栨暟瀹氭椂鍣紙鍊欒瘖鍒楄〃銆佺粺璁°�佸綋鍓嶅彨鍙锋偅鑰呫�佸仠姝㈠�欒瘖寮�鍏抽兘浼氬埛鏂帮級
+ if (!timerRunFlag && roomBedVO.roomId != null) {
+ timerRunFlag = true
+ doctorTimer()
+ } else if (roomBedVO.roomId != null) {
+ await initLoad()
+ }
+ // 鈶� 鍒锋柊銆屽凡瀹屾垚鍒楄〃銆嶏紙闈㈡澘鍐呬細鎸夋柊宸ヤ綅鐨� checkTypes 閲嶆柊杩囨护锛�
+ devReadyPanelRef.value?.getList?.()
+ }
+)
/** 鍒濆鍖� **/
onMounted(() => {
@@ -275,7 +380,7 @@
甯冨眬浼樺寲锛氬姛鑳芥寜閽浐瀹氬湪椤甸潰搴曢儴锛屼笉鍐嶇敤 position:absolute 娴湪鍐呭涓娿��
璇﹁ components/DoctorPageLayout锛堜笌鍙彿妫�鏌�/瑁呮満椤靛叡鐢ㄥ悓涓�甯冨眬锛夈��
-->
- <DoctorPageLayout>
+ <DoctorPageLayout :bed-switch-enabled="false">
<template #header>
<TitlePanel :titleType=1 :room="roomBedVO" :patientStatistic="patientStat" />
</template>
@@ -290,7 +395,11 @@
/>
<template #aside>
- <QueuePanel :room="roomBedVO" :queue="patientList" @event_RecallFinish="onEventRecallFinish"/>
+ <QueuePanel :room="roomBedVO" :queue="patientList" :waiting-list="roomWaitingList"
+ :fetch-info="fetchInfo"
+ @event_RecallFinish="onEventRecallFinish"
+ @event_PullWaiting="onEventPullWaiting"
+ @event_HurryUp="onEventHurryUp" />
</template>
diff --git a/src/views/ecg/queue/QueueForm.vue b/src/views/ecg/queue/QueueForm.vue
index e982e23..f75c17e 100644
--- a/src/views/ecg/queue/QueueForm.vue
+++ b/src/views/ecg/queue/QueueForm.vue
@@ -47,8 +47,8 @@
<el-form-item label="璇婂缂栧彿" prop="roomId">
<el-input v-model="formData.roomId" placeholder="璇疯緭鍏ヨ瘖瀹ょ紪鍙�" />
</el-form-item>
- <el-form-item label="璇婄枟搴婄紪鍙�" prop="bedNo">
- <el-input v-model="formData.bedNo" placeholder="璇疯緭鍏ヨ瘖鐤楀簥缂栧彿" />
+ <el-form-item label="璇婂宸ヤ綅缂栧彿" prop="bedNo">
+ <el-input v-model="formData.bedNo" placeholder="璇疯緭鍏ヨ瘖瀹ゅ伐浣嶇紪鍙�" />
</el-form-item>
</el-form>
<template #footer>
diff --git a/src/views/ecg/queue/index.vue b/src/views/ecg/queue/index.vue
index 6e071dd..a4152ac 100644
--- a/src/views/ecg/queue/index.vue
+++ b/src/views/ecg/queue/index.vue
@@ -36,7 +36,7 @@
<el-input v-model="queryParams.roomId" placeholder="璇疯緭鍏ヨ瘖瀹ょ紪鍙�" clearable @keyup.enter="handleQuery"
class="!w-240px" />
</el-form-item>
- <el-form-item label="璇婄枟搴婂彿" prop="bedNo">
+ <el-form-item label="璇婂宸ヤ綅" prop="bedNo">
<el-input v-model="queryParams.bedNo" placeholder="璇疯緭鍏ヨ瘖鐤楀簥鍙�" clearable @keyup.enter="handleQuery"
class="!w-240px" />
</el-form-item>
@@ -74,58 +74,31 @@
<!-- 鍒楄〃 -->
<ContentWrap>
- <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
- <el-table-column label="鎿嶄綔" align="center" min-width="120px">
- <template #default="scope">
- <!-- <el-button
- link
- type="primary"
- @click="openAppointmentForm('preview', scope.row.patId, scope.row.bookCheckType)"
- v-hasPermi="['ecg:appointment:preview']"
- >
- 鏌ョ湅
- </el-button>-->
- <!--
- <el-button
- link
- type="danger"
- @click="handleDelete(scope.row.id)"
- v-hasPermi="['ecg:queue:delete']"
- >
- 鍒犻櫎
- </el-button>
- -->
- <el-button link type="danger" @click="handleJump(scope.row)" v-if="scope.row.status === 10"
- v-hasPermi="['ecg:queue:jump']">
- {{ scope.row.jumpFlag === 0 ? "鍔犳��" : "鍙栨秷鍔犳��" }}
- </el-button>
- <el-button link type="danger" @click="recall(scope.row)"
- v-if="scope.row.status === 3 || scope.row.status === 5 || scope.row.status === 7"
- v-hasPermi="['ecg:queue:recall']">
- 鍙洖
- </el-button>
- <el-button link type="danger" @click="passWaitingPatient(scope.row)" v-if="scope.row.status === 10"
- v-hasPermi="['ecg:queue:pass']">
- 杩囧彿
- </el-button>
- </template>
- </el-table-column>
+ <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"
+ :row-class-name="queueRowClass">
<!-- <el-table-column label="id" align="center" prop="id" />-->
- <el-table-column label="鐢宠鍗曞彿" align="center" prop="applyNo" min-width="110px" />
- <el-table-column label="鎺掗槦搴忓彿" align="center" prop="seqNum" />
- <el-table-column label="棰勭害鍙�" align="center" prop="bookSeqNum" />
- <el-table-column label="杩囧彿鏍囪" align="center" prop="passed" />
- <el-table-column label="鎮h�呯紪鍙�" align="center" prop="patId" />
- <el-table-column label="鎮h�呭鍚�" align="center" prop="patName" min-width="90px" /><el-table-column label="妫�鏌ラ」鐩�"
- align="center" prop="bookCheckType" min-width="100px">
+ <el-table-column label="鐢宠鍗曞彿" align="center" prop="applyNo" min-width="110px" />
+ <el-table-column label="妫�鏌ラ」鐩�" align="center" prop="bookCheckType" min-width="150px">
<template #default="scope">
{{ getCheckTypeName(scope.row.bookCheckType) }}
</template>
</el-table-column>
- <el-table-column label="鏉ユ簮" align="center" width="90px">
+ <!--
+ 鎺掗槦鍙凤紙鏈渶姹傦級锛氬彧淇濈暀 seq_num 涓�涓彿锛屾樉绀轰负銆屾鏌ラ」鐩墠缂� + 鍙枫�嶃��
+ 鍘熸潵鐨勩�屾帓闃熷簭鍙�(bookSeqNum)銆嶅垪宸插垹闄� 鈥斺�� 瀹冨拰銆屾鏌ュ簭鍙�(seqNum)銆嶅苟瀛樻鏄彿娣蜂贡鐨勬潵婧愩��
+ 鍙锋寜妫�鏌ラ」鐩悇鑷紪鍙凤紝涓嶅悓妫�鏌ラ」鐩細鍑虹幇鐩稿悓鏁板瓧锛屾晠鐢ㄥ墠缂�鍖哄垎銆�
+ -->
+ <el-table-column label="鎺掗槦搴忓彿" align="center" prop="seqNum">
<template #default="scope">
- <!-- 浼樺厛鐢ㄩ绾﹀崟骞抽摵鍊硷紝鍥為��鍒� patDetails 蹇収 -->
- <dict-tag :type="DICT_TYPE.ECG_PAT_SOURCE" :value="scope.row.patSrc ?? scope.row.patDetails?.source ?? 0" />
+ {{ getCheckTypeSeqPrefix(scope.row.bookCheckType) }}{{ scope.row.seqNum ?? '-' }}
+ </template>
+ </el-table-column>
+ <!-- <el-table-column label="杩囧彿鏍囪" align="center" prop="passed" /> -->
+ <el-table-column label="鎮h�呯紪鍙�" align="center" prop="patId" />
+ <el-table-column label="濮撳悕" align="center" min-width="200px">
+ <template #default="scope">
+ {{ scope.row.patName }} <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.patGender" />{{ formatAge(scope.row.patBirthday) }}
+ <dict-tag :type="DICT_TYPE.ECG_PAT_SOURCE" :value="scope.row.patSrc" />
</template>
</el-table-column>
<el-table-column label="棰勭害鏃舵" align="center" prop="bookTimeslot" min-width="100px">
@@ -133,12 +106,36 @@
<dict-tag :type="DICT_TYPE.ECG_BOOK_TIMESLOT" :value="scope.row.bookTimeslot" />
</template>
</el-table-column>
- <el-table-column label="鐘舵��" align="center" prop="status">
+ <el-table-column label="鐘舵��" align="center" prop="status" width="90px">
<template #default="scope">
<dict-tag :type="DICT_TYPE.ECG_QUEUE_STATUS" :value="scope.row.status" />
</template>
+ </el-table-column>
+ <el-table-column label="澶氳�愯嵂" align="center" prop="tolerance">
+ <template #default="scope">
+ <!-- 闇�姹�6锛氬鑰愯蛋瀛楀吀锛汵ULL 鎸�"鏃�"鏄剧ず锛圦12锛� -->
+ <dict-tag :type="DICT_TYPE.ECG_TOLERANCE" :value="scope.row.tolerance ?? 0" />
+ </template>
</el-table-column>
- <el-table-column label="VIP" align="center" prop="isVip" />
+ <!-- VIP锛氭樉绀恒�屾槸/鍚︺�嶄腑鏂囷紙鍘熷厛鐩存帴鏄剧ず 0/1锛夈�傚瓧鍏� infra_boolean_string = true/鏄�乫alse/鍚� -->
+ <el-table-column label="VIP" align="center" width="80px">
+ <template #default="scope">
+ <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="Number(scope.row.isVip) === 1" />
+ </template>
+ </el-table-column>
+ <el-table-column label="寮�鍗曞尰甯�" align="center" prop="doctor" min-width="100px">
+ <template #default="scope">{{ scope.row.doctor || '-' }}</template>
+ </el-table-column>
+ <!-- 闇�姹�1锛氬尰鍢卞彿锛圚IS observationRequest.id.item[root=2.16.156.10011.1.28]锛夈��
+ 璇ヨ妭鐐瑰湪瑙勮寖涓潪蹇呴』椤癸紝鍘嗗彶鏁版嵁锛堟柊澧炲垪涔嬪墠閲囬泦鐨勶級涓虹┖锛屾樉绀� '-'銆� -->
+ <el-table-column label="鍖诲槺鍙�" align="center" prop="doctorAdviceNo" min-width="110px">
+ <template #default="scope">
+ {{ scope.row.doctorAdviceNo || '-' }}
+ </template>
+ </el-table-column>
+ <el-table-column label="璇婂缂栧彿" align="center" prop="roomId" />
+ <el-table-column label="璇婂鍚嶇О" align="center" prop="roomName" />
+ <el-table-column label="璇婂宸ヤ綅" align="center" prop="bedNo" />
<el-table-column label="灏辫瘖鍙�" align="center" prop="episodeId" min-width="110px" />
<!-- 鏈垪鏍囩鐢便�屽氨璇婂崱鍙枫�嶆敼涓恒�岄棬璇婂彿銆嶏紙缁忕‘璁わ級銆傚師鍥狅紙璇﹁銆婇儴缃叉竻鍗曘��5.1锛夛細
HIS 鍦ㄥ崱鍙锋Ы浣嶄紶绌猴紝medical_card 鍏ㄥ簱 159,116 琛�**鏃犱竴闈炵┖**锛�
@@ -152,23 +149,6 @@
</el-tag>
</template>
</el-table-column>
- <!-- 闇�姹�1锛氬尰鍢卞彿锛圚IS observationRequest.id.item[root=2.16.156.10011.1.28]锛夈��
- 璇ヨ妭鐐瑰湪瑙勮寖涓潪蹇呴』椤癸紝鍘嗗彶鏁版嵁锛堟柊澧炲垪涔嬪墠閲囬泦鐨勶級涓虹┖锛屾樉绀� '-'銆� -->
- <el-table-column label="鍖诲槺鍙�" align="center" prop="doctorAdviceNo" min-width="110px">
- <template #default="scope">
- {{ scope.row.doctorAdviceNo || '-' }}
- </template>
- </el-table-column>
- <el-table-column label="鎬у埆" align="center" prop="patGender" width="70px">
- <template #default="scope">{{ genderFormat(scope.row.patGender) }}</template>
- </el-table-column>
- <el-table-column label="鍑虹敓鏃ユ湡" align="center" min-width="110px">
- <template #default="scope">{{ formatDateOnly(scope.row.patBirthday) }}</template>
- </el-table-column>
- <el-table-column label="骞撮緞" align="center" width="80px">
- <template #default="scope">{{ formatAge(scope.row.patBirthday) }}</template>
- </el-table-column>
-
<el-table-column label="鐥呭尯" align="center" min-width="110px">
<template #default="scope">{{ scope.row.patWardDesc || scope.row.patDetails?.wardDesc || '-' }}</template>
</el-table-column>
@@ -179,35 +159,47 @@
{{ scope.row.patBedNo || scope.row.patDetails?.bedNo || '-' }}
</template>
</el-table-column>
+
+ <el-table-column label="鍑虹敓鏃ユ湡" align="center" min-width="110px">
+ <template #default="scope">{{ formatDateOnly(scope.row.patBirthday) }}</template>
+ </el-table-column>
<el-table-column label="鎮h�呯數璇�" align="center" min-width="120px">
<template #default="scope">
{{ scope.row.patMobile || scope.row.patPhone || scope.row.patDetails?.mobile || '-' }}
</template>
- </el-table-column>
- <el-table-column label="鐧昏鏃堕棿" align="center" min-width="150px">
- <template #default="scope">{{ formatDateTime(scope.row.registerDate) }}</template>
- </el-table-column>
+ </el-table-column>
<el-table-column label="寮�鍗曟棩鏈�" align="center" min-width="150px">
<template #default="scope">{{ formatDateTime(scope.row.doctorTime) }}</template>
</el-table-column>
<el-table-column label="璺濅粖澶╂暟" align="center" width="90px">
<template #default="scope">{{ formatDaysFromOrder(scope.row.doctorTime) }}</template>
</el-table-column>
- <el-table-column label="寮�鍗曞尰甯�" align="center" prop="doctor" min-width="100px">
- <template #default="scope">{{ scope.row.doctor || '-' }}</template>
+ <el-table-column label="杩囨湡鏍囪" align="center" prop="expired" />
+ <el-table-column label="鐧昏鏃堕棿" align="center" min-width="150px">
+ <template #default="scope">{{ formatDateTime(scope.row.registerDate) }}</template>
</el-table-column>
-
- <el-table-column label="澶氳�愯嵂" width="150" align="center" prop="tolerance">
+ <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
+ <!-- 鎿嶄綔鍒楋細鍥哄畾鍦ㄥ垪琛ㄦ渶鍚庝綅缃紙fixed="right" 淇濊瘉濮嬬粓璐村湪鏈�鍙充晶锛�
+ 鎸夐挳閰嶈壊涓庛�岄绾﹁褰曘�嶆ā鍧楃殑鎿嶄綔鍒椾繚鎸佷竴鑷达細
+ 鍔犳�� / 杩囧彿 鈫� 鍚岃妯″潡銆岀紪杈戙�嶆寜閽紙type=primary plain锛�
+ 鍙洖 鈫� 鍚岃妯″潡銆屽垹闄ゃ�嶆寜閽紙type=danger plain锛� -->
+ <el-table-column label="鎿嶄綔" fixed="right" align="center" width="180px">
<template #default="scope">
- <!-- 闇�姹�6锛氬鑰愯蛋瀛楀吀锛汵ULL 鎸�"鏃�"鏄剧ず锛圦12锛� -->
- <dict-tag :type="DICT_TYPE.ECG_TOLERANCE" :value="scope.row.tolerance ?? 0" />
+ <el-button type="primary" plain size="small" @click="handleJump(scope.row)" v-if="scope.row.status === 10"
+ v-hasPermi="['ecg:queue:jump']">
+ {{ scope.row.jumpFlag === 0 ? "鍔犳��" : "鍙栨秷鍔犳��" }}
+ </el-button>
+ <el-button type="primary" plain size="small" @click="passWaitingPatient(scope.row)"
+ v-if="scope.row.status === 10" v-hasPermi="['ecg:queue:pass']">
+ 杩囧彿
+ </el-button>
+ <el-button type="danger" plain size="small" @click="recall(scope.row)"
+ v-if="scope.row.status === 3 || scope.row.status === 5 || scope.row.status === 7"
+ v-hasPermi="['ecg:queue:recall']">
+ 鍙洖
+ </el-button>
</template>
</el-table-column>
- <el-table-column label="杩囨湡鏍囪" align="center" prop="expired" />
- <el-table-column label="璇婂缂栧彿" align="center" prop="roomId" />
- <el-table-column label="璇婂鍚嶇О" align="center" prop="roomName" />
- <el-table-column label="璇婄枟搴婂彿" align="center" prop="bedNo" />
- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
</el-table>
<!-- 鍒嗛〉 -->
<Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
@@ -230,7 +222,7 @@
import { useCheckTypeStore } from "@/store/modules/checkType";
import AppointmentForm from "@/views/ecg/appointment/AppointmentForm.vue";
import { genderFormat } from "@/utils/stringUtil";
-import { getCheckTypeName } from "../../../utils/checkTypeFormatter";
+import { getCheckTypeName, getCheckTypeSeqPrefix } from "../../../utils/checkTypeFormatter";
// 闇�姹�1锛氭偅鑰呬俊鎭� 18 椤圭殑鍏叡鏍煎紡鍖栵紙骞撮緞銆佽窛浠婂ぉ鏁扮瓑锛�
import { formatAge, formatDaysFromOrder, formatDateTime, formatDateOnly, resolveCardNo } from '@/utils/patientInfo'
@@ -385,4 +377,42 @@
console.info("queue onActivated...")
handleQuery()
})
+
+/**
+ * 闃熷垪琛屾牱寮忥細鎶娿�屽凡杩囧彿銆嶇殑璁板綍鏁磋鏍囩孩锛屾柟渚垮尰鐢熶竴鐪艰瘑鍒��
+ *
+ * 涓轰粈涔堟寜琛岄珮浜�屼笉鏄彧缁欑姸鎬佹爣绛句笂鑹诧細
+ * 路 瀛楀吀 ecg_queue_status 閲� 13 涓姸鎬�**閮芥病鏈夐厤 color_type**锛�
+ * 鎵�浠� dict-tag 娓叉煋鍑烘潵鍏ㄦ槸榛樿鐏拌壊鏍囩锛屽郊姝ゆ病鏈夊尯鍒嗗害锛�
+ * 路 杩囧彿鏄渶闇�瑕佽娉ㄦ剰鐨勭姸鎬侊紙鎮h�呴敊杩囦簡鍙彿锛夛紝鏁磋鏍囪壊姣斿皬鏍囩鏇撮啋鐩��
+ *
+ * 宸茶繃鍙风姸鎬佸�硷紙瀛楀吀 ecg_queue_status锛夛細
+ * 3 = 宸茶繃鍙�-鎺掗槦銆�5 = 宸茶繃鍙枫��7 = 宸茶繃鍙�-瀹夎
+ */
+const PASSED_STATUSES = [3, 5, 7]
+const queueRowClass = ({ row }: { row: QueueVO }) => {
+ return PASSED_STATUSES.includes(Number(row.status)) ? 'queue-row-passed' : ''
+}
</script>
+
+<style scoped lang="scss">
+/* 宸茶繃鍙凤細鏁磋娴呯孩搴� + 宸︿晶绾㈣壊绔栨潯锛屾壂涓�鐪煎氨鑳藉畾浣� */
+:deep(.el-table .queue-row-passed) {
+ /* el-table 鐨勮鑳屾櫙鍙栬嚜璇ュ彉閲忥紝瑕嗗啓瀹冨彲璁╄搴曡壊鏁翠綋鍙樼孩 */
+ --el-table-tr-bg-color: var(--el-color-danger-light-9);
+
+ td.el-table__cell {
+ background-color: var(--el-color-danger-light-9);
+ }
+
+ /* 宸︿晶绔栨潯鐢� border-left 鑰岄潪 box-shadow锛氫笌 el-table 鐨勫崟鍏冩牸杈规妯″瀷鏇村吋瀹� */
+ td.el-table__cell:first-child {
+ border-left: 4px solid var(--el-color-danger);
+ }
+
+ /* 榧犳爣鎮仠鏃朵繚鎸佺孩鑹插熀璋冿紝閬垮厤琚� el-table 鐨� hover 鑳屾櫙瑕嗙洊 */
+ &:hover>td.el-table__cell {
+ background-color: var(--el-color-danger-light-8) !important;
+ }
+}
+</style>
diff --git a/src/views/ecg/room/RoomForm.vue b/src/views/ecg/room/RoomForm.vue
index b6a8d3d..1fd9578 100644
--- a/src/views/ecg/room/RoomForm.vue
+++ b/src/views/ecg/room/RoomForm.vue
@@ -17,11 +17,11 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="璇婄枟搴婄紪鍙�" prop="bedNo">
- <el-input v-model="formData.bedNo" placeholder="璇疯緭鍏ヨ瘖鐤楀簥缂栧彿" />
+ <el-form-item label="宸ヤ綅缂栧彿" prop="bedNo">
+ <el-input v-model="formData.bedNo" placeholder="璇疯緭鍏ュ伐浣嶇紪鍙�" />
</el-form-item>
- <el-form-item label="璇婂IP" prop="bedNo">
- <el-input v-model="formData.ip" placeholder="璇疯緭鍏ヨ瘖瀹P" />
+ <el-form-item label="宸ヤ綅缁戝畾IP" prop="bedNo">
+ <el-input v-model="formData.ip" placeholder="璇疯緭鍏ュ伐浣嶇粦瀹氱殑IP" />
</el-form-item>
<el-form-item label="妫�鏌ラ」鐩�" prop="checkTypes">
@@ -35,6 +35,7 @@
<el-radio :value="0" > 妫�鏌� </el-radio>
<el-radio :value="1" > 棰嗙敤 </el-radio>
<el-radio :value="2" > 瑁呮満 </el-radio>
+ <el-radio :value="3" > 鍒嗚瘖 </el-radio>
</el-radio-group>
</el-form-item>
diff --git a/src/views/ecg/room/RoomLoginSelect.vue b/src/views/ecg/room/RoomLoginSelect.vue
index 9922457..9d0755e 100644
--- a/src/views/ecg/room/RoomLoginSelect.vue
+++ b/src/views/ecg/room/RoomLoginSelect.vue
@@ -1,5 +1,35 @@
<template>
<div class="room-select">
+ <!--
+ 鏈〉鏄�**椤跺眰璺敱**锛堜笉鍦� Layout 閲岋級锛屽叏灞忕嫭鍗犮�佹病鏈変晶杈硅彍鍗曪紝
+ 鎵�浠ュ繀椤昏嚜宸辨彁渚涘嚭鍙o紙鏈闇�姹傦細鍘熸潵杩涙潵鍚庡嚭涓嶅幓锛夈��
+ -->
+ <div class="room-select__topbar">
+ <span class="room-select__title">閫夋嫨璇婂宸ヤ綅</span>
+ <div class="room-select__topbar-right">
+ <el-button size="default" @click="goBack">
+ <Icon icon="ep:back" class="mr-4px" />杩斿洖
+ </el-button>
+ <el-button size="default" @click="showIpDebug">
+ <Icon icon="ep:monitor" class="mr-4px" />IP 璇婃柇
+ </el-button>
+ <el-button size="default" type="danger" plain @click="doLogout">
+ <Icon icon="ep:switch-button" class="mr-4px" />閫�鍑虹櫥褰�
+ </el-button>
+ </div>
+ </div>
+
+ <!-- 閫夋嫨宸ヤ綅妯″紡鎻愮ず鍖猴細褰撳墠鐢佃剳IP + 鏈嚜鍔ㄥ尮閰嶅埌鐨勫師鍥狅紙妯″紡 1/3锛� -->
+ <div class="room-select__hint" v-if="hintText">
+ <el-alert :title="hintText" :type="hintType" :closable="false" show-icon />
+ <div class="room-select__ip">
+ <span>褰撳墠鐢佃剳IP锛�<b>{{ clientIp || '鏈瘑鍒�' }}</b></span>
+ <el-button link type="primary" @click="loadClientIp">閲嶆柊鑾峰彇</el-button>
+ <el-tag v-if="(mode === 2 || mode === 3) && canBindIp" size="small" type="success" effect="plain">鍏ュ骇鍚庝細鎶婅IP缁戝畾鍒版墍閫夊伐浣�</el-tag>
+ <el-tag v-else-if="(mode === 2 || mode === 3) && isIpv6" size="small" type="warning" effect="plain">IPv6 璁块棶锛屾湰娆′笉鍐欏叆IP缁戝畾锛堜粎閲囩敤 IPv4锛�</el-tag>
+ <el-tag v-else-if="(mode === 2 || mode === 3) && isLoopback" size="small" type="warning" effect="plain">鏈満璁块棶锛堝洖鐜湴鍧�锛夛紝鏈涓嶄細鍐欏叆IP缁戝畾</el-tag>
+ </div>
+ </div>
<div class="room-select__scroll">
<div class="room-select__list">
<div class="room-select__item" v-for="(bed, index) in bedList" :key="`${bed.roomId}-${bed.bedNo}-${index}`">
@@ -12,18 +42,27 @@
<el-button type="primary" size="large" @click="confirmCurSel">纭</el-button>
<el-button size="large" @click="resetPage">閲嶇疆</el-button>
</div>
+
+ <!-- IP 璇婃柇缁撴灉锛堟帓鏌�"宸ヤ綅缁戝畾鐨処P涓嶅"锛� -->
+ <el-dialog v-model="ipDebugVisible" title="IP 璇婃柇锛堝悗绔疄闄呰瘑鍒埌鐨勫鎴风鍦板潃锛�" width="640px">
+ <pre class="room-select__ip-debug">{{ ipDebugText }}</pre>
+ <template #footer>
+ <el-button @click="showIpDebug">閲嶆柊璇婃柇</el-button>
+ <el-button type="primary" @click="ipDebugVisible = false">鍏抽棴</el-button>
+ </template>
+ </el-dialog>
</div>
</template>
<script setup lang="ts">
import {RoomBedSelect} from "@/components/RoomBedSelect"
-import { RoomApi, RoomVO } from '@/api/ecg/room'
+import { RoomApi, RoomVO, isUsableSeatIp } from '@/api/ecg/room'
import {useUserStore} from "@/store/modules/user";
import {ElMessage, ElMessageBox} from "element-plus";
import {cloneDeep} from "lodash-es";
import {DoctorApi} from "@/api/ecg/doctor";
import {useRoomStore} from "@/store/modules/room";
-const { push } = useRouter()
+const { push, back } = useRouter()
defineOptions({ name: 'RoomLoginSelect' })
@@ -32,6 +71,185 @@
const userStore = useUserStore()
const roomStore = useRoomStore()
const curUser = userStore.getUser
+
+/* ==================== 閫夋嫨宸ヤ綅妯″紡锛�0/1/2/3锛夌浉鍏� ==================== */
+/** 閫夋嫨宸ヤ綅妯″紡锛�0 寮哄埗閫夋嫨 / 1 IP鍖归厤 / 2 鎵嬪姩閫夋嫨骞跺啓IP / 3 绯荤粺榛樿 */
+const mode = ref<number>(-1)
+/** 鍚庣璇嗗埆鍒扮殑鏈満IP */
+const clientIp = ref<string>('')
+/** 璇P鏄惁鏄湰鏈哄洖鐜紙127.x / ::1锛夆�斺�旇鏄庢祻瑙堝櫒鍜屾湇鍔″湪鍚屼竴鍙版満鍣紝涓嶈兘浣滀负宸ヤ綅缁戝畾鏍囪瘑 */
+const isLoopback = ref<boolean>(false)
+/** 璇P鏄惁鏄� IPv6锛堟湰绯荤粺宸ヤ綅缁戝畾浠呴噰鐢� IPv4锛� */
+const isIpv6 = ref<boolean>(false)
+/** 琚己鍒惰烦鏉ユ椂鐨勫師鍥狅細force/nomatch/occupied/error */
+const reason = ref<string>(new URLSearchParams(location.search).get('reason') || '')
+/** 宸ヤ綅琚崰鐢ㄦ椂鐨勫崰鐢ㄤ汉 */
+const occupiedBy = ref<string>(new URLSearchParams(location.search).get('who') || '')
+
+const hintText = computed(() => {
+ if (reason.value === 'multi') {
+ return `鏈満IP锛�${clientIp.value || '鏈瘑鍒�'}锛夊搴斿涓伐浣嶏紝鏃犳硶鑷姩纭畾锛岃鐐归�変綘鎵�鍦ㄧ殑宸ヤ綔浣嶇疆`
+ }
+ if (reason.value === 'occupied') {
+ return `鏈嚜鍔ㄥ尮閰嶅埌鍙敤宸ヤ綅锛氳IP瀵瑰簲鐨勫伐浣嶅凡琚�${occupiedBy.value || '鍏朵粬鍖荤敓'}鍗犵敤锛岃鎵嬪姩閫夋嫨宸ヤ綅`
+ }
+ if (reason.value === 'ip_is_server') {
+ return `璇嗗埆鍒扮殑鏄�愭湇鍔″櫒鑷韩鍦板潃銆戯紙${clientIp.value || '鏈瘑鍒�'}锛夛細璇存槑褰撳墠鏄湪鏈嶅姟鍣ㄤ笂/杩滅▼妗岄潰閲岃闂紝鎴栦唬鐞嗘妸瀹㈡埛绔湴鍧�鍐欐垚浜嗘湇鍔″櫒鍦板潃 鈥斺�� 涓嶈兘浣滀负宸ヤ綅鏍囪瘑锛岃鍦ㄥ尰鐢熺數鑴戜笂銆佺敤鏈嶅姟鍣ㄧ殑 IPv4 鍦板潃璁块棶锛涘彲鐐瑰彸涓娿�孖P 璇婃柇銆嶆煡鐪嬭鎯卄
+ }
+ if (reason.value === 'ip_invalid') {
+ return `鏈満IP涓嶅彲鐢紙${clientIp.value || '鏈瘑鍒�'}锛夛細鍥炵幆鍦板潃鎴� IPv6 涓嶈兘浣滀负宸ヤ綅鏍囪瘑锛岃鏀圭敤鏈嶅姟鍣ㄧ殑 IPv4 鍦板潃璁块棶锛涗篃鍙洿鎺ユ墜鍔ㄩ�夋嫨宸ヤ綅`
+ }
+ if (reason.value === 'nomatch') {
+ return `鏈嚜鍔ㄥ尮閰嶅埌宸ヤ綅锛堟湰鏈篒P锛�${clientIp.value || '鏈瘑鍒�'}锛夛紝璇锋墜鍔ㄩ�夋嫨宸ヤ綅`
+ }
+ if (reason.value === 'error') {
+ return '鑷姩鍖归厤宸ヤ綅澶辫触锛岃鎵嬪姩閫夋嫨宸ヤ綅'
+ }
+ if (mode.value === 2 || mode.value === 3) {
+ return '璇烽�夋嫨浣犵殑宸ヤ綅锛氱‘璁ゅ悗浼氭妸鏈満IP缁戝畾鍒拌宸ヤ綅锛屼互鍚庣櫥褰曞皢鎸塈P鑷姩鍖归厤'
+ }
+ return ''
+})
+
+const hintType = computed(() => (reason.value === 'occupied' ? 'warning' : 'info'))
+
+/** 鍙栨湰鏈篒P锛堝悗绔瘑鍒級锛岀敤浜庢彁绀轰笌妯″紡2/3鐨勭粦瀹� */
+const loadClientIp = async () => {
+ try {
+ const resp: any = await RoomApi.getIpBed()
+ clientIp.value = resp?.clientIp || ''
+ isLoopback.value = !!resp?.ipLoopback
+ isIpv6.value = !!resp?.ipv6
+ } catch (e) {
+ clientIp.value = ''
+ isLoopback.value = false
+ isIpv6.value = false
+ }
+}
+
+/* ==================== 鏈〉鍑哄彛锛堟湰娆¢渶姹傦細鍘熸潵杩涙潵鍚庡嚭涓嶅幓锛� ==================== */
+
+/**
+ * 杩斿洖涓婁竴椤碉紱娌℃湁鍘嗗彶鏃跺洖棣栭〉銆�
+ *
+ * 璇存槑锛氭湰椤垫槸**椤跺眰璺敱**銆佸叏灞忕嫭鍗狅紙涓嶅湪 Layout 閲岋級锛屽洜姝ゆ病鏈変晶杈硅彍鍗曞彲鐢ㄣ��
+ * 闈炲尰鐢熻鑹诧紙濡� admin锛夌偣杩欓噷鍗冲彲姝e父绂诲紑锛�**鏈叆搴х殑鍖荤敓**鑻�"杩斿洖"鍒板伐浣滃彴椤碉紝
+ * 浼氳璺敱瀹堝崼鍐嶆閫佸洖鏈〉锛堣繖鏄�"寮哄埗閫夊伐浣�"鐨勬棦瀹氳涓猴級鈥斺�� 閭g鎯呭喌璇风敤銆岄��鍑虹櫥褰曘�嶃��
+ */
+const goBack = () => {
+ if (window.history.length > 1) {
+ back()
+ } else {
+ push({ path: '/' })
+ }
+}
+
+/** 閫�鍑虹櫥褰曪細浠讳綍鎯呭喌閮借兘绂诲紑鏈〉锛堝厹搴曞嚭鍙o級 */
+const doLogout = async () => {
+ try {
+ await ElMessageBox.confirm('纭畾閫�鍑虹櫥褰曞悧锛�', '鎻愮ず', {
+ confirmButtonText: '纭畾閫�鍑�',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ })
+ } catch {
+ return // 鐢ㄦ埛鍙栨秷
+ }
+ await userStore.loginOut()
+}
+
+/* ==================== IP 璇婃柇锛堟帓鏌�"宸ヤ綅缁戝畾鐨処P涓嶅"锛� ==================== */
+
+const ipDebugVisible = ref(false)
+const ipDebugText = ref('')
+
+/** 璋冨悗绔瘖鏂帴鍙o紝鎶�"鍚庣鍒板簳鎶婅皝褰撴垚浜嗗鎴风"閫愰」鎽婂紑 */
+const showIpDebug = async () => {
+ try {
+ const data: any = await RoomApi.ipDebug()
+ ipDebugText.value = Object.entries(data || {})
+ .map(([k, v]) => {
+ let text: string
+ if (Array.isArray(v)) {
+ text = v.length ? v.join('銆�') : '锛堟棤锛�'
+ } else if (v === null || v === undefined || v === '') {
+ text = '锛堢┖锛�'
+ } else {
+ text = String(v)
+ }
+ return `${k}锛�${text}`
+ })
+ .join('\n')
+ ipDebugVisible.value = true
+ } catch (e: any) {
+ ElMessage({
+ message: 'IP 璇婃柇澶辫触锛�' + (e?.message || e),
+ type: 'warning',
+ duration: 4000
+ })
+ }
+}
+
+/** 鏈満IP鏄惁鍙敤浜庣粦瀹氾紙鍥炵幆/鏈寚瀹�/鏈瘑鍒� 鈫� 涓嶈兘缁戝畾锛� */
+const canBindIp = computed(() => isUsableSeatIp(clientIp.value) && !isLoopback.value)
+
+/**
+ * 妯″紡 2/3锛氭妸鏈満IP鍐欏埌鎵�閫夊伐浣嶃��
+ * 鑻ヨIP宸茬粦鍦ㄥ埆鐨勫伐浣嶏紝鍏堝脊纭锛岀敤鎴峰悓鎰忓悗甯� force=true 瑕嗙洊銆�
+ * @returns 鏄惁鍙互缁х画鍏ュ骇
+ */
+const bindIpIfNeeded = async (bed: RoomVO): Promise<boolean> => {
+ if (mode.value !== 2 && mode.value !== 3) {
+ return true // 妯″紡 0/1 涓嶅啓IP
+ }
+ if (bed.id == null) {
+ return true
+ }
+ // 鍥炵幆锛�127.x / ::1锛夎鏄庢祻瑙堝櫒鍜屾湇鍔″湪鍚屼竴鍙版満鍣紝鏃犳硶浣滀负宸ヤ綅缁戝畾鏍囪瘑
+ if (isLoopback.value || !canBindIp.value) {
+ let msg: string
+ if (isLoopback.value) {
+ msg =
+ '褰撳墠璁块棶鏉ヨ嚜鏈満锛堝洖鐜湴鍧� ' +
+ clientIp.value +
+ '锛夛紝鏈涓嶅啓鍏P缁戝畾锛涜鍦ㄥ疄闄呭尰鐢熺殑鐢佃剳涓婅闂悗鍐嶇粦瀹�'
+ } else if (isIpv6.value) {
+ msg =
+ '褰撳墠璁块棶浣跨敤鐨勬槸 IPv6 鍦板潃锛�' +
+ clientIp.value +
+ '锛夛紝鏈郴缁熷伐浣嶇粦瀹氫粎閲囩敤 IPv4锛屾湰娆′笉鍐欏叆IP缁戝畾锛涜鏀圭敤鏈嶅姟鍣ㄧ殑 IPv4 鍦板潃璁块棶'
+ } else {
+ msg = '鏈兘璇嗗埆鍙敤鐨勬湰鏈篒Pv4鍦板潃锛�' + (clientIp.value || '绌�') + '锛夛紝鏈涓嶅啓鍏P缁戝畾'
+ }
+ ElMessage({ message: msg, type: 'warning', duration: 5000 })
+ return true
+ }
+ try {
+ let resp: any = await roomStore.bindCurrentIp(bed.id as number, false)
+ if (resp?.code === 409 || resp?.conflict) {
+ const target = `銆�${bed.roomName || ''} / ${bed.bedNo || ''}銆峘
+ await ElMessageBox.confirm(
+ `${resp.msg}锛屾槸鍚︽敼缁戝埌${target}锛燂紙鏀圭粦鍚庡師宸ヤ綅灏嗕笉鍐嶈嚜鍔ㄥ尮閰嶆湰鏈猴級`,
+ '鎻愮ず',
+ { confirmButtonText: '纭畾鏀圭粦', cancelButtonText: '鍙栨秷', type: 'warning' }
+ )
+ resp = await roomStore.bindCurrentIp(bed.id as number, true)
+ }
+ if (resp?.code !== 200) {
+ ElMessage({ message: resp?.msg || '缁戝畾鏈満IP澶辫触', type: 'warning', duration: 3000 })
+ return false
+ }
+ clientIp.value = resp.clientIp || clientIp.value
+ return true
+ } catch (err: any) {
+ if (err === 'cancel') {
+ return false
+ }
+ console.error('[bindIpIfNeeded] 缁戝畾鏈満IP寮傚父', err)
+ ElMessage({ message: '缁戝畾鏈満IP澶辫触锛�' + (err?.message || err), type: 'warning', duration: 3000 })
+ return false
+ }
+}
const isEmptyOpeningBed = ref<boolean>(true);
const bedMap = ref() // 鍒楄〃鐨勬暟鎹�
@@ -65,8 +283,11 @@
})
/** 鍒濆鍖� **/
-onMounted(() => {
+onMounted(async () => {
console.info( curUser.id + " onMounted")
+ // 璇诲彇銆岄�夋嫨宸ヤ綅妯″紡銆嶅苟鍙栨湰鏈篒P锛堟ā寮� 2/3 闇�瑕佸湪鍏ュ骇鏃舵妸IP鍐欏埌宸ヤ綅锛�
+ mode.value = await roomStore.loadRoomSelectMode()
+ loadClientIp()
getList()
})
@@ -95,15 +316,58 @@
if (roomStore.getIsSetRoom) {
const roomVOArray = data[key] as RoomVO[];
roomVOArray.forEach((roomVO) => {
- if (roomVO.docId === curUser.id
+ // 鐢ㄥ瓧绗︿覆姣旇緝锛岄伩鍏� docId(number) 涓� userId(string) 绫诲瀷涓嶅悓瀵艰嚧鍖归厤涓嶄笂
+ if (String(roomVO.docId) === String(curUser.id)
&& roomVO.roomId === roomStore.room!.roomId
&& roomVO.bedNo === roomStore.room!.bedNo) {
- curSel.value = roomVO
+ // 鈿狅笍 蹇呴』**鎷疯礉**锛歝urSel 鑻ヤ笌鍒楄〃椤瑰叡鐢ㄥ悓涓�涓璞★紝
+ // 鍚庣画 resetCurSel() 灏卞湴娓呴浂浼氭妸鍒楄〃閲岄偅寮犲崱鐗囩殑璇婂鍚�/宸ヤ綅鍙蜂竴璧锋竻鎺�
+ // 锛堢幇鍦哄弽棣堢殑"鍒囨崲宸ヤ綅鍚庡師宸ヤ綅缂栧彿/鍚嶇О鏈夋椂涓嶆樉绀�"灏辨槸杩欎釜鍘熷洜锛夈��
+ curSel.value = { ...roomVO }
roomStore.setRoomInfoAction(curSel.value)
}
})
}
}
+}
+
+/** 宸ヤ綅浣滀笟绫诲瀷 鈫� 宸ヤ綔鍙拌矾鐢憋紙0妫�鏌� 1棰嗙敤 2瑁呮満锛� */
+const workbenchPath = (opType?: number | null) => {
+ if (opType === 0) return '/ecg/doc/routine'
+ if (opType === 1) return '/ecg/doc/dev-ready'
+ if (opType === 2) return '/ecg/doc/dev-install'
+ return ''
+}
+
+/**
+ * 鍏ュ骇/鍒囨崲宸ヤ綅**涔嬪悗**鐨勫幓鍚戙��
+ *
+ * 銆愭湰娆¢渶姹傘�戜笉鍐�"閫夊畬宸ヤ綅灏辫嚜鍔ㄦ墦寮�鍙彿妫�鏌ラ〉" 鈥斺�� 绯荤粺涓嶇煡閬撶敤鎴锋帴涓嬫潵鏄鍋�
+ * 鍙彿妫�鏌ャ�佽澶囬鐢ㄣ�佽鏈鸿繕鏄媶鏈猴紝鏇夸粬鍐冲畾鍙嶈�岃澶氱偣涓�娆¤繑鍥炪�傝鍒欙細
+ * 鈶� 鑻ユ槸**琚矾鐢卞畧鍗涪杩囨潵**鐨勶紙甯� redirect / redirectedFrom锛夆啋 鍥炲埌浠栧師鏈兂鍘荤殑閭d竴椤碉紱
+ * 鈶� `forceEnter=true`锛堢敤鎴蜂富鍔ㄧ偣浜嗛《閮ㄣ�岀‘璁ゃ�嶆寜閽級鈫� 鎸夊伐浣嶄綔涓氱被鍨嬭繘鍏ュ搴斿伐浣滃彴
+ * 锛堣繖鏄敤鎴锋槑纭〃杈剧殑"鎴戣杩涘幓"锛屼笉绠楁浛浠栧喅瀹氾級锛�
+ * 鈶� 鍏朵綑锛堣嚜宸辩偣椤舵爮杩涙潵鎹㈠伐浣嶏級鈫� **鍋滅暀鍦ㄦ湰椤�**锛岀敱鐢ㄦ埛鑷繁浠庤彍鍗曢�夌洰鏍囬〉銆�
+ */
+const gotoAfterSeat = (opType?: number | null, forceEnter = false) => {
+ const redirect = (route.query.redirect as string) || route.redirectedFrom?.fullPath || ''
+ if (redirect && redirect !== '/roomselect') {
+ push({ path: redirect })
+ return
+ }
+ if (forceEnter) {
+ const path = workbenchPath(opType)
+ if (path) {
+ push({ path })
+ return
+ }
+ }
+ const seat = roomStore.getCurrentSeat
+ ElMessage({
+ message: `宸插叆搴э細${seat?.roomName || ''} ${seat?.bedNo || ''}锛堣浠庡乏渚ц彍鍗曡繘鍏ラ渶瑕佺殑宸ヤ綔鍙帮級`,
+ type: 'success',
+ duration: 4000
+ })
}
const confirmCurSel = () => {
@@ -115,104 +379,65 @@
});
return
}
-
- // curSel.value.opType 0 1 2
- if (curSel.value.opType === 0) {
- push({path: "/ecg/doc/routine"})
- }
- else if (curSel.value.opType === 1) {
- push({path: "/ecg/doc/dev-ready"})
- }
- else if (curSel.value.opType === 2) {
- push({path: "/ecg/doc/dev-install"})
- }
- else {
- push({path: route.redirectedFrom?.fullPath})
- }
-
-/*
- if (isStringEmpty(route.redirectedFrom?.fullPath))
- push({ path: "/ecg/doc/dev-ready"})
- else if(route.redirectedFrom?.fullPath === "/roomselect" )
- push({ path: "/ecg/doc/dev-ready"})
- else if(route.redirectedFrom?.fullPath === "/ecg/roomselect" )
- push({ path: "/ecg/doc/dev-ready"})
- else
- push({ path: route.redirectedFrom?.fullPath})
-*/
+ // 鐢ㄦ埛涓诲姩鐐广�岀‘璁ゃ��= 鏄庣‘瑕佽繘鍏ュ伐浣滃彴 鈫� 鎸夊伐浣嶄綔涓氱被鍨嬭繘鍏ワ紙鑻ユ湰娆℃槸琚涪杩囨潵鐨勶紝浼樺厛鍥炲師鐩爣椤碉級
+ gotoAfterSeat(curSel.value.opType, true)
}
const haveSeatConfirm = async (newRoomVO: RoomVO) => {
if (newRoomVO !== curSel.value) {
- let data;
-/* 淇濈暀杩欏潡閫昏緫
- if (curSel.value.docId !== null) {
- data = await DoctorApi.bedDoctorOff(curSel.value)
- if (data !== 0) {
- ElMessage({
- message: '鍐呴儴閿欒!' + data,
- type: 'info',
- duration: 3000 // 鑷姩鍏抽棴鏃堕棿锛岄粯璁や负3000ms
- });
- return
- }
+ // 妯″紡 2/3锛氬厛鎶婃湰鏈篒P缁戝畾鍒版墍閫夊伐浣嶏紙鍐茬獊鏃剁敱 bindIpIfNeeded 寮圭‘璁わ級
+ const canProceed = await bindIpIfNeeded(newRoomVO)
+ if (!canProceed) {
+ return
}
-*/
resetCurSel()
- await roomStore.clearRoomInfoAction()
const tempRoomVO = cloneDeep(newRoomVO)
tempRoomVO.docId = curUser.id
tempRoomVO.docName = curUser.nickname
- data = await DoctorApi.bedDoctorOn(tempRoomVO)
- if (data !== 0) {
- ElMessage({
- message: '鍐呴儴閿欒!' + data,
- type: 'info',
- duration: 3000 // 鑷姩鍏抽棴鏃堕棿锛岄粯璁や负3000ms
- });
+
+ // 銆愭湰娆¢渶姹傘�戣蛋 store 鐨勫叆搴у姩浣滐細鏈嶅姟绔叆搴ф垚鍔熷悗浼�**鑷姩閲婃斁鎴戣繖涓处鍙风殑鍏跺畠宸ヤ綅**
+ // 锛堜竴浜轰竴宸ヤ綅锛夛紝骞舵妸宸ヤ綅淇℃伅鍐欒繘浼氳瘽缂撳瓨銆�
+ const seated = await roomStore.seatRoom(tempRoomVO)
+ if (!seated) {
+ // 澶辫触鏃惰嚜鍔ㄨ皟璇婃柇鎺ュ彛锛屾妸搴撻噷鐪熷疄琛屼笌缁撹涓�璧风粰鍑猴紙渚夸簬鐜板満涓�閿畾浣嶏級
+ await reportSeatFailure(tempRoomVO)
+ getList()
return
}
- await roomStore.setRoomInfoAction(tempRoomVO)
- newRoomVO.docId = curUser.id
- newRoomVO.docName = curUser.nickname
- curSel.value = newRoomVO;
+ // 椤舵爮"褰撳墠宸ヤ綅"鏍囩鍒锋柊锛堝悗绔负鍑嗭級
+ await roomStore.fetchMySeat()
+
+ // 鈿狅笍 鐢�**鎷疯礉**鏇存柊"褰撳墠宸ヤ綅"锛歯ewRoomVO 鏄垪琛ㄩ噷鐨勫璞★紝
+ // 鐩存帴鏀瑰畠铏界劧鑳借鍗$墖鏄剧ず"鎴戠殑宸ヤ綅"锛屼絾鍚庣画 resetCurSel() 浼氳繛甯︽竻鎺夊崱鐗囩殑
+ // 璇婂鍚�/宸ヤ綅鍙凤紙鐜板満鍙嶉鐨勭幇璞★級銆傛敼涓烘嫹璐濆悗锛屽垪琛ㄦ暟鎹彧鐢� getList() 缁熶竴鍒锋柊銆�
+ curSel.value = { ...newRoomVO, docId: curUser.id, docName: curUser.nickname }
+
+ // 銆愭湰娆′慨澶嶃�戝叆搴ф垚鍔熷悗**閲嶆柊鎷変竴娆″垪琛�**锛氬惁鍒欏崱鐗囪繕鏄棫鐨� docId=null锛�
+ // 浼氫竴鐩存樉绀�"绌洪棽"锛堢幇鍦哄弽棣�"鍏ュ骇鍚庣殑宸ヤ綅杩樻槸鏄剧ず绌洪棽"锛夈��
+ await getList()
}
- // curSel.value.opType 0 1 2
- if (newRoomVO.opType === 0) {
- push({path: "/ecg/doc/routine"})
- }
- else if (newRoomVO.opType === 1) {
- push({path: "/ecg/doc/dev-ready"})
- }
- else if (newRoomVO.opType === 2) {
- push({path: "/ecg/doc/dev-install"})
- }
- else {
- push({path: route.redirectedFrom?.fullPath})
- }
-
-/*
- // curSel.value.opType 0 1 2
- if (isStringEmpty(route.redirectedFrom?.fullPath)) {
- push({path: "/ecg/doc/dev-ready"})
- }
- else if(route.redirectedFrom?.fullPath === "/roomselect" ) {
- push({path: "/ecg/doc/dev-ready"})
- }
- else if(route.redirectedFrom?.fullPath === "/ecg/roomselect" ) {
- push({path: "/ecg/doc/dev-ready"})
- }
- else {
- push({path: route.redirectedFrom?.fullPath})
- }
-*/
+ // 銆愭湰娆¢渶姹傘�戝叆搴�/鍒囨崲鎴愬姛鍚庝笉鍐嶈嚜鍔ㄦ墦寮�鍙彿妫�鏌ラ〉锛�
+ // 琚畧鍗涪杩囨潵鐨勫洖鍘熺洰鏍囬〉锛岃嚜宸辩偣杩涙潵鎹㈠伐浣嶇殑鍒欏仠鍦ㄦ湰椤碉紙瑙� gotoAfterSeat 璇存槑锛�
+ gotoAfterSeat(newRoomVO.opType, false)
}
const leaveSeatConfirm = async (roomVO: RoomVO) => {
+ // 銆愭湰娆¢渶姹傘�戠搴у彧鑳芥竻**鑷繁鐨�** doc_id锛堟湇鍔$ setBedDoctorOff 宸插姞 doc_id 鏉′欢锛夛紝
+ // 杩欓噷鍏堟嫤涓�閬擄紝閬垮厤"鏃佽/鍏朵粬鍖荤敓"鐐圭搴ф妸姝e湪鎿嶄綔鐨勪汉韪㈡帀銆�
+ // 鐢ㄥ瓧绗︿覆姣旇緝锛岄伩鍏� number/string 绫诲瀷宸紓瀵艰嚧璇垽銆�
+ if (roomVO.docId != null && String(roomVO.docId) !== String(curUser.id)) {
+ ElMessage({
+ message: `璇ュ伐浣嶇敱銆�${roomVO.docName || '鍏朵粬鍖荤敓'}銆嶆搷浣滀腑锛屾偍涓嶈兘璁╀粬绂诲骇`,
+ type: 'warning',
+ duration: 4000
+ })
+ return
+ }
+
if (roomVO.docId !== null) {
let data = await DoctorApi.bedDoctorOff(roomVO)
if (data !== 0) {
@@ -230,31 +455,133 @@
getList()
}
-const haveSeat = async (newRoomVO: RoomVO) => {
- // 1. 鎻愬彇涓嶅悓鐨勬彁绀鸿
- const message = newRoomVO.docId != null
- ? '宸茬粡鏈変汉浜�, 鏄惁纭畾瑕佺户缁叆搴�?'
- : '鍏ュ骇, 鏄惁缁х画?';
+/**
+ * 鎸� roomId + bedNo 鍙栬宸ヤ綅**鏈�鏂�**鐨勬暟鎹��
+ *
+ * 涓轰粈涔堝叆搴у墠瑕佸啀鎷変竴娆★細椤甸潰涓婄殑鍒楄〃鏄繘鍏ユ湰椤垫椂鎷夌殑锛屽尰鐢熷彲鑳藉仠鐣欏緢涔咃紝
+ * 鏈熼棿鍒汉姝eソ鎶婃煇涓伐浣嶅潗涓婁簡 鈥斺�� 杩欐椂鎸夋棫鏁版嵁鍒ゆ柇"绌洪棽"灏变細鍙戝嚭鍏ュ骇璇锋眰锛�
+ * 琚悗绔嫆缁濓紙鐜板満鍙嶉鐨�"閫変簡鍒汉宸插叆搴х殑宸ヤ綅鎶ラ敊"姝f槸杩欑鎯呭喌锛夈��
+ */
+const findLatestBed = async (bed: RoomVO): Promise<RoomVO | null> => {
+ try {
+ const map: any = await RoomApi.getOpeningBedMap()
+ const all: RoomVO[] = []
+ for (const key in map || {}) {
+ const arr = map[key]
+ if (Array.isArray(arr)) {
+ all.push(...arr)
+ }
+ }
+ return (
+ all.find(
+ (b) => String(b.roomId) === String(bed.roomId) && String(b.bedNo) === String(bed.bedNo)
+ ) || null
+ )
+ } catch (e) {
+ console.warn('[findLatestBed] 鍒锋柊宸ヤ綅鏈�鏂扮姸鎬佸け璐ワ紝鎸夐〉闈㈢幇鏈夋暟鎹户缁�', e)
+ return null
+ }
+}
+
+/**
+ * 鍏ュ骇澶辫触鏃剁殑鑷姪璇婃柇锛堟湰娆℃柊澧烇級銆�
+ *
+ * 鐜板満鍑虹幇杩�"宸ヤ綅鍦ㄥ簱閲屾槑鏄庣┖闂诧紝鍏ュ骇鍗存姤鐘舵�佸紓甯�"锛屽厜闈犲脊涓�鍙ラ敊璇彁绀烘棤娉曞畾浣嶃��
+ * 杩欓噷鍦ㄥけ璐ユ椂鑷姩璋� `GET /clinic/room/bed-state`锛屾妸搴撻噷**鍘熷琛�**涓庣粨璁轰竴璧峰脊缁欑敤鎴凤紝
+ * 鐢ㄦ埛鎶婂脊绐楀唴瀹瑰彂鍥炲嵆鍙畾浣嶏紙缁撳熬绌烘牸 / 鐘舵�佷笉瀵� / 宸茶鍒犻櫎 / 宸茶鍒汉鍗犵敤锛夈��
+ */
+const reportSeatFailure = async (bed: RoomVO) => {
+ let detail = ''
+ try {
+ const data: any = await RoomApi.bedState({ id: bed.id, roomId: bed.roomId, bedNo: bed.bedNo })
+ const row = Array.isArray(data?.琛屾槑缁�) && data.琛屾槑缁�.length ? data.琛屾槑缁哰0] : null
+ detail =
+ (data?.璇婃柇缁撹 ? `\n\n璇婃柇锛�${data.璇婃柇缁撹}` : '') +
+ (row
+ ? `\n\n搴撳唴璇ヨ锛歩d=${row.id} room_id=${row.room_id} bed_no=[${row.bed_no}](len=${row.bed_no_len}, HEX=${row.bed_no_hex}) status=${row.status} doc_id=${row.doc_id} doc_name=${row.doc_name} deleted=${row.deleted}`
+ : '')
+ console.warn('[reportSeatFailure] 宸ヤ綅鐘舵�佽瘖鏂�', data)
+ } catch (e) {
+ console.warn('[reportSeatFailure] 璇婃柇鎺ュ彛璋冪敤澶辫触', e)
+ }
+ await ElMessageBox.alert(
+ `鍏ュ骇鏈垚鍔燂細璇ュ伐浣嶅彲鑳藉凡琚粬浜哄崰鐢紝鎴栫姸鎬佷笉鍏佽锛堝凡鍏抽棴锛夈��${detail}`,
+ '鍏ュ骇澶辫触',
+ { confirmButtonText: '鐭ラ亾浜�', type: 'warning' }
+ )
+}
+
+/**
+ * 鐐广�屽叆搴с�嶆寜閽殑鍏ュ彛銆�
+ *
+ * 銆愭湰娆¢渶姹傘�戜袱鏉¤鍒欙細
+ * 鈶� **涓嶆尋鎺夊埆浜�**锛氬伐浣嶅凡琚粬浜烘搷浣滄椂涓嶈兘鍏ュ骇锛堝師鏉ヤ細鍏堟妸瀵规柟"绂诲骇"鍐嶆姠鍗狅紝
+ * 鏈嶅姟绔凡鏀逛负鍙厑璁告竻鑷繁鐨� doc_id锛岃繖閲岀粰鍑烘槑纭彁绀鸿�屼笉鏄鎺ュ彛鎶ラ敊锛夛紱
+ * 鈶� **涓�浜轰竴宸ヤ綅**锛氭垜宸茬粡鍦ㄥ埆鐨勫伐浣嶆椂锛屽脊纭鍚庡垏鎹紝鍘熷伐浣嶇敱鏈嶅姟绔嚜鍔ㄩ噴鏀俱��
+ *
+ * 鍙︼細鍏ュ骇鍓嶄細**閲嶆柊鎷変竴娆℃渶鏂扮姸鎬�**锛岄伩鍏嶆嬁鍑犲垎閽熷墠鐨勬暟鎹幓鍏ュ骇锛堝埆浜哄彲鑳藉垰鍧愪笂锛夈��
+ */
+const haveSeat = async (bedFromPage: RoomVO) => {
+ // 鈸� 鍏堢敤鏈�鏂版暟鎹牳瀵癸紙杩欎竴姝ユ槸鏈鐜板満"閫変簡鍒汉宸插叆搴х殑宸ヤ綅鈫掓姤閿�"鐨勫鐥囦慨澶嶏級
+ const latest = await findLatestBed(bedFromPage)
+ if (!latest) {
+ ElMessage({
+ message: '璇ュ伐浣嶅凡涓嶅彲鐢紙鍙兘宸茶鍏抽棴锛夛紝鍒楄〃宸插埛鏂帮紝璇烽噸鏂伴�夋嫨',
+ type: 'warning',
+ duration: 4000
+ })
+ getList()
+ return
+ }
+ const newRoomVO = latest
+
+ // 鈶� 宸茶**鍒汉**鍗犵敤 鈫� 涓嶆姠锛屽苟鍒锋柊鍒楄〃璁╁崱鐗囨樉绀�"宸插叆搴э細X"
+ if (newRoomVO.docId != null && String(newRoomVO.docId) !== String(curUser.id)) {
+ ElMessage({
+ message: `璇ュ伐浣嶅凡鐢便��${newRoomVO.docName || '鍏朵粬鍖荤敓'}銆嶆搷浣滀腑锛屼笉鑳藉叆搴э紙涓嶆尋鎺夋鍦ㄦ搷浣滅殑浜猴級`,
+ type: 'warning',
+ duration: 5000
+ })
+ getList()
+ return
+ }
+
+ // 鈶� 灏辨槸鎴戝綋鍓嶈繖涓伐浣� 鈫� 涓嶅繀閲嶅鍏ュ骇锛堥伩鍏嶅寮逛竴娆$‘璁わ級
+ const mySeat = roomStore.getCurrentSeat
+ const alreadyMine = newRoomVO.docId != null && String(newRoomVO.docId) === String(curUser.id)
+ const sameAsMySeat =
+ !!mySeat?.seated &&
+ String(mySeat.roomId) === String(newRoomVO.roomId) &&
+ mySeat.bedNo === newRoomVO.bedNo
+ if (alreadyMine && sameAsMySeat) {
+ ElMessage({
+ message: `鎮ㄥ凡鍏ュ骇銆�${newRoomVO.roomName || ''} / ${newRoomVO.bedNo || ''}銆嶏紝鏃犻渶閲嶅鍏ュ骇`,
+ type: 'info',
+ duration: 3000
+ })
+ await roomStore.fetchMySeat()
+ return
+ }
+
+ // 鈶� 鎴戝凡鍏ュ骇鍏跺畠宸ヤ綅 鈫� 纭鍚庡垏鎹紙鏈嶅姟绔叆搴ф椂浼氳嚜鍔ㄩ��鍑哄師宸ヤ綅锛�
+ const switching =
+ !!mySeat?.seated &&
+ (String(mySeat.roomId) !== String(newRoomVO.roomId) || mySeat.bedNo !== newRoomVO.bedNo)
+ const message = switching
+ ? `鎮ㄥ凡鍦ㄣ��${mySeat?.roomName || ''} / ${mySeat?.bedNo || ''}銆嶅叆搴э紝纭畾鍒囨崲鍒般��${newRoomVO.roomName || ''} / ${newRoomVO.bedNo || ''}銆嶅悧锛燂紙鍘熷伐浣嶄細鑷姩閫�鍑猴級`
+ : '鍏ュ骇, 鏄惁缁х画?'
try {
- // 2. 绛夊緟鐢ㄦ埛鐐瑰嚮纭
await ElMessageBox.confirm(message, '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
- });
-
- if (newRoomVO.docId != null) {
- await leaveSeatConfirm(newRoomVO);
- }
-
- // 4. 绂诲骇鎴愬姛锛堟垨鍘熸湰灏辨病浜猴級锛屾渶鍚庢墽琛屽叆搴�
- await haveSeatConfirm(newRoomVO);
-
+ })
+ await haveSeatConfirm(newRoomVO)
} catch (err) {
// 鍙湁鐢ㄦ埛涓诲姩鐐瑰嚮鍙栨秷鏃舵墠蹇界暐锛屽叾浠栨姤閿欏彲浠ユ墦鍗板嚭鏉ユ柟渚挎帓鏌�
if (err !== 'cancel') {
- console.error('鍏ュ骇娴佺▼寮傚父:', err);
+ console.error('鍏ュ骇娴佺▼寮傚父:', err)
}
}
}
@@ -276,32 +603,39 @@
// 鍚屾椂鍧愪簡澶氫釜宸ヤ綅鏃讹紝璁惧畾褰撳墠浼氳瘽鐨勫伐浣�
const setCurSeat = (roomVO: RoomVO) => {
- roomStore.setRoomInfoAction( roomVO )
- curSel.value = roomVO
+ // 鎷疯礉涓�浠藉啀鏀捐繘 curSel锛岄伩鍏嶄笌鍒楄〃椤瑰叡鐢ㄥ璞★紙瑙� getList 閲岀殑璇存槑锛�
+ const seat = { ...roomVO }
+ roomStore.setRoomInfoAction( seat )
+ curSel.value = seat
+ // 椤舵爮鏍囩鍚屾锛堜互鏈嶅姟绔负鍑嗭級
+ roomStore.fetchMySeat()
- // curSel.value.opType 0 1 2
- if (roomVO.opType === 0) {
- push({path: "/ecg/doc/routine"})
- }
- else if (roomVO.opType === 1) {
- push({path: "/ecg/doc/dev-ready"})
- }
- else if (roomVO.opType === 2) {
- push({path: "/ecg/doc/dev-install"})
- }
- else {
- push({path: route.redirectedFrom?.fullPath})
- }
+ // 銆愭湰娆¢渶姹傘�戜笉鑷姩鎵撳紑宸ヤ綔鍙伴〉锛堣 gotoAfterSeat 璇存槑锛夛細
+ // 鑻ユ湰娆℃槸琚畧鍗涪杩囨潵鐨勪細鍥炲師鐩爣椤碉紝鍚﹀垯鍋滅暀鍦ㄩ�夊伐浣嶉〉
+ gotoAfterSeat(roomVO.opType, false)
}
+/**
+ * 閲嶇疆"褰撳墠宸ヤ綅"銆�
+ *
+ * 鈿狅笍銆愭湰娆′慨澶嶃�戝繀椤�**璧嬩竴涓柊瀵硅薄**锛屼笉鑳藉氨鍦版竻绌� curSel.value 鐨勫瓧娈碉細
+ * 鍘熷疄鐜帮紙curSel.value.bedNo = null 涔嬬被锛夊湪 curSel 涓庡垪琛ㄩ」鍏辩敤瀵硅薄鏃讹紝
+ * 浼氭妸椤甸潰鍗$墖涓婄殑銆屽伐浣嶇紪鍙� / 璇婂鍚嶇О銆嶄竴璧锋竻鎺� 鈥斺�� 涔熷氨鏄幇鍦哄弽棣堢殑
+ * "鍒囨崲鍒板叾浠栧伐浣嶅悗锛屽師宸ヤ綅鏈夋椂宸ヤ綅缂栧彿娌℃樉绀猴紝鏈夋椂璇婂鍚嶇О涓嶆樉绀�"銆�
+ */
const resetCurSel = () => {
- curSel.value.id = null
- curSel.value.roomId = null
- curSel.value.roomName = null
- curSel.value.bedNo = null
- curSel.value.status = null
- curSel.value.docId = null
- curSel.value.docName = null
+ curSel.value = {
+ id: null,
+ roomId: null,
+ roomName: null,
+ bedNo: null,
+ ip: null,
+ status: null,
+ docId: null,
+ docName: null,
+ checkTypes: [],
+ opType: 0
+ } as RoomVO
}
</script>
@@ -315,6 +649,22 @@
height: 100vh;
padding: 15px;
overflow: hidden;
+
+ /* 閫夋嫨宸ヤ綅妯″紡鎻愮ず鍖猴細璇存槑涓轰粈涔堣瑕佹眰鎵嬪姩閫夊伐浣� */
+ &__hint {
+ flex: none;
+ margin-bottom: 10px;
+ }
+
+ &__ip {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ gap: 10px;
+ margin-top: 8px;
+ font-size: 13px;
+ color: #606266;
+ }
// 楂樺害闅忓崱鐗囨暟閲忚嚜閫傚簲锛涘崱鐗囧鍒拌涓嶄笅鏃舵墠鍐呴儴婊氬姩锛堥〉闈㈡湰韬缁堜笉婊氬姩锛�
&__scroll {
@@ -345,5 +695,45 @@
padding-top: 12px;
text-align: center;
}
+
+ /*
+ 椤堕儴鏉★紙鏈闇�姹傦級锛氭湰椤垫槸椤跺眰璺敱銆佹病鏈変晶杈硅彍鍗曪紝鍑哄彛鍙兘鑷繁缁欍��
+ 宸︽爣棰� + 鍙炽�岃繑鍥� / IP 璇婃柇 / 閫�鍑虹櫥褰曘�嶃��
+ */
+ &__topbar {
+ flex: none;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 4px 0 10px;
+ border-bottom: 1px solid var(--el-border-color-lighter);
+ margin-bottom: 8px;
+ }
+
+ &__title {
+ font-size: 16px;
+ font-weight: 600;
+ color: #303133;
+ }
+
+ &__topbar-right {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+ }
+
+ /* IP 璇婃柇缁撴灉锛氫繚鐣欏師鏍风┖鏍间笌鎹㈣锛屼究浜庨�愰」鏍稿 */
+ &__ip-debug {
+ margin: 0;
+ max-height: 60vh;
+ overflow: auto;
+ padding: 10px 12px;
+ background: var(--el-fill-color-light);
+ border-radius: 4px;
+ font-size: 13px;
+ line-height: 1.8;
+ white-space: pre-wrap;
+ word-break: break-all;
+ }
}
</style>
diff --git a/src/views/ecg/room/RoomSetting.vue b/src/views/ecg/room/RoomSetting.vue
index 258617f..a7d041f 100644
--- a/src/views/ecg/room/RoomSetting.vue
+++ b/src/views/ecg/room/RoomSetting.vue
@@ -13,9 +13,34 @@
<el-button size="small" @click="resetSchedule" > 閲嶇疆瀹氭椂浠诲姟 </el-button>
<el-button size="small" @click="refresh" > 鍒锋柊 </el-button>
</div>
+ <div class="mode-area">
+ <span class="mode-label">閫夋嫨宸ヤ綅妯″紡锛�</span>
+ <el-select v-model="roomSelectMode" size="small" style="width: 210px" @change="saveRoomSelectMode">
+ <el-option :value="0" label="0 - 鎸夐渶瑕佸己鍒堕�夋嫨宸ヤ綅" />
+ <el-option :value="1" label="1 - 鐧诲綍IP鍖归厤宸ヤ綅" />
+ <el-option :value="2" label="2 - 鐧诲綍鏃舵墜鍔ㄩ�夋嫨宸ヤ綅锛堝啓鍏ユ湰鏈篒P锛�" />
+ <el-option :value="3" label="3 - 鎸夌郴缁熼粯璁ゅ鐞�" />
+ </el-select>
+ <span class="mode-tip">
+ 0=姣忔閮借閫夛紱1=鎸塈P鑷姩鍖归厤锛屽尮閰嶄笉鍒版墠璁╅�夛紱2=姣忔閮借閫夊苟鎶婃湰鏈篒P鍐欏埌璇ュ伐浣嶏紱
+ 3=璇P棣栨閫変竴娆″苟璁颁綇锛屼箣鍚庢寜1鑷姩鍖归厤
+ </span>
+ <span class="mode-warn" v-if="unboundIpBeds.length > 0">
+ 浠ヤ笅宸ヤ綅鏈粦瀹氭湁鏁堢殑 IPv4 鍦板潃锛堟湰绯荤粺宸ヤ綅缁戝畾浠呴噰鐢� IPv4锛夛紝妯″紡1銆�3灏嗘棤娉曡嚜鍔ㄥ尮閰嶅埌瀹冧滑锛歿{ unboundIpBeds.join('銆�') }}
+ </span>
+ </div>
</el-main>
<el-aside width="210px" class="monitor-aside">
- <div>寮�璇婃椂闂达細{{ openingPeriod }} {{ monitorInfo?.openingFlag }} </div>
+ <div>
+ 寮�璇婃椂闂达細{{ openingPeriod }}
+ <!--
+ 銆愭湰娆¤鏄庛�戝紑璇婄姸鎬佹槸"鑷姩琛ヤ汉"鐨勬�婚棬闂革細
+ 宸查棴璇婃椂锛�**鎺掗槦涓殑鎮h�呬笉浼氳鑷姩鎼繘鍚勫伐浣嶇殑鍊欒瘖鍖�**锛堢晫闈笂涓嶄細鏈夋姤閿欙紝鍙〃鐜颁负"浜轰笉杩涙潵"锛夈��
+ -->
+ <el-tag :type="monitorInfo?.openingFlag === 1 ? 'success' : 'info'" size="small">
+ {{ monitorInfo?.openingFlag === 1 ? '寮�璇婁腑锛堜細鑷姩琛ヤ汉锛�' : '宸查棴璇婏紙涓嶄細鑷姩琛ヤ汉锛�' }}
+ </el-tag>
+ </div>
<div>宸ヤ綅姒傚喌锛� {{monitorInfo?.openingBedNum}} {{monitorInfo?.docBedNum}} {{monitorInfo?.routingBedNum}} </div>
<div v-for="(value, key) in monitorInfo.checkTypeBedInfo" :key="key">
{{ getCheckTypeName(Number(key)) }} {{ value }}
@@ -28,17 +53,23 @@
<script setup lang="ts">
import {RoomStatus} from "@/components/RoomStatus"
-import { RoomApi, RoomVO, MonitorInfo } from '@/api/ecg/room'
+import { RoomApi, RoomVO, MonitorInfo, isUsableSeatIp } from '@/api/ecg/room'
import { QueueApi } from '@/api/ecg/queue'
-import { getConfigKey } from '@/api/infra/config'
-import {useCheckTypeStore} from "@/store/modules/checkType";
-import {getCheckTypeName} from "../../../utils/checkTypeFormatter";
+import { getConfigKey, getConfigPage, createConfig, updateConfig } from '@/api/infra/config'
+import { useCheckTypeStore } from "@/store/modules/checkType";
+import { getCheckTypeName } from "../../../utils/checkTypeFormatter";
defineOptions({ name: 'RoomSetting' })
const bedMap = ref() // 鍒楄〃鐨勬暟鎹�
const openingPeriod = ref<string>('')
+/**
+ * 銆岄�夋嫨宸ヤ綅妯″紡銆嶅弬鏁帮紙ecg.room.select.mode锛夛細
+ * 0=鎸夐渶瑕佸己鍒堕�夋嫨宸ヤ綅锛堥粯璁わ紝鍘熻涓猴級 1=鐧诲綍IP鍖归厤宸ヤ綅 2=鐧诲綍鏃舵墜鍔ㄩ�夋嫨宸ヤ綅锛堝啓鍏ユ湰鏈篒P锛� 3=鎸夌郴缁熼粯璁ゅ鐞�
+ */
+const roomSelectMode = ref<number>(0)
+const roomSelectModeConfigId = ref<number | undefined>(undefined)
const monitorInfo = ref<MonitorInfo>({
openingBedNum: 0,
docBedNum: 0,
@@ -49,9 +80,71 @@
const checkTypeStore = useCheckTypeStore();
+/** 璇P鑳藉惁鐢ㄤ簬鑷姩鍖归厤宸ヤ綅锛堟敮鎸� IPv4/IPv6锛涚┖銆�0.0.0.0銆�::銆�127.x銆�::1 閮芥槸鏃犳晥鍗犱綅/鍥炵幆鍊硷級 */
+const isIpUsable = (ip?: string | null) => isUsableSeatIp(ip)
+
+/** 鏈粦瀹氭湁鏁圛P鐨勫伐浣嶏紙妯″紡 1銆�3 鍖归厤涓嶅埌瀹冧滑锛岀鐞嗛〉缁欏嚭鎻愰啋锛� */
+const unboundIpBeds = computed<string[]>(() => {
+ const map: any = bedMap.value || {}
+ const list: string[] = []
+ Object.keys(map).forEach((roomName) => {
+ ;(map[roomName] as RoomVO[]).forEach((bed) => {
+ if (!isIpUsable(bed.ip)) {
+ list.push(`${roomName}/${bed.bedNo ?? ''}`)
+ }
+ })
+ })
+ return list
+})
+
const getOpeningPeriod = async () => {
const data = await getConfigKey('ecg.openingtime')
openingPeriod.value = data
+}
+
+/** 璇诲彇銆岄�夋嫨宸ヤ綅妯″紡銆嶅弬鏁帮紙鍙傛暟涓嶅瓨鍦ㄦ椂淇濇寔 0锛� */
+const ROOM_SELECT_MODE_KEY = 'ecg.room.select.mode'
+const getRoomSelectMode = async () => {
+ try {
+ const page: any = await getConfigPage({ key: ROOM_SELECT_MODE_KEY, pageNo: 1, pageSize: 10 })
+ const hit = (page?.list || []).find((c: any) => c.key === ROOM_SELECT_MODE_KEY)
+ if (hit) {
+ roomSelectModeConfigId.value = hit.id
+ const n = Number(hit.value)
+ roomSelectMode.value = [0, 1, 2, 3].includes(n) ? n : 0
+ } else {
+ // 鍙傛暟杩樻病寤猴細鎸夌己鐪� 0 鏄剧ず锛屼繚瀛樻椂鍐嶅垱寤�
+ roomSelectMode.value = 0
+ roomSelectModeConfigId.value = undefined
+ }
+ } catch (e) {
+ console.warn('[getRoomSelectMode] 璇诲彇閫夋嫨宸ヤ綅妯″紡澶辫触锛屾寜 0 澶勭悊', e)
+ }
+}
+
+/** 淇濆瓨銆岄�夋嫨宸ヤ綅妯″紡銆嶏細宸叉湁鍙傛暟鍒欐洿鏂帮紝娌℃湁鍒欏垱寤猴紙ConfigSaveReqVO 娌℃湁 type 瀛楁锛屽埆浼狅級 */
+const saveRoomSelectMode = async () => {
+ const payload: any = {
+ category: 'biz',
+ name: '閫夋嫨宸ヤ綅妯″紡',
+ key: ROOM_SELECT_MODE_KEY,
+ value: String(roomSelectMode.value),
+ visible: true,
+ remark: '0=鎸夐渶瑕佸己鍒堕�夋嫨宸ヤ綅锛�1=鐧诲綍IP鍖归厤宸ヤ綅锛堝尮閰嶄笉鍒版寜0锛夛紱2=鐧诲綍鏃舵墜鍔ㄩ�夋嫨宸ヤ綅骞跺啓鍏ユ湰鏈篒P锛�3=鎸夌郴缁熼粯璁ゅ鐞嗭紙棣栨閫夊苟璁癐P锛屼箣鍚庢寜1锛�'
+ }
+ try {
+ if (roomSelectModeConfigId.value) {
+ payload.id = roomSelectModeConfigId.value
+ await updateConfig(payload)
+ } else {
+ const id: any = await createConfig(payload)
+ roomSelectModeConfigId.value = id ?? undefined
+ await getRoomSelectMode()
+ }
+ ElMessage.success('閫夋嫨宸ヤ綅妯″紡宸蹭繚瀛樹负 ' + roomSelectMode.value)
+ } catch (e: any) {
+ ElMessage.error('淇濆瓨澶辫触锛�' + (e?.message || e))
+ }
}
const getMonitorInfo = async () => {
@@ -94,6 +187,7 @@
onMounted(() => {
getList()
getOpeningPeriod()
+ getRoomSelectMode()
getMonitorInfo()
})
@@ -127,6 +221,32 @@
margin-bottom: 8px;
}
+/* 閫夋嫨宸ヤ綅妯″紡璁剧疆鍖� */
+.mode-area {
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
+ gap: 8px;
+ padding: 6px 8px;
+ font-size: 12px;
+ color: #606266;
+}
+
+.mode-label {
+ font-weight: 600;
+}
+
+.mode-tip {
+ color: #909399;
+ max-width: 640px;
+ line-height: 16px;
+}
+
+.mode-warn {
+ flex: 1 0 100%;
+ color: #e6a23c;
+}
+
/* 鍙充晶鐩戞帶淇℃伅锛氬瓧鍙锋敹绱э紝閬垮厤鎹㈣鎾戦珮 */
.monitor-aside {
padding: 8px 10px;
diff --git a/src/views/ecg/room/index.vue b/src/views/ecg/room/index.vue
index f60c38c..adac25a 100644
--- a/src/views/ecg/room/index.vue
+++ b/src/views/ecg/room/index.vue
@@ -17,10 +17,10 @@
class="!w-240px"
/>
</el-form-item>
- <el-form-item label="璇婄枟搴婂彿" prop="bedNo">
+ <el-form-item label="璇婂宸ヤ綅" prop="bedNo">
<el-input
v-model="queryParams.bedNo"
- placeholder="璇疯緭鍏ヨ瘖鐤楀簥缂栧彿"
+ placeholder="璇疯緭鍏ヨ瘖瀹ゅ伐浣嶇紪鍙�"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
@@ -66,8 +66,13 @@
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="璇婂缂栧彿" align="center" prop="roomId" />
<el-table-column label="璇婂鍚嶇О" align="center" prop="roomName" />
- <el-table-column label="璇婄枟搴婄紪鍙�" align="center" prop="bedNo" />
- <el-table-column label="璇婂IP" align="center" prop="ip" />
+ <el-table-column label="璇婂宸ヤ綅" align="center" prop="bedNo" />
+ <el-table-column label="宸ヤ綅缁戝畾IP" align="center" prop="ip" />
+ <el-table-column label="鎿嶄綔绫诲瀷" align="center" prop="opType">
+ <template #default="scope">
+ {{ opTypeText(scope.row.opType) }}
+ </template>
+ </el-table-column>
<el-table-column label="妫�鏌ラ」鐩�" align="center" prop="checkTypes" width="180px">
<template #default="scope">
<div v-for="(checkType, subIndex) in scope.row.checkTypes" :key="subIndex">
@@ -144,6 +149,21 @@
const queryFormRef = ref() // 鎼滅储鐨勮〃鍗�
const exportLoading = ref(false) // 瀵煎嚭鐨勫姞杞戒腑
+/**
+ * 鎿嶄綔绫诲瀷涓枃锛堟湰闇�姹傦細鍒楄〃涓嶅啀鏄剧ず鏁板瓧锛夈��
+ *
+ * 鍙栧�间笌鍚庣 `BedOpTypeEnum`銆佷互鍙婃湰妯″潡 RoomForm 鐨勩�屼綔涓氱被鍨嬨�嶅崟閫夐」淇濇寔涓�鑷达細
+ * 0=妫�鏌� 1=棰嗙敤 2=瑁呮満
+ * 鍘嗗彶鑴忔暟鎹紙null / 鍏跺畠鍊硷級鏄剧ず '-'锛屼笉鐚溿��
+ */
+const opTypeText = (opType?: number | null) => {
+ if (opType === 0) return '妫�鏌�'
+ if (opType === 1) return '棰嗙敤'
+ if (opType === 2) return '瑁呮満'
+ if (opType === 3) return '鍒嗚瘖'
+ return '-'
+}
+
/** 鏌ヨ鍒楄〃 */
const getList = async () => {
loading.value = true
diff --git a/vite.config.ts b/vite.config.ts
index 20973d8..5065ceb 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -34,6 +34,21 @@
target: 'http://localhost:48080',
ws: false,
changeOrigin: true,
+ // 銆愰噸瑕併�憍fwd=true锛氫唬鐞嗚浆鍙戞椂鎶�**鐪熷疄瀹㈡埛绔疘P**鍐欏叆 X-Forwarded-For銆�
+ //
+ // 涓轰粈涔堝繀椤诲紑锛氬悗绔敤 Hutool 鐨� ServletUtil.getClientIP()锛屽畠浼樺厛璇�
+ // X-Forwarded-For锛涙病鏈夎澶存椂閫�鍥� request.getRemoteAddr()銆傝�岃繖閲屾槸 Node 浠g悊鍘昏繛
+ // `http://localhost:48080`锛孨ode 鍦� Windows 涓婃妸 localhost 浼樺厛瑙f瀽涓� IPv6锛�
+ // 浜庢槸鍚庣鎷垮埌鐨勬槸鍥炵幆鍦板潃 `0:0:0:0:0:0:0:1`锛堢函 IPv4 鏈哄櫒涓婃槸 127.0.0.1锛夈��
+ // 瀹炴祴琛ㄧ幇锛氬嵆浣跨敤 http://192.168.3.15/ 璁块棶锛宻ystem_login_log.user_ip 浠嶈褰�
+ // `0:0:0:0:0:0:0:1`锛屼娇"鎸塈P鑷姩鍖归厤璇婂宸ヤ綅"锛坋cg.room.select.mode=1/3锛夋案杩滃尮閰嶄笉鍒帮紝
+ // 涔熸棤娉曟妸鏈満IP鍐欏叆 clinic_room.ip銆�
+ //
+ // 寮�鍚悗锛氱櫥褰曟棩蹇椼�佹寜IP鍙栬瘖瀹わ紙CallController / CallingScreenController锛夈��
+ // 閫夋嫨宸ヤ綅妯″紡绛夐兘鑳芥嬁鍒扮湡瀹炲鎴风 IPv4 鍦板潃銆�
+ // 娉ㄦ剰锛歑-Forwarded-For 鍙浼�狅紝浠呴�傜敤浜庡唴缃�/寮�鍙戠幆澧冿紱
+ // 鐢熶骇鐜鐢卞墠缃弽鍚戜唬鐞嗭紙nginx锛夌洿鎺ラ�忎紶璇ュご鍗冲彲锛屾棤闇�渚濊禆鏈厤缃��
+ xfwd: true,
// rewrite: (path) => path.replace(new RegExp(`^/admin-api`), ''),
},
},
--
Gitblit v1.9.3