From 1296d22c33386ea5b3cc48a653a1715dd9512591 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 24 Jan 2024 11:52:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/demo' into demo
---
src/pages/page-web/projects/wayline.vue | 49 ++++
package.json | 1
src/components/waylinetool/index.vue | 520 +++++++++++++++++++++++++++++++++++++++++++++------
3 files changed, 492 insertions(+), 78 deletions(-)
diff --git a/package.json b/package.json
index 95be0ea..7d10f5a 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
"eventemitter3": "^5.0.0",
"file-saver": "^2.0.5",
"jszip": "^3.10.1",
+ "lodash": "^4.17.21",
"mitt": "^3.0.0",
"moment": "^2.29.4",
"mqtt": "4.0.1",
diff --git a/src/components/waylinetool/index.vue b/src/components/waylinetool/index.vue
index f8eed9e..df3854d 100644
--- a/src/components/waylinetool/index.vue
+++ b/src/components/waylinetool/index.vue
@@ -1,11 +1,35 @@
<template>
<ul class="btn-list" v-if="waylineAbout.isShow">
+ <!-- 参数按钮 -->
<li class="s-btn" v-for="(item, index) in btnList" :key="index">
<div class="title">{{ item.title }}</div>
- <div class="btn" @click="item.event(item)" :style="{ backgroundColor: item.selected ? '#2D8CF0' : '#323131' }">
- <img :src="item.icon" alt="icon">
- </div>
+ <a-popover placement="leftTop" trigger="click" arrow-point-at-center class="param-popover">
+ <template #title>
+ <span>{{ item.title }}</span>
+ </template>
+ <template #content>
+ <div class="popover-content">
+ <div v-for="sParam in item.param" :key="sParam.key" class="content-box">
+ <div>{{ sParam.title }}</div>
+ <a-input v-model:value="sParam.value" placeholder="请输入参数" v-if="!sParam.isRadio" />
+ <a-radio-group :options="sParam.options" v-model:value="sParam.value" v-else />
+ <div class="annotation" v-if="sParam.annotation">
+ 注：{{ sParam.annotation }}
+ </div>
+ </div>
+ <div class="btn-tool">
+ <a-button @click="resetParamSetting(item)">重置</a-button>
+ <a-button type="primary" @click="item.event(item)">确定</a-button>
+ </div>
+ </div>
+ </template>
+ <div class="btn" @click="() => saveInitPopoverParam(item.param)"
+ :style="{ backgroundColor: item.selected ? '#2D8CF0' : '#323131' }">
+ <img :src="item.icon" alt="icon">
+ </div>
+ </a-popover>
</li>
+ <!-- 确认和取消按钮 -->
<li class="s-btn">
<div class="title">取消编辑</div>
<div class="btn cancel-edit" @click="cencalEdit">
@@ -27,11 +51,11 @@
import JSZIP from 'jszip'
import { saveAs } from 'file-saver'
import { message } from 'ant-design-vue'
+import { cloneDeep } from 'lodash'
import {
CloseOutlined,
CheckOutlined
} from '@ant-design/icons-vue'
-import { Item } from 'ant-design-vue/lib/menu'
// 初始化jszip
const JsZip = new JSZIP()
@@ -41,11 +65,25 @@
return new URL(`/src/assets/icons/${name}`, import.meta.url).href
}
-// 点位按钮list
+interface popoverParamType {
+ title: string,
+ key: string,
+ isRadio?: boolean,
+ annotation?: string,
+ options?: {
+ label: string,
+ value: string
+ }[],
+ value: string
+}
+
+// 点击按钮list
interface sBtn {
key: string,
icon: string,
title: string,
+ distinguish?: string,
+ param: popoverParamType[],
event: Function,
selected?: boolean
}
@@ -57,92 +95,229 @@
const curKmzName = ref<string>('')
// 当前kmzpath
const curKmzPath = ref<string>('')
+// popover初始参数
+const initPopoverParam = ref<popoverParamType[]>([])
const btnList = ref<sBtn[]>([
+ // 开始录像
{
key: 'startRecord',
icon: getResource('waylinetool/camera-on.png'),
title: '开始录像',
+ param: [
+ {
+ title: '负载挂载位置',
+ key: 'payloadPositionIndex',
+ isRadio: true,
+ options: [
+ { label: '飞行器1号挂载位置', value: '0' },
+ { label: '飞行器2号挂载位置', value: '1' },
+ { label: '飞行器3号挂载位置', value: '2' },
+ ],
+ annotation: '飞行器1号挂载位置。M300 RTK，M350 RTK机型，对应机身左前方。其它机型，对应主云台。飞行器2号挂载位置。M300 RTK，M350 RTK机型，对应机身右前方。飞行器3号挂载位置。M300 RTK，M350 RTK机型，对应机身上方。',
+ value: ''
+ },
+ {
+ title: '拍摄照片文件后缀',
+ key: 'fileSuffix',
+ annotation: '为生成媒体文件命名时将额外附带该后缀',
+ value: ''
+ },
+ {
+ title: '拍摄照片存储类型',
+ key: 'payloadLensIndex',
+ isRadio: true,
+ options: [
+ { label: '存储变焦镜头拍摄照片', value: 'zoom' },
+ { label: '存储广角镜头拍摄照片', value: 'wide' },
+ { label: '存储红外镜头拍摄照片', value: 'ir' },
+ { label: '存储窄带镜头拍摄照片', value: 'narrow_band' },
+ { label: '全部使用', value: 'zoom, wide, ir, narrow_band' }
+ ],
+ value: ''
+ },
+ {
+ title: '是否使用全局存储类型',
+ key: 'useGlobalPayloadLensIndex',
+ isRadio: true,
+ options: [
+ { label: '不使用全局设置', value: '0' },
+ { label: '使用全局设置', value: '1' }
+ ],
+ value: ''
+ }
+ ],
event: (obj: sBtn) => {
- obj.selected = !obj.selected
- editKmlFile('startRecord', {
- payloadPositionIndex: 0,
- fileSuffix: `_${new Date().toLocaleString()}`,
- payloadLensIndex: 'zoom',
- useGlobalPayloadLensIndex: 0
- })
+ paramPopover('startRecord', obj)
}
},
+ // 停止录像
{
key: 'stopRecord',
icon: getResource('waylinetool/camera-off.png'),
title: '停止录像',
+ param: [
+ {
+ title: '负载挂载位置',
+ key: 'payloadPositionIndex',
+ isRadio: true,
+ options: [
+ { label: '飞行器1号挂载位置', value: '0' },
+ { label: '飞行器2号挂载位置', value: '1' },
+ { label: '飞行器3号挂载位置', value: '2' },
+ ],
+ annotation: '飞行器1号挂载位置。M300 RTK，M350 RTK机型，对应机身左前方。其它机型，对应主云台。飞行器2号挂载位置。M300 RTK，M350 RTK机型，对应机身右前方。飞行器3号挂载位置。M300 RTK，M350 RTK机型，对应机身上方。',
+ value: ''
+ },
+ {
+ title: '拍摄照片存储类型',
+ key: 'payloadLensIndex',
+ isRadio: true,
+ options: [
+ { label: '存储变焦镜头拍摄照片', value: 'zoom' },
+ { label: '存储广角镜头拍摄照片', value: 'wide' },
+ { label: '存储红外镜头拍摄照片', value: 'ir' },
+ { label: '存储窄带镜头拍摄照片', value: 'narrow_band' },
+ { label: '全部使用', value: 'zoom, wide, ir, narrow_band' }
+ ],
+ value: ''
+ }
+ ],
event: (obj: sBtn) => {
- obj.selected = !obj.selected
- editKmlFile('stopRecord', {
- payloadPositionIndex: 0,
- payloadLensIndex: 'zoom'
- })
+ paramPopover('stopRecord', obj)
}
},
+ // 开始等时间隔拍照
{
key: 'time',
icon: getResource('waylinetool/shoot1.png'),
title: '开始等时间隔拍照',
+ param: [],
event: (obj: sBtn) => {
- obj.selected = !obj.selected
+ obj.selected = true
editKmlFile('time')
}
},
+ // 开始等距间隔拍照
{
key: 'distance',
icon: getResource('waylinetool/shoot2.png'),
title: '开始等距间隔拍照',
+ param: [],
event: (obj: sBtn) => {
- obj.selected = !obj.selected
+ obj.selected = true
editKmlFile('distance')
}
},
+ // 结束间隔拍照
{
key: 'deleteShootType',
icon: getResource('waylinetool/shoot3.png'),
title: '结束间隔拍照',
+ param: [],
event: (obj: sBtn) => {
- obj.selected = !obj.selected
+ obj.selected = true
editKmlFile('deleteShootType')
}
},
+ // 悬停
{
key: 'hover',
icon: getResource('waylinetool/xt.png'),
title: '悬停',
+ param: [
+ {
+ title: '飞行器悬停等待时间',
+ key: 'hoverTime',
+ annotation: '参数需大于0， 单位为秒',
+ value: ''
+ }
+ ],
event: (obj: sBtn) => {
- obj.selected = !obj.selected
- editKmlFile('hover', {
- hoverTime: 10
- })
+ paramPopover('hover', obj)
}
},
+ // 飞行器偏航角
{
key: 'rotateYaw',
icon: getResource('waylinetool/droneyaw.png'),
title: '飞行器偏航角',
+ param: [
+ {
+ title: '飞行器目标偏航角（相对于地理北）',
+ key: 'aircraftHeading',
+ annotation: '范围为-180°到180°，飞行器旋转至该目标偏航角。0°为正北方向，90°为正东方向，-90°为正西方向，-180°/180°为正南方向。',
+ value: ''
+ },
+ {
+ title: '飞行器偏航角转动模式',
+ key: 'aircraftPathMode',
+ isRadio: true,
+ options: [
+ { label: '顺时针旋转', value: 'clockwise' },
+ { label: '逆时针旋转', value: 'counterClockwise' }
+ ],
+ value: ''
+ }
+ ],
event: (obj: sBtn) => {
- obj.selected = !obj.selected
- editKmlFile('rotateYaw', {
- aircraftHeading: 0,
- aircraftPathMode: 'clockwise'
- })
+ paramPopover('rotateYaw', obj)
}
},
+ // 云台偏航角
{
key: 'gimbalRotate',
+ distinguish: 'yaw',
icon: getResource('waylinetool/holderyaw.png'),
title: '云台偏航角',
+ param: [
+ {
+ title: '负载挂载位置',
+ key: 'payloadPositionIndex',
+ isRadio: true,
+ options: [
+ { label: '飞行器1号挂载位置', value: '0' },
+ { label: '飞行器2号挂载位置', value: '1' },
+ { label: '飞行器3号挂载位置', value: '2' },
+ ],
+ annotation: '飞行器1号挂载位置。M300 RTK，M350 RTK机型，对应机身左前方。其它机型，对应主云台。飞行器2号挂载位置。M300 RTK，M350 RTK机型，对应机身右前方。飞行器3号挂载位置。M300 RTK，M350 RTK机型，对应机身上方。',
+ value: ''
+ },
+ {
+ title: '云台转动模式',
+ key: 'gimbalRotateMode',
+ isRadio: true,
+ options: [
+ { label: '绝对角度，相对于正北方的角度', value: 'relativeAngle' },
+ { label: '相对角度，相对于飞行器机头的角度', value: 'absoluteAngle' }
+ ],
+ value: ''
+ },
+ {
+ title: '是否使能云台Yaw转动',
+ key: 'gimbalYawRotateEnable',
+ isRadio: true,
+ options: [
+ { label: '不使能', value: '0' },
+ { label: '使能', value: '1' }
+ ],
+ value: ''
+ },
+ {
+ title: '云台Yaw转动角度',
+ key: 'gimbalYawRotateAngle',
+ annotation: '不同云台可转动范围不同',
+ value: ''
+ },
+ {
+ title: '云台完成转动用时',
+ key: 'gimbalRotateTime',
+ annotation: '单位为秒',
+ value: ''
+ }
+ ],
event: (obj: sBtn) => {
- obj.selected = !obj.selected
- editKmlFile('gimbalRotate', {
- payloadPositionIndex: 0,
+ paramPopover('gimbalRotate', obj, {
gimbalHeadingYawBase: 'north',
gimbalRotateMode: 'relativeAngle',
// 上下摆动 pitch xyz中心点为基准
@@ -152,70 +327,180 @@
gimbalRollRotateEnable: 0,
gimbalRollRotateAngle: 0,
// 左右摆动 yaw xyz中心点为基准
- gimbalYawRotateEnable: 1,
- gimbalYawRotateAngle: 30.1,
gimbalRotateTimeEnable: 0,
- gimbalRotateTime: 3
})
}
},
+ // 云台俯仰角
{
key: 'gimbalRotate',
+ distinguish: 'pitch',
icon: getResource('waylinetool/holdertilt.png'),
title: '云台俯仰角',
+ param: [
+ {
+ title: '负载挂载位置',
+ key: 'payloadPositionIndex',
+ isRadio: true,
+ options: [
+ { label: '飞行器1号挂载位置', value: '0' },
+ { label: '飞行器2号挂载位置', value: '1' },
+ { label: '飞行器3号挂载位置', value: '2' },
+ ],
+ annotation: '飞行器1号挂载位置。M300 RTK，M350 RTK机型，对应机身左前方。其它机型，对应主云台。飞行器2号挂载位置。M300 RTK，M350 RTK机型，对应机身右前方。飞行器3号挂载位置。M300 RTK，M350 RTK机型，对应机身上方。',
+ value: ''
+ },
+ {
+ title: '云台转动模式',
+ key: 'gimbalRotateMode',
+ isRadio: true,
+ options: [
+ { label: '绝对角度，相对于正北方的角度', value: 'relativeAngle' },
+ { label: '相对角度，相对于飞行器机头的角度', value: 'absoluteAngle' }
+ ],
+ value: ''
+ },
+ {
+ title: '是否使能云台Pitch转动',
+ key: 'gimbalPitchRotateEnable',
+ isRadio: true,
+ options: [
+ { label: '不使能', value: '0' },
+ { label: '使能', value: '1' }
+ ],
+ value: ''
+ },
+ {
+ title: '云台Pitch转动角度',
+ key: 'gimbalPitchRotateAngle',
+ annotation: '不同云台可转动范围不同',
+ value: ''
+ },
+ {
+ title: '云台完成转动用时',
+ key: 'gimbalRotateTime',
+ value: ''
+ }
+ ],
event: (obj: sBtn) => {
- obj.selected = !obj.selected
- editKmlFile('gimbalRotate', {
- payloadPositionIndex: 0,
+ paramPopover('gimbalRotate', obj, {
gimbalHeadingYawBase: 'north',
gimbalRotateMode: 'relativeAngle',
- gimbalPitchRotateEnable: 1,
- gimbalPitchRotateAngle: 31.1,
gimbalRollRotateEnable: 0,
gimbalRollRotateAngle: 0,
gimbalYawRotateEnable: 0,
gimbalYawRotateAngle: 0,
gimbalRotateTimeEnable: 0,
- gimbalRotateTime: 3
})
}
},
+ // 拍照
{
key: 'takePhoto',
icon: getResource('waylinetool/camera.png'),
title: '拍照',
+ param: [
+ {
+ title: '负载挂载位置',
+ key: 'payloadPositionIndex',
+ isRadio: true,
+ options: [
+ { label: '飞行器1号挂载位置', value: '0' },
+ { label: '飞行器2号挂载位置', value: '1' },
+ { label: '飞行器3号挂载位置', value: '2' },
+ ],
+ annotation: '飞行器1号挂载位置。M300 RTK，M350 RTK机型，对应机身左前方。其它机型，对应主云台。飞行器2号挂载位置。M300 RTK，M350 RTK机型，对应机身右前方。飞行器3号挂载位置。M300 RTK，M350 RTK机型，对应机身上方。',
+ value: ''
+ },
+ {
+ title: '拍摄照片文件后缀',
+ key: 'fileSuffix',
+ annotation: '为生成媒体文件命名时将额外附带该后缀。',
+ value: ''
+ },
+ {
+ title: '拍摄照片存储类型',
+ key: 'payloadLensIndex',
+ isRadio: true,
+ options: [
+ { label: '存储变焦镜头拍摄照片', value: 'zoom' },
+ { label: '存储广角镜头拍摄照片', value: 'wide' },
+ { label: '存储红外镜头拍摄照片', value: 'ir' },
+ { label: '存储窄带镜头拍摄照片', value: 'narrow_band' },
+ { label: '全部使用', value: 'zoom, wide, ir, narrow_band' }
+ ],
+ value: ''
+ },
+ {
+ title: '是否使用全局存储类型',
+ key: 'useGlobalPayloadLensIndex',
+ isRadio: true,
+ options: [
+ { label: '不使用全局设置', value: '0' },
+ { label: '使用全局设置', value: '1' }
+ ],
+ value: ''
+ }
+ ],
event: (obj: sBtn) => {
- obj.selected = !obj.selected
- editKmlFile('takePhoto', {
- payloadPositionIndex: 0,
- fileSuffix: `_${new Date().toLocaleString()}`,
- payloadLensIndex: 'zoom',
- useGlobalPayloadLensIndex: 0
- })
+ paramPopover('takePhoto', obj)
}
},
+ // 相机变焦
{
key: 'zoom',
icon: getResource('waylinetool/fd.png'),
title: '相机变焦',
+ param: [
+ {
+ title: '负载挂载位置',
+ key: 'payloadPositionIndex',
+ isRadio: true,
+ options: [
+ { label: '飞行器1号挂载位置', value: '0' },
+ { label: '飞行器2号挂载位置', value: '1' },
+ { label: '飞行器3号挂载位置', value: '2' },
+ ],
+ annotation: '飞行器1号挂载位置。M300 RTK，M350 RTK机型，对应机身左前方。其它机型，对应主云台。飞行器2号挂载位置。M300 RTK，M350 RTK机型，对应机身右前方。飞行器3号挂载位置。M300 RTK，M350 RTK机型，对应机身上方。',
+ value: ''
+ },
+ {
+ title: '变焦焦距',
+ key: 'focalLength',
+ annotation: '单位mm，值>0',
+ value: ''
+ }
+ ],
event: (obj: sBtn) => {
- obj.selected = !obj.selected
- editKmlFile('zoom', {
- payloadPositionIndex: 0,
- focalLength: 2
- })
+ paramPopover('zoom', obj)
}
},
+ // 创建文件夹
{
key: 'customDirName',
icon: getResource('waylinetool/create-file.png'),
title: '创建文件夹',
+ param: [
+ {
+ title: '负载挂载位置',
+ key: 'payloadPositionIndex',
+ isRadio: true,
+ options: [
+ { label: '飞行器1号挂载位置', value: '0' },
+ { label: '飞行器2号挂载位置', value: '1' },
+ { label: '飞行器3号挂载位置', value: '2' },
+ ],
+ annotation: '飞行器1号挂载位置。M300 RTK，M350 RTK机型，对应机身左前方。其它机型，对应主云台。飞行器2号挂载位置。M300 RTK，M350 RTK机型，对应机身右前方。飞行器3号挂载位置。M300 RTK，M350 RTK机型，对应机身上方。',
+ value: ''
+ },
+ {
+ title: '新文件夹的名称',
+ key: 'directoryName',
+ value: ''
+ }
+ ],
event: (obj: sBtn) => {
- obj.selected = !obj.selected
- editKmlFile('customDirName', {
- payloadPositionIndex: 0,
- directoryName: '新建文件夹'
- })
+ paramPopover('customDirName', obj)
}
}
])
@@ -230,15 +515,8 @@
* @return {*} void
*/
const readKmzFile = (kmzPath: string) => {
- // return axios.get(kmzPath, { responseType: 'arraybuffer' })
- return axios({
- method: 'GET',
- url: kmzPath,
- headers: {
- 'X-Auth-Token': window.localStorage.getItem('x-auth-token')
- },
- responseType: 'arraybuffer'
- })
+ const [, address] = kmzPath.split('cloud-bucket')
+ return axios.get(import.meta.env.VITE_MEDIAPANEL_API_URL + address, { responseType: 'arraybuffer' })
.then(fileRes => fileRes.data)
.then(kmzData => JsZip.loadAsync(kmzData)) // 解压kmz文件
.then(kmzZip => kmzZip)
@@ -273,14 +551,20 @@
const funcRegx = /<wpml:actionActuatorFunc>([\s\S]*?)<\/wpml:actionActuatorFunc>/g
const funcs = (points[currentPosition.value] || '').match(funcRegx)
const funcNameRegx = /<wpml:actionActuatorFunc>(.*?)<\/wpml:actionActuatorFunc>/
-
const shootTypeRegx = /<wpml:shootType>([\s\S]*?)<\/wpml:shootType>/g
const shootType = (points[currentPosition.value] || '').match(shootTypeRegx)
const shootTypeValueRegx = /<wpml:shootType>(.*?)<\/wpml:shootType>/
+
+ // 云台正则
+ const actionRegx = /<wpml:action>([\s\S]*?)<\/wpml:action>/g
+ const actions = (points[currentPosition.value] || '').match(actionRegx)
+ const gimbalPitchRotateAngleRegx = /<wpml:gimbalPitchRotateAngle>(.*?)<\/wpml:gimbalPitchRotateAngle>/
+ const gimbalYawRotateAngleRegx = /<wpml:gimbalYawRotateAngle>(.*?)<\/wpml:gimbalYawRotateAngle>/
+
btnList.value.forEach(sBtn => {
funcs?.forEach((func: string) => {
const funcName = func.match(funcNameRegx) || []
- if (funcName[1] === sBtn.key) {
+ if (funcName[1] === sBtn.key && !sBtn.distinguish) {
sBtn.selected = true
}
})
@@ -290,6 +574,39 @@
sBtn.selected = true
}
})
+ if (sBtn.distinguish) {
+ const action = actions?.find((action: string) => action.includes('<wpml:actionActuatorFunc>gimbalRotate</wpml:actionActuatorFunc>'))
+ const pitchAngle = action?.match(gimbalPitchRotateAngleRegx) || []
+ const yawAngle = action?.match(gimbalYawRotateAngleRegx) || []
+ if (!!Number(pitchAngle[1]) && sBtn.distinguish === 'pitch') {
+ sBtn.selected = true
+ }
+ if (!!Number(yawAngle[1]) && sBtn.distinguish === 'yaw') {
+ sBtn.selected = true
+ }
+ }
+ })
+ settingDefaultValue(content)
+ })
+}
+
+// popover设置默认值
+const settingDefaultValue = (content: string) => {
+ const regx = /<Placemark>([\s\S]*?)<\/Placemark>/g
+ const points = content.match(regx) || []
+ // 当前选中的点
+ const currentPoint = points[currentPosition.value]
+ const actionRegx = /<wpml:action>([\s\S]*?)<\/wpml:action>/g
+ const actionsKML = currentPoint.match(actionRegx)
+ btnList.value.forEach((sBtn: sBtn) => {
+ const kml = `<wpml:actionActuatorFunc>${sBtn.key}</wpml:actionActuatorFunc>`
+ const action = actionsKML?.find((action: string) => action.includes(kml))
+ sBtn.param.forEach((sParam) => {
+ const paramRegex = new RegExp(`<wpml:${sParam.key}>([\\s\\S]*?)<\\/wpml:${sParam.key}>`, 'g')
+ const actionParam = action?.match(paramRegex) || ['']
+ const infoRegx = new RegExp(`<wpml:${sParam.key}>([\\s\\S]*?)<\\/wpml:${sParam.key}>`)
+ const value: string[] = actionParam[0]?.match(infoRegx) || ['']
+ sParam.value = value[1] || ''
})
})
}
@@ -318,6 +635,38 @@
</wpml:action>
`
return template
+}
+
+/**
+ * @description: Popover参数编辑
+ * @param {*} btnobj: 事件按钮所有参数
+ * @param {*} eventType 事件类型
+ * @param {*} eventParam 事件参数Param
+ * @return {*}
+ */
+const paramPopover = (eventType: string, btnobj: sBtn, eventParam?: any) => {
+ // 判断参数是否为有存在空的
+ let isParamNull = false
+ btnobj.param.some((sParam: any) => {
+ isParamNull = sParam.value === ''
+ return isParamNull
+ })
+ if (isParamNull) return message.warning('确认失败，请检查填写的参数')
+ // 参数处理
+ const param = { ...eventParam }
+ btnobj.param.forEach((sParam: { key: string, value: string | number }) => {
+ param[sParam.key] = sParam.value
+ })
+ editKmlFile(eventType, param)
+ btnobj.selected = true
+}
+
+const saveInitPopoverParam = (param: popoverParamType[]) => {
+ initPopoverParam.value = cloneDeep(param)
+}
+
+const resetParamSetting = (btnParam: sBtn) => {
+ btnParam.param = cloneDeep(initPopoverParam.value)
}
/**
@@ -432,6 +781,9 @@
})
}
+onMounted(() => {
+ kmzFileZip.value = null
+})
</script>
<style lang="scss" scoped>
.btn-list {
@@ -491,4 +843,34 @@
}
}
}
+
+.popover-content {
+ .content-box {
+ margin-bottom: 10px;
+
+ .annotation {
+ font-size: 12px;
+ color: rgb(188, 187, 187);
+ max-width: 300px;
+ }
+ }
+
+ .btn-tool {
+ display: flex;
+ justify-content: center;
+ gap: 10px;
+
+ .ant-btn {
+ flex: 1;
+ }
+ }
+}
+
+:deep() {
+ .ant-radio-wrapper {
+ display: block;
+ max-width: 300px;
+ text-wrap: wrap;
+ }
+}
</style>
diff --git a/src/pages/page-web/projects/wayline.vue b/src/pages/page-web/projects/wayline.vue
index 49fd1f3..f6ce2e6 100644
--- a/src/pages/page-web/projects/wayline.vue
+++ b/src/pages/page-web/projects/wayline.vue
@@ -99,13 +99,10 @@
<ArrowLeftOutlined />
<span>返回上一页</span>
</div>
- <li
- v-for="(item, index) in tragetPointArr"
- :key="index"
- :class="{ selectedColor : index === selectedPoint }"
+ <li v-for="(item, index) in tragetPointArr" :key="index" :class="{ selectedColor: index === selectedPoint }"
@click="tragetPointClick(item.position, index)">
<div class="graph">
- <div class="left" :style="{borderTopColor: index === selectedPoint ? '#FF9900' : '#2D8CF0'}"></div>
+ <div class="left" :style="{ borderTopColor: index === selectedPoint ? '#FF9900' : '#2D8CF0' }"></div>
<div class="right">{{ index + 1 }}</div>
</div>
<div class="graph-right">
@@ -190,6 +187,7 @@
const eventList = reactive<{
key: string,
name: string,
+ distinguish?: string,
icon?: string
}[]>([
{
@@ -229,8 +227,15 @@
},
{
key: 'gimbalRotate',
- name: '旋转云台',
+ distinguish: 'Yaw',
+ name: '云台俯仰角',
icon: getResource('waylinetool/holderyaw.png'),
+ },
+ {
+ key: 'gimbalYawRotate',
+ name: '云台偏航角',
+ distinguish: 'pitch',
+ icon: getResource('waylinetool/holdertilt.png'),
},
{
key: 'rotateYaw',
@@ -350,6 +355,8 @@
* @param file
*/
function initKmlFile (file: string) {
+ const [, address] = file.split('cloud-bucket')
+ file = import.meta.env.VITE_MEDIAPANEL_API_URL + address
removeById('kmzLine')
const options = {
camera: global.$viewer.scene.camera,
@@ -562,6 +569,9 @@
const actionRegx = /<wpml:action>([\s\S]*?)<\/wpml:action>/g
// 获取shootType
const shootTypeRegx = /<wpml:shootType>([\s\S]*?)<\/wpml:shootType>/g
+ // 云台角度
+ const gimbalPitchRotateAngleRegx = /<wpml:gimbalPitchRotateAngle>(.*?)<\/wpml:gimbalPitchRotateAngle>/
+ const gimbalYawRotateAngleRegx = /<wpml:gimbalYawRotateAngle>(.*?)<\/wpml:gimbalYawRotateAngle>/
// 当前kmz文件航点
const kmlPoints = kml.match(regx)
kmlPoints?.forEach((point: string, index: number) => {
@@ -573,7 +583,18 @@
const actions = ponitAction[0].match(actionRegx)
actions?.forEach(action => {
eventList.forEach((item: any) => {
- action.includes(item.key) && eventArr.push(item)
+ if (!item.distinguish) {
+ action.includes(item.key) && eventArr.push(item)
+ } else {
+ const pitchAngle = action?.match(gimbalPitchRotateAngleRegx) || []
+ const yawAngle = action?.match(gimbalYawRotateAngleRegx) || []
+ if (!!Number(pitchAngle[1]) && item.distinguish === 'pitch') {
+ eventArr.push(item)
+ }
+ if (!!Number(yawAngle[1]) && item.distinguish === 'yaw') {
+ eventArr.push(item)
+ }
+ }
})
})
tragetPointArr.value[index].eventList = eventArr
@@ -635,26 +656,32 @@
padding: 0;
margin: 0;
list-style-type: none;
+
.back-btn {
cursor: pointer;
padding: 10px;
border-bottom: 1px solid #4f4f4f;
+
span {
margin-left: 10px;
}
+
&:hover {
color: #2d8cf0;
}
}
+
li {
cursor: pointer;
padding: 10px 0;
margin: 0 7px;
display: flex;
+
.graph {
width: 40px;
display: flex;
align-items: center;
+
.left {
width: 0;
height: 0;
@@ -662,27 +689,32 @@
border-right: 10px solid transparent;
border-left: 10px solid transparent;
}
+
.right {
margin-left: 3px;
}
}
+
.graph-right {
width: calc(100% - 40px);
height: 30px;
border-bottom: 1px solid #4f4f4f;
display: flex;
align-items: center;
+
.s-event-icon {
width: 25px;
height: 25px;
display: flex;
justify-content: center;
align-items: center;
+
img {
width: 70%;
}
}
}
+
&:hover {
background-color: #3C3C3C;
}
@@ -734,5 +766,4 @@
.selectedColor {
background-color: #3C3C3C;
-}
-</style>
+}</style>
--
Gitblit v1.9.3