From 30b7e00b38c4998a8ac7356d555e905699db57e4 Mon Sep 17 00:00:00 2001
From: yy <11@11.com>
Date: Wed, 5 Jun 2024 17:58:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E7=94=9F=E5=91=BD=E4=BD=93?=
 =?UTF-8?q?=E5=BE=81=E6=96=AD=E5=BC=80=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/remote-ws-store.ts                | 14 ++++++++------
 src/views/remote-manage/part/remote-part.vue |  4 +---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/stores/remote-ws-store.ts b/src/stores/remote-ws-store.ts
index d549a52..5499469 100644
--- a/src/stores/remote-ws-store.ts
+++ b/src/stores/remote-ws-store.ts
@@ -126,7 +126,7 @@ export const useRemoteWsStore = defineStore("remoteWs", {
         },
         subscribeVital(name: string, id: string, date: string, index: number, cb: any) {
             const patient = this.patient[name + id + date + index]
-            if (patient.vitalWS) {
+            if (patient && patient.vitalWS) {
                 patient.vitalWS.onmessage = (e: any) => {
                     if (e && e.data) {
                         const data = JSON.parse(e.data);
@@ -146,11 +146,13 @@ export const useRemoteWsStore = defineStore("remoteWs", {
         },
         vitalOnclose(name: string, id: string, date: string, index: number, cb: any) {
             const patient = this.patient[name + id + date + index]
-            patient.vitalWS.onclose = () => {
-                const status = this.getCloseStatus()
-                if (!status[name + id + date + index + 'vitalWS']) {
-                    delete patient.vitalWS
-                    cb()
+            if (patient && patient.vitalWS) {
+                patient.vitalWS.onclose = () => {
+                    const status = this.getCloseStatus()
+                    if (!status[name + id + date + index + 'vitalWS']) {
+                        delete patient.vitalWS
+                        cb()
+                    }
                 }
             }
         },
diff --git a/src/views/remote-manage/part/remote-part.vue b/src/views/remote-manage/part/remote-part.vue
index f5bf74f..1ffa4a4 100644
--- a/src/views/remote-manage/part/remote-part.vue
+++ b/src/views/remote-manage/part/remote-part.vue
@@ -207,9 +207,7 @@ function setLog(data: any) {
 const breakRemote = () => {
     remoteWsStore.disconnect(remoteItem.value.patient, remoteItem.value.patientId, remoteItem.value.date, remoteItem.value.index)
     remoteWsStore.resetRemoteTask(remoteWsStore.getCurrentTaskIndex())
-    if (remoteWsStore.getActiveRemoteTask()) {
-        showData(remoteWsStore.getActiveRemoteTask())
-    }
+    showData(remoteWsStore.getActiveRemoteTask())
     emit('breakRemote')
 }