From 55fcb97a3d487f54353564f1e402e4d4b61feee9 Mon Sep 17 00:00:00 2001
From: GuLiMmo <2820890765@qq.com>
Date: Tue, 12 Mar 2024 17:54:05 +0800
Subject: [PATCH] update：kmz/json转换、kmz打包后无法解析等
---
src/pages/page-web/projects/wayline.vue | 160 ++++++++++++-----------------------------------------
1 files changed, 37 insertions(+), 123 deletions(-)
diff --git a/src/pages/page-web/projects/wayline.vue b/src/pages/page-web/projects/wayline.vue
index 983dc21..92e07d3 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="addWaylineDialog">
<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,19 +119,12 @@
: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
@@ -199,7 +139,7 @@
<a-form-item label="选择飞行器与负载">
<a-select></a-select>
<div class="drone-box">
- <img :src="getResource('wrj.png')" alt="" srcset="" class="drone-img">
+ <img :src="getResource('wrj.png')" alt="" srcset="" class="drone-img" />
</div>
</a-form-item>
</a-form>
@@ -223,13 +163,7 @@
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 EventBus from '/@/event-bus/'
import { ELocalStorageKey, ERouterName } from '/@/types'
import { EDeviceType } from '/@/types/device'
@@ -259,10 +193,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,
@@ -276,39 +207,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 ||
@@ -440,13 +356,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()
+ })
}
// 返回上一页
@@ -461,8 +375,8 @@
// 新建航线
interface waylineFormState {
- fileName: string,
- droneType: string,
+ fileName: string
+ droneType: string
payloadType: string
}
const addWaylineDialogShow = ref<boolean>(false)
@@ -470,7 +384,7 @@
const waylineFormState = reactive<UnwrapRef<waylineFormState>>({
fileName: '',
droneType: '',
- payloadType: ''
+ payloadType: '',
})
const addWaylineDialog = () => {
addWaylineDialogShow.value = true
--
Gitblit v1.9.3