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 | 687 ++++++++++++++++++++++++--------------------------------
1 files changed, 294 insertions(+), 393 deletions(-)
diff --git a/src/pages/page-web/projects/wayline.vue b/src/pages/page-web/projects/wayline.vue
index ce39371..42a9319 100644
--- a/src/pages/page-web/projects/wayline.vue
+++ b/src/pages/page-web/projects/wayline.vue
@@ -1,25 +1,22 @@
<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"
+ <a-upload
+ name="file"
+ :multiple="false"
+ :before-upload="beforeUpload"
+ :show-upload-list="false"
:customRequest="uploadFile">
<a-button type="text" style="color: white">
<SelectOutlined />
</a-button>
</a-upload>
- <a-button type="text" style="color: white">
+ <a-button type="text" style="color: white" @click="addWaylineDialogShow = true">
<template #icon>
<PlusOutlined />
</template>
@@ -33,12 +30,9 @@
<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;
- ">
+ <div
+ class="pr10"
+ style="width: 120px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden">
{{ wayline.name }}
</div>
</a-tooltip>
@@ -46,12 +40,9 @@
<UserOutlined />
</div>
<a-tooltip :title="wayline.user_name">
- <div class="ml5 pr10" style="
- width: 80px;
- white-space: nowrap;
- text-overflow: ellipsis;
- overflow: hidden;
- ">
+ <div
+ class="ml5 pr10"
+ style="width: 80px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden">
{{ wayline.user_name }}
</div>
</a-tooltip>
@@ -84,24 +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" />
</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>
+ <span class="mr10">更新时间: {{ new Date(wayline.update_time).toLocaleString() }}</span>
</div>
</div>
</div>
@@ -109,8 +93,16 @@
<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">
+ <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">
@@ -119,16 +111,72 @@
</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>
<!-- 航线编辑 -->
<div class="targt-point scrollbar" :style="{ height: height + 'px' }" v-else>
- <route-edit v-model:details="waylineDetails" @back-fn="backPage" />
+ <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 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>
@@ -144,32 +192,24 @@
EditOutlined,
} from '@ant-design/icons-vue'
import { message } from 'ant-design-vue'
-import { onMounted, onUpdated, reactive, ref } from '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 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
@@ -181,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,
@@ -198,108 +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 isPointListOpen = ref<boolean>(false)
-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;
- }[]
->([
- {
- 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: 'time',
- name: '开始等时间隔拍照',
- icon: getResource('waylinetool/shoot1.png'),
- },
- {
- key: 'distance',
- name: '开始等距间隔拍照',
- icon: getResource('waylinetool/shoot2.png'),
- },
- {
- key: 'zoom',
- name: '变焦',
- icon: getResource('waylinetool/fd.png'),
- },
- {
- key: 'customDirName',
- name: '创建新文件夹',
- icon: getResource('waylinetool/create-file.png'),
- },
- {
- key: 'gimbalRotate',
- distinguish: 'Yaw',
- name: '云台俯仰角',
- icon: getResource('waylinetool/holderyaw.png'),
- },
- {
- key: 'gimbalYawRotate',
- name: '云台偏航角',
- distinguish: 'pitch',
- icon: getResource('waylinetool/holdertilt.png'),
- },
- {
- key: 'rotateYaw',
- name: '飞行器偏航',
- icon: getResource('waylinetool/droneyaw.png'),
- },
- {
- 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
+ const data = document.getElementById('data')?.lastElementChild as HTMLDivElement
if (
pagination.total === 0 ||
Math.ceil(pagination.total / pagination.page_size) <= pagination.page ||
@@ -387,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)
@@ -408,7 +363,7 @@
// 编辑显示
const routeEventEdit = (wayline: WaylineFile) => {
loading.value = true
- getWayLineFile(workspaceId.value, wayline.id).then(res => {
+ getWayLineFile(workspaceId.value, wayline.id).then((res) => {
store.commit('SET_WAYLINE_KMZPATH', res.data)
isPointListOpen.value = !isPointListOpen.value
loading.value = false
@@ -420,7 +375,6 @@
* @param file
*/
function initKmlFile (file: string) {
- // removeById('entityLine')
removeAllPoint()
const options = {
camera: global.$viewer.scene.camera,
@@ -430,128 +384,10 @@
if (kmlDataSource) {
global.$viewer.dataSources.remove(kmlDataSource)
}
- 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)
- }
- // 创建广告牌信息
- 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: 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.dataSources.add(Cesium.KmlDataSource.load(file, options)).then((res: any) => {
+ kmlDataSource = res
+ const mapDraw = useMapDraw(kmlDataSource, [], file, global)
+ mapDraw.drawWayline()
})
}
@@ -565,31 +401,76 @@
})
}
-// 点击目标点
-function tragetPointClick (position: Cesium.Cartesian3, index: number) {
- selectedPoint.value = index
- store.commit('SET_WAYLINE_INFO', {
- isShow: true,
- 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),
+// 新建航线
+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 closeAddWaylineDialog = () => {
+ waylineFormRef.value.resetFields()
}
function onScroll (e: any) {
@@ -605,16 +486,16 @@
}
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[]>([])
@@ -643,98 +524,6 @@
fileList.value = []
})
})
-}
-
-// 创建广告牌
-const createBillboard = (title: string | number, 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(Number(title) === 1 ? 'S' : title, 10, 15)
- ctx.closePath()
- return billboard
-}
-
-/**
- * @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
- // 获取shootType
- const shootTypeRegx = /<wpml:shootType>([\s\S]*?)<\/wpml:shootType>/g
- // 云台角度
- const gimbalPitchRotateAngleRegx =
- /<wpml:gimbalPitchRotateAngle>(.*?)<\/wpml:gimbalPitchRotateAngle>/
- const gimbalYawRotateAngleRegx =
- /<wpml:gimbalYawRotateAngle>(.*?)<\/wpml:gimbalYawRotateAngle>/
- // 当前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) => {
- if (!item.distinguish) {
- action.includes(item.key) && eventArr.push(item)
- } else {
- const pitchAngle =
- action?.match(gimbalPitchRotateAngleRegx) || []
- const yawAngle = action?.match(gimbalYawRotateAngleRegx) || []
- if (!!Number(pitchAngle[1]) && item.distinguish === 'pitch') {
- eventArr.push(item)
- }
- if (!!Number(yawAngle[1]) && item.distinguish === 'yaw') {
- eventArr.push(item)
- }
- }
- })
- })
- 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)
- })
- })
- }
- })
- })
}
const openEditModal = (wayline: any) => {
@@ -806,9 +595,9 @@
align-items: center;
.info-box {
flex: 1;
- border-right: 1px solid hsla(0,0%,100%,.1);
+ border-right: 1px solid hsla(0, 0%, 100%, 0.1);
.title {
- color: hsla(0,0%,100%,.65);
+ color: hsla(0, 0%, 100%, 0.65);
font-size: 12px;
font-weight: bold;
}
@@ -912,6 +701,118 @@
}
}
}
+
+ .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 {
--
Gitblit v1.9.3