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 | 108 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 68 insertions(+), 40 deletions(-)
diff --git a/src/pages/page-web/projects/wayline.vue b/src/pages/page-web/projects/wayline.vue
index 1c1e957..42a9319 100644
--- a/src/pages/page-web/projects/wayline.vue
+++ b/src/pages/page-web/projects/wayline.vue
@@ -134,28 +134,41 @@
@cancel="closeAddWaylineDialog"
:get-container="() => projectWayLine"
:cancel-button-props="{ ghost: true }">
- <a-form layout="vertical" :model="waylineFormState" ref="waylineFormRef" class="create-wayline-content">
- <a-form-item label="航线名称">
- <a-input class="wayline-input" v-model="waylineFormState.fileName" placeholder="请输入航线名称"></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-form-item label="选择飞行器与负载" name="droneEnumValue">
<a-select
- v-model="waylineFormState.droneType"
+ v-model:value="waylineFormState.droneEnumValue"
:options="droneTypeList"
class="drone-select"
:showArrow="false"
placeholder="请选择无人机型号"
- :getPopupContainer="(triggerNode: any) => triggerNode.parentNode"
- @change="droneTypeChange">
+ :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="waylineFormState.payloadType"
- :options="dronePayloads"
+ v-model:value="waylineFormState.payloadEnumValue"
+ :options="droneTypeList.find((s) => s.value === waylineFormState.droneEnumValue)?.payloads"
allowClear
placeholder="请选择云台型号"
:showArrow="false"
@@ -181,27 +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 EventBus from '/@/event-bus/'
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 { fileAuthor } from '/@/utils/cesium/use-kmz-tsa'
-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
@@ -396,54 +404,71 @@
// 新建航线
interface waylineFormState {
fileName: string
- droneType: string | number | undefined
- payloadType: string | number | undefined
+ 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: 67,
- payloadType: '',
+ droneEnumValue: '67',
+ payloadEnumValue: undefined,
})
interface droneType {
label: string
- value: number
+ value: string
payloads?: droneType[]
+ icon?: string
}
const droneTypeList = reactive<droneType[]>([
{
label: 'M30系列',
- value: 67,
+ value: '67',
+ icon: getResource('model-m30.png'),
payloads: [
- { label: 'M30 相机', value: 0 },
- { label: 'M30T 相机', value: 0 },
+ { label: 'M30 相机', value: '52' },
+ { label: 'M30T 相机', value: '53' },
],
},
{
label: 'Mavic 3 行业系列',
- value: 77,
+ value: '77',
+ icon: getResource('model-mavic3.png'),
payloads: [
- { label: 'Mavic3E 相机', value: 0 },
- { label: 'Mavic3T 相机', value: 0 },
+ { label: 'Mavic3E 相机', value: '66' },
+ { label: 'Mavic3T 相机', value: '67' },
],
},
{
label: 'Matrice 3D 系列',
- value: 91,
+ value: '91',
+ icon: getResource('model-matrice3d.png'),
payloads: [
- { label: 'M3D 相机', value: 0 },
- { label: 'M3DT 相机', value: 0 },
+ { label: 'M3D 相机', value: '80' },
+ { label: 'M3TD 相机', value: '81' },
],
},
])
-const dronePayloads = ref<droneType[]>([])
-const droneTypeChange = (value: number) => {
- const payloads = droneTypeList.find((s) => s.value === value)?.payloads
- dronePayloads.value = payloads || []
+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 addWaylineFile = () => {}
const closeAddWaylineDialog = () => {
waylineFormRef.value.resetFields()
}
@@ -685,7 +710,7 @@
flex-direction: column;
}
.drone-img {
- width: 70%;
+ width: 60%;
}
:deep() {
.ant-form-item-label {
@@ -703,7 +728,7 @@
:deep() {
.ant-select-selector {
color: #fff;
- background-color: #3c3c3c;
+ background-color: #3c3c3c !important;
border: 0;
font-weight: bolder;
}
@@ -736,7 +761,9 @@
border-radius: 3px;
.title {
color: #fff;
- text-align: center;
+ display: flex;
+ align-items: center;
+ justify-content: center;
padding: 5px 0;
span {
width: 5px;
@@ -744,13 +771,14 @@
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;
+ background-color: transparent !important;
font-weight: bold;
color: #fff;
.ant-select-selection-placeholder {
--
Gitblit v1.9.3