From 8237e77973bc48599593175912a2ba6e3dbde075 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Tue, 2 Apr 2024 20:48:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20100=E7=99=BE=E5=88=86=E5=8F=B7?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E6=94=B9=E6=88=90=E7=BA=A2=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/content/Content.vue | 46 +++++++++++--------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 1919492..c0ac090 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -533,10 +533,9 @@ function reloadList() {
               <n-checkbox v-show="batch && item.historyStates !== 2 && item.historyStates !== 3" v-model:checked="item.checked" @click.stop
                 @update:checked="onCheckChange($event, item)" />
             </div>
-            <div class="percent">
-              <SvgIcon size="42" name="tag" />
+            <div class="percent" :class="{ 'percent-red': item?.maxSimilarity >= 100  }">
               <div class="val">
-                {{ item?.maxSimilarity && Number(item?.maxSimilarity).toFixed(0) }}%
+                {{ item?.maxSimilarity && Number(item?.maxSimilarity).toFixed(0) }}<span class="percent-unit">%</span>
               </div>
             </div>
 
@@ -967,29 +966,26 @@ function reloadList() {
 
       .percent {
         position: absolute;
-        text-align: center;
-        z-index: 3;
-        right: 17px;
-        top: 2px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 35px;
+        height: 18px;
+        opacity: 0.9;
+        background: #6f92fd;
+        border-radius: 6px 0px 6px 0px;
+        z-index: 5;
+        right: 12px;
+        top: 15px;
         color: #fff;
-
-        .val {
-          position: absolute;
-          left: 0;
-          top: 0;
-          display: block;
-          width: 100%;
-          height: 100%;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          font-size: 12px;
-          font-family: PingFang SC, PingFang SC-Semibold;
-          font-weight: Semibold;
-          text-align: left;
-          color: #ffffff;
-          line-height: 24px;
-        }
+        font-size: 14px;
+      }
+      .percent-unit {
+        font-size: 8px;
+        margin-top: 4px;
+      }
+      .percent-red{
+        background: #ff4e4f;
       }
 
       .pass-status {

From 5638e1a4162357a4db42a183bcb27523e9cf6da1 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Tue, 2 Apr 2024 21:11:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4taskId=E4=B8=BAta?=
 =?UTF-8?q?skchildpictureid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/content/Content.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index c0ac090..0737451 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -13,7 +13,7 @@ import emitter from '@/utils/mitt';
 import { useInfiniteScroll } from "@vueuse/core";
 import { format } from 'date-fns';
 import imagesloaded from "imagesloaded";
-import { clone, debounce, pickBy } from "lodash-es";
+import { clone, cloneDeep, debounce, pickBy } from "lodash-es";
 import { useDialog, useMessage } from "naive-ui";
 import { computed, onUnmounted, onUpdated, reactive, ref, unref, watch } from "vue";
 import PictureInfo from "../components/PictureInfo.vue";
@@ -296,8 +296,11 @@ function rejectHandler() {
 }
 function detailRejectHandler() {
   const modal = unref(notPassModalRef)! as any
-  modal.showModal([taskDetailInfo.value])
+  const params = cloneDeep(taskDetailInfo.value)
+  params.id = params.taskchildpictureid
+  modal.showModal([params])
 }
+
 function singleRejectHandler(item) {
   const modal = unref(notPassModalRef)! as any
   modal.showModal([item])
@@ -324,6 +327,7 @@ function approvalHandler(items?: any) {
   }
   else if (overTask.value) {
     cloneItem = clone(overTask.value)
+    cloneItem.id = cloneItem.taskchildpictureid
     processItems = [cloneItem]
   }
   //  任务包图片 => 点击 => 通过/不通过按钮