From 1c58222a02c5c7477d1fc52072dc89c00f07b491 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 19 Apr 2025 19:03:52 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard

---
 src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue b/src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue
index 36da55e..6873e0a 100644
--- a/src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue
+++ b/src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue
@@ -324,9 +324,10 @@
 function cancelControl() {
 	exitController({ client_id: client_id.value, dock_sn: dockSn.value })
 		.then(res => {
-			flightController.value = false
 			deviceTopicInfo.value.subTopic = ''
 			deviceTopicInfo.value.pubTopic = ''
+			flightController.value = false
+			isAutoControl.value = true
 			ElMessage.success('退出飞行控制成功')
 		})
 		.catch(e => {})
@@ -365,6 +366,7 @@
 	await returnHome(dockSn?.value)
 	ElMessage.success('返航操作成功')
 	isBackDock.value = true
+	isAutoControl.value = true
 }
 
 // 取消返航
@@ -372,6 +374,7 @@
 	await returnHomeCancel({ dock_sn: dockSn?.value, client_id: client_id.value })
 	ElMessage.success('取消返航成功')
 	isBackDock.value = false
+	isAutoControl.value = false
 }
 
 // 创建mqtt连接

--
Gitblit v1.9.3