From e172845658596f6ee488a5bfd280a06ec069ff1f Mon Sep 17 00:00:00 2001 From: raofuzi <2641346316@qq.com> Date: Mon, 22 Apr 2024 22:00:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/worksheet/aside/Aside.vue | 1 + src/views/worksheet/content/Content.vue | 106 +++++++++++++++++------- src/views/worksheet/index.vue | 27 +++--- 3 files changed, 90 insertions(+), 44 deletions(-) diff --git a/src/views/worksheet/aside/Aside.vue b/src/views/worksheet/aside/Aside.vue index e6fd17b..4cafb65 100644 --- a/src/views/worksheet/aside/Aside.vue +++ b/src/views/worksheet/aside/Aside.vue @@ -269,6 +269,7 @@ if (searchContent) { &-header { padding: 12px 16px; width: 100%; + display: table; overflow: hidden; .warpper { diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue index 9df7ef5..aa1f714 100644 --- a/src/views/worksheet/content/Content.vue +++ b/src/views/worksheet/content/Content.vue @@ -6,6 +6,7 @@ import { clone, cloneDeep, debounce, pickBy } from 'lodash-es' import { useDialog, useMessage } from 'naive-ui' import { computed, + nextTick, onMounted, onUnmounted, onUpdated, @@ -37,6 +38,7 @@ const totalCount = ref(0) let _imagesload: any const bgLoadingImg = ref(bgLoading) const imgbigshow = ref(true) +const isInitLoading = ref(0) function changeimgbigshow() { imgbigshow.value = !imgbigshow.value @@ -132,23 +134,53 @@ function reset() { } async function refreshHandler() { reset() - - useInfiniteScroll( - el as any, - () => { - loadMore() - }, - { distance: 10, canLoadMore: () => canloadMore }, - ) + // 暂时注释 start + // useInfiniteScroll( + // el as any, + // () => { + // loadMore() + // }, + // { distance: 10, canLoadMore: () => canloadMore }, + // ) + // 暂时注释 end + loadMore() + setTimeout(() => { + loadMore() + canloadMore = true + }, 1000) + nextTick(() => { + setTimeout(() => { + useInfiniteScroll( + el as any, + () => { + console.log('加载更多lllllllllllllllll') + loadMore() + }, + { distance: 10, canLoadMore: () => canloadMore }, + ) + }, 300) + }) } +useInfiniteScroll( + el as any, + () => { + console.log('加载更多lllllllllllllllll') + loadMore() + }, + { distance: 10, canLoadMore: () => canloadMore }, +) + async function loadMore() { + console.log('loading.value的加载更多', loading.value, el.value) if (loading.value || el.value == null) return const more = await featchList() listData.value.push(...more) - console.log('listData.value11111111111111111', listData.value) + loading.value = false + isInitLoading.value++ + console.log('listData.value11111111111111111', listData.value, isInitLoading.value) } async function featchList() { @@ -163,7 +195,7 @@ async function featchList() { }) totalCount.value = total - canloadMore = pageCount >= taskpagination.pageNo && pageCount > 0 + canloadMore = (pageCount >= taskpagination.pageNo && pageCount > 0 && isInitLoading.value > 1) return data } catch (error) { @@ -175,19 +207,21 @@ async function featchList() { const layout = debounce(() => { if (el.value == null) return - - _imagesload = imagesloaded('.grid-item') - - _imagesload.on('done', (instance) => { - if (!el.value) - return - loading.value = false - }) - - _imagesload.on('fail', (instance) => { - message.error('图片错误') - loading.value = false - }) + loading.value = false + // 暂时注释 start + // _imagesload = imagesloaded('.grid-item') + + // _imagesload.on('done', (instance) => { + // if (!el.value) + // return + // loading.value = false + // }) + + // _imagesload.on('fail', (instance) => { + // message.error('图片错误') + // loading.value = false + // }) + // 暂时注释 end }, 300) const fullscreenStyles = computed(() => ({ @@ -202,13 +236,17 @@ const fullscreenStyles = computed(() => ({ // 切换全屏状态 function toggleFullScreen() { isFullScreen.value = !isFullScreen.value - if(!isFullScreen.value){ - imgbigshow.value=true - } + if (!isFullScreen.value) + imgbigshow.value = true } onUpdated(() => { - layout() + // layout() + // nextTick(() => { + // setTimeout(() => { + // layout() + // }, 500) + // }) }) watch( @@ -635,6 +673,7 @@ defineExpose({
+
-import DataHeader from "@/components/DataHeader/index.vue"; -import { ref } from "vue"; -import Aside from "./aside/Aside.vue"; -import Content from "./content/Content.vue"; -import { useWorkOrder } from "@/store/modules/workOrder"; +import { ref } from 'vue' +import Aside from './aside/Aside.vue' +import Content from './content/Content.vue' +import DataHeader from '@/components/DataHeader/index.vue' +import { useWorkOrder } from '@/store/modules/workOrder' import Robot from '@/components/Robot/index.vue' - -const workStore = useWorkOrder(); -const contentRef: any = ref(null); -const ApprovalOver = (packageId) => { - const id: string = workStore.getActiveId; - contentRef.value.queryDetail(id); -}; +const workStore = useWorkOrder() +const contentRef: any = ref(null) +function ApprovalOver(packageId) { + const id: string = workStore.getActiveId + contentRef.value.queryDetail(id) +}