diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue index b49c2cc..18be55a 100644 --- a/src/layout/components/Header/RecycleModal.vue +++ b/src/layout/components/Header/RecycleModal.vue @@ -170,16 +170,16 @@ async function featchList() { loading = true try { // const result = await dubiousfilelist({ ...pagination, orderbyname: timeRange.value }) - + pagination.pageNo += 1 // console.log('pagination.pageNo------------', pagination.pageNo) const result = await dubiousfilelist({ ...pagination, ...sortObj }) // TODO:测试数据 // result.data = Array.from({ length: 30 }) const { data, pageCount, current } = result - // pagination.pageNo = data.current + pagination.pageNo = data.current // canloadMore = pageCount >= pagination.pageNo && pageCount > 0; canloadMore = data.pages >= pagination.pageNo && data.pages > 0 - pagination.pageNo += 1 + // console.log('canloadMore------------', canloadMore) loading = false return result.data.records @@ -204,6 +204,7 @@ const updateHtml = debounce(() => { }, 1600) async function loadMore() { + console.log('可疑文件夹出来了11111111111111', loading, el.value) if (loading || el.value == null) return @@ -562,7 +563,7 @@ function rejectHandler() { function reset() { batch.value = false // pagination.pageNo = 1; - pagination.pageNo = 1 + pagination.pageNo = 0 pagination.pageSize = 30 selectIds.value = [] selectedApproveItems.value.length = 0 @@ -699,8 +700,11 @@ watch(() => show.value, async (newVal) => { // const list = await featchList() // listData.value = list // layout() - reset() - loadMore() + console.log('开启了可疑弹窗aaa') + setTimeout(() => { + reset() + loadMore() + }, 50) } }) diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue index 60f6c4b..f03a7bf 100644 --- a/src/views/home/content/Content.vue +++ b/src/views/home/content/Content.vue @@ -299,8 +299,8 @@ async function featchList(userSearchId?: string) { params.izsimilarity = params.izsimilarity.join('-') // rao end - console.log('window.cancle.queryPageListByCheckNo', window.cancle.queryPageListByCheckNo) - console.log('window.cancle.getPictureList', window.cancle.getPictureList) + // console.log('window.cancle.queryPageListByCheckNo', window.cancle.queryPageListByCheckNo) + // console.log('window.cancle.getPictureList', window.cancle.getPictureList) if (checkTaskStatus.value === 2 && isRefresh) { // 取消上次的请求 window.cancle.queryPageListByCheckNo && window.cancle.queryPageListByCheckNo() @@ -787,6 +787,7 @@ function loadImg(src) { function previewImageUrl(img1, img2) { setTimeout(async () => { const img = document.getElementsByClassName('n-image-preview').item(0) + img.src = img1 await loadImg(img2) img.src = img2 }, 50) diff --git a/src/views/task/modal/BatchModal.vue b/src/views/task/modal/BatchModal.vue index 98c0788..1fdc978 100644 --- a/src/views/task/modal/BatchModal.vue +++ b/src/views/task/modal/BatchModal.vue @@ -435,6 +435,7 @@ function loadImg(src) { function previewImageUrl(img1, img2) { setTimeout(async () => { const img = document.getElementsByClassName('n-image-preview').item(0) + img.src = img1 await loadImg(img2) img.src = img2 }, 50)