审批bug

src/enums/index.ts

@@ -0,0 +1,7 @@
+// 任务审核状态
+export const TASK_STATUS_OBJ = {
+  1: '未提交',
+  2: '待审批',
+  3: '通过',
+  4: '不通过',
+} as any

src/views/task/aside/ListItem.vue

@@ -18,7 +18,8 @@ const props = defineProps({
     default: () => [],
   },
 })
-
+console.log(props.showFieldList)
+console.log(props.listItem)
 const svgName = computed(() => {
   return props.selected ? 'task-select' : 'task'
 })
@@ -27,7 +28,7 @@ const svgName = computed(() => {
 <template>
   <div class="list-item" :class="{ 'list-item-selected': selected }">
     <div v-for="(item, index) in showFieldList" :key="index">
-      <div v-if="item.id === 'fromsourceid'" class="list-item-header">
+      <div v-if="item.id === 'fromtaskname'" class="list-item-header">
         <div class="id-wrap">
           <SvgIcon :name="svgName" size="28" />
           <span
@@ -55,7 +56,7 @@ const svgName = computed(() => {
         <li v-else-if="item.id === 'createdate'">
           提交时间：{{ format(listItem.createdate, "yyyy-MM-dd HH:mm:ss") }}
         </li>
-        <li v-else>
+        <li v-else class="ellipsis">
           <span class="label">{{ item.name }}：</span>{{ listItem[item.id] }}
         </li>
       </ul>
@@ -146,6 +147,14 @@ const svgName = computed(() => {
     line-height: 18px;
   }
 
+  .ellipsis{
+    display: block;
+    width: 226px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
   &-selected {
     background: rgba(68,113,232,0.07);
   }

src/views/task/content/Content.vue

@@ -5,6 +5,7 @@ import { useDialog, useMessage } from 'naive-ui'
 import { useRoute } from 'vue-router'
 import BatchModal from '../modal/BatchModal.vue'
 import { getAllfieldList, getfieldList } from '@/api/home/filter'
+import { TASK_STATUS_OBJ } from '@/enums/index'
 
 import { audit, dubiousfileyd, getSimilarityList, getTaskDetailInfo } from '@/api/task/task'
 import { getTaskDetailPictureList } from '@/api/work/work'
@@ -85,7 +86,6 @@ onMounted(() => {
 
 // 键盘左右箭头快捷切换
 function handleKeydown(event) {
-  console.log(event)
   if (event.key === 'ArrowLeft')
     backHandler()
   // 在这里执行左箭头的逻辑
@@ -413,13 +413,12 @@ function getPercent(pictureid: string) {
         <div
           v-show="!showActions"
           style="display: flex; align-items: center"
-          @click="setBatch(true)"
         >
-          <div class="btn">
+          <div class="btn" @click="setBatch(true)">
             <SvgIcon style="margin-right: 6px" size="22" name="batch" />
             批量审批
           </div>
-          <n-popover
+          <!-- <n-popover
             ref="popover"
             :style="{ padding: '0px' }"
             style="width: 148px"
@@ -443,7 +442,7 @@ function getPercent(pictureid: string) {
                 <SvgIcon size="20" name="download" /><span style="margin-left: 5px">导出全部数据</span>
               </li>
             </ul>
-          </n-popover>
+          </n-popover> -->
           <div class="icon-wrap">
             <SvgIcon
               size="20"
@@ -507,8 +506,8 @@ function getPercent(pictureid: string) {
           />
         </div>
         <div class="status">
-          <img v-show="taskDetailInfo?.userapprove?.statshis === 2" class="img-status" src="@/assets/images/pass.png" alt="">
+          <img v-show="taskDetailInfo?.userapprove?.statshis === 2" class="img-status" src="@/assets/images/task/pass.png" alt="">
-          <img v-show="taskDetailInfo?.userapprove?.statshis === 3" class="img-status" src="@/assets/images/not_pass.png" alt="">
+          <img v-show="taskDetailInfo?.userapprove?.statshis === 3" class="img-status" src="@/assets/images/task/not_pass.png" alt="">
         </div>
         <div class="mark">
           <SvgIcon
@@ -524,27 +523,27 @@ function getPercent(pictureid: string) {
             name="zhen"
           />
         </div>
-        <div class="info">
+        <div class="info img-info">
           <n-grid x-gap="12" y-gap="10" :cols="12">
             <n-gi span="4" class="gi1">
               <span>
-                <SvgIcon size="40" name="m1" />
+                <img class="icon-status" src="@/assets/images/task/status.png" alt="">
               </span>
             </n-gi>
             <n-gi span="8" class="gi2">
-              <span style="font-size: bold; font-size: 18px">{{ mark }}</span>
+              <span class="value">{{ TASK_STATUS_OBJ[taskDetailInfo.states] }}</span>
-              <span>审批状态</span>
+              <span class="label">审批状态</span>
             </n-gi>
             <n-gi span="4" class="gi1">
               <span>
-                <SvgIcon size="40" name="m2" />
+                <img class="icon-status" src="@/assets/images/task/similarity.png" alt="">
               </span>
             </n-gi>
             <n-gi span="8" class="gi2">
-              <span style="font-size: bold; font-size: 18px">{{
+              <span class="value num">{{
                 totalCount
-              }}</span>
+              }}<span class="unit">张</span> </span>
-              <span>相似匹配</span>
+              <span class="label">相似匹配</span>
             </n-gi>
           </n-grid>
         </div>
@@ -592,7 +591,7 @@ function getPercent(pictureid: string) {
                 />
               </div>
               <div class="percent">
-                {{ getPercent(item.pictureid) }}
+                {{ item.similarityscore }}
               </div>
             </div>
           </div>
@@ -658,6 +657,39 @@ function getPercent(pictureid: string) {
   margin-left: 10px;
   cursor: pointer;
 }
+
+.img-info{
+  .icon-status{
+    width: 32px;
+    height: 32px;
+  }
+
+  .label{
+    font-size: 11px;
+    font-family: PingFang SC, PingFang SC-Medium;
+    font-weight: 500;
+    color: #ffffff;
+  }
+
+  .value{
+    font-size: 15px;
+    font-family: PingFang SC, PingFang SC-Semibold;
+    font-weight: 600;
+    color: #ffffff;
+  }
+
+  .num{
+    font-size: 18px;
+    font-family: PingFang SC, PingFang SC-Semibold;
+    font-weight: 600;
+    color: #ffffff;
+  }
+
+  .unit{
+    font-size: 11px;
+  }
+
+}
 .wrapper {
   display: flex;
   flex: 1;
@@ -778,7 +810,7 @@ function getPercent(pictureid: string) {
         height: 119px;
         background: rgba(216, 216, 216, 0.4);
         border-radius: 7px;
-        padding: 10px;
+        padding: 16px 0 0 23px;
         color: #fff;
       }
 
@@ -884,7 +916,9 @@ function getPercent(pictureid: string) {
 
       .percent {
         position: absolute;
-        text-align: center;
+        display: flex;
+        align-items: center;
+        justify-content: center;
         width: 35px;
         height: 18px;
         opacity: 0.9;
@@ -894,6 +928,15 @@ function getPercent(pictureid: string) {
         right: 12px;
         top: 2px;
         color: #fff;
+        font-size: 14px;
+      }
+
+      .percent-unit{
+        font-size: 8dvb;
+      }
+
+      .percent-red{
+        background: #ff4e4f;
       }
     }
   }