From 951aacd10e070d3c9867dbb19404bc470f2e3aad Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 29 Nov 2023 10:20:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/demo' into demo

---
 src/components/GMap.vue |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/components/GMap.vue b/src/components/GMap.vue
index 082074c..18e835b 100644
--- a/src/components/GMap.vue
+++ b/src/components/GMap.vue
@@ -735,6 +735,7 @@
         :payloads="osdVisible.payloads">
       </DroneControlPanel>
     </div>
+    <waylineTool />
   </div>
 </template>
 
@@ -782,6 +783,7 @@
 import Cesium from './cesiumMap/cesium.vue'
 import { convertTimestampToDate } from '/@/utils/time'
 import { cesiumOperation } from '/@/hooks/use-cesium-tsa'
+import waylineTool from './waylinetool/index.vue'
 export default defineComponent({
   components: {
     BorderOutlined,
@@ -807,6 +809,7 @@
     CarryOutOutlined,
     RocketOutlined,
     DesktopOutlined,
+    waylineTool
   },
   name: 'GMap',
   props: {},

--
Gitblit v1.9.3