From 3bc61e446ef2456f6eaa10656966f7fbe8104fd0 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Mon, 21 Apr 2025 16:24:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into test

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

diff --git a/src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue b/src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue
index 6873e0a..cf4331e 100644
--- a/src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue
+++ b/src/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue
@@ -158,6 +158,7 @@
 const droneSn = inject('droneSn')
 const trueAltitude = inject('trueAltitude')
 const client_id = inject('client_id')
+const isBackDock = inject('isBackDock')
 
 const deviceTopicInfo = ref({
 	pubTopic: '',
@@ -359,7 +360,7 @@
 	})
 }
 
-const isBackDock = ref(false)
+
 
 // 返航
 async function onBackDock() {

--
Gitblit v1.9.3