From 7e6da80846a0be065b735ba3bf2a8690a515561e Mon Sep 17 00:00:00 2001
From: raofuzi <2641346316@qq.com>
Date: Thu, 18 Apr 2024 16:06:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/work/work.ts                           | 4 +++-
 src/views/home/content/Content.vue             | 4 +++-
 src/views/worksheet/components/PictureWall.vue | 4 +++-
 src/views/worksheet/content/Content.vue        | 3 ++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/api/work/work.ts b/src/api/work/work.ts
index 03b1812..c3141e8 100644
--- a/src/api/work/work.ts
+++ b/src/api/work/work.ts
@@ -100,7 +100,9 @@ export async function getPictureSimilarityList(params: PageParam & PictureSortPa
       taskname: item.fromTaskName,
       assignee: item.assignee,
       pictureid: item.pictureid || item.pictureId,
-      imgurl: item.serverThumbnailUrl,
+      imgurl: item.imgUrl,
+      imgUrl: item.imgUrl,
+      serverThumbnailUrl: item.serverThumbnailUrl,
       maxSimilarity: item.maxSimilarity,
       thumburl: item.ocrPicture?.serverThumbnailUrl || item.ocrPicture?.imgurl,
       iztrueorfalse: item.iztrueorfalse,
diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 179c3fc..31c7663 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -141,7 +141,9 @@ useInfiniteScroll(
 )
 
 onUpdated(() => {
-  layout()
+  nextTick(() => {
+    layout()
+  })
 })
 
 const timeRange = ref('')
diff --git a/src/views/worksheet/components/PictureWall.vue b/src/views/worksheet/components/PictureWall.vue
index 591d8d1..6bb9a37 100644
--- a/src/views/worksheet/components/PictureWall.vue
+++ b/src/views/worksheet/components/PictureWall.vue
@@ -22,7 +22,9 @@ import { useDialog, useMessage } from "naive-ui";
 import { onMounted, onUnmounted, onUpdated, reactive, ref, toRefs, unref, watch } from "vue";
 import ConfrimModal from "../modal/ConfrimModal.vue";
 import type { ApprovalParam, SimilarityPictureSortParam } from "/#/api";
+import bgLoading from '@/assets/images/bg-loading.png';
 
+const bgLoadingImg = ref(bgLoading)
 const props = defineProps({
   taskDetailInfo: {
     type: Object,
@@ -333,7 +335,7 @@ onUnmounted(() => {
     <div class="wrapper-list">
       <div v-for="(item, index) in listData" :key="index" :class="{ 'item-selected': item === selectTask }"
         class="grid-item" @click="handleSelect(item)" @mouseover="overTaskHandelr(item)" @mouseleave="leaveTaskHandler">
-        <div class="img-wrapper" :style="{ 'background-image': `url(${item.imgurl})` }" />
+        <div class="img-wrapper" :style="{ 'background-image': `url(${item?.serverThumbnailUrl ? item.serverThumbnailUrl : item.imgUrl ? item.imgUrl: bgLoadingImg})` }" />
         <div class="time-wrapper">
           <div class="time">
             <SvgIcon color="#FFF" size="16" name="camera" />
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 388bc17..0ac27c8 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -147,6 +147,7 @@ async function loadMore() {
 
   const more = await featchList()
   listData.value.push(...more)
+  console.log("listData.value11111111111111111", listData.value);
 }
 
 async function featchList() {
@@ -834,7 +835,7 @@ defineExpose({
           >
             <div
               class="img-wrapper"
-              :style="{ background: `url(${item?.serverThumbnailUrl ? item.serverThumbnailUrl : item.imgurl ? item.imgurl: bgLoadingImg})` }"
+              :style="{ background: `url(${item.serverThumbnailUrl ? item.serverThumbnailUrl : item.imgUrl ? item.imgUrl: bgLoadingImg})` }"
             />
             <div class="time-wrapper">
               <div class="time">