diff --git a/src/views/index.vue b/src/views/index.vue index aa5dbd8..49e404c 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -22,13 +22,13 @@ --> - + diff --git a/src/views/remote-manage/part/remote-part.vue b/src/views/remote-manage/part/remote-part.vue index 7c1cafb..1d5725b 100644 --- a/src/views/remote-manage/part/remote-part.vue +++ b/src/views/remote-manage/part/remote-part.vue @@ -156,6 +156,10 @@ function showData(i: any) { remoteWsStore.setCurrentTaskIndex(i) currentIndex = remoteWsStore.getCurrentTaskIndex() remoteItem.value = remoteWsStore.getRemoteTask()[currentIndex] + currentException = {} + if (remoteItem.value && remoteItem.value.patient) { + remoteWsStore.createVital(remoteItem.value.patient, remoteItem.value.patientId, remoteItem.value.date, currentIndex) + } getData() } diff --git a/src/views/remote-manage/remote-control.vue b/src/views/remote-manage/remote-control.vue index 508cdc3..4f65539 100644 --- a/src/views/remote-manage/remote-control.vue +++ b/src/views/remote-manage/remote-control.vue @@ -271,6 +271,12 @@ onUnmounted(() => { // remoteWsStore.unsubscribeMedicine(currentRemote.value.patient, currentRemote.value.patientId, currentRemote.value.date, index); remoteWsStore.unsubscribeVital(currentRemote.value.patient, currentRemote.value.patientId, currentRemote.value.date, currentIndex); remoteWsStore.disconnectChat(currentRemote.value.patient, currentRemote.value.patientId, currentRemote.value.date, currentIndex) + if (!router.currentRoute.value.path.startsWith("/remote-manage/")) { + const tasks: any = remoteWsStore.getRemoteTask() + tasks.forEach((task: any) => { + remoteWsStore.disconnect(task.patient, task.patientId, task.date, task.index) + }) + } }) function subscribeWS() { diff --git a/src/views/remote-manage/remote-manage.vue b/src/views/remote-manage/remote-manage.vue index 918b0e6..441037f 100644 --- a/src/views/remote-manage/remote-manage.vue +++ b/src/views/remote-manage/remote-manage.vue @@ -1,37 +1,37 @@ diff --git a/src/views/remote-manage/remote-thumbnail.vue b/src/views/remote-manage/remote-thumbnail.vue index 377a1ea..2bd7a30 100644 --- a/src/views/remote-manage/remote-thumbnail.vue +++ b/src/views/remote-manage/remote-thumbnail.vue @@ -1,36 +1,40 @@ @@ -56,66 +69,66 @@ const addLogAfter = (index: number) => { $size: 20px; .remote-thumbnail-page { - width: 100%; - height: 1010px; - overflow: auto; - - .remote-box { width: 100%; - height: 33.33%; - display: flex; + height: 1010px; + overflow: auto; - .remote-item { - width: 25%; - height: 100%; - padding: $size*0.2; - } - - &.row2 { - height: 66.67%; - - .left-box { - width: 75%; - height: 100%; + .remote-box { + width: 100%; + height: 33.33%; display: flex; - flex-wrap: wrap; .remote-item { - width: 33.33%; - height: 50%; - } - } - - .right-box { - position: relative; - width: 25%; - height: 100%; - padding: $size*0.1; - padding-top: $size*0.2 + $size; - display: flex; - flex-wrap: wrap; - - .message-title { - position: absolute; - height: $size; - top: $size*0.2; - left: $size*0.2; - right: $size*0.2; - background-color: $red; - text-align: center; - font-size: $size*0.7; - line-height: $size; - color: white; - font-weight: 600; + width: 25%; + height: 100%; + padding: $size*0.2; } - .message-item { - width: 50%; - height: 20%; - padding: $size*0.2; + &.row2 { + height: 66.67%; + + .left-box { + width: 75%; + height: 100%; + display: flex; + flex-wrap: wrap; + + .remote-item { + width: 33.33%; + height: 50%; + } + } + + .right-box { + position: relative; + width: 25%; + height: 100%; + padding: $size*0.1; + padding-top: $size*0.2 + $size; + display: flex; + flex-wrap: wrap; + + .message-title { + position: absolute; + height: $size; + top: $size*0.2; + left: $size*0.2; + right: $size*0.2; + background-color: $red; + text-align: center; + font-size: $size*0.7; + line-height: $size; + color: white; + font-weight: 600; + } + + .message-item { + width: 50%; + height: 20%; + padding: $size*0.2; + } + } } - } } - } }