From 31ad252341e3614daab677a9cf2e37f62489484e Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Fri, 18 Nov 2022 18:35:12 +0800
Subject: [PATCH] initial v1.3.0
---
src/pages/page-web/projects/wayline.vue | 78 +++++++++++++++++++++++++++++++++++----
1 files changed, 70 insertions(+), 8 deletions(-)
diff --git a/src/pages/page-web/projects/wayline.vue b/src/pages/page-web/projects/wayline.vue
index b64e8e8..da7db6b 100644
--- a/src/pages/page-web/projects/wayline.vue
+++ b/src/pages/page-web/projects/wayline.vue
@@ -3,12 +3,24 @@
<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="22">Flight Route Library</a-col>
- <a-col :span="1"></a-col>
+ <a-col :span="15">Flight Route Library</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"
+ :customRequest="uploadFile"
+ >
+ <a-button type="text" style="color: white;">
+ <SelectOutlined />
+ </a-button>
+ </a-upload>
+ </a-col>
</a-row>
</div>
<div class="height-100">
- <a-spin :spinning="loading" :delay="1000" tip="downloading" size="large">
+ <a-spin :spinning="loading" :delay="300" tip="downloading" size="large">
<div class="scrollbar uranus-scrollbar" v-if="waylinesData.data.length !== 0" @scroll="onScroll">
<div v-for="wayline in waylinesData.data" :key="wayline.id">
<div class="wayline-panel" style="padding-top: 5px;" @click="selectRoute(wayline)">
@@ -72,14 +84,17 @@
import { reactive } from '@vue/reactivity'
import { message } from 'ant-design-vue'
import { onMounted, onUpdated, ref } from 'vue'
-import { deleteWaylineFile, downloadWaylineFile, getWaylineFiles } from '/@/api/wayline'
-import { ELocalStorageKey } from '/@/types'
-import { EllipsisOutlined, RocketOutlined, CameraFilled, UserOutlined } from '@ant-design/icons-vue'
+import { deleteWaylineFile, downloadWaylineFile, getWaylineFiles, importKmzFile } from '/@/api/wayline'
+import { ELocalStorageKey, ERouterName } from '/@/types'
+import { EllipsisOutlined, RocketOutlined, CameraFilled, UserOutlined, SelectOutlined } from '@ant-design/icons-vue'
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'
const loading = ref(false)
const store = useMyStore()
@@ -93,19 +108,28 @@
data: [] as WaylineFile[]
})
+const root = getRoot()
const workspaceId = 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)
onMounted(() => {
getWaylines()
+ setTimeout(() => {
+ const element = document.getElementsByClassName('scrollbar').item(0) as HTMLDivElement
+ const parent = element?.parentNode as HTMLDivElement
+ console.info(element, parent)
+ // console.info(element.scrollHeight, parent.clientHeight)
+ }, 1000)
})
onUpdated(() => {
const element = document.getElementsByClassName('scrollbar').item(0) as HTMLDivElement
const parent = element?.parentNode as HTMLDivElement
setTimeout(() => {
+ console.info(element, parent)
if (element?.scrollHeight < parent?.clientHeight && pagination.total > waylinesData.data.length) {
if (canRefresh.value) {
pagination.page++
@@ -130,6 +154,7 @@
if (res.code !== 0) {
return
}
+ waylinesData.data = []
res.data.list.forEach((wayline: WaylineFile) => waylinesData.data.push(wayline))
pagination.total = res.data.pagination.total
pagination.page = res.data.pagination.page
@@ -151,8 +176,7 @@
deleteWaylineId.value = ''
deleteTip.value = false
pagination.total--
- waylinesData.data = []
- setTimeout(getWaylines, 500)
+ getWaylines()
})
}
@@ -175,12 +199,50 @@
function onScroll (e: any) {
const element = e.srcElement
+ console.info(element)
if (element.scrollTop + element.clientHeight === element.scrollHeight && Math.ceil(pagination.total / pagination.page_size) > pagination.page && canRefresh.value) {
pagination.page++
getWaylines()
}
}
+interface FileItem {
+ uid: string;
+ name?: string;
+ status?: string;
+ response?: string;
+ url?: string;
+}
+
+interface FileInfo {
+ file: FileItem;
+ fileList: FileItem[];
+}
+const fileList = ref<FileItem[]>([])
+
+function beforeUpload (file: FileItem) {
+ fileList.value = [file]
+ loading.value = true
+ return true
+}
+const uploadFile = async () => {
+ console.info(loading.value)
+ fileList.value.forEach(async (file: FileItem) => {
+ const fileData = new FormData()
+ fileData.append('file', file, file.name)
+ await importKmzFile(workspaceId, fileData).then((res) => {
+ if (res.code === 0) {
+ message.success(`${file.name} file uploaded successfully`)
+ canRefresh.value = true
+ getWaylines()
+ }
+ }).finally(() => {
+ loading.value = false
+ fileList.value = []
+ })
+ })
+}
+
</script>
<style lang="scss" scoped>
--
Gitblit v1.9.3