From 05fbbddd7786f4870a456dc92f80bf262c93be88 Mon Sep 17 00:00:00 2001
From: gaofy <1014893517@qq.com>
Date: Thu, 28 Dec 2023 15:42:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E6=8E=A7=E5=88=B6=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E5=99=A8=E7=A6=BB=E5=BC=80=E9=A1=B5=E9=9D=A2=E5=90=8E?=
 =?UTF-8?q?=E5=8D=B8=E8=BD=BD=EF=BC=8C=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/patients-manage/form/patients-form.vue |  2 +-
 src/views/remote-manage/remote-control.vue       | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/views/patients-manage/form/patients-form.vue b/src/views/patients-manage/form/patients-form.vue
index 24dac44..906cc99 100644
--- a/src/views/patients-manage/form/patients-form.vue
+++ b/src/views/patients-manage/form/patients-form.vue
@@ -87,7 +87,7 @@
             <el-button class="f18" type="primary" @click="saveData">确认</el-button>
         </div>
         <div v-else-if="type === 'edit'" style="text-align: right;">
-            <el-button class="f18" @click="saveData">修改</el-button>
+            <el-button class="f18" @click="close">取消</el-button>
             <el-button class="f18" type="primary" @click="saveData">更新</el-button>
         </div>
     </el-form>
diff --git a/src/views/remote-manage/remote-control.vue b/src/views/remote-manage/remote-control.vue
index 4c28ae7..dd8552b 100644
--- a/src/views/remote-manage/remote-control.vue
+++ b/src/views/remote-manage/remote-control.vue
@@ -131,7 +131,7 @@
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref, reactive } from 'vue';
+import { onMounted, ref, reactive, onBeforeUnmount } from 'vue';
 import { useRouter, useRoute } from 'vue-router'
 import { ElMessageBox, ElMessage } from 'element-plus';
 import { useRemoteStore } from '@/stores/remote-info-store'
@@ -210,6 +210,13 @@ onMounted(() => {
 	initScale();
 	
 });
+// 页面卸载前清除定时器
+onBeforeUnmount(() => {
+	clearInterval(featureTimer)
+	clearInterval(ecgTimer)
+	clearInterval(aiFlagTimer)
+	clearInterval(medicineTimer)
+})
 
 function initData() {
 	lungAlarm.value = false;
@@ -273,7 +280,7 @@ function setTableData(res: any) {
 function getMedicine() {
 	let isRunTimer = true;
 	clearInterval(medicineTimer);
-	setInterval(() => {
+	medicineTimer = setInterval(() => {
 		if (isRunTimer && JSON.stringify(tableDataStore) === JSON.stringify(tableData) && isAIDose.value) {
 			isRunTimer = false;
 			const url = isAIDose.value ? '/getaimedicine' : '/getdoctormedicine';
@@ -291,12 +298,12 @@ function getChartData() {
 	let isRunTimer = true;
 	clearInterval(featureTimer);
 	clearInterval(ecgTimer);
-	setInterval(() => {
+	featureTimer = setInterval(() => {
 		if (isRunTimer) {
 			getData()
 		}
 	}, 2000);
-	setInterval(() => {
+	ecgTimer = setInterval(() => {
 		try {
 			chartDom4.value.updateChart(0, new Date());
 		} catch (error) { }