From 8dacad04d05230e64ddfbf2c9757eecca7c61589 Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Wed, 13 Sep 2023 09:31:45 +0800
Subject: [PATCH] Merge branch 'develop' of http://s16s652780.51mypc.cn:49896/r/yskj/iot_drone_web into develop
---
src/pages/page-web/projects/wayline.vue | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/src/pages/page-web/projects/wayline.vue b/src/pages/page-web/projects/wayline.vue
index 2d8b1b0..0bc9059 100644
--- a/src/pages/page-web/projects/wayline.vue
+++ b/src/pages/page-web/projects/wayline.vue
@@ -96,6 +96,11 @@
import { load } from '@amap/amap-jsapi-loader'
import { getRoot } from '/@/root'
+import * as Cesium from 'cesium'
+
+const { appContext } = getCurrentInstance()
+const global = appContext.config.globalProperties
+
const loading = ref(false)
const store = useMyStore()
const projectId = store.state.common.projectId
@@ -138,17 +143,18 @@
return
}
canRefresh.value = false
- getWaylineFiles(workspaceId, {
- page: pagination.page,
- page_size: pagination.page_size,
- order_by: 'update_time desc'
+ getWaylineFiles({
+ workspaceId: projectId,
}).then(res => {
- if (res.code !== 0) {
+ console.log(res, '+++++++++++++++++++++++++++++++++++++')
+
+ if (res.code !== 5000) {
return
}
- waylinesData.data = [...waylinesData.data, ...res.data.list]
- pagination.total = res.data.pagination.total
- pagination.page = res.data.pagination.page
+
+ const data = res.data
+
+ waylinesData.data = [...waylinesData.data, ...data]
}).finally(() => {
canRefresh.value = true
})
@@ -187,7 +193,22 @@
}
function selectRoute (wayline: WaylineFile) {
- store.commit('SET_SELECT_WAYLINE_INFO', wayline)
+ console.log(global, '+++++++++++')
+
+ const options = {
+ camera: global.$viewer.scene.camera,
+ canvas: global.$viewer.scene.canvas,
+ screenOverlayContainer: global.$viewer.container,
+ }
+ global.$viewer.dataSources.add(
+ Cesium.KmlDataSource.load(
+ '/src/assets/kmz/test.kmz',
+ options
+ )).then(res => {
+ console.log(res, '+++++++++++++++++++')
+ })
+
+ // store.commit('SET_SELECT_WAYLINE_INFO', wayline)
}
function onScroll (e: any) {
--
Gitblit v1.9.3