From b4d89fbfa4115235381afaafd71702c76bd1307b Mon Sep 17 00:00:00 2001
From: GuLiMmo <2820890765@qq.com>
Date: Wed, 29 Nov 2023 17:32:21 +0800
Subject: [PATCH] 航线编辑修改
---
src/assets/icons/waylinetool/holdertilt.png | 0
src/assets/icons/waylinetool/droneyaw.png | 0
src/assets/icons/waylinetool/holderyaw.png | 0
src/pages/page-web/projects/wayline.vue | 26 ++++++++++----------------
src/assets/icons/waylinetool/shoot3.png | 0
src/assets/icons/waylinetool/shoot1.png | 0
src/assets/icons/waylinetool/shoot2.png | 0
src/store/index.ts | 4 +++-
8 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/src/assets/icons/waylinetool/droneyaw.png b/src/assets/icons/waylinetool/droneyaw.png
new file mode 100644
index 0000000..c7f476b
--- /dev/null
+++ b/src/assets/icons/waylinetool/droneyaw.png
Binary files differ
diff --git a/src/assets/icons/waylinetool/holdertilt.png b/src/assets/icons/waylinetool/holdertilt.png
new file mode 100644
index 0000000..ae96500
--- /dev/null
+++ b/src/assets/icons/waylinetool/holdertilt.png
Binary files differ
diff --git a/src/assets/icons/waylinetool/holderyaw.png b/src/assets/icons/waylinetool/holderyaw.png
new file mode 100644
index 0000000..bffa8fa
--- /dev/null
+++ b/src/assets/icons/waylinetool/holderyaw.png
Binary files differ
diff --git a/src/assets/icons/waylinetool/shoot1.png b/src/assets/icons/waylinetool/shoot1.png
new file mode 100644
index 0000000..6d8f611
--- /dev/null
+++ b/src/assets/icons/waylinetool/shoot1.png
Binary files differ
diff --git a/src/assets/icons/waylinetool/shoot2.png b/src/assets/icons/waylinetool/shoot2.png
new file mode 100644
index 0000000..65fe3d8
--- /dev/null
+++ b/src/assets/icons/waylinetool/shoot2.png
Binary files differ
diff --git a/src/assets/icons/waylinetool/shoot3.png b/src/assets/icons/waylinetool/shoot3.png
new file mode 100644
index 0000000..f3ba161
--- /dev/null
+++ b/src/assets/icons/waylinetool/shoot3.png
Binary files differ
diff --git a/src/pages/page-web/projects/wayline.vue b/src/pages/page-web/projects/wayline.vue
index 8dad990..fd9060f 100644
--- a/src/pages/page-web/projects/wayline.vue
+++ b/src/pages/page-web/projects/wayline.vue
@@ -136,6 +136,7 @@
import { getRoot } from '/@/root'
import * as Cesium from 'cesium'
import { cesiumOperation } from '/@/hooks/use-cesium-tsa'
+import { gcj02towgs84, wgs84togcj02 } from '/@/vendors/coordtransform'
import axios from 'axios'
import JSZIP from 'jszip'
// 初始化jszip
@@ -203,10 +204,6 @@
icon: getResource('waylinetool/camera-off.png'),
},
{
- key: 'focus',
- name: '对焦'
- },
- {
key: 'zoom',
name: '变焦',
icon: getResource('waylinetool/fd.png'),
@@ -222,20 +219,13 @@
},
{
key: 'rotateYaw',
- name: '飞行器偏航'
+ name: '飞行器偏航',
+ icon: getResource('waylinetool/droneyaw.png'),
},
{
key: 'hover',
name: '悬停等待',
icon: getResource('waylinetool/xt.png'),
- },
- {
- key: 'gimbalEvenlyRotate',
- name: '航段间均匀转动云台pitch角'
- },
- {
- key: 'orientedShoot',
- name: '精准复拍动作'
}
])
@@ -263,7 +253,8 @@
removeById('clickBox')
store.commit('SET_WAYLINE_INFO', {
isShow: false,
- wayline: {}
+ wayline: {},
+ position: null,
})
})
@@ -332,7 +323,8 @@
// 清除选中点柱形和隐藏按钮
store.commit('SET_WAYLINE_INFO', {
isShow: false,
- wayline: {}
+ wayline: {},
+ position: null
})
removeById('clickBox')
isPointListOpen.value = !isPointListOpen.value
@@ -407,7 +399,8 @@
selectedPoint.value = index
store.commit('SET_WAYLINE_INFO', {
isShow: true,
- wayline: currentWayLine
+ wayline: currentWayLine,
+ position: position
})
if (getEntityById('clickBox')) {
removeById('clickBox')
@@ -430,6 +423,7 @@
heightReference: true
}
}
+
const boxEntity = global.$viewer.entities.add(entity)
global.$viewer.flyTo(boxEntity, {
duration: 3,
diff --git a/src/store/index.ts b/src/store/index.ts
index 0eb84ff..b669865 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -100,6 +100,7 @@
waylineTool: {
isShow: false as boolean,
wayline: {} as any,
+ position: null as any,
kmzPath: '' as string
}
})
@@ -210,9 +211,10 @@
state.clientId = clientId
},
// 设置wayline中的信息
- SET_WAYLINE_INFO (state, { isShow, wayline }) {
+ SET_WAYLINE_INFO (state, { isShow, wayline, position }) {
state.waylineTool.isShow = isShow
state.waylineTool.wayline = wayline
+ state.waylineTool.position = position
},
SET_WAYLINE_KMZPATH (state, kmzPath) {
state.waylineTool.kmzPath = kmzPath
--
Gitblit v1.9.3