From cee338f18d22bbbb989d79c0add082fdb4e2b8ef Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 08 Sep 2023 11:09:00 +0800
Subject: [PATCH] store添加projectId

---
 src/pages/page-web/projects/wayline.vue |   57 ++++++++++++++++++++++++++-------------------------------
 1 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/src/pages/page-web/projects/wayline.vue b/src/pages/page-web/projects/wayline.vue
index 4a6dda9..2d8b1b0 100644
--- a/src/pages/page-web/projects/wayline.vue
+++ b/src/pages/page-web/projects/wayline.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="project-wayline-wrapper height-100">
+    <a-spin :spinning="loading" :delay="300" tip="downloading" 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>
@@ -19,9 +20,8 @@
         </a-col>
       </a-row>
     </div>
-    <div class="height-100">
-    <a-spin :spinning="loading" :delay="300" tip="downloading" size="large">
-      <div class="scrollbar uranus-scrollbar" v-if="waylinesData.data.length !== 0" @scroll="onScroll">
+    <div :style="{ height : height + 'px'}" class="scrollbar">
+      <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">
           <div class="wayline-panel" style="padding-top: 5px;" @click="selectRoute(wayline)">
             <div class="title">
@@ -75,8 +75,8 @@
               </div>
           </template>
       </a-modal>
-    </a-spin>
     </div>
+    </a-spin>
   </div>
 </template>
 
@@ -98,9 +98,10 @@
 
 const loading = ref(false)
 const store = useMyStore()
+const projectId = store.state.common.projectId
 const pagination :IPage = {
   page: 1,
-  total: 0,
+  total: -1,
   page_size: 10
 }
 
@@ -114,31 +115,22 @@
 const deleteWaylineId = ref<string>('')
 const canRefresh = ref(true)
 const importVisible = ref<boolean>(root.$router.currentRoute.value.name === ERouterName.WAYLINE)
+const height = ref()
 
 onMounted(() => {
+  const parent = document.getElementsByClassName('scrollbar').item(0)?.parentNode as HTMLDivElement
+  height.value = document.body.clientHeight - parent.firstElementChild!.clientHeight
   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++
-        getWaylines()
-      }
-    } else if (element && element.className.indexOf('height-100') === -1) {
-      element.className = element.className + ' height-100'
+  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
     }
-  }, 300)
+    pagination.page++
+    getWaylines()
+  }, 1000)
 })
 
 function getWaylines () {
@@ -154,8 +146,7 @@
     if (res.code !== 0) {
       return
     }
-    waylinesData.data = []
-    res.data.list.forEach((wayline: WaylineFile) => waylinesData.data.push(wayline))
+    waylinesData.data = [...waylinesData.data, ...res.data.list]
     pagination.total = res.data.pagination.total
     pagination.page = res.data.pagination.page
   }).finally(() => {
@@ -175,7 +166,9 @@
     }
     deleteWaylineId.value = ''
     deleteTip.value = false
-    pagination.total--
+    pagination.total = 0
+    pagination.page = 1
+    waylinesData.data = []
     getWaylines()
   })
 }
@@ -199,8 +192,7 @@
 
 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) {
+  if (element.scrollTop + element.clientHeight >= element.scrollHeight - 5 && Math.ceil(pagination.total / pagination.page_size) > pagination.page && canRefresh.value) {
     pagination.page++
     getWaylines()
   }
@@ -229,10 +221,13 @@
   fileList.value.forEach(async (file: FileItem) => {
     const fileData = new FormData()
     fileData.append('file', file, file.name)
-    await importKmzFile(workspaceId, fileData).then((res) => {
+    await importKmzFile(projectId, fileData).then((res) => {
       if (res.code === 0) {
         message.success(`${file.name} file uploaded successfully`)
         canRefresh.value = true
+        pagination.total = 0
+        pagination.page = 1
+        waylinesData.data = []
         getWaylines()
       }
     }).finally(() => {

--
Gitblit v1.9.3