From ed6b769d2947c8f6f61452f9bc942db474651651 Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Tue, 17 Oct 2023 15:17:03 +0800
Subject: [PATCH] Merge branch 'demo' of http://s16s652780.51mypc.cn:49896/r/yskj/iot_drone_web into demo
---
src/components/g-map/DroneControlPanel.vue | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/components/g-map/DroneControlPanel.vue b/src/components/g-map/DroneControlPanel.vue
index 24731e6..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'])
--
Gitblit v1.9.3