From 5f35a4891178ece4fc611ecb515610841abe0f43 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 21 Nov 2023 17:22:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/demo' into demo
---
src/components/g-map/DroneControlPanel.vue | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/components/g-map/DroneControlPanel.vue b/src/components/g-map/DroneControlPanel.vue
index 7747c6d..1e821d6 100644
--- a/src/components/g-map/DroneControlPanel.vue
+++ b/src/components/g-map/DroneControlPanel.vue
@@ -321,6 +321,7 @@
import { parseJsonFile } from '/@/utils/geo-utils'
import { cesiumOperation } from '/@/hooks/use-cesium-tsa'
import * as Cesium from 'cesium'
+import { start } from 'repl'
const props = defineProps<{
sn: string,
deviceInfo: DeviceInfoType,
@@ -526,8 +527,14 @@
flyByArea(sn, dockPoint, jsonPath, radius, deviceSn, payloadIndex).then(res => {
const targetPoint = res.data
console.log('targetPoint====', targetPoint)
+ // 机场位置
+ const startPoint = {
+ lon: props.deviceInfo.dock.basic_osd.longitude,
+ lat: props.deviceInfo.dock.basic_osd.latitude
+ }
+ targetPoint.unshift(startPoint)
// 获取到点之后在图上绘点
- targetPoint.forEach((point, index) => {
+ targetPoint.forEach((point: { lon: number; lat: number }, index: number) => {
console.log(point)
const setting = {
longitude: point.lon,
--
Gitblit v1.9.3