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 | 369 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 226 insertions(+), 143 deletions(-)
diff --git a/src/pages/page-web/projects/wayline.vue b/src/pages/page-web/projects/wayline.vue
index d79c70d..42a9319 100644
--- a/src/pages/page-web/projects/wayline.vue
+++ b/src/pages/page-web/projects/wayline.vue
@@ -1,22 +1,11 @@
<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-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"
@@ -27,10 +16,7 @@
<SelectOutlined />
</a-button>
</a-upload>
- <a-button
- type="text"
- style="color: white"
- @click="addWaylineDialog">
+ <a-button type="text" style="color: white" @click="addWaylineDialogShow = true">
<template #icon>
<PlusOutlined />
</template>
@@ -38,30 +24,15 @@
</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"
- @click="selectRoute(wayline)">
+ <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" @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;
- ">
+ style="width: 120px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden">
{{ wayline.name }}
</div>
</a-tooltip>
@@ -71,35 +42,24 @@
<a-tooltip :title="wayline.user_name">
<div
class="ml5 pr10"
- style="
- width: 80px;
- white-space: nowrap;
- text-overflow: ellipsis;
- overflow: hidden;
- ">
+ style="width: 80px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden">
{{ wayline.user_name }}
</div>
</a-tooltip>
<div class="fz20 tools">
<span style="margin-right: 10px">
- <EditOutlined
- style="font-size: 15px"
- @click.stop="routeEventEdit(wayline)" />
+ <EditOutlined style="font-size: 15px" @click.stop="routeEventEdit(wayline)" />
</span>
<a-dropdown>
<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>
- <a-menu-item
- @click="downloadWayline(wayline.id, wayline.name)">
+ <a-menu-item @click="downloadWayline(wayline.id, wayline.name)">
<span>下载</span>
</a-menu-item>
<a-menu-item @click="showWaylineTip(wayline.id)">
@@ -115,30 +75,17 @@
<RocketOutlined />
</span>
<span class="ml5">{{
- Object.keys(EDeviceType)[
- Object.values(EDeviceType).indexOf(wayline.drone_model_key)
- ]
+ 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 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)">
- <span class="mr10"
- >更新时间:
- {{ new Date(wayline.update_time).toLocaleString() }}</span
- >
+ <span class="mr10">更新时间: {{ new Date(wayline.update_time).toLocaleString() }}</span>
</div>
</div>
</div>
@@ -172,34 +119,60 @@
:cancel-button-props="{ ghost: true }"
@ok="handleEditName">
<div class="wayline-title">航线名称</div>
- <a-input
- v-model:value="currentWayLine.name"
- placeholder="请输入航线名称" />
+ <a-input v-model:value="currentWayLine.name" placeholder="请输入航线名称" />
</a-modal>
</div>
<!-- 航线编辑 -->
- <div
- class="targt-point scrollbar"
- :style="{ height: height + 'px' }"
- v-else>
- <route-edit
- v-model:isCreateWayline="isCreateWayline"
- @back-fn="backPage" />
+ <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" class="create-wayline-content">
- <a-form-item label="航线名称">
- <a-input class="wayline-input"></a-input>
+ <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="选择飞行器与负载">
- <a-select></a-select>
+ <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="getResource('wrj.png')" alt="" srcset="" class="drone-img">
+ <img
+ :src="droneTypeList.find((item) => item.value === waylineFormState.droneEnumValue)?.icon"
+ alt="drone-img"
+ class="drone-img" />
+ </div>
+ <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>
@@ -221,31 +194,22 @@
import { message } from 'ant-design-vue'
import { onMounted, UnwrapRef, 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 { deleteWaylineFile, downloadWaylineFile, getWaylineFiles, importKmzFile, getWayLineFile } from '/@/api/wayline'
import { ELocalStorageKey, ERouterName } from '/@/types'
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 useMapDraw from '/@/utils/cesium/use-map-draw'
-import axios from 'axios'
+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
@@ -257,10 +221,7 @@
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,
@@ -274,39 +235,24 @@
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,
- addPolyline,
- removeAllPoint,
-} = cesiumOperation()
+const { removeById, addClickEvent, getEntityById, addPolyline, removeAllPoint } = cesiumOperation()
const isPointListOpen = ref<boolean>(false)
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
+ const data = document.getElementById('data')?.lastElementChild as HTMLDivElement
if (
pagination.total === 0 ||
Math.ceil(pagination.total / pagination.page_size) <= pagination.page ||
@@ -394,6 +340,8 @@
function selectRoute (wayline: WaylineFile) {
loading.value = true
+ fileAuthor.name = wayline.name
+ fileAuthor.author = wayline.user_name
getWayLineFile(workspaceId.value, wayline.id)
.then((res) => {
store.commit('SET_SELECT_WAYLINE_INFO', wayline)
@@ -436,13 +384,11 @@
if (kmlDataSource) {
global.$viewer.dataSources.remove(kmlDataSource)
}
- global.$viewer.dataSources
- .add(Cesium.KmlDataSource.load(file, options))
- .then((res: any) => {
- kmlDataSource = res
- const mapDraw = useMapDraw(kmlDataSource, [], file, global)
- mapDraw.drawWayline()
- })
+ global.$viewer.dataSources.add(Cesium.KmlDataSource.load(file, options)).then((res: any) => {
+ kmlDataSource = res
+ const mapDraw = useMapDraw(kmlDataSource, [], file, global)
+ mapDraw.drawWayline()
+ })
}
// 返回上一页
@@ -457,19 +403,74 @@
// 新建航线
interface waylineFormState {
- fileName: string,
- droneType: string,
- payloadType: string
+ 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: '',
- droneType: '',
- payloadType: ''
+ droneEnumValue: '67',
+ payloadEnumValue: undefined,
})
-const addWaylineDialog = () => {
- addWaylineDialogShow.value = true
+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 closeAddWaylineDialog = () => {
+ waylineFormRef.value.resetFields()
}
function onScroll (e: any) {
@@ -709,24 +710,106 @@
flex-direction: column;
}
.drone-img {
- width: 70%;
+ width: 60%;
}
:deep() {
.ant-form-item-label {
+ margin-top: 15px;
label {
color: #ffffff73;
}
}
.wayline-input {
border-color: #4f4f4f;
+ margin: 0;
}
- .ant-select-selector {
- color: #fff;
- background-color: #3c3c3c;
- border: 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;
+ }
+ }
+ }
}
- .ant-select-arrow {
+ }
+ .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;
+ }
+ }
}
}
}
--
Gitblit v1.9.3