From d87242f609a6ebaba6f2b45b2c0b41f961e92d4b Mon Sep 17 00:00:00 2001
From: GuLiMmo <2820890765@qq.com>
Date: Fri, 01 Mar 2024 20:16:00 +0800
Subject: [PATCH] update
---
src/pages/page-web/projects/wayline.vue | 615 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 383 insertions(+), 232 deletions(-)
diff --git a/src/pages/page-web/projects/wayline.vue b/src/pages/page-web/projects/wayline.vue
index f6ce2e6..ce39371 100644
--- a/src/pages/page-web/projects/wayline.vue
+++ b/src/pages/page-web/projects/wayline.vue
@@ -1,47 +1,70 @@
<template>
<div class="project-wayline-wrapper height-100" ref="projectWayLine">
<a-spin :spinning="loading" :delay="300" tip="加载中" size="large">
- <div style="height: 50px; line-height: 50px; border-bottom: 1px solid #4f4f4f; font-weight: 450;">
+ <div style="
+ height: 50px;
+ line-height: 50px;
+ border-bottom: 1px solid #4f4f4f;
+ font-weight: 450;
+ ">
<a-row>
<a-col :span="1"></a-col>
- <a-col :span="15">{{ isPointListOpen ? '航点列表' : '航线库' }}</a-col>
+ <a-col :span="15">{{
+ isPointListOpen ? "航点列表" : "航线库"
+ }}</a-col>
<a-col :span="8" v-if="importVisible" class="flex-row flex-justify-end flex-align-center">
<a-upload name="file" :multiple="false" :before-upload="beforeUpload" :show-upload-list="false"
:customRequest="uploadFile">
- <a-button type="text" style="color: white;">
+ <a-button type="text" style="color: white">
<SelectOutlined />
</a-button>
</a-upload>
+ <a-button type="text" style="color: white">
+ <template #icon>
+ <PlusOutlined />
+ </template>
+ </a-button>
</a-col>
</a-row>
</div>
<div :style="{ height: height + 'px' }" class="scrollbar" v-if="!isPointListOpen">
<div id="data" class="height-100 uranus-scrollbar" v-if="waylinesData.data.length !== 0" @scroll="onScroll">
- <div v-for="wayline in waylinesData.data" :key="wayline.id">
- <div class="wayline-panel" style="padding-top: 5px;" @click="selectRoute(wayline)">
+ <div v-for="wayline in waylinesData.data" :key="wayline.id" @click="selectRoute(wayline)">
+ <div class="wayline-panel" style="padding-top: 5px">
<div class="title">
<a-tooltip :title="wayline.name">
- <div class="pr10" style="width: 120px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden;">
- {{ wayline.name }}</div>
+ <div class="pr10" style="
+ width: 120px;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ ">
+ {{ wayline.name }}
+ </div>
</a-tooltip>
<div class="ml10">
<UserOutlined />
</div>
<a-tooltip :title="wayline.user_name">
- <div class="ml5 pr10"
- style="width: 80px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden;">{{
- wayline.user_name }}</div>
+ <div class="ml5 pr10" style="
+ width: 80px;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ ">
+ {{ wayline.user_name }}
+ </div>
</a-tooltip>
- <div class="fz20">
- <!-- <span style="margin-right: 10px;">
- <EditOutlined style="font-size: 15px;" />
- </span> -->
+ <div class="fz20 tools">
+ <span style="margin-right: 10px">
+ <EditOutlined style="font-size: 15px" @click.stop="routeEventEdit(wayline)" />
+ </span>
<a-dropdown>
- <a style="color: white;">
+ <a style="color: white">
<EllipsisOutlined />
</a>
<template #overlay>
- <a-menu theme="dark" class="more" style="background: #3c3c3c;">
+ <a-menu theme="dark" class="more" style="background: #3c3c3c">
<a-menu-item @click="openEditModal(wayline)">
<span>重命名</span>
</a-menu-item>
@@ -56,21 +79,29 @@
</a-dropdown>
</div>
</div>
- <div class="ml10 mt5" style="color: hsla(0,0%,100%,0.65);">
+ <div class="ml10 mt5" style="color: hsla(0, 0%, 100%, 0.65)">
<span>
<RocketOutlined />
</span>
- <span class="ml5">{{ Object.keys(EDeviceType)[Object.values(EDeviceType).indexOf(wayline.drone_model_key)]
+ <span class="ml5">{{
+ Object.keys(EDeviceType)[
+ Object.values(EDeviceType).indexOf(wayline.drone_model_key)
+ ]
}}</span>
<span class="ml10">
- <CameraFilled style="border-top: 1px solid; padding-top: -3px;" />
+ <CameraFilled style="border-top: 1px solid; padding-top: -3px" />
</span>
<span class="ml5" v-for="payload in wayline.payload_model_keys" :key="payload.id">
- {{ Object.keys(EDeviceType)[Object.values(EDeviceType).indexOf(payload)] }}
+ {{
+ Object.keys(EDeviceType)[
+ Object.values(EDeviceType).indexOf(payload)
+ ]
+ }}
</span>
</div>
- <div class="mt5 ml10" style="color: hsla(0,0%,100%,0.35);">
- <span class="mr10">更新时间: {{ new Date(wayline.update_time).toLocaleString() }}</span>
+ <div class="mt5 ml10" style="color: hsla(0, 0%, 100%, 0.35)">
+ <span class="mr10">更新时间:
+ {{ new Date(wayline.update_time).toLocaleString() }}</span>
</div>
</div>
</div>
@@ -80,7 +111,7 @@
</div>
<a-modal v-model:visible="deleteTip" okText="确定" cancelText="取消" width="450px" :closable="false"
:maskClosable="false" centered :okButtonProps="{ danger: true }" @ok="deleteWayline">
- <p class="pt10 pl20" style="height: 50px;">确定要删除该文件吗？</p>
+ <p class="pt10 pl20" style="height: 50px">确定要删除该文件吗？</p>
<template #title>
<div class="flex-row flex-justify-center">
<span>删除</span>
@@ -94,40 +125,37 @@
<a-input v-model:value="currentWayLine.name" placeholder="请输入航线名称" />
</a-modal>
</div>
- <ul class="targt-point scrollbar" :style="{ height: height + 'px' }" v-else>
- <div class="back-btn" @click="isPointListOpen = !isPointListOpen">
- <ArrowLeftOutlined />
- <span>返回上一页</span>
- </div>
- <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="right">{{ index + 1 }}</div>
- </div>
- <div class="graph-right">
- <div v-for="(event, index) in item.eventList" :key="index" class="s-event-icon">
- <a-tooltip placement="top">
- <template #title>
- {{ event.name }}
- </template>
- <img :src="event.icon" alt="icon" />
- </a-tooltip>
- </div>
- </div>
- </li>
- </ul>
+ <!-- 航线编辑 -->
+ <div class="targt-point scrollbar" :style="{ height: height + 'px' }" v-else>
+ <route-edit v-model:details="waylineDetails" @back-fn="backPage" />
+ </div>
</a-spin>
</div>
</template>
<script lang="ts" setup>
-import { reactive } from '@vue/reactivity'
+import {
+ PlusOutlined,
+ EllipsisOutlined,
+ RocketOutlined,
+ CameraFilled,
+ UserOutlined,
+ SelectOutlined,
+ EditOutlined,
+} from '@ant-design/icons-vue'
import { message } from 'ant-design-vue'
-import { onMounted, onUpdated, ref } from 'vue'
-import { deleteWaylineFile, downloadWaylineFile, getWaylineFiles, importKmzFile, getWayLineFile } from '/@/api/wayline'
+import { onMounted, onUpdated, reactive, ref } from 'vue'
+import routeEdit from './components/route-edit/index.vue'
+import ImageTrailMaterial from '/@/utils/cesium/ImageTrailMaterial'
+import { getPolylineLength } from '/@/utils/cesium/mapUtils'
+import {
+ deleteWaylineFile,
+ downloadWaylineFile,
+ getWaylineFiles,
+ importKmzFile,
+ getWayLineFile,
+} from '/@/api/wayline'
import { ELocalStorageKey, ERouterName } from '/@/types'
-import { ArrowLeftOutlined, EllipsisOutlined, RocketOutlined, CameraFilled, UserOutlined, SelectOutlined, EditOutlined } from '@ant-design/icons-vue'
import { EDeviceType } from '/@/types/device'
import { useMyStore } from '/@/store'
import { WaylineFile } from '/@/types/wayline'
@@ -153,43 +181,56 @@
const { appContext }: any = getCurrentInstance()
const global = appContext.config.globalProperties
const store = useMyStore()
-let kmlDataSource: { entities: { values: { _children: any }[] }; show: boolean } | null | any = null
+let kmlDataSource:
+ | { entities: { values: { _children: any }[] }; show: boolean }
+ | null
+ | any = null
const pagination: IPage = {
page: 1,
total: -1,
- page_size: 10
+ page_size: 10,
}
const kmlEntity = ref<any>([])
const waylinesData = reactive({
- data: [] as WaylineFile[]
+ data: [] as WaylineFile[],
})
// 当前点击的信息
const currentWayLine = ref<any>({})
const root = getRoot()
-const workspaceId = computed(() => store.state.common.projectId || localStorage.getItem(ELocalStorageKey.WorkspaceId))
+const workspaceId = computed(
+ () =>
+ store.state.common.projectId ||
+ localStorage.getItem(ELocalStorageKey.WorkspaceId)
+)
const deleteTip = ref(false)
const deleteWaylineId = ref<string>('')
const canRefresh = ref(true)
-const importVisible = ref<boolean>(root.$router.currentRoute.value.name === ERouterName.WAYLINE)
+const importVisible = ref<boolean>(
+ root.$router.currentRoute.value.name === ERouterName.WAYLINE
+)
const editVisible = ref<boolean>(false)
const height = ref()
-const { removeById, addClickEvent, getEntityById } = cesiumOperation()
+const { removeById, addClickEvent, getEntityById, addPolyline, removeAllPoint } = cesiumOperation()
const isPointListOpen = ref<boolean>(false)
-const tragetPointArr = ref<{
- position: Cesium.Cartesian3,
- eventList: any[]
-}[]>([])
+const tragetPointArr = ref<
+ {
+ position: Cesium.Cartesian3;
+ eventList: any[];
+ }[]
+>([])
const selectedPoint = ref<number | null>(null)
// 对应事件
-const eventList = reactive<{
- key: string,
- name: string,
- distinguish?: string,
- icon?: string
-}[]>([
+const eventList = reactive<
+ {
+ key: string;
+ name: string;
+ distinguish?: string;
+ icon?: string;
+ }[]
+>([
{
key: 'takePhoto',
name: '单拍',
@@ -246,17 +287,24 @@
key: 'hover',
name: '悬停等待',
icon: getResource('waylinetool/xt.png'),
- }
+ },
])
onMounted(() => {
- const parent = document.getElementsByClassName('scrollbar').item(0)?.parentNode as HTMLDivElement
- height.value = document.body.clientHeight - parent.firstElementChild!.clientHeight
+ const parent = document.getElementsByClassName('scrollbar').item(0)
+ ?.parentNode as HTMLDivElement
+ height.value =
+ document.body.clientHeight - parent.firstElementChild!.clientHeight
getWaylines()
const key = setInterval(() => {
- const data = document.getElementById('data')?.lastElementChild as HTMLDivElement
- if (pagination.total === 0 || Math.ceil(pagination.total / pagination.page_size) <= pagination.page || height.value <= data?.clientHeight + data?.offsetTop) {
+ const data = document.getElementById('data')
+ ?.lastElementChild as HTMLDivElement
+ if (
+ pagination.total === 0 ||
+ Math.ceil(pagination.total / pagination.page_size) <= pagination.page ||
+ height.value <= data?.clientHeight + data?.offsetTop
+ ) {
clearInterval(key)
return
}
@@ -270,8 +318,9 @@
if (kmlDataSource) {
global.$viewer.dataSources.remove(kmlDataSource)
}
- removeById('kmzLine')
- removeById('clickBox')
+ // removeById('entityLine')
+ removeAllPoint()
+ // removeById('clickBox')
store.commit('SET_WAYLINE_INFO', {
isShow: false,
wayline: {},
@@ -287,17 +336,19 @@
getWaylineFiles(workspaceId.value, {
page: pagination.page,
page_size: pagination.page_size,
- order_by: 'update_time desc'
- }).then(res => {
- if (res.code !== 0) {
- return
- }
- waylinesData.data = [...waylinesData.data, ...res.data.list]
- pagination.total = res.data.pagination.total
- pagination.page = res.data.pagination.page
- }).finally(() => {
- canRefresh.value = true
+ order_by: 'update_time desc',
})
+ .then((res) => {
+ if (res.code !== 0) {
+ return
+ }
+ waylinesData.data = [...waylinesData.data, ...res.data.list]
+ pagination.total = res.data.pagination.total
+ pagination.page = res.data.pagination.page
+ })
+ .finally(() => {
+ canRefresh.value = true
+ })
}
function showWaylineTip (waylineId: string) {
@@ -306,7 +357,7 @@
}
function deleteWayline () {
- deleteWaylineFile(workspaceId.value, deleteWaylineId.value).then(res => {
+ deleteWaylineFile(workspaceId.value, deleteWaylineId.value).then((res) => {
if (res.code === 0) {
message.success('文件删除成功')
}
@@ -321,43 +372,56 @@
function downloadWayline (waylineId: string, fileName: string) {
loading.value = true
- downloadWaylineFile(workspaceId.value, waylineId).then(res => {
- if (!res) {
- return
- }
- const data = new Blob([res], { type: 'application/zip' })
- downloadFile(data, fileName + '.kmz')
- }).finally(() => {
- loading.value = false
- })
+ downloadWaylineFile(workspaceId.value, waylineId)
+ .then((res) => {
+ if (!res) {
+ return
+ }
+ const data = new Blob([res], { type: 'application/zip' })
+ downloadFile(data, fileName + '.kmz')
+ })
+ .finally(() => {
+ loading.value = false
+ })
}
function selectRoute (wayline: WaylineFile) {
loading.value = true
- getWayLineFile(workspaceId.value, wayline.id).then(res => {
- store.commit('SET_SELECT_WAYLINE_INFO', wayline)
- initKmlFile(res.data)
- store.commit('SET_WAYLINE_KMZPATH', res.data)
- }).finally(() => {
- loading.value = false
- })
+ getWayLineFile(workspaceId.value, wayline.id)
+ .then((res) => {
+ store.commit('SET_SELECT_WAYLINE_INFO', wayline)
+ initKmlFile(res.data)
+ store.commit('SET_WAYLINE_KMZPATH', res.data)
+ })
+ .finally(() => {
+ loading.value = false
+ })
// 清除选中点柱形和隐藏按钮
store.commit('SET_WAYLINE_INFO', {
isShow: false,
wayline: {},
- position: null
+ position: null,
})
- removeById('clickBox')
- isPointListOpen.value = !isPointListOpen.value
+ // isPointListOpen.value = !isPointListOpen.value
}
+
+// 编辑显示
+const routeEventEdit = (wayline: WaylineFile) => {
+ loading.value = true
+ getWayLineFile(workspaceId.value, wayline.id).then(res => {
+ store.commit('SET_WAYLINE_KMZPATH', res.data)
+ isPointListOpen.value = !isPointListOpen.value
+ loading.value = false
+ })
+}
+
/**
* 加载kml文件
* @param file
*/
function initKmlFile (file: string) {
- const [, address] = file.split('cloud-bucket')
- file = import.meta.env.VITE_MEDIAPANEL_API_URL + address
- removeById('kmzLine')
+ // removeById('entityLine')
+ removeAllPoint()
const options = {
camera: global.$viewer.scene.camera,
canvas: global.$viewer.scene.canvas,
@@ -366,54 +430,138 @@
if (kmlDataSource) {
global.$viewer.dataSources.remove(kmlDataSource)
}
- global.$viewer.dataSources.add(
- Cesium.KmlDataSource.load(
- file,
- options
- )).then((res: any) => {
- kmlDataSource = res
- kmlEntity.value = kmlDataSource.entities.values
- kmlDataSource.show = true
- const kmlEntityArr = kmlDataSource.entities.values[0]._children
- const cartesianArr: any[] = []
- for (let i = 0; i < kmlEntityArr.length; i++) {
- const entity = kmlEntityArr[i]
- const billboard = createBillboard(`${i + 1}`, '#2D8CF0')
- entity._id = 'tragetPoint' + i
- entity.billboard = new Cesium.BillboardGraphics({
- image: billboard,
- pixelOffset: new Cesium.Cartesian2(0, -20)
- })
- entity.point = new Cesium.PointGraphics({
- pixelSize: 20,
- color: Cesium.Color.GHOSTWHITE,
- outlineColor: Cesium.Color.BLACK,
- })
- cartesianArr.push(entity.position._value)
- tragetPointArr.value[i] = {
- position: entity.position._value,
- eventList: []
- }
+ global.$viewer.dataSources
+ .add(Cesium.KmlDataSource.load(file, options))
+ .then((res: any) => {
+ kmlDataSource = res
+ createPointMarker(kmlDataSource)
+ // 解析kmz文件
+ readKmzFile(file)
+ })
+}
+
+const waylineDetails = reactive<{
+ title: string,
+ value: string | number
+}[]>([
+ {
+ title: '航线长度',
+ value: '0'
+ },
+ {
+ title: '预计执行时间',
+ value: '0'
+ },
+ {
+ title: '航点',
+ value: 0
+ },
+ {
+ title: '照片',
+ value: 0
+ },
+])
+async function createPointMarker (dataSource: { entities: { values: { _children: any }[] }; show: boolean }) {
+ const ellipsoid = global.$viewer.scene.globe.ellipsoid
+ kmlEntity.value = dataSource.entities.values
+ dataSource.show = true
+ const kmlEntityArr = dataSource.entities.values[0]._children
+ const cartesianArr: any[] = []
+ let btmStartPoint = null
+ // 修改点位样式信息等
+ for (let i = 0; i < kmlEntityArr.length; i++) {
+ const entity = kmlEntityArr[i]
+ // 将cartographic3D坐标转换为正常坐标
+ const c3Position = entity.position._value
+ const c2Postion = ellipsoid.cartesianToCartographic(c3Position)
+ const longitude = Cesium.Math.toDegrees(c2Postion.longitude)
+ const latitude = Cesium.Math.toDegrees(c2Postion.latitude)
+ const height = 100
+ entity.position = Cesium.Cartesian3.fromDegrees(longitude, latitude, height)
+ if (i === 0) {
+ btmStartPoint = Cesium.Cartesian3.fromDegrees(longitude, latitude, 0)
}
- // tragetPointArr.value = cartesianArr
- // const stripe = createStripe()
- const lineEntity = global.$viewer.entities.add({
- name: 'entityLine',
- id: 'kmzLine',
+ // 创建广告牌信息
+ const billboard = createBillboard(`${i + 1}`, '#61d396')
+ // 修改id
+ entity._id = 'tragetPoint' + i
+ // 修改广告牌样式
+ entity.billboard = new Cesium.BillboardGraphics({
+ image: billboard,
+ pixelOffset: new Cesium.Cartesian2(0, -20),
+ })
+ // 修改点的信息
+ entity.point = new Cesium.PointGraphics({
+ pixelSize: 20,
+ color: Cesium.Color.GHOSTWHITE,
+ outlineColor: Cesium.Color.BLACK,
+ })
+ // 创建虚线
+ addPolyline({
+ id: 'dashLine' + i,
polyline: {
- positions: cartesianArr,
- width: 20,
- material: new Cesium.PolylineArrowMaterialProperty(Cesium.Color.MEDIUMSPRINGGREEN),
- clampToGround: false, // 关闭贴地效果，保留高度
- },
+ positions: Cesium.Cartesian3.fromDegreesArrayHeights([
+ longitude,
+ latitude,
+ height,
+ longitude,
+ latitude,
+ 0
+ ]),
+ width: 1,
+ material: new Cesium.PolylineDashMaterialProperty({
+ color: Cesium.Color.WHITE
+ })
+ }
})
+ cartesianArr.push(entity.position._value)
+ tragetPointArr.value[i] = {
+ position: entity.position._value,
+ eventList: [],
+ }
+ }
+ // 创建起飞位置
+ global.$viewer.entities.add({
+ id: 'dronePosition',
+ position: btmStartPoint,
+ billboard: {
+ image: getResource('dock.png'),
+ width: 36,
+ height: 36,
+ }
+ })
+ // 绘制链接线
+ addPolyline({
+ id: 'entityLine',
+ polyline: {
+ positions: [btmStartPoint, ...cartesianArr],
+ width: 7,
+ material: new ImageTrailMaterial({
+ backgroundColor: Cesium.Color.fromBytes(96, 210, 149),
+ image: getResource('arrow-right.png'),
+ imageW: 7,
+ duration: 0,
+ animation: false
+ }),
+ clampToGround: false, // 关闭贴地效果，保留高度
+ },
+ })
+ const lineEntity = getEntityById('entityLine')
+ const polylineLength = getPolylineLength(lineEntity).toFixed(1) || 0
+ waylineDetails[0].value = polylineLength + 'm'
+ waylineDetails[2].value = cartesianArr.length
+ global.$viewer.flyTo(lineEntity, {
+ offset: new Cesium.HeadingPitchRange(0, -90, 300),
+ })
+}
- global.$viewer.flyTo(lineEntity, {
- offset: new Cesium.HeadingPitchRange(0, -90, 8000)
- })
-
- // 解析kmz文件
- readKmzFile(file)
+// 返回上一页
+function backPage () {
+ isPointListOpen.value = false
+ store.commit('SET_WAYLINE_INFO', {
+ isShow: false,
+ wayline: {},
+ position: 0,
})
}
@@ -422,40 +570,35 @@
selectedPoint.value = index
store.commit('SET_WAYLINE_INFO', {
isShow: true,
- wayline: currentWayLine,
- position: index
+ wayline: currentWayLine.value,
+ position: index,
})
if (getEntityById('clickBox')) {
removeById('clickBox')
}
- kmlDataSource.entities._entities._array.forEach((entity: { _id: string; billboard: Cesium.BillboardGraphics }, i: number) => {
- entity.billboard = new Cesium.BillboardGraphics({
- image: createBillboard(`${i}`, entity._id === `tragetPoint${index}` ? '#FF9900' : '#2D8CF0'),
- pixelOffset: new Cesium.Cartesian2(0, -20)
- })
- })
- // 创建盒子
- const entity = {
- id: 'clickBox',
- position,
- box: {
- dimensions: new Cesium.Cartesian3(10.0, 10.0, 120),
- material: Cesium.Color.MEDIUMSPRINGGREEN.withAlpha(0.1),
- // outline: true,
- // outlineColor: Cesium.Color.MEDIUMSPRINGGREEN.withAlpha(0.8),
- heightReference: true
+ kmlDataSource.entities._entities._array.forEach(
+ (
+ entity: { _id: string; billboard: Cesium.BillboardGraphics },
+ i: number
+ ) => {
+ entity.billboard = new Cesium.BillboardGraphics({
+ image: createBillboard(
+ `${i}`,
+ entity._id === `tragetPoint${index}` ? '#FF9900' : '#2D8CF0'
+ ),
+ pixelOffset: new Cesium.Cartesian2(0, -20),
+ })
}
- }
-
- const boxEntity = global.$viewer.entities.add(entity)
- global.$viewer.flyTo(boxEntity, {
- duration: 3,
- })
+ )
}
function onScroll (e: any) {
const element = e.srcElement
- if (element.scrollTop + element.clientHeight >= element.scrollHeight - 5 && Math.ceil(pagination.total / pagination.page_size) > pagination.page && canRefresh.value) {
+ if (
+ element.scrollTop + element.clientHeight >= element.scrollHeight - 5 &&
+ Math.ceil(pagination.total / pagination.page_size) > pagination.page &&
+ canRefresh.value
+ ) {
pagination.page++
getWaylines()
}
@@ -484,24 +627,26 @@
fileList.value.forEach(async (file: FileItem) => {
const fileData = new FormData()
fileData.append('file', file, file.name)
- await importKmzFile(workspaceId.value, fileData).then((res) => {
- if (res.code === 0) {
- message.success(`${file.name} 文件上传成功`)
- canRefresh.value = true
- pagination.total = 0
- pagination.page = 1
- waylinesData.data = []
- getWaylines()
- }
- }).finally(() => {
- loading.value = false
- fileList.value = []
- })
+ await importKmzFile(workspaceId.value, fileData)
+ .then((res) => {
+ if (res.code === 0) {
+ message.success(`${file.name} 文件上传成功`)
+ canRefresh.value = true
+ pagination.total = 0
+ pagination.page = 1
+ waylinesData.data = []
+ getWaylines()
+ }
+ })
+ .finally(() => {
+ loading.value = false
+ fileList.value = []
+ })
})
}
// 创建广告牌
-const createBillboard = (title: string, color: string) => {
+const createBillboard = (title: string | number, color: string) => {
// 创建canvas绘制广告牌
const billboard = document.createElement('canvas')
billboard.width = 30
@@ -515,35 +660,9 @@
ctx.fill()
ctx.font = '18px serif'
ctx.fillStyle = '#ffffff'
- ctx.fillText(title, 10, 15)
+ ctx.fillText(Number(title) === 1 ? 'S' : title, 10, 15)
ctx.closePath()
return billboard
-}
-
-// 创建条纹
-const createStripe = () => {
- // 创建canvas绘制广告牌
- const stripe = document.createElement('canvas')
- stripe.width = 40
- stripe.height = 40
- const ctx: HTMLCanvasElement | any = stripe.getContext('2d')
- ctx.beginPath()
- ctx.moveTo(0, 20)
- ctx.lineTo(0, 40)
- ctx.lineTo(20, 20)
- ctx.lineTo(20, 0)
- ctx.fillStyle = '#fff'
- ctx.fill()
- ctx.closePath()
- ctx.beginPath()
- ctx.moveTo(20, 0)
- ctx.lineTo(20, 20)
- ctx.lineTo(40, 40)
- ctx.lineTo(40, 20)
- ctx.fillStyle = '#fff'
- ctx.fill()
- ctx.closePath()
- return stripe
}
/**
@@ -553,25 +672,30 @@
*/
const readKmzFile = (kmzPath: string) => {
// 使用axios读取文件
- return axios.get(kmzPath, { responseType: 'arraybuffer' })
- .then(fileRes => fileRes.data)
- .then(kmzData => JsZip.loadAsync(kmzData)) // 解压kmz文件
- .then(kmzZip => {
+ return axios
+ .get(kmzPath, { responseType: 'arraybuffer' })
+ .then((fileRes) => fileRes.data)
+ .then((kmzData) => JsZip.loadAsync(kmzData)) // 解压kmz文件
+ .then((kmzZip) => {
// 通过文件名找到 KML 文件
const kmlFile = kmzZip.file(/\.kml$/i)[0]
return kmlFile.async('text')
- }).then(kml => {
+ })
+ .then((kml) => {
// 查找航点标签reg
const regx = /<Placemark>([\s\S]*?)<\/Placemark>/g
// 查找事件组reg
- const actionGroupReg = /<wpml:actionGroup>([\s\S]*?)<\/wpml:actionGroup>/g
+ 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
// 云台角度
- const gimbalPitchRotateAngleRegx = /<wpml:gimbalPitchRotateAngle>(.*?)<\/wpml:gimbalPitchRotateAngle>/
- const gimbalYawRotateAngleRegx = /<wpml:gimbalYawRotateAngle>(.*?)<\/wpml:gimbalYawRotateAngle>/
+ const gimbalPitchRotateAngleRegx =
+ /<wpml:gimbalPitchRotateAngle>(.*?)<\/wpml:gimbalPitchRotateAngle>/
+ const gimbalYawRotateAngleRegx =
+ /<wpml:gimbalYawRotateAngle>(.*?)<\/wpml:gimbalYawRotateAngle>/
// 当前kmz文件航点
const kmlPoints = kml.match(regx)
kmlPoints?.forEach((point: string, index: number) => {
@@ -581,12 +705,13 @@
if (ponitAction) {
// 当前事件
const actions = ponitAction[0].match(actionRegx)
- actions?.forEach(action => {
+ actions?.forEach((action) => {
eventList.forEach((item: any) => {
if (!item.distinguish) {
action.includes(item.key) && eventArr.push(item)
} else {
- const pitchAngle = action?.match(gimbalPitchRotateAngleRegx) || []
+ const pitchAngle =
+ action?.match(gimbalPitchRotateAngleRegx) || []
const yawAngle = action?.match(gimbalYawRotateAngleRegx) || []
if (!!Number(pitchAngle[1]) && item.distinguish === 'pitch') {
eventArr.push(item)
@@ -620,7 +745,6 @@
const handleEditName = () => {
editVisible.value = false
}
-
</script>
<style lang="scss" scoped>
@@ -642,6 +766,10 @@
height: 30px;
font-weight: bold;
margin: 0px 10px 0 10px;
+
+ .tools {
+ display: flex;
+ }
}
}
@@ -670,6 +798,28 @@
color: #2d8cf0;
}
}
+ .wayline-info {
+ display: flex;
+ height: 50px;
+ margin: 10px 0;
+ text-align: center;
+ align-items: center;
+ .info-box {
+ flex: 1;
+ border-right: 1px solid hsla(0,0%,100%,.1);
+ .title {
+ color: hsla(0,0%,100%,.65);
+ font-size: 12px;
+ font-weight: bold;
+ }
+ .info {
+ font-weight: bold;
+ }
+ &:last-child {
+ border: 0;
+ }
+ }
+ }
li {
cursor: pointer;
@@ -685,7 +835,7 @@
.left {
width: 0;
height: 0;
- border-top: 15px solid #2D8CF0;
+ border-top: 15px solid #2d8cf0;
border-right: 10px solid transparent;
border-left: 10px solid transparent;
}
@@ -716,7 +866,7 @@
}
&:hover {
- background-color: #3C3C3C;
+ background-color: #3c3c3c;
}
}
}
@@ -748,7 +898,7 @@
.ant-modal-body,
.ant-modal-footer {
- background-color: #1C1C1C;
+ background-color: #1c1c1c;
border: 0;
.wayline-title {
@@ -765,5 +915,6 @@
}
.selectedColor {
- background-color: #3C3C3C;
-}</style>
+ background-color: #3c3c3c;
+}
+</style>
--
Gitblit v1.9.3