From aec00ecc093be803860c8675cbe1c4c776a7cb4e Mon Sep 17 00:00:00 2001
From: GuLiMmo <2820890765@qq.com>
Date: Tue, 19 Mar 2024 17:49:21 +0800
Subject: [PATCH] update： 新建航线、事件编辑、kmz文件问题修改
---
src/pages/page-web/projects/wayline.vue | 784 +++++++++++++++++++++++++++++++------------------------
1 files changed, 444 insertions(+), 340 deletions(-)
diff --git a/src/pages/page-web/projects/wayline.vue b/src/pages/page-web/projects/wayline.vue
index 8dad990..42a9319 100644
--- a/src/pages/page-web/projects/wayline.vue
+++ b/src/pages/page-web/projects/wayline.vue
@@ -1,47 +1,61 @@
<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="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"
+ <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" @click="addWaylineDialogShow = true">
+ <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,20 +70,21 @@
</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)] }}
</span>
</div>
- <div class="mt5 ml10" style="color: hsla(0,0%,100%,0.35);">
+ <div class="mt5 ml10" style="color: hsla(0, 0%, 100%, 0.35)">
<span class="mr10">更新时间: {{ new Date(wayline.update_time).toLocaleString() }}</span>
</div>
</div>
@@ -78,9 +93,17 @@
<div v-else>
<a-empty :image-style="{ height: '60px', marginTop: '60px' }" />
</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>
+ <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>
<template #title>
<div class="flex-row flex-justify-center">
<span>删除</span>
@@ -88,58 +111,105 @@
</template>
</a-modal>
<!-- 编辑 -->
- <a-modal class="edit-modal-box" v-model:visible="editVisible" title="编辑航线名称" :get-container="() => projectWayLine"
- :cancel-button-props="{ ghost: true }" @ok="handleEditName">
+ <a-modal
+ class="edit-modal-box"
+ v-model:visible="editVisible"
+ title="编辑航线名称"
+ :get-container="() => projectWayLine"
+ :cancel-button-props="{ ghost: true }"
+ @ok="handleEditName">
<div class="wayline-title">航线名称</div>
<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">
- <img :src="event.icon" alt="icon" />
+ <!-- 航线编辑 -->
+ <div class="targt-point scrollbar" :style="{ height: height + 'px' }" v-else>
+ <route-edit v-model:isCreateWayline="isCreateWayline" @back-fn="backPage" />
+ </div>
+ <!-- 新建航线 -->
+ <a-modal
+ v-model:visible="addWaylineDialogShow"
+ title="新建航线"
+ @ok="addWaylineFile"
+ @cancel="closeAddWaylineDialog"
+ :get-container="() => projectWayLine"
+ :cancel-button-props="{ ghost: true }">
+ <a-form
+ layout="vertical"
+ :model="waylineFormState"
+ ref="waylineFormRef"
+ :rules="waylineFormRules"
+ name="fileName"
+ class="create-wayline-content">
+ <a-form-item label="航线名称" name="fileName">
+ <a-input
+ class="wayline-input"
+ v-model:value="waylineFormState.fileName"
+ placeholder="请输入航线名称"></a-input>
+ </a-form-item>
+ <a-form-item label="选择飞行器与负载" name="droneEnumValue">
+ <a-select
+ v-model:value="waylineFormState.droneEnumValue"
+ :options="droneTypeList"
+ class="drone-select"
+ :showArrow="false"
+ placeholder="请选择无人机型号"
+ :getPopupContainer="(triggerNode: any) => triggerNode.parentNode">
+ </a-select>
+ </a-form-item>
+ <a-form-item name="payloadEnumValue">
+ <div class="drone-box">
+ <img
+ :src="droneTypeList.find((item) => item.value === waylineFormState.droneEnumValue)?.icon"
+ alt="drone-img"
+ class="drone-img" />
</div>
- </div>
- </li>
- </ul>
+ <div class="payload-select">
+ <div class="title"><span></span> 云台I</div>
+ <a-select
+ v-model:value="waylineFormState.payloadEnumValue"
+ :options="droneTypeList.find((s) => s.value === waylineFormState.droneEnumValue)?.payloads"
+ allowClear
+ placeholder="请选择云台型号"
+ :showArrow="false"
+ :getPopupContainer="(triggerNode: any) => triggerNode.parentNode" />
+ </div>
+ </a-form-item>
+ </a-form>
+ </a-modal>
</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 { onMounted, UnwrapRef, reactive, ref } from 'vue'
+import routeEdit from './components/route-edit/index.vue'
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'
import { downloadFile } from '/@/utils/common'
import { IPage } from '/@/api/http/type'
-import { CURRENT_CONFIG } from '/@/api/http/config'
-import { load } from '@amap/amap-jsapi-loader'
import { getRoot } from '/@/root'
import * as Cesium from 'cesium'
import { cesiumOperation } from '/@/hooks/use-cesium-tsa'
-import axios from 'axios'
+import useMapDraw from '/@/utils/cesium/use-map-draw'
+import useKmzTsa, { fileAuthor } from '/@/utils/cesium/use-kmz-tsa'
import JSZIP from 'jszip'
// 初始化jszip
const JsZip = new JSZIP()
+const { create: createWayline } = useKmzTsa()
const getResource = (name: string) => {
return new URL(`/src/assets/icons/${name}`, import.meta.url).href
@@ -155,11 +225,11 @@
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>({})
@@ -172,72 +242,9 @@
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: string[]
-}[]>([])
-const selectedPoint = ref<number | null>(null)
-
-// 对应事件
-const eventList: any = reactive<{
- key: string,
- name: string,
- icon?: string
-}[]>([
- {
- key: 'takePhoto',
- name: '单拍',
- icon: getResource('waylinetool/camera.png'),
- },
- {
- key: 'startRecord',
- name: '开始录像',
- icon: getResource('waylinetool/camera-on.png'),
- },
- {
- key: 'stopRecord',
- name: '结束录像',
- icon: getResource('waylinetool/camera-off.png'),
- },
- {
- key: 'focus',
- name: '对焦'
- },
- {
- key: 'zoom',
- name: '变焦',
- icon: getResource('waylinetool/fd.png'),
- },
- {
- key: 'customDirName',
- name: '创建新文件夹',
- icon: getResource('waylinetool/create-file.png'),
- },
- {
- key: 'gimbalRotate',
- name: '旋转云台'
- },
- {
- key: 'rotateYaw',
- name: '飞行器偏航'
- },
- {
- key: 'hover',
- name: '悬停等待',
- icon: getResource('waylinetool/xt.png'),
- },
- {
- key: 'gimbalEvenlyRotate',
- name: '航段间均匀转动云台pitch角'
- },
- {
- key: 'orientedShoot',
- name: '精准复拍动作'
- }
-])
onMounted(() => {
const parent = document.getElementsByClassName('scrollbar').item(0)?.parentNode as HTMLDivElement
@@ -246,7 +253,11 @@
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) {
+ if (
+ pagination.total === 0 ||
+ Math.ceil(pagination.total / pagination.page_size) <= pagination.page ||
+ height.value <= data?.clientHeight + data?.offsetTop
+ ) {
clearInterval(key)
return
}
@@ -255,15 +266,18 @@
}, 1000)
console.log(workspaceId.value)
})
+
onUnmounted(() => {
if (kmlDataSource) {
global.$viewer.dataSources.remove(kmlDataSource)
}
- removeById('kmzLine')
- removeById('clickBox')
+ // removeById('entityLine')
+ removeAllPoint()
+ // removeById('clickBox')
store.commit('SET_WAYLINE_INFO', {
isShow: false,
- wayline: {}
+ wayline: {},
+ position: null,
})
})
@@ -275,17 +289,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) {
@@ -294,7 +310,7 @@
}
function deleteWayline () {
- deleteWaylineFile(workspaceId.value, deleteWaylineId.value).then(res => {
+ deleteWaylineFile(workspaceId.value, deleteWaylineId.value).then((res) => {
if (res.code === 0) {
message.success('文件删除成功')
}
@@ -309,40 +325,57 @@
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
- })
+ fileAuthor.name = wayline.name
+ fileAuthor.author = wayline.user_name
+ 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: {}
+ wayline: {},
+ 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) {
- removeById('kmzLine')
+ removeAllPoint()
const options = {
camera: global.$viewer.scene.camera,
canvas: global.$viewer.scene.canvas,
@@ -351,110 +384,118 @@
if (kmlDataSource) {
global.$viewer.dataSources.remove(kmlDataSource)
}
- global.$viewer.dataSources.add(
- Cesium.KmlDataSource.load(
- file,
- options
- )).then((res: any) => {
+ 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: []
- }
- }
- // tragetPointArr.value = cartesianArr
- // const stripe = createStripe()
- const lineEntity = global.$viewer.entities.add({
- name: 'entityLine',
- id: 'kmzLine',
- polyline: {
- positions: cartesianArr,
- width: 20,
- material: new Cesium.PolylineArrowMaterialProperty(Cesium.Color.MEDIUMSPRINGGREEN),
- clampToGround: false, // 关闭贴地效果，保留高度
- },
- })
-
- global.$viewer.flyTo(lineEntity, {
- offset: new Cesium.HeadingPitchRange(0, -90, 8000)
- })
-
- // 解析kmz文件
- readKmzFile(file)
+ const mapDraw = useMapDraw(kmlDataSource, [], file, global)
+ mapDraw.drawWayline()
})
}
-// 点击目标点
-function tragetPointClick (position: Cesium.Cartesian3, index: number) {
- selectedPoint.value = index
+// 返回上一页
+function backPage () {
+ isPointListOpen.value = false
store.commit('SET_WAYLINE_INFO', {
- isShow: true,
- wayline: currentWayLine
+ isShow: false,
+ wayline: {},
+ position: 0,
})
- 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)
+}
+
+// 新建航线
+interface waylineFormState {
+ fileName: string
+ droneEnumValue: string
+ payloadEnumValue: string
+}
+const waylineFormRef = ref()
+const addWaylineDialogShow = ref<boolean>(false)
+const isCreateWayline = ref<boolean>(false)
+const waylineFormRules = {
+ fileName: [{ required: true, message: '请输入航线文件名称', trigger: 'blur' }],
+ droneEnumValue: [{ required: true, message: '请选择无人机型号', trigger: 'blur' }],
+ payloadEnumValue: [{ required: true, message: '请选择无人机云台型号', trigger: 'blur' }],
+}
+const waylineFormState = reactive<UnwrapRef<waylineFormState>>({
+ fileName: '',
+ droneEnumValue: '67',
+ payloadEnumValue: undefined,
+})
+interface droneType {
+ label: string
+ value: string
+ payloads?: droneType[]
+ icon?: string
+}
+const droneTypeList = reactive<droneType[]>([
+ {
+ label: 'M30系列',
+ value: '67',
+ icon: getResource('model-m30.png'),
+ payloads: [
+ { label: 'M30 相机', value: '52' },
+ { label: 'M30T 相机', value: '53' },
+ ],
+ },
+ {
+ label: 'Mavic 3 行业系列',
+ value: '77',
+ icon: getResource('model-mavic3.png'),
+ payloads: [
+ { label: 'Mavic3E 相机', value: '66' },
+ { label: 'Mavic3T 相机', value: '67' },
+ ],
+ },
+ {
+ label: 'Matrice 3D 系列',
+ value: '91',
+ icon: getResource('model-matrice3d.png'),
+ payloads: [
+ { label: 'M3D 相机', value: '80' },
+ { label: 'M3TD 相机', value: '81' },
+ ],
+ },
+])
+const addWaylineFile = () => {
+ waylineFormRef.value
+ .validate()
+ .then((values: waylineFormState) => {
+ createWayline(values).then((createRes: any) => {
+ if (createRes) {
+ store.commit('SET_WAYLINE_KMZPATH', '')
+ isPointListOpen.value = !isPointListOpen.value
+ } else {
+ message.error('创建航线失败，错误码：', createRes)
+ }
+ })
})
- })
- // 创建盒子
- 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
- }
- }
- const boxEntity = global.$viewer.entities.add(entity)
- global.$viewer.flyTo(boxEntity, {
- duration: 3,
- })
+}
+const closeAddWaylineDialog = () => {
+ waylineFormRef.value.resetFields()
}
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()
}
}
interface FileItem {
- uid: string;
- name?: string;
- status?: string;
- response?: string;
- url?: string;
+ uid: string
+ name?: string
+ status?: string
+ response?: string
+ url?: string
}
interface FileInfo {
- file: FileItem;
- fileList: FileItem[];
+ file: FileItem
+ fileList: FileItem[]
}
const fileList = ref<FileItem[]>([])
@@ -467,107 +508,22 @@
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 = []
- })
- })
-}
-
-// 创建广告牌
-const createBillboard = (title: string, color: string) => {
- // 创建canvas绘制广告牌
- const billboard = document.createElement('canvas')
- billboard.width = 30
- billboard.height = 30
- const ctx: HTMLCanvasElement | any = billboard.getContext('2d')
- ctx.beginPath()
- ctx.moveTo(0, 0)
- ctx.lineTo(30, 0)
- ctx.lineTo(15, 22)
- ctx.fillStyle = color
- ctx.fill()
- ctx.font = '18px serif'
- ctx.fillStyle = '#ffffff'
- ctx.fillText(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
-}
-
-/**
- * @description: 获取kmz文件中的内容
- * @param {*} kmzPath kmz文件地址
- * @return {*} void
- */
-const readKmzFile = (kmzPath: string) => {
- // 使用axios读取文件
- 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 => {
- // 查找航点标签reg
- const regx = /<Placemark>([\s\S]*?)<\/Placemark>/g
- // 查找事件组reg
- const actionGroupReg = /<wpml:actionGroup>([\s\S]*?)<\/wpml:actionGroup>/g
- // 查找单个事件reg
- const actionRegx = /<wpml:action>([\s\S]*?)<\/wpml:action>/g
- // 当前kmz文件航点
- const kmlPoints = kml.match(regx)
- kmlPoints?.forEach((point: string, index: number) => {
- // 当前点的事件组
- const ponitAction = point.match(actionGroupReg)
- const eventArr: string[] = []
- if (ponitAction) {
- // 当前事件
- const actions = ponitAction[0].match(actionRegx)
- actions?.forEach(action => {
- eventList.forEach((item: any) => {
- action.includes(item.key) && eventArr.push(item)
- })
- })
- tragetPointArr.value[index].eventList = eventArr
+ 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 openEditModal = (wayline: any) => {
@@ -578,7 +534,6 @@
const handleEditName = () => {
editVisible.value = false
}
-
</script>
<style lang="scss" scoped>
@@ -600,6 +555,10 @@
height: 30px;
font-weight: bold;
margin: 0px 10px 0 10px;
+
+ .tools {
+ display: flex;
+ }
}
}
@@ -614,56 +573,89 @@
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;
}
}
+ .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%, 0.1);
+ .title {
+ color: hsla(0, 0%, 100%, 0.65);
+ font-size: 12px;
+ font-weight: bold;
+ }
+ .info {
+ font-weight: bold;
+ }
+ &:last-child {
+ border: 0;
+ }
+ }
+ }
+
li {
cursor: pointer;
padding: 10px 0;
margin: 0 7px;
display: flex;
+
.graph {
width: 40px;
display: flex;
align-items: center;
+
.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;
}
+
.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;
+ background-color: #3c3c3c;
}
}
}
@@ -695,7 +687,7 @@
.ant-modal-body,
.ant-modal-footer {
- background-color: #1C1C1C;
+ background-color: #1c1c1c;
border: 0;
.wayline-title {
@@ -709,9 +701,121 @@
}
}
}
+
+ .create-wayline-content {
+ .drone-box {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ flex-direction: column;
+ }
+ .drone-img {
+ width: 60%;
+ }
+ :deep() {
+ .ant-form-item-label {
+ margin-top: 15px;
+ label {
+ color: #ffffff73;
+ }
+ }
+ .wayline-input {
+ border-color: #4f4f4f;
+ margin: 0;
+ }
+ }
+ .drone-select {
+ :deep() {
+ .ant-select-selector {
+ color: #fff;
+ background-color: #3c3c3c !important;
+ border: 0;
+ font-weight: bolder;
+ }
+ .ant-select-dropdown {
+ background-color: #3c3c3c;
+ color: #fff;
+ .ant-empty-description {
+ color: #fff;
+ }
+ .ant-select-item-option {
+ color: #fff;
+ font-weight: bold;
+ &-active {
+ background-color: rgb(45, 45, 45);
+ }
+ &-selected {
+ background-color: rgb(45, 45, 45);
+ color: #2d8cf0;
+ }
+ }
+ }
+ }
+ }
+ .payload-select {
+ margin: 0 auto;
+ background-color: black;
+ width: 150px;
+ font-weight: bold;
+ border: 1px solid #4f4f4f;
+ border-radius: 3px;
+ .title {
+ color: #fff;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ padding: 5px 0;
+ span {
+ width: 5px;
+ height: 5px;
+ border-radius: 50%;
+ display: inline-block;
+ background-color: orange;
+ margin-right: 5px;
+ }
+ }
+ :deep() {
+ .ant-select-selector {
+ border: 0;
+ box-shadow: none !important;
+ background-color: transparent !important;
+ font-weight: bold;
+ color: #fff;
+ .ant-select-selection-placeholder {
+ text-align: center;
+ }
+ .ant-select-selection-item {
+ text-align: center;
+ }
+ }
+ .ant-select-clear {
+ color: red;
+ background-color: transparent;
+ }
+ .ant-select-dropdown {
+ background-color: #000;
+ color: #fff;
+ .ant-empty-description {
+ color: #fff;
+ }
+ }
+ .ant-select-item-option {
+ color: #fff;
+ font-weight: bold;
+ &-active {
+ background-color: rgb(45, 45, 45);
+ }
+ &-selected {
+ background-color: rgb(45, 45, 45);
+ color: #2d8cf0;
+ }
+ }
+ }
+ }
+ }
}
.selectedColor {
- background-color: #3C3C3C;
+ background-color: #3c3c3c;
}
</style>
--
Gitblit v1.9.3