From 09dc74e264b6262cbe41c9c8476e24705871d4a6 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期日, 08 十一月 2026 23:31:17 +0800
Subject: [PATCH] yxh

---
 src/permission.ts |   39 ++++++++++++++++++++++++++++++++-------
 1 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/permission.ts b/src/permission.ts
index fcdd1b2..bca1eba 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -13,7 +13,6 @@
 import { useRoomStoreWithOut } from "@/store/modules/room";
 // 闇�姹傦細30 鍒嗛挓鏃犳搷浣滄墠瑕佹眰閲嶆柊鐧诲綍锛堝墠绔┖闂叉娴嬶級
 import { setupIdleLogout } from '@/hooks/web/useIdleLogout'
-import { setupBedReleaseOnUnload } from '@/utils/releaseBed'
 
 const { start, done } = useNProgress()
 
@@ -56,7 +55,31 @@
     if (res.seated) {
       return true
     }
-    // 銆愪富/鍥磋路鏈闇�姹傘�戞病鑷姩鍏ュ骇涔�**涓嶅啀寮哄埗璺�"閫夊伐浣嶉〉"**锛�
+
+    // 銆愭湰闇�姹傘�戞湰鏈� IP 瀵瑰簲鐨勫伐浣�**鏈変汉鍧愮潃**锛堜笂涓�鐝尰鐢熸病閫�鍑哄伐浣嶏級鈫� 鎻愮ず鏄惁鎺ョ銆�
+    // 鎺ョ鍚庣珛鍗虫垚涓鸿宸ヤ綅涓讳汉锛屽苟鎸夌幇鏈夐�昏緫鑷姩鍔犺浇璇ュ伐浣嶃�屽氨璇婁腑銆嶆偅鑰呫��
+    if (res.reason === 'occupied' && res.roomId != null && res.bedNo) {
+      const bedText = `${res.roomName || '璇婂' + res.roomId} 路 ${res.bedNo}`
+      try {
+        await ElMessageBox.confirm(
+          `鏈満瀵瑰簲鐨勫伐浣嶃��${bedText}銆嶅綋鍓嶇敱銆�${res.occupiedBy || '鍏朵粬鍖荤敓'}銆嶅崰鐢ㄣ�俓n` +
+            `鏄惁鎺ョ璇ュ伐浣嶇户缁伐浣滐紵锛堟帴绠″悗瀵规柟灏嗚寮哄埗绂诲骇锛塦,
+          '宸ヤ綅琚崰鐢�',
+          { confirmButtonText: '鎺ョ宸ヤ綅', cancelButtonText: '鍏堜笉鎺ョ锛堝彧璇诲洿瑙傦級', type: 'warning' }
+        )
+        const ok = await roomStore.takeOverBed(res.roomId, res.bedNo)
+        if (ok) {
+          ElMessage.success(`宸叉帴绠″伐浣嶏細${bedText}`)
+          return true
+        }
+        ElMessage.warning('鎺ョ澶辫触锛屽凡鎸夊彧璇诲洿瑙傝繘鍏ワ紙鍙◢鍚庡湪椤舵爮銆屽伐浣嶃�嶉噷鍐嶈瘯锛�')
+      } catch {
+        // 鐢ㄦ埛閫夋嫨涓嶆帴绠� 鈫� 鎸夊彧璇诲洿瑙傝繘鍏�
+        console.info('[room] 鐢ㄦ埛鏀惧純鎺ョ宸ヤ綅锛屾寜鍙鍥磋杩涘叆')
+      }
+    }
+
+    // 銆愪富/鍥磋銆戞病鑷姩鍏ュ骇涔�**涓嶅啀寮哄埗璺�"閫夊伐浣嶉〉"**锛�
     // 鍏佽浠�"鏈叆搴� / 鍥磋"韬唤杩涘叆宸ヤ綔鍙帮紙鍙锛夛紝鐢卞伐浣滃彴椤堕儴鐨勩�屽伐浣嶃�嶄笅鎷�
     // 閫夋嫨瑕佹煡鐪嬶紙鍥磋锛夋垨瑕佸叆搴х殑宸ヤ綅銆傝嫢涓�寰嬪脊鍥為�夊伐浣嶉〉锛屽氨姘歌繙鏃犳硶鍥磋鍒汉銆�
     console.info('[room] 鏈嚜鍔ㄥ叆搴э紙' + (res.reason || 'nomatch') + '锛夛紝鎸�"鍙洿瑙�"鏀捐')
@@ -222,10 +245,12 @@
   // ==========================================================================
   if (getAccessToken() && to.path !== '/login') {
     setupIdleLogout()
-    // 闇�姹傦細閫�鍑虹郴缁熸椂鑷姩閫�鍑哄崰鐢ㄧ殑璇婄枟搴婁綅銆�
-    // 娉ㄥ唽 `pagehide` 鍏滃簳锛堝叧闂爣绛鹃〉/鍒锋柊/璺宠蛋锛夆�斺�� 鍐呴儴鑷甫骞傜瓑淇濇姢锛�
-    // 鍙槸"灏藉姏鑰屼负"鐨勬渶鍚庝竴灞傦紱涓昏淇濋殰鍦� useIdleLogout / userStore.loginOut /
-    // axios 鐨� handleAuthorized 涓夊鏄庣‘鐨勯��鍑鸿矾寰勪笂銆�
-    setupBedReleaseOnUnload()
+    // 銆愭湰娆″彉鏇淬��**宸茬Щ闄�** `setupBedReleaseOnUnload()`锛坧agehide + sendBeacon锛夈��
+    //
+    // 鍘熻涓猴細鍏抽棴鏍囩椤� / 鍒锋柊 / 璺宠蛋鏃堕兘浼氶噴鏀惧崰鐢ㄧ殑宸ヤ綅锛屽鑷�
+    //   路 鎸� F5 鍒锋柊涓�娆″氨涓㈠伐浣嶏紱
+    //   路 娴忚鍣ㄥ穿婧冩仮澶嶃�佸垏璧颁竴浼氬効鍥炴潵锛屼篃鍙兘鍥� pagehide 涓㈠伐浣嶃��
+    // 鐜板湪宸ヤ綅鍙湪**鐢ㄦ埛涓诲姩鎿嶄綔**鏃堕噴鏀撅細鎵嬪姩銆岀搴с�嶃�佹墜鍔ㄣ�岄��鍑虹櫥褰曘�嶃��
+    // 鍖荤敓涓嬬彮蹇樼搴х殑鍏滃簳锛氣憼 闂瘖鏃剁粺涓�娓呯┖褰撶彮宸ヤ綅锛涒憽 绠$悊鍛樸�屾竻绌哄伐浣嶃�嶃��
   }
 })

--
Gitblit v1.9.3