From 55bcb26474f9562484c8e60262dcf9ec73afcc8a Mon Sep 17 00:00:00 2001
From: raoyongjun <2641346316@qq.com>
Date: Thu, 9 May 2024 11:59:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=8F=AF?=
 =?UTF-8?q?=E7=96=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Header/RecycleModal.vue | 16 ++++++++++------
 src/views/home/content/Content.vue            |  5 +++--
 src/views/task/modal/BatchModal.vue           |  1 +
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue
index b49c2cc..7785e21 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('开启了可疑弹窗')
+    setTimeout(() => {
+      reset()
+      loadMore()
+    }, 50)
   }
 })
 </script>
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)
-- 
2.39.3


From 598858e14432362ef8daa1fa0c50becae82a1c23 Mon Sep 17 00:00:00 2001
From: raoyongjun <2641346316@qq.com>
Date: Thu, 9 May 2024 13:35:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Header/RecycleModal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue
index 7785e21..18be55a 100644
--- a/src/layout/components/Header/RecycleModal.vue
+++ b/src/layout/components/Header/RecycleModal.vue
@@ -700,7 +700,7 @@ watch(() => show.value, async (newVal) => {
     // const list = await featchList()
     // listData.value = list
     // layout()
-    console.log('开启了可疑弹窗')
+    console.log('开启了可疑弹窗aaa')
     setTimeout(() => {
       reset()
       loadMore()
-- 
2.39.3