From 943d2875938ca95f7c1071cd242d67e19e03a613 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 30 八月 2024 11:16:59 +0800
Subject: [PATCH] update

---
 src/views/ecg/room/RoomLoginSelect.vue |   28 +++++++++++++---------------
 1 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/views/ecg/room/RoomLoginSelect.vue b/src/views/ecg/room/RoomLoginSelect.vue
index 1229835..15a620a 100644
--- a/src/views/ecg/room/RoomLoginSelect.vue
+++ b/src/views/ecg/room/RoomLoginSelect.vue
@@ -16,11 +16,11 @@
 <script setup lang="ts">
 import {RoomBedSelect} from "@/components/RoomBedSelect"
 import { RoomApi, RoomVO } from '@/api/ecg/room'
-import { queueApi } from '@/api/ecg/queue'
 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";
 const {  push } = useRouter()
 
 defineOptions({ name: 'RoomLoginSelect' })
@@ -73,14 +73,10 @@
 }
 
 const haveSeatConfirm = async (newRoomVO: RoomVO) => {
-  const tempRoomVO = cloneDeep(newRoomVO)
-  tempRoomVO.docId = curUser.id
-  tempRoomVO.docName = curUser.nickname
-
   if (newRoomVO !== curSel.value) {
     let data;
     if (curSel.value.docId !== null) {
-      data = await queueApi.bedDoctorOff(curSel.value)
+      data = await DoctorApi.bedDoctorOff(curSel.value)
       if (data !== 0) {
         ElMessage({
           message: '鍐呴儴閿欒!' + data,
@@ -93,7 +89,10 @@
     curSel.value.docId = null
     curSel.value.docName = null
 
-    data = await queueApi.bedDoctorOn(tempRoomVO)
+    const tempRoomVO = cloneDeep(newRoomVO)
+    tempRoomVO.docId = curUser.id
+    tempRoomVO.docName = curUser.nickname
+    data = await DoctorApi.bedDoctorOn(tempRoomVO)
     if (data !== 0) {
       ElMessage({
         message: '鍐呴儴閿欒!' + data,
@@ -102,12 +101,12 @@
       });
       return
     }
-  }
 
-  newRoomVO.docId = curUser.id
-  newRoomVO.docName = curUser.nickname
-  curSel.value = newRoomVO
-  userStore.setRoomInfoAction(curSel.value)
+    newRoomVO.docId = curUser.id
+    newRoomVO.docName = curUser.nickname
+    curSel.value = newRoomVO
+    userStore.setRoomInfoAction(curSel.value)
+  }
 
   if (isStringEmpty(route.redirectedFrom?.fullPath))
     push({ path: "/"})
@@ -118,8 +117,8 @@
 }
 
 const leaveSeatConfirm = async () => {
-  if (curSel.value.roomId !== null) {
-      let data = await queueApi.bedDoctorOff(curSel.value)
+  if (curSel.value.docId !== null) {
+      let data = await DoctorApi.bedDoctorOff(curSel.value)
       if (data !== 0) {
           ElMessage({
               message: '鍐呴儴閿欒!' + data,
@@ -131,7 +130,6 @@
 
     curSel.value.docId = null
     curSel.value.docName = null
-    resetCurSel()
   }
 
   userStore.clearRoomInfoAction()

--
Gitblit v1.9.3