From 88f106e0b85c4745c593886ea9b1912098a5dbb4 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Sat, 19 Apr 2025 19:44:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/CurrentTaskDetails/ControlPanel/BaseControl.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/CurrentTaskDetails/ControlPanel/BaseControl.vue b/src/components/CurrentTaskDetails/ControlPanel/BaseControl.vue
index 37bc32a..c365f48 100644
--- a/src/components/CurrentTaskDetails/ControlPanel/BaseControl.vue
+++ b/src/components/CurrentTaskDetails/ControlPanel/BaseControl.vue
@@ -34,6 +34,8 @@
const list3 = computed(() => [
{ name: '自动控制', svg: 'autoControl', style: { top: '-70%' }, active: isAutoControl.value, handle: autoControl },
+ //如果是返航， 继续任务 就是自动任务
+ //如果是取消返航， 继续任务 就是自动任务
{ name: '继续任务', svg: 'continueTask', style: { left: '70%' }, active: false, handle: autoControl },
{
name: '手动控制',
@@ -46,7 +48,6 @@
])
function autoControl() {
- isAutoControl.value = true
EventBus.emit('controlPanel-cancelControl')
}
@@ -55,7 +56,6 @@
}
function turnBack() {
- isAutoControl.value = true
EventBus.emit('controlPanel-returnOrCancelReturn')
}
</script>
--
Gitblit v1.9.3