From 9ca17378677d6969e5401188a7ff321a7e3335c6 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 14 Nov 2023 17:39:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/demo' into demo
---
src/components/g-map/DroneControlPanel.vue | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/components/g-map/DroneControlPanel.vue b/src/components/g-map/DroneControlPanel.vue
index 549ed53..ec3722b 100644
--- a/src/components/g-map/DroneControlPanel.vue
+++ b/src/components/g-map/DroneControlPanel.vue
@@ -496,6 +496,7 @@
lon: props.deviceInfo.dock.basic_osd.longitude,
lat: props.deviceInfo.dock.basic_osd.latitude
})
+ const deviceSn = props.deviceInfo.dock.basic_osd.sub_device?.device_sn
const jsonData = await parseJsonFile('../src/assets/jsonData/图斑_FeaturesToJSON(1).json')
const sn = props.sn
const features = jsonData.features
@@ -514,7 +515,7 @@
list.push(areaList)
})
- flyByArea(sn, dockPoint, list, radius).then(res => {
+ flyByArea(sn, dockPoint, list, radius, deviceSn).then(res => {
console.log(res, '----------------')
})
}
--
Gitblit v1.9.3