From 53bcb7e5dffa071d2c6593f5db7f0b6e4e2f8dfe Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 18 Oct 2023 16:17:02 +0800
Subject: [PATCH] 隐藏重复定时和连续执行
---
src/components/g-map/DroneControlPanel.vue | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/components/g-map/DroneControlPanel.vue b/src/components/g-map/DroneControlPanel.vue
index 04947f5..a143ba3 100644
--- a/src/components/g-map/DroneControlPanel.vue
+++ b/src/components/g-map/DroneControlPanel.vue
@@ -340,13 +340,21 @@
cmd: cmdItem.cmdKey,
action: cmdItem.action
}, false)
- if (result && flightController.value) {
- message.success('返航成功')
- exitFlightCOntrol()
- } else {
- message.warn('请先进入控制！')
- }
- cmdItem.loading = false
+ // if (result && flightController.value) {
+ // message.success('返航成功')
+ // exitFlightCOntrol()
+ // } else {
+ // message.warn('请先进入控制！')
+ // }
+ // cmdItem.loading = false
+ if (result) {
+ message.success('返航成功')
+ }
+ // 退出飞行控制
+ if (result && flightController.value) {
+ exitFlightCOntrol()
+ }
+ cmdItem.loading = false
}
const emits = defineEmits(['update:modelValue'])
@@ -404,8 +412,8 @@
const takeoffToPointPopoverData = reactive({
visible: false,
loading: false,
- latitude: 28.62426114 as null | number,
- longitude: 115.85657177 as null | number,
+ latitude: null as null | number,
+ longitude: null as null | number,
height: 120 as null | number,
securityTakeoffHeight: 100 as null | number,
maxSpeed: MAX_SPEED,
@@ -417,8 +425,8 @@
function onShowTakeoffToPointPopover () {
takeoffToPointPopoverData.visible = !takeoffToPointPopoverData.visible
takeoffToPointPopoverData.loading = false
- takeoffToPointPopoverData.latitude = 28.62426114
- takeoffToPointPopoverData.longitude = 115.85657177
+ takeoffToPointPopoverData.latitude = props.deviceInfo.dock.basic_osd.latitude
+ takeoffToPointPopoverData.longitude = props.deviceInfo.dock.basic_osd.longitude
takeoffToPointPopoverData.securityTakeoffHeight = 100
takeoffToPointPopoverData.rthAltitude = 100
takeoffToPointPopoverData.rcLostAction = LostControlActionInCommandFLight.RETURN_HOME
--
Gitblit v1.9.3