From 030dc5a8d1eaa0f25520034bdb00c41e7ac08852 Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Wed, 13 Sep 2023 15:50:09 +0800
Subject: [PATCH] 冲突修改
---
src/pages/page-web/projects/wayline.vue | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/pages/page-web/projects/wayline.vue b/src/pages/page-web/projects/wayline.vue
index 393b265..7c61ad1 100644
--- a/src/pages/page-web/projects/wayline.vue
+++ b/src/pages/page-web/projects/wayline.vue
@@ -126,17 +126,17 @@
onMounted(() => {
const parent = document.getElementsByClassName('scrollbar').item(0)?.parentNode as HTMLDivElement
height.value = document.body.clientHeight - parent.firstElementChild!.clientHeight
- // getWaylines()
+ getWaylines()
- // const key = setInterval(() => {
- // const data = document.getElementById('data')?.lastElementChild as HTMLDivElement
- // if (pagination.total === 0 || Math.ceil(pagination.total / pagination.page_size) <= pagination.page || height.value <= data?.clientHeight + data?.offsetTop) {
- // clearInterval(key)
- // return
- // }
- // pagination.page++
- // getWaylines()
- // }, 1000)
+ const key = setInterval(() => {
+ const data = document.getElementById('data')?.lastElementChild as HTMLDivElement
+ if (pagination.total === 0 || Math.ceil(pagination.total / pagination.page_size) <= pagination.page || height.value <= data?.clientHeight + data?.offsetTop) {
+ clearInterval(key)
+ return
+ }
+ pagination.page++
+ getWaylines()
+ }, 1000)
})
function getWaylines () {
@@ -196,6 +196,10 @@
// store.commit('SET_SELECT_WAYLINE_INFO', wayline)
}
+/**
+ * 加载kml文件
+ * @param file
+ */
function initKmlFile (file:string) {
const options = {
camera: global.$viewer.scene.camera,
@@ -235,7 +239,9 @@
},
})
- global.$viewer.flyTo(lineEntity)
+ global.$viewer.flyTo(lineEntity, {
+ offset: new Cesium.HeadingPitchRange(0, -90, 1000)
+ })
})
}
--
Gitblit v1.9.3