From 2c2bc8614c8ea0ce386369eb4924da1e6aa052d1 Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Wed, 27 Sep 2023 09:35:57 +0800
Subject: [PATCH] 添加环境配置区分
---
src/pages/page-web/projects/wayline.vue | 65 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/src/pages/page-web/projects/wayline.vue b/src/pages/page-web/projects/wayline.vue
index 7c61ad1..3ea0aaf 100644
--- a/src/pages/page-web/projects/wayline.vue
+++ b/src/pages/page-web/projects/wayline.vue
@@ -1,6 +1,6 @@
<template>
<div class="project-wayline-wrapper height-100">
- <a-spin :spinning="loading" :delay="300" tip="downloading" size="large">
+ <a-spin :spinning="loading" :delay="300" tip="加载中" size="large">
<div style="height: 50px; line-height: 50px; border-bottom: 1px solid #4f4f4f; font-weight: 450;">
<a-row>
<a-col :span="1"></a-col>
@@ -40,10 +40,10 @@
<template #overlay>
<a-menu theme="dark" class="more" style="background: #3c3c3c;">
<a-menu-item @click="downloadWayline(wayline.id, wayline.name)">
- <span>Download</span>
+ <span>下载</span>
</a-menu-item>
<a-menu-item @click="showWaylineTip(wayline.id)">
- <span>Delete</span>
+ <span>删除</span>
</a-menu-item>
</a-menu>
</template>
@@ -59,7 +59,7 @@
</span>
</div>
<div class="mt5 ml10" style="color: hsla(0,0%,100%,0.35);">
- <span class="mr10">Update at {{ new Date(wayline.update_time).toLocaleString() }}</span>
+ <span class="mr10">更新时间: {{ new Date(wayline.update_time).toLocaleString() }}</span>
</div>
</div>
</div>
@@ -67,11 +67,11 @@
<div v-else>
<a-empty :image-style="{ height: '60px', marginTop: '60px' }" />
</div>
- <a-modal v-model:visible="deleteTip" width="450px" :closable="false" :maskClosable="false" centered :okButtonProps="{ danger: true }" @ok="deleteWayline">
- <p class="pt10 pl20" style="height: 50px;">Wayline file is unrecoverable once deleted. Continue?</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>Delete</span>
+ <span>删除</span>
</div>
</template>
</a-modal>
@@ -84,7 +84,7 @@
import { reactive } from '@vue/reactivity'
import { message } from 'ant-design-vue'
import { onMounted, onUpdated, ref } from 'vue'
-import { deleteWaylineFile, downloadWaylineFile, getWaylineFiles, importKmzFile } from '/@/api/wayline'
+import { deleteWaylineFile, downloadWaylineFile, getWaylineFiles, importKmzFile, getWayLineFile } from '/@/api/wayline'
import { ELocalStorageKey, ERouterName } from '/@/types'
import { EllipsisOutlined, RocketOutlined, CameraFilled, UserOutlined, SelectOutlined } from '@ant-design/icons-vue'
import { EDeviceType } from '/@/types/device'
@@ -95,16 +95,13 @@
import { CURRENT_CONFIG } from '/@/api/http/config'
import { load } from '@amap/amap-jsapi-loader'
import { getRoot } from '/@/root'
-
import * as Cesium from 'cesium'
-let kmlDataSource = null
-
-const { appContext } = getCurrentInstance()
-const global = appContext.config.globalProperties
const loading = ref(false)
+const { appContext } = getCurrentInstance()
+const global = appContext.config.globalProperties
const store = useMyStore()
-const projectId = store.state.common.projectId
+let kmlDataSource = null
const pagination :IPage = {
page: 1,
total: -1,
@@ -116,7 +113,7 @@
})
const root = getRoot()
-const workspaceId = 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)
@@ -137,6 +134,7 @@
pagination.page++
getWaylines()
}, 1000)
+ console.log(workspaceId.value)
})
function getWaylines () {
@@ -144,16 +142,17 @@
return
}
canRefresh.value = false
- getWaylineFiles({
- workspaceId: projectId,
+ getWaylineFiles(workspaceId.value, {
+ page: pagination.page,
+ page_size: pagination.page_size,
+ order_by: 'update_time desc'
}).then(res => {
- if (res.code !== 5000) {
+ if (res.code !== 0) {
return
}
-
- const data = res.data
-
- waylinesData.data = [...waylinesData.data, ...data]
+ waylinesData.data = [...waylinesData.data, ...res.data.list]
+ pagination.total = res.data.pagination.total
+ pagination.page = res.data.pagination.page
}).finally(() => {
canRefresh.value = true
})
@@ -165,7 +164,7 @@
}
function deleteWayline () {
- deleteWaylineFile(workspaceId, deleteWaylineId.value).then(res => {
+ deleteWaylineFile(workspaceId.value, deleteWaylineId.value).then(res => {
if (res.code === 0) {
message.success('Wayline file deleted')
}
@@ -180,7 +179,7 @@
function downloadWayline (waylineId: string, fileName: string) {
loading.value = true
- downloadWaylineFile(workspaceId, waylineId).then(res => {
+ downloadWaylineFile(workspaceId.value, waylineId).then(res => {
if (!res) {
return
}
@@ -192,10 +191,14 @@
}
function selectRoute (wayline: WaylineFile) {
- initKmlFile('/src/assets/kmz/test.kmz')
- // store.commit('SET_SELECT_WAYLINE_INFO', wayline)
+ loading.value = true
+ getWayLineFile(workspaceId.value, wayline.id).then(res => {
+ store.commit('SET_SELECT_WAYLINE_INFO', wayline)
+ initKmlFile(res.data)
+ }).finally(() => {
+ loading.value = false
+ })
}
-
/**
* 加载kml文件
* @param file
@@ -210,7 +213,7 @@
Cesium.KmlDataSource.load(
file,
options
- )).then(res => {
+ )).then((res: any) => {
kmlDataSource = res
kmlDataSource.show = true
@@ -244,7 +247,6 @@
})
})
}
-
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) {
@@ -252,7 +254,6 @@
getWaylines()
}
}
-
interface FileItem {
uid: string;
name?: string;
@@ -276,9 +277,9 @@
fileList.value.forEach(async (file: FileItem) => {
const fileData = new FormData()
fileData.append('file', file, file.name)
- await importKmzFile(projectId, fileData).then((res) => {
+ await importKmzFile(workspaceId.value, fileData).then((res) => {
if (res.code === 0) {
- message.success(`${file.name} file uploaded successfully`)
+ message.success(`${file.name} 文件上传成功`)
canRefresh.value = true
pagination.total = 0
pagination.page = 1
--
Gitblit v1.9.3