Merge branch 'jie' into main

src/api/work/work.ts

@@ -102,7 +102,8 @@ export async function getTaskDetailPictureList(params: PageParam & PictureSortPa
       taskname: item.fromtaskname,
       assignee: item.assignee,
       pictureid: item.pictureid,
-      imgurl: item.imgUrl,
+      imgurl: item.serverThumbnailUrl,
+      maxSimilarity: item.maxSimilarity,
       thumburl: item.ocrPicture?.serverThumbnailUrl || item.ocrPicture?.imgurl,
       iztrueorfalse: item.iztrueorfalse,
       states: item.states,

src/views/worksheet/content/Content.vue

@@ -443,6 +443,7 @@ function previewHandler(event: MouseEvent) {
         </div>
       </div>
     </div>
+
     <n-spin :show="loading">
       <div ref="el" class="scroll">
         <div class="wrapper-detail">
@@ -549,7 +550,7 @@ function previewHandler(event: MouseEvent) {
                   >图片大小
                 </span>
                 <span style=" color: #333333; font-size: 16px"
-                  >{{ (taskDetailInfo?.pictureInfo?.imgSize /1000).toFixed(2) }}KB</span
+                  >{{ taskDetailInfo?.pictureInfo && (taskDetailInfo?.pictureInfo?.imgSize /1000).toFixed(2) }}KB</span
                 >
               </div>
               <div class="property">
@@ -557,7 +558,7 @@ function previewHandler(event: MouseEvent) {
                   >图片格式
                 </span>
                 <span style=" color: #333333; font-size: 16px"
-                  >{{ taskDetailInfo?.pictureInfo?.imgSpace }}</span
+                  >{{ taskDetailInfo?.pictureInfo?.imgFormat }}</span
                 >
               </div>
               <div class="property">
@@ -573,7 +574,7 @@ function previewHandler(event: MouseEvent) {
                   >色彩空间
                 </span>
                 <span style=" color: #333333; font-size: 16px"
-                  >{{ taskDetailInfo?.pictureInfo?.imgMeasure }}</span
+                  >{{ taskDetailInfo?.pictureInfo?.imgSpace }}</span
                 >
               </div>
               <div class="property">
@@ -653,7 +654,7 @@ function previewHandler(event: MouseEvent) {
             <div class="percent">
               <SvgIcon size="42" name="tag" />
               <div class="val">
-                {{ getPercent(item.pictureid) }}
+                {{ item?.maxSimilarity && Number(item?.maxSimilarity).toFixed(0)  }}%
               </div>
             </div>
             <div class="mark">
@@ -892,7 +893,7 @@ function previewHandler(event: MouseEvent) {
     .grid-item {
       box-sizing: border-box;
       border-radius: 8px;
-      padding: 9px 10px;
+      padding: 9px 5px;
       position: relative;
 
       .img-wrapper {