From 7d208ee6892bb60422f1204fa6edb139dc104209 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 04 Dec 2023 09:53:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/demo' into demo
---
src/assets/icons/waylinetool/holdertilt.png | 0
src/assets/icons/waylinetool/droneyaw.png | 0
src/assets/icons/waylinetool/holderyaw.png | 0
env/.env.dev | 10
src/pages/page-web/projects/wayline.vue | 57 ++++--
src/components/MediaPanel.vue | 2
env/.env.production | 4
src/assets/icons/waylinetool/shoot3.png | 0
src/components/waylinetool/index.vue | 418 +++++++++++++++++++++++++++++++++++++++++++---
src/assets/icons/waylinetool/shoot1.png | 0
src/assets/icons/waylinetool/shoot2.png | 0
src/store/index.ts | 4
12 files changed, 438 insertions(+), 57 deletions(-)
diff --git a/env/.env.dev b/env/.env.dev
index 86fcb0e..68dada4 100644
--- a/env/.env.dev
+++ b/env/.env.dev
@@ -1,9 +1,5 @@
-# VITE_API_URL = 'http://192.168.1.133:6789'
-# VITE_WS_API_URL = 'ws://192.168.1.133:6789/api/v1/ws'
-# VITE_APP_ENVIRONMENT=DEV
-# VITE_BASE_API = '/drone-api'
-
-VITE_API_URL = 'http://171.34.76.171:8880/drone'
-VITE_WS_API_URL = 'ws://171.34.76.171:8882/ws'
+VITE_API_URL = 'http://192.168.1.133:6789'
+VITE_MEDIAPANEL_API_URL = 'https://dev.jxpskj.com:8026/cloud-bucket',
+VITE_WS_API_URL = 'ws://192.168.1.133:6789/api/v1/ws'
VITE_APP_ENVIRONMENT=DEV
VITE_BASE_API = '/drone-api'
\ No newline at end of file
diff --git a/env/.env.production b/env/.env.production
index ea9232a..57d71b4 100644
--- a/env/.env.production
+++ b/env/.env.production
@@ -1,6 +1,6 @@
VITE_APP_ENVIRONMENT=PROD
VITE_APP_APIGATEWAY_BACKEND_HOST=''
VITE_API_URL = 'https://dev.jxpskj.com:36789'
+VITE_MEDIAPANEL_API_URL = 'https://dev.jxpskj.com:8026/cloud-bucket',
VITE_WS_API_URL = 'wss://dev.jxpskj.com:36789/api/v1/ws'
-VITE_BASE_API = '/drone-api'
-
+VITE_BASE_API = '/drone-api'
\ No newline at end of file
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/components/MediaPanel.vue b/src/components/MediaPanel.vue
index e00294d..55dca59 100644
--- a/src/components/MediaPanel.vue
+++ b/src/components/MediaPanel.vue
@@ -126,7 +126,7 @@
const videoPlayerId = ref('videoPlayerId')
// 文件前缀
// const prefix = 'https://dev.jxpskj.com:8026/cloud-bucket'
-const prefix = mediaPanelPrefix || 'https://dev.jxpskj.com:8026/cloud-bucket'
+const prefix = mediaPanelPrefix || import.meta.env.VITE_MEDIAPANEL_API_URL
// 搜索栏配置项
const searchPanelOptions = reactive({
size: 'large',
diff --git a/src/components/waylinetool/index.vue b/src/components/waylinetool/index.vue
index a70281b..f8eed9e 100644
--- a/src/components/waylinetool/index.vue
+++ b/src/components/waylinetool/index.vue
@@ -1,16 +1,39 @@
<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">
- <img :src="item.icon" alt="icon">
- </div>
- </li>
- </ul>
+ <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>
+ </li>
+ <li class="s-btn">
+ <div class="title">取消编辑</div>
+ <div class="btn cancel-edit" @click="cencalEdit">
+ <CloseOutlined />
+ </div>
+ </li>
+ <li class="s-btn">
+ <div class="title">确认编辑</div>
+ <div class="btn confirm-edit" @click="confirmEdit">
+ <CheckOutlined />
+ </div>
+ </li>
+ </ul>
</template>
<script lang="ts" setup>
import { ref, computed } from 'vue'
import { useMyStore } from '/@/store'
+import axios from 'axios'
+import JSZIP from 'jszip'
+import { saveAs } from 'file-saver'
+import { message } from 'ant-design-vue'
+import {
+ CloseOutlined,
+ CheckOutlined
+} from '@ant-design/icons-vue'
+import { Item } from 'ant-design-vue/lib/menu'
+// 初始化jszip
+const JsZip = new JSZIP()
const store = useMyStore()
@@ -20,78 +43,394 @@
// 点位按钮list
interface sBtn {
+ key: string,
icon: string,
title: string,
- event: Function
+ event: Function,
+ selected?: boolean
}
+
+// 保存当前选择的kmz文件
+const kmzFileZip = ref()
+// 当前选中的位置
+const currentPosition = ref()
+const curKmzName = ref<string>('')
+// 当前kmzpath
+const curKmzPath = ref<string>('')
const btnList = ref<sBtn[]>([
{
+ key: 'startRecord',
icon: getResource('waylinetool/camera-on.png'),
title: '开始录像',
- event: () => {}
+ event: (obj: sBtn) => {
+ obj.selected = !obj.selected
+ editKmlFile('startRecord', {
+ payloadPositionIndex: 0,
+ fileSuffix: `_${new Date().toLocaleString()}`,
+ payloadLensIndex: 'zoom',
+ useGlobalPayloadLensIndex: 0
+ })
+ }
},
{
+ key: 'stopRecord',
icon: getResource('waylinetool/camera-off.png'),
title: '停止录像',
- event: () => {}
+ event: (obj: sBtn) => {
+ obj.selected = !obj.selected
+ editKmlFile('stopRecord', {
+ payloadPositionIndex: 0,
+ payloadLensIndex: 'zoom'
+ })
+ }
},
{
- icon: '',
+ key: 'time',
+ icon: getResource('waylinetool/shoot1.png'),
title: '开始等时间隔拍照',
- event: () => {}
+ event: (obj: sBtn) => {
+ obj.selected = !obj.selected
+ editKmlFile('time')
+ }
},
{
- icon: '',
+ key: 'distance',
+ icon: getResource('waylinetool/shoot2.png'),
title: '开始等距间隔拍照',
- event: () => {}
+ event: (obj: sBtn) => {
+ obj.selected = !obj.selected
+ editKmlFile('distance')
+ }
},
{
- icon: '',
+ key: 'deleteShootType',
+ icon: getResource('waylinetool/shoot3.png'),
title: '结束间隔拍照',
- event: () => {}
+ event: (obj: sBtn) => {
+ obj.selected = !obj.selected
+ editKmlFile('deleteShootType')
+ }
},
{
+ key: 'hover',
icon: getResource('waylinetool/xt.png'),
title: '悬停',
- event: () => {}
+ event: (obj: sBtn) => {
+ obj.selected = !obj.selected
+ editKmlFile('hover', {
+ hoverTime: 10
+ })
+ }
},
{
- icon: '',
+ key: 'rotateYaw',
+ icon: getResource('waylinetool/droneyaw.png'),
title: '飞行器偏航角',
- event: () => {}
+ event: (obj: sBtn) => {
+ obj.selected = !obj.selected
+ editKmlFile('rotateYaw', {
+ aircraftHeading: 0,
+ aircraftPathMode: 'clockwise'
+ })
+ }
},
{
- icon: '',
+ key: 'gimbalRotate',
+ icon: getResource('waylinetool/holderyaw.png'),
title: '云台偏航角',
- event: () => {}
+ event: (obj: sBtn) => {
+ obj.selected = !obj.selected
+ editKmlFile('gimbalRotate', {
+ payloadPositionIndex: 0,
+ gimbalHeadingYawBase: 'north',
+ gimbalRotateMode: 'relativeAngle',
+ // 上下摆动 pitch xyz中心点为基准
+ gimbalPitchRotateEnable: 0,
+ gimbalPitchRotateAngle: 0,
+ // 摆动 roll 已x位基准
+ gimbalRollRotateEnable: 0,
+ gimbalRollRotateAngle: 0,
+ // 左右摆动 yaw xyz中心点为基准
+ gimbalYawRotateEnable: 1,
+ gimbalYawRotateAngle: 30.1,
+ gimbalRotateTimeEnable: 0,
+ gimbalRotateTime: 3
+ })
+ }
},
{
- icon: '',
+ key: 'gimbalRotate',
+ icon: getResource('waylinetool/holdertilt.png'),
title: '云台俯仰角',
- event: () => {}
+ event: (obj: sBtn) => {
+ obj.selected = !obj.selected
+ editKmlFile('gimbalRotate', {
+ payloadPositionIndex: 0,
+ 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: '拍照',
- event: () => {}
+ event: (obj: sBtn) => {
+ obj.selected = !obj.selected
+ editKmlFile('takePhoto', {
+ payloadPositionIndex: 0,
+ fileSuffix: `_${new Date().toLocaleString()}`,
+ payloadLensIndex: 'zoom',
+ useGlobalPayloadLensIndex: 0
+ })
+ }
},
{
+ key: 'zoom',
icon: getResource('waylinetool/fd.png'),
title: '相机变焦',
- event: () => {}
+ event: (obj: sBtn) => {
+ obj.selected = !obj.selected
+ editKmlFile('zoom', {
+ payloadPositionIndex: 0,
+ focalLength: 2
+ })
+ }
},
{
+ key: 'customDirName',
icon: getResource('waylinetool/create-file.png'),
title: '创建文件夹',
- event: () => {}
+ event: (obj: sBtn) => {
+ obj.selected = !obj.selected
+ editKmlFile('customDirName', {
+ payloadPositionIndex: 0,
+ directoryName: '新建文件夹'
+ })
+ }
}
])
const waylineAbout = computed(() => {
- console.log(store.state.waylineTool)
return store.state.waylineTool
})
+
+/**
+ * @description: 读取kmz文件转blob
+ * @param {*} kmzPath 文件地址
+ * @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'
+ })
+ .then(fileRes => fileRes.data)
+ .then(kmzData => JsZip.loadAsync(kmzData)) // 解压kmz文件
+ .then(kmzZip => kmzZip)
+ .catch(() => message.error('请求kmz文件失败!!'))
+}
+
+watch(() => store.state.waylineTool.kmzPath, (n: string) => {
+ curKmzPath.value = n
+ const arr = n.split('/')
+ curKmzName.value = decodeURIComponent(arr[arr.length - 1])
+ readKmzFile(n).then(kmzFile => {
+ kmzFileZip.value = kmzFile
+ })
+}, {
+ deep: true
+})
+
+watch(() => store.state.waylineTool.position, (position: number) => {
+ currentPosition.value = position
+ eventLight()
+}, {
+ deep: true
+})
+
+// 事件高亮
+const eventLight = () => {
+ // 已经添加的事件高亮
+ btnList.value.forEach(item => { item.selected = false })
+ kmzFileZip.value.file(/\.kml$/i)[0].async('text').then((content: string) => {
+ const regx = /<Placemark>([\s\S]*?)<\/Placemark>/g
+ const points = content.match(regx) || []
+ 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>/
+ btnList.value.forEach(sBtn => {
+ funcs?.forEach((func: string) => {
+ const funcName = func.match(funcNameRegx) || []
+ if (funcName[1] === sBtn.key) {
+ sBtn.selected = true
+ }
+ })
+ shootType?.forEach((shootType: string) => {
+ const typeValue = shootType.match(shootTypeValueRegx) || []
+ if (typeValue[1] === sBtn.key) {
+ sBtn.selected = true
+ }
+ })
+ })
+ })
+}
+
+/**
+ * @description: 创建kml模版
+ * @param {*} actionId 事件id(唯一)
+ * @param {*} actionType 事件类型
+ * @param {*} param 事件参数
+ * @return {*} void
+ */
+const createActionKML = (actionId: string, actionType: string, param: any) => {
+ let paramKML = ''
+ Object.keys(param).forEach((key: string) => {
+ paramKML += `
+ <wpml:${key}>${param[key]}</wpml:${key}>
+ `
+ })
+ const template = `
+ <wpml:action>
+ <wpml:actionId>${actionId}</wpml:actionId>
+ <wpml:actionActuatorFunc>${actionType}</wpml:actionActuatorFunc>
+ <wpml:actionActuatorFuncParam>
+ ${paramKML}
+ </wpml:actionActuatorFuncParam>
+ </wpml:action>
+ `
+ return template
+}
+
+/**
+ * @description: 修改template.kml文件
+ * @param {*} eventType 事件类型
+ * @param {*} eventParam 事件参数
+ * @return {*} void
+ */
+const editKmlFile = (eventType: string, eventParam?: any) => {
+ // kmzZip文件处理
+ const kmlFile = kmzFileZip.value.file(/\.kml$/i)[0]
+ kmlFile.async('text').then((kmlText: string) => {
+ const regx = /<Placemark>([\s\S]*?)<\/Placemark>/g
+ const points = kmlText.match(regx) || []
+ // 当前要修改的字段
+ // const curSelected: string | any = points?.find(item => item.includes(currentPosition.value.join(',')))
+ const curSelected: string | any = points[currentPosition.value]
+ // 判断是不是间隔拍照任务
+ if (eventType === 'time' || eventType === 'distance' || eventType === 'deleteShootType') {
+ // 判断当前选中的点是否存在shootType
+ const shootTypeRegx = /<wpml:shootType>([\s\S]*?)<\/wpml:shootType>/g
+ const kmlResult: string[] = curSelected.match(shootTypeRegx) || []
+ const shootTypeKML = kmlResult[0]
+ let replacedKML = ''
+ // 判断是不是结束间隔拍照任务
+ if (eventType === 'deleteShootType') {
+ if (!shootTypeKML) {
+ message.warning('暂未设置间隔任务，无法结束！！')
+ } else {
+ replacedKML = curSelected.replace(shootTypeRegx, '')
+ }
+ } else {
+ // 判断是否已经设置间隔拍照任务
+ if (shootTypeKML) {
+ replacedKML = curSelected.replace(shootTypeRegx, `<wpml:shootType>${eventType}</wpml:shootType>`)
+ } else {
+ // 判断是否存在actionGroup
+ const index = curSelected.indexOf('<wpml:actionGroup>')
+ if (index === -1) {
+ const placeMarkIdx = curSelected.indexOf('</Placemark>')
+ replacedKML = curSelected.slice(0, placeMarkIdx) + `<wpml:shootType>${eventType}</wpml:shootType>` + curSelected.slice(placeMarkIdx)
+ } else {
+ replacedKML = curSelected.slice(0, index) + `<wpml:shootType>${eventType}</wpml:shootType>` + curSelected.slice(index)
+ }
+ }
+ }
+ // 将另外两个间隔任务按钮高亮取消
+ btnList.value.forEach((sBtn: sBtn) => {
+ if (sBtn.key === 'time' || sBtn.key === 'distance' || sBtn.key === 'deleteShootType') {
+ if (sBtn.key !== eventType) {
+ sBtn.selected = false
+ }
+ }
+ })
+ // 替换原本KML
+ const replacedTemplateKML = kmlText.replace(curSelected, replacedKML)
+ JsZip.file('wpmz/template.kml', replacedTemplateKML)
+ kmzFileZip.value.file('wpmz/template.kml', replacedTemplateKML)
+ return
+ }
+ // 查找actionGroup
+ const actionGroupReg = /<wpml:actionGroup>([\s\S]*?)<\/wpml:actionGroup>/g
+ const actionGroup = curSelected.match(actionGroupReg) ? curSelected.match(actionGroupReg)[0] : ''
+ // 查找action
+ const actionReg = /<wpml:action>([\s\S]*?)<\/wpml:action>/g
+ const actions = actionGroup.match(actionReg) || []
+
+ // 判断kml文件中是否存在当前事件
+ const actionIndex = actions.findIndex((action: string) => action.includes(eventType))
+ if (actionIndex === -1) {
+ // 创建事件
+ const actionKML = createActionKML(actions.length, eventType, eventParam)
+ actions.push(actionKML)
+ } else {
+ // 移除当前存在的事件
+ actions.splice(actionIndex, 1)
+ }
+
+ let replacedActionsKML = ''
+ // 创建actionGroup
+ const actionGroupKML = `
+ <wpml:actionGroup>
+ ${actions.join('')}
+ </wpml:actionGroup>
+ `
+ // 判断是否存在事件组
+ if (!actionGroup) {
+ const index = curSelected.indexOf('</Placemark>')
+ replacedActionsKML = curSelected.slice(0, index) + actionGroupKML + curSelected.slice(index)
+ } else {
+ // 替换原有的action
+ replacedActionsKML = curSelected.replace(actionGroupReg, actionGroupKML)
+ }
+ // Placemark代替
+ const replacedTemplateKML = kmlText.replace(curSelected, replacedActionsKML)
+
+ JsZip.file('wpmz/template.kml', replacedTemplateKML)
+ kmzFileZip.value.file('wpmz/template.kml', replacedTemplateKML)
+ })
+}
+
+const cencalEdit = () => {
+ readKmzFile(curKmzPath.value).then(kmzFile => {
+ kmzFileZip.value = kmzFile
+ eventLight()
+ })
+}
+
+const confirmEdit = () => {
+ JsZip.generateAsync({ type: 'blob' }).then(content => {
+ saveAs(content, curKmzName.value)
+ })
+}
</script>
<style lang="scss" scoped>
@@ -100,13 +439,16 @@
right: 75px;
top: 50%;
transform: translateY(-50%);
+
.s-btn {
margin-bottom: 15px;
display: flex;
align-items: center;
+
&:last-child {
margin: 0;
}
+
.title {
width: 130px;
text-align: right;
@@ -115,6 +457,7 @@
text-shadow: 2px 2px 2px #000;
font-weight: bold;
}
+
.btn {
width: 34px;
height: 34px;
@@ -123,10 +466,29 @@
display: flex;
justify-content: center;
align-items: center;
+
img {
width: 20px;
}
}
}
+
+ .cancel-edit {
+ font-size: 20px;
+ color: #fff;
+
+ &:hover {
+ background-color: #FF4D4F;
+ }
+ }
+
+ .confirm-edit {
+ font-size: 20px;
+ color: #fff;
+
+ &:hover {
+ background-color: #1777FF;
+ }
+ }
}
</style>
diff --git a/src/pages/page-web/projects/wayline.vue b/src/pages/page-web/projects/wayline.vue
index 8dad990..49fd1f3 100644
--- a/src/pages/page-web/projects/wayline.vue
+++ b/src/pages/page-web/projects/wayline.vue
@@ -110,7 +110,12 @@
</div>
<div class="graph-right">
<div v-for="(event, index) in item.eventList" :key="index" class="s-event-icon">
- <img :src="event.icon" alt="icon" />
+ <a-tooltip placement="top">
+ <template #title>
+ {{ event.name }}
+ </template>
+ <img :src="event.icon" alt="icon" />
+ </a-tooltip>
</div>
</div>
</li>
@@ -177,12 +182,12 @@
const isPointListOpen = ref<boolean>(false)
const tragetPointArr = ref<{
position: Cesium.Cartesian3,
- eventList: string[]
+ eventList: any[]
}[]>([])
const selectedPoint = ref<number | null>(null)
// 对应事件
-const eventList: any = reactive<{
+const eventList = reactive<{
key: string,
name: string,
icon?: string
@@ -203,8 +208,14 @@
icon: getResource('waylinetool/camera-off.png'),
},
{
- key: 'focus',
- name: '对焦'
+ key: 'time',
+ name: '开始等时间隔拍照',
+ icon: getResource('waylinetool/shoot1.png'),
+ },
+ {
+ key: 'distance',
+ name: '开始等距间隔拍照',
+ icon: getResource('waylinetool/shoot2.png'),
},
{
key: 'zoom',
@@ -218,24 +229,18 @@
},
{
key: 'gimbalRotate',
- name: '旋转云台'
+ name: '旋转云台',
+ icon: getResource('waylinetool/holderyaw.png'),
},
{
key: 'rotateYaw',
- name: '飞行器偏航'
+ name: '飞行器偏航',
+ icon: getResource('waylinetool/droneyaw.png'),
},
{
key: 'hover',
name: '悬停等待',
icon: getResource('waylinetool/xt.png'),
- },
- {
- key: 'gimbalEvenlyRotate',
- name: '航段间均匀转动云台pitch角'
- },
- {
- key: 'orientedShoot',
- name: '精准复拍动作'
}
])
@@ -255,6 +260,7 @@
}, 1000)
console.log(workspaceId.value)
})
+
onUnmounted(() => {
if (kmlDataSource) {
global.$viewer.dataSources.remove(kmlDataSource)
@@ -263,7 +269,8 @@
removeById('clickBox')
store.commit('SET_WAYLINE_INFO', {
isShow: false,
- wayline: {}
+ wayline: {},
+ position: null,
})
})
@@ -332,7 +339,8 @@
// 清除选中点柱形和隐藏按钮
store.commit('SET_WAYLINE_INFO', {
isShow: false,
- wayline: {}
+ wayline: {},
+ position: null
})
removeById('clickBox')
isPointListOpen.value = !isPointListOpen.value
@@ -407,7 +415,8 @@
selectedPoint.value = index
store.commit('SET_WAYLINE_INFO', {
isShow: true,
- wayline: currentWayLine
+ wayline: currentWayLine,
+ position: index
})
if (getEntityById('clickBox')) {
removeById('clickBox')
@@ -430,6 +439,7 @@
heightReference: true
}
}
+
const boxEntity = global.$viewer.entities.add(entity)
global.$viewer.flyTo(boxEntity, {
duration: 3,
@@ -550,6 +560,8 @@
const actionGroupReg = /<wpml:actionGroup>([\s\S]*?)<\/wpml:actionGroup>/g
// 查找单个事件reg
const actionRegx = /<wpml:action>([\s\S]*?)<\/wpml:action>/g
+ // 获取shootType
+ const shootTypeRegx = /<wpml:shootType>([\s\S]*?)<\/wpml:shootType>/g
// 当前kmz文件航点
const kmlPoints = kml.match(regx)
kmlPoints?.forEach((point: string, index: number) => {
@@ -566,6 +578,15 @@
})
tragetPointArr.value[index].eventList = eventArr
}
+ // 获取当前是否存在拍照模式
+ const pointShootTypeKML = point.match(shootTypeRegx)
+ if (pointShootTypeKML) {
+ pointShootTypeKML.forEach((type: string) => {
+ eventList.forEach((item: any) => {
+ type.includes(item.key) && eventArr.push(item)
+ })
+ })
+ }
})
})
}
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