From e41cb44dc302b51534036b3cf114dd2d5bc4f809 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期二, 29 九月 2026 14:32:49 +0800
Subject: [PATCH] 修改了数据采集

---
 src/views/ecg/room/RoomLoginSelect.vue |  222 ++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 177 insertions(+), 45 deletions(-)

diff --git a/src/views/ecg/room/RoomLoginSelect.vue b/src/views/ecg/room/RoomLoginSelect.vue
index fa8f72f..9922457 100644
--- a/src/views/ecg/room/RoomLoginSelect.vue
+++ b/src/views/ecg/room/RoomLoginSelect.vue
@@ -1,14 +1,16 @@
 <template>
-  <div style="display: flex; flex-direction: column; align-items: center;">
-    <div style="display: flex; flex-wrap: wrap; justify-content: center; margin-bottom: 20px">
-      <div class=roomwrap v-for="(value, key) in bedMap" :key="key">
-        <RoomBedSelect :title="key" :bedList="value" :curBed="curSel" @event-haveseat="haveSeat" @event-leaveseat="leaveSeat"/>
+  <div class="room-select">
+    <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}`">
+          <RoomBedSelect :bed="bed" :curBed="curSel" :curUser='curUser' @event-haveseat="haveSeat" @event-leaveseat="leaveSeat" @event-setcurseat="setCurSeat"/>
+        </div>
+        <el-empty v-if="isEmptyOpeningBed" class="room-select__empty" description="宸ヤ綅娌℃湁寮�鏀�"/>
       </div>
-      <el-empty v-if="isEmptyOpeningBed" description="宸ヤ綅娌℃湁寮�鏀�"/>
     </div>
-    <div>
-      <el-button @click="confirmCurSel">纭</el-button>
-      <el-button @click="resetPage">閲嶇疆</el-button>
+    <div class="room-select__actions">
+      <el-button type="primary" size="large" @click="confirmCurSel">纭</el-button>
+      <el-button size="large" @click="resetPage">閲嶇疆</el-button>
     </div>
   </div>
 </template>
@@ -18,9 +20,9 @@
 import { RoomApi, RoomVO } from '@/api/ecg/room'
 import {useUserStore} from "@/store/modules/user";
 import {ElMessage, ElMessageBox} from "element-plus";
-import {isStringEmpty} from "@/utils/stringUtil";
 import {cloneDeep} from "lodash-es";
 import {DoctorApi} from "@/api/ecg/doctor";
+import {useRoomStore} from "@/store/modules/room";
 const {  push } = useRouter()
 
 defineOptions({ name: 'RoomLoginSelect' })
@@ -28,6 +30,7 @@
 const route = useRoute();
 
 const userStore = useUserStore()
+const roomStore = useRoomStore()
 const curUser = userStore.getUser
 
 const isEmptyOpeningBed = ref<boolean>(true);
@@ -39,7 +42,26 @@
   bedNo: null,
   status: null,
   docId: null,
-  docName: null
+  docName: null,
+  ip: "",
+  checkTypes: [],
+  opType: 0
+})
+
+// 涓�涓簥浣嶄竴涓崱鐗囷細鎶� {璇婂鍚�: 搴婁綅[]} 鎷嶅钩鎴愬簥浣嶅垪琛�
+const bedList = computed<RoomVO[]>(() => {
+  const list: RoomVO[] = []
+  const map = bedMap.value
+  if (!map) {
+    return list
+  }
+  for (const key in map) {
+    const beds = map[key] as RoomVO[]
+    if (beds && beds.length > 0) {
+      list.push(...beds)
+    }
+  }
+  return list
 })
 
 /** 鍒濆鍖� **/
@@ -61,21 +83,26 @@
 const getList = async () => {
   resetCurSel()
 
-  console.info( "getList before"  )
+  console.info("getList before")
   const data = await RoomApi.getOpeningBedMap()
   bedMap.value = data;
-  console.info( "getList after " + data )
+  console.info("getList after " + data)
 
   isEmptyOpeningBed.value = true
   for (const key in data) {
-      isEmptyOpeningBed.value = false
+    isEmptyOpeningBed.value = false
+
+    if (roomStore.getIsSetRoom) {
       const roomVOArray = data[key] as RoomVO[];
       roomVOArray.forEach((roomVO) => {
-        if (roomVO.docId === curUser.id) {
+        if (roomVO.docId === curUser.id
+            && roomVO.roomId === roomStore.room!.roomId
+            && roomVO.bedNo === roomStore.room!.bedNo) {
           curSel.value = roomVO
-          userStore.setRoomInfoAction(curSel.value)
+          roomStore.setRoomInfoAction(curSel.value)
         }
       })
+    }
   }
 }
 
@@ -89,19 +116,36 @@
     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: "/"})
+    push({ path: "/ecg/doc/dev-ready"})
   else if(route.redirectedFrom?.fullPath === "/roomselect" )
-    push({ path: "/"})
+    push({ path: "/ecg/doc/dev-ready"})
   else if(route.redirectedFrom?.fullPath === "/ecg/roomselect" )
-    push({ path: "/"})
+    push({ path: "/ecg/doc/dev-ready"})
   else
     push({ path: route.redirectedFrom?.fullPath})
+*/
 }
 
 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) {
@@ -113,9 +157,10 @@
         return
       }
     }
+*/
 
     resetCurSel()
-    userStore.clearRoomInfoAction()
+    await roomStore.clearRoomInfoAction()
 
     const tempRoomVO = cloneDeep(newRoomVO)
     tempRoomVO.docId = curUser.id
@@ -130,29 +175,46 @@
       return
     }
 
-    userStore.setRoomInfoAction(tempRoomVO)
+    await roomStore.setRoomInfoAction(tempRoomVO)
     newRoomVO.docId = curUser.id
     newRoomVO.docName = curUser.nickname
     curSel.value = newRoomVO;
   }
 
-  if (isStringEmpty(route.redirectedFrom?.fullPath)) {
-    push({path: "/"})
+  // curSel.value.opType 0 1 2
+  if (newRoomVO.opType === 0) {
+    push({path: "/ecg/doc/routine"})
   }
-  else if(route.redirectedFrom?.fullPath === "/roomselect" ) {
-    push({path: "/"})
+  else if (newRoomVO.opType === 1) {
+    push({path: "/ecg/doc/dev-ready"})
   }
-  else if(route.redirectedFrom?.fullPath === "/ecg/roomselect" ) {
-    push({path: "/"})
+  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})
+  }
+*/
 }
 
-const leaveSeatConfirm = async () => {
-  if (curSel.value.docId !== null) {
-      let data = await DoctorApi.bedDoctorOff(curSel.value)
+const leaveSeatConfirm = async (roomVO: RoomVO) => {
+  if (roomVO.docId !== null) {
+      let data = await DoctorApi.bedDoctorOff(roomVO)
       if (data !== 0) {
           ElMessage({
               message: '鍐呴儴閿欒!' + data,
@@ -164,23 +226,37 @@
   }
 
   resetCurSel()
-  userStore.clearRoomInfoAction()
+  await roomStore.clearRoomInfoAction()
   getList()
 }
 
 const haveSeat = async (newRoomVO: RoomVO) => {
-  ElMessageBox.confirm(
-      '鍏ュ骇, 鏄惁缁х画?',
-      '鎻愮ず',
-      {
-        confirmButtonText: '纭畾',
-        cancelButtonText: '鍙栨秷',
-        type: 'warning'
-      }
-  ).then(async () => {
-    haveSeatConfirm(newRoomVO)
-  }).catch(() => {
-  });
+  // 1. 鎻愬彇涓嶅悓鐨勬彁绀鸿
+  const message = newRoomVO.docId != null
+    ? '宸茬粡鏈変汉浜�, 鏄惁纭畾瑕佺户缁叆搴�?'
+    : '鍏ュ骇, 鏄惁缁х画?';
+
+  try {
+    // 2. 绛夊緟鐢ㄦ埛鐐瑰嚮纭
+    await ElMessageBox.confirm(message, '鎻愮ず', {
+      confirmButtonText: '纭畾',
+      cancelButtonText: '鍙栨秷',
+      type: 'warning'
+    });
+
+    if (newRoomVO.docId != null) {
+      await leaveSeatConfirm(newRoomVO);
+    }
+
+    // 4. 绂诲骇鎴愬姛锛堟垨鍘熸湰灏辨病浜猴級锛屾渶鍚庢墽琛屽叆搴�
+    await haveSeatConfirm(newRoomVO);
+
+  } catch (err) {
+    // 鍙湁鐢ㄦ埛涓诲姩鐐瑰嚮鍙栨秷鏃舵墠蹇界暐锛屽叾浠栨姤閿欏彲浠ユ墦鍗板嚭鏉ユ柟渚挎帓鏌�
+    if (err !== 'cancel') {
+      console.error('鍏ュ骇娴佺▼寮傚父:', err);
+    }
+  }
 }
 
 const leaveSeat = (roomVO: RoomVO) => {
@@ -193,9 +269,29 @@
         type: 'warning'
       }
   ).then(() => {
-    leaveSeatConfirm()
+    leaveSeatConfirm(roomVO)
   }).catch(() => {
   });
+}
+
+// 鍚屾椂鍧愪簡澶氫釜宸ヤ綅鏃讹紝璁惧畾褰撳墠浼氳瘽鐨勫伐浣�
+const setCurSeat = (roomVO: RoomVO) => {
+  roomStore.setRoomInfoAction( roomVO )
+  curSel.value = roomVO
+
+  // 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})
+  }
 }
 
 const resetCurSel = () => {
@@ -211,7 +307,43 @@
 </script>
 
 <style scoped lang="scss">
-.roomwrap {
-  margin-right: 20px;
+// 搴婁綅澶氭椂鍏ㄩ儴鍘嬬缉鍦ㄤ竴灞忓唴鏄剧ず锛屼笉鍑虹幇椤甸潰婊氬姩鏉�
+.room-select {
+  display: flex;
+  flex-direction: column;
+  box-sizing: border-box;
+  height: 100vh;
+  padding: 15px;
+  overflow: hidden;
+
+  // 楂樺害闅忓崱鐗囨暟閲忚嚜閫傚簲锛涘崱鐗囧鍒拌涓嶄笅鏃舵墠鍐呴儴婊氬姩锛堥〉闈㈡湰韬缁堜笉婊氬姩锛�
+  &__scroll {
+    flex: 0 1 auto;
+    min-height: 0;
+    overflow-y: auto;
+  }
+
+  &__list {
+    display: grid;
+    // 鍥哄畾鍒楀锛氬崱鐗囦笉浼氳鎷変几鍙樺舰锛屼粠宸﹀埌鍙炽�佷粠涓婂線涓嬫帓鍒�
+    grid-template-columns: repeat(auto-fit, 188px);
+    justify-content: center;
+    gap: 12px;
+  }
+
+  &__item {
+    min-width: 0;
+  }
+
+  // 绌虹姸鎬佽法婊℃暣琛岋紝閬垮厤琚尋鍒板崟鐙竴鍒楅噷
+  &__empty {
+    grid-column: 1 / -1;
+  }
+
+  &__actions {
+    flex: none;
+    padding-top: 12px;
+    text-align: center;
+  }
 }
 </style>

--
Gitblit v1.9.3