From eec99c21e7513b210c61077e375b46bc59173f63 Mon Sep 17 00:00:00 2001
From: elseif <else.switch@gmail.com>
Date: Mon, 18 Mar 2024 14:08:40 +0800
Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/aside/Aside.vue             | 12 ++----------
 src/views/final/content/Content.vue         |  9 ++++-----
 src/views/home/aside/Aside.vue              | 11 ++---------
 src/views/home/aside/comp/AdvanceFilter.vue |  1 +
 4 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/src/views/final/aside/Aside.vue b/src/views/final/aside/Aside.vue
index 9e3ed29..3d3778c 100644
--- a/src/views/final/aside/Aside.vue
+++ b/src/views/final/aside/Aside.vue
@@ -134,16 +134,8 @@ function scrollHandler(key: string) {
   element?.scrollIntoView(true)
 }
 
-// 设置过滤配置的值（匹配的设置，不匹配的重置为默认值）
-function filterHandler(filterList: Filter[]) {
-  const filerMap: Record<string, any> = {}
-
-  for (const filter of filterList) {
-    const { key, value } = filter
-    filerMap[key] = value
-  }
-
-  emitter.emit('filter-final', filerMap)
+function filterHandler(searchId: string) {
+  emitter.emit('filter-final', searchId)
 }
 
 function editFilter(filter: any) {
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index c6326fd..77efc19 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -130,15 +130,14 @@ const pagination = reactive({
 })
 const tableData = ref<Array<RowData>>([])
 const selectionIds = ref<DataTableRowKey[]>([])
-const userStore = useUser()
 const dialog = useDialog()
 const message = useMessage()
 const finalStore = useFinal()
 
-async function query(page: number, pageSize: number, filterValues?: any) {
+async function query(page: number, pageSize: number, filterId?: any) {
   const asideParmas = unref(finalStore.getAsideValue)
   // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
-  const params = filterValues || asideParmas
+  const params = filterId ? { userSearchId: filterId } : asideParmas
   const result = await getFinalList({ sortorder: 'asc', pageSize, currPage: page, sortname: '', ...params })
   const { data, pageCount } = result
   tableData.value = data
@@ -404,9 +403,9 @@ function reset() {
   pagination.pageSize = 1
 }
 
-async function refreshHandler(filterValues?: any) {
+async function refreshHandler(searchId?: any) {
   reset()
-  query(pagination.page, pagination.pageSize, filterValues)
+  query(pagination.page, pagination.pageSize, searchId)
 }
 </script>
 
diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue
index 1a008f2..7445876 100644
--- a/src/views/home/aside/Aside.vue
+++ b/src/views/home/aside/Aside.vue
@@ -133,15 +133,8 @@ function scrollHandler(key: string) {
 }
 
 // 选择某个过滤配置，刷新图片墙
-function filterHandler(filterList: Filter[]) {
-  const filerMap: Record<string, any> = {}
-
-  for (const filter of filterList) {
-    const { key, value } = filter
-    filerMap[key] = value
-  }
-
-  emitter.emit('filter', filerMap)
+function filterHandler(searchId: string) {
+  emitter.emit('filter', searchId)
 }
 
 function editFilter(filter: any) {
diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue
index df6193c..9388c82 100644
--- a/src/views/home/aside/comp/AdvanceFilter.vue
+++ b/src/views/home/aside/comp/AdvanceFilter.vue
@@ -46,6 +46,7 @@ function generateDefaultConfig(): FilterEntity[] {
 
     if (isDefaultFilter === true) {
       const config = {
+        id: '',
         name: label,
         favorite: false,
         isDefaultFilter,

From ceb473d4b2cc08bdb12fa4d8b2de1b22c13ff966 Mon Sep 17 00:00:00 2001
From: elseif <else.switch@gmail.com>
Date: Mon, 18 Mar 2024 17:38:24 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E5=B7=A5=E5=8D=95=E6=8B=96?=
 =?UTF-8?q?=E5=8A=A8=E5=8A=A0=E8=BD=BD=EF=BC=9B=E6=9B=B4=E6=8D=A2=E7=BC=A9?=
 =?UTF-8?q?=E7=95=A5=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/work/work.ts                        |   2 +
 src/views/home/content/Content.vue          |  40 ++-
 src/views/task/content/Content.vue          |   2 +-
 src/views/worksheet/aside/WorkSheetList.vue |   2 +-
 src/views/worksheet/content/Content.vue     | 306 +++++++++++++-------
 5 files changed, 226 insertions(+), 126 deletions(-)

diff --git a/src/api/work/work.ts b/src/api/work/work.ts
index 949fc80..c84322f 100644
--- a/src/api/work/work.ts
+++ b/src/api/work/work.ts
@@ -77,6 +77,7 @@ export async function getTaskDetailPictureList(packageid: string, taskchildpictu
   })
 
   const { data: { records, pages, total } } = res
+  debugger
 
   // 精简一下数据
   const list = records.map((item) => {
@@ -87,6 +88,7 @@ export async function getTaskDetailPictureList(packageid: string, taskchildpictu
       assignee: item.assignee,
       pictureid: item.pictureid,
       imgurl: item.ocrPicture.imgurl,
+      thumburl: item.serverThumbnailUrl || item.ocrPicture.imgurl,
       iztrueorfalse: item.iztrueorfalse,
       states: item.states,
       history: hasHistory(item.ocpictureid, item.picturecompare),
diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index ada822f..35148cf 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -26,7 +26,7 @@ const el = ref<HTMLDivElement | null>(null)
 const viewMode = ref('masonry')
 const pagination = reactive({
   pageNo: 0,
-  pageSize: 50,
+  pageSize: 30,
 })
 const configStore = useConfig()
 const packageModalRef = ref(null)
@@ -136,6 +136,7 @@ async function featchList() {
     const list = data.map((item) => {
       return {
         imgUrl: item.imgurl,
+        thumburl: item.serverThumbnailUrl || item.imgurl,
         upname: item.upname,
         ocrPictureclass: item.ocrPictureclass,
         uphead: item.uphead,
@@ -216,7 +217,7 @@ watch(() => configStore.asideValue, (newVal, oldVal) => {
 
 function reset() {
   pagination.pageNo = 0
-  pagination.pageSize = 50
+  pagination.pageSize = 30
   listData.value.length = 0
   loading.value = false
   canloadMore = true
@@ -241,6 +242,10 @@ async function refreshHandler(filtersearchId?: any) {
 function getAvatar(url: string): string {
   return url ? getImgUrl(url) : avatar
 }
+
+const totalCount = computed(() => {
+  return listData.value.length
+})
 </script>
 
 <template>
@@ -253,19 +258,22 @@ function getAvatar(url: string): string {
       <SvgIcon style="cursor: pointer;" size="105" name="yijianchachong" @click="oneCheck" />
     </div>
     <div class="wrapper-content">
-      <div class="form">
-        <n-popselect v-model:value="timeRange" :options="timeOptions" trigger="click">
-          <div class="dropdown">
-            <span>{{ timeLabel || '请选择' }}</span>
-            <SvgIcon class="gap" name="arrow-botton" size="14" />
-          </div>
-        </n-popselect>
-        <n-popselect v-model:value="viewMode" :options="viewOptions" trigger="click">
-          <div class="dropdown">
-            <span>{{ viewLabel || '请选择' }}</span>
-            <SvgIcon class="gap" name="arrow-botton" size="14" />
-          </div>
-        </n-popselect>
+      <div style="display: flex;justify-content: space-between;">
+        <div class="form">
+          <n-popselect v-model:value="timeRange" :options="timeOptions" trigger="click">
+            <div class="dropdown">
+              <span>{{ timeLabel || '请选择' }}</span>
+              <SvgIcon class="gap" name="arrow-botton" size="14" />
+            </div>
+          </n-popselect>
+          <n-popselect v-model:value="viewMode" :options="viewOptions" trigger="click">
+            <div class="dropdown">
+              <span>{{ viewLabel || '请选择' }}</span>
+              <SvgIcon class="gap" name="arrow-botton" size="14" />
+            </div>
+          </n-popselect>
+        </div>
+        <span>共{{ totalCount }}项</span>
       </div>
       <n-spin :show="loading">
         <div ref="el" class="scroll" :style="listStyle">
@@ -279,7 +287,7 @@ function getAvatar(url: string): string {
               > -->
               <n-image
                 class="img" :img-props="{ onClick: hideDownload }"
-                :class="{ 'img-fit': viewMode !== 'masonry' }" :src="item.imgUrl"
+                :class="{ 'img-fit': viewMode !== 'masonry' }" :src="item.thumburl"
               />
               <div class="info">
                 <div class="left">
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index f0e6a58..08e12e8 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -369,7 +369,7 @@ function getPercent(pictureid: string) {
           </div>
           <div class="list">
             <div v-for="(item, index) in taskDetailPictureList" :key="index" class="item">
-              <div class="img-wrapper" :style="{ 'background-image': `url(${item.imgurl})` }" />
+              <div class="img-wrapper" :style="{ 'background-image': `url(${item.thumburl})` }" />
               <div class="check">
                 <n-checkbox
                   v-show="batch"
diff --git a/src/views/worksheet/aside/WorkSheetList.vue b/src/views/worksheet/aside/WorkSheetList.vue
index 8fe2644..9717eb0 100644
--- a/src/views/worksheet/aside/WorkSheetList.vue
+++ b/src/views/worksheet/aside/WorkSheetList.vue
@@ -27,7 +27,7 @@ const { isLoading } = useInfiniteScroll(
   () => {
     loadMore()
   },
-  { distance: 10, interval: 300, canLoadMore: () => {
+  { distance: 10, interval: 800, canLoadMore: () => {
     // console.log('canloadmore excuted!')
     return canloadMore.value
   } },
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 54d6a47..03f0e06 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -1,7 +1,9 @@
 <script lang="ts" setup>
-import { computed, onUnmounted, reactive, ref, unref, watch } from 'vue'
+import { computed, onMounted, onUnmounted, onUpdated, reactive, ref, unref, watch } from 'vue'
 import { useDialog, useMessage } from 'naive-ui'
-import { clone, pickBy } from 'lodash-es'
+import { clone, debounce, pickBy } from 'lodash-es'
+import { useInfiniteScroll } from '@vueuse/core'
+import imagesloaded from 'imagesloaded'
 import ConfrimModal from '../modal/ConfrimModal.vue'
 import type { PictureSortParam, SetTFParam } from '/#/api'
 import { useWorkOrder } from '@/store/modules/workOrder'
@@ -15,6 +17,7 @@ const selectItems = ref<any[]>([])
 const message = useMessage()
 const dialog = useDialog()
 const totalCount = ref(0)
+let _imagesload: any
 
 function setBatch(value: boolean) {
   batch.value = value
@@ -59,6 +62,11 @@ const taskDetailInfo = ref<any>({})
 const taskDetailPictureList = ref<any[]>([])
 const confrimModalRef = ref(null)
 const imageRef = ref<ComponentElRef | null>()
+const listData = ref<any[]>([])
+const loading = ref(false)
+const el = ref<HTMLDivElement | null>(null)
+
+let canloadMore = true
 
 let processItems: any[] = []
 
@@ -184,16 +192,86 @@ function backHandler() {
   workStore.back()
 }
 
+function reset() {
+  taskpagination.pageNo = 0
+  taskpagination.pageSize = 20
+  listData.value.length = 0
+  loading.value = false
+  canloadMore = true
+}
+
+async function refreshHandler() {
+  reset()
+
+  useInfiniteScroll(
+    el as any,
+    () => {
+      loadMore()
+    },
+    { distance: 10, canLoadMore: () => canloadMore },
+  )
+}
+
+async function loadMore() {
+  if (loading.value || el.value == null)
+    return
+
+  const more = await featchList()
+  listData.value.push(...more)
+}
+
+async function featchList() {
+  loading.value = true
+  try {
+    taskpagination.pageNo += 1
+    const taskId = selectTask.value.id
+    const { data, total, pageCount } = await getTaskDetailPictureList(workStore.activeId, taskId, { ...taskpagination, ...sortBy })
+    totalCount.value = total
+    canloadMore = pageCount >= taskpagination.pageNo && pageCount > 0
+
+    return data
+  }
+  catch (error) {
+    canloadMore = false
+    return []
+  }
+}
+
+const layout = debounce(() => {
+  if (el.value == null)
+    return
+
+  _imagesload = imagesloaded('.grid-item')
+
+  _imagesload.on('done', (instance) => {
+    if (!el.value)
+      return
+    const scrollHeight = el.value!.scrollHeight
+    const clientHeight = el.value!.clientHeight
+    const top = scrollHeight - clientHeight - 100
+    el.value!.scrollTo({ top, behavior: 'instant' })
+    loading.value = false
+  })
+
+  _imagesload.on('fail', (instance) => {
+    message.error('图片错误')
+    loading.value = false
+  })
+}, 300)
+
+onUpdated(() => {
+  layout()
+})
+
 watch(() => workStore.activeId, async (newValue, oldValue) => {
-  const taskId = workStore.getActiveId
+  const packageid = workStore.getActiveId
 
-  if (isEmpty(taskId))
+  if (isEmpty(packageid))
     return
 
   const res = await getPackageTaskList(newValue, packagepagination)
   const { data } = res
   taskList.value = data
-
   if (taskList.value.length > 0)
     handleSelect(taskList.value[0])
 })
@@ -208,9 +286,15 @@ async function handleSelect(item: any) {
   const taskId = item.id
   taskDetailInfo.value = await getTaskDetailInfo(taskId, workStore.activeId)
 
-  const { data, total } = await getTaskDetailPictureList(workStore.activeId, taskId, { ...taskpagination, ...sortBy })
-  taskDetailPictureList.value = data
-  totalCount.value = total
+  const packageid = workStore.getActiveId
+
+  if (isEmpty(packageid))
+    return
+
+  // const { data, total } = await getTaskDetailPictureList(workStore.activeId, taskId, { ...taskpagination, ...sortBy })
+  // taskDetailPictureList.value = data
+  // totalCount.value = total
+  refreshHandler()
 }
 
 async function sortHandler(orderby: 'pictureResult' | 'fromuptime') {
@@ -292,8 +376,6 @@ function previewHandler(event: MouseEvent) {
   if (imageRef.value)
     (imageRef.value as any).mergedOnClick()
 }
-
-const count = computed(() => taskDetailPictureList.value.length)
 </script>
 
 <template>
@@ -334,110 +416,115 @@ const count = computed(() => taskDetailPictureList.value.length)
         </div>
       </div>
     </div>
-    <div class="wrapper-detail">
-      <div
-        class="left" :style="{ 'background-image': `url(${taskDetailInfo?.ocrPicture?.imgurl})` }"
-        @click="previewHandler"
-      >
-        <div class="mark">
-          <SvgIcon v-show="taskDetailInfo?.iztrueorfalse === 0" size="128" name="jia" />
-        </div>
-        <div class="mark">
-          <SvgIcon v-show="taskDetailInfo?.iztrueorfalse === 1" size="128" name="zhen" />
-        </div>
-        <div class="info">
-          <n-grid x-gap="16" y-gap="0" :cols="12">
-            <n-gi span="4">
-              <span style="color:#8b8d8f;">
-                <SvgIcon name="m1" />
-              </span>
-            </n-gi>
-            <n-gi span="8" style="display: flex;align-items: left;flex-direction: column;justify-content: center;">
-              <span>{{ mark }}</span>
-              <span>图片标记</span>
-            </n-gi>
-            <n-gi span="4">
-              <span style="color:#8b8d8f;">
-                <SvgIcon name="m2" />
-              </span>
-            </n-gi>
-            <n-gi span="8" style="display: flex;align-items: left;flex-direction: column;justify-content: center;">
-              <span>{{ totalCount }}</span>
-              <span>相似匹配</span>
-            </n-gi>
-          </n-grid>
-        </div>
-        <div style="display: none;">
-          <n-image ref="imageRef" :img-props="{ onClick: hideDownload }" :src="taskDetailInfo?.ocrPicture?.imgurl" />
-        </div>
-      </div>
-      <div class="right">
-        <n-scrollbar style="max-height: 100%;">
-          <span class="name">图片名称</span>
-          <div class="tags">
-            <div class="tag tag-actived">
-              重复图片
+    <n-spin :show="loading">
+      <div ref="el" class="scroll">
+        <div class="wrapper-detail">
+          <div
+            class="left" :style="{ 'background-image': `url(${taskDetailInfo?.ocrPicture?.imgurl})` }"
+            @click="previewHandler"
+          >
+            <div class="mark">
+              <SvgIcon v-show="taskDetailInfo?.iztrueorfalse === 0" size="128" name="jia" />
             </div>
-            <div class="tag">
-              基线任务
+            <div class="mark">
+              <SvgIcon v-show="taskDetailInfo?.iztrueorfalse === 1" size="128" name="zhen" />
+            </div>
+            <div class="info">
+              <n-grid x-gap="16" y-gap="0" :cols="12">
+                <n-gi span="4">
+                  <span style="color:#8b8d8f;">
+                    <SvgIcon name="m1" />
+                  </span>
+                </n-gi>
+                <n-gi span="8" style="display: flex;align-items: left;flex-direction: column;justify-content: center;">
+                  <span>{{ mark }}</span>
+                  <span>图片标记</span>
+                </n-gi>
+                <n-gi span="4">
+                  <span style="color:#8b8d8f;">
+                    <SvgIcon name="m2" />
+                  </span>
+                </n-gi>
+                <n-gi span="8" style="display: flex;align-items: left;flex-direction: column;justify-content: center;">
+                  <span>{{ totalCount }}</span>
+                  <span>相似匹配</span>
+                </n-gi>
+              </n-grid>
+            </div>
+            <div style="display: none;">
+              <n-image ref="imageRef" :img-props="{ onClick: hideDownload }" :src="taskDetailInfo?.ocrPicture?.imgurl" />
             </div>
           </div>
-          <n-divider />
-          <div class="property">
-            <span class="property-name top" style="font-weight: bold;color: #333333;">拜访终端
-            </span>
-            <span style="font-weight: bold;color: #333333;font-size: 16px;">拜访终端</span>
-          </div>
-          <div v-for="(key) in Object.keys(propertys)" :key="key" class="property">
-            <span class="property-name">{{ fieldMap[key] }}</span>
-            <span class="property-content ">{{ propertys[key] }}</span>
+          <div class="right">
+            <n-scrollbar style="max-height: 100%;">
+              <span class="name">图片名称</span>
+              <div class="tags">
+                <div class="tag tag-actived">
+                  重复图片
+                </div>
+                <div class="tag">
+                  基线任务
+                </div>
+              </div>
+              <n-divider />
+              <div class="property">
+                <span class="property-name top" style="font-weight: bold;color: #333333;">拜访终端
+                </span>
+                <span style="font-weight: bold;color: #333333;font-size: 16px;">拜访终端</span>
+              </div>
+              <div v-for="(key) in Object.keys(propertys)" :key="key" class="property">
+                <span class="property-name">{{ fieldMap[key] }}</span>
+                <span class="property-content ">{{ propertys[key] }}</span>
+              </div>
+            </n-scrollbar>
           </div>
-        </n-scrollbar>
-      </div>
-    </div>
-    <div style="display: flex;justify-content: space-between;padding: 12px 0px;">
-      <div><span style="font-size: 21px;font-weight: bold;">相似图片</span><span>({{ count }})</span></div>
-      <div style="display: flex;align-items: center;" @click="sortHandler('fromuptime')">
-        <div style="cursor: pointer;">
-          <span>按时间排序</span>
-          <SvgIcon style="margin-left: 8px;" name="sort" size="12" />
         </div>
-        <div style="margin-left: 15px;cursor: pointer" @click="sortHandler('pictureResult')">
-          <span>相似度排序</span>
-          <SvgIcon style="margin-left: 8px;" name="sort" size="12" />
-        </div>
-      </div>
-    </div>
-    <div class="wrapper-list">
-      <div
-        v-for="(item, index) in taskDetailPictureList" :key="index" :class="{ 'item-selected': item === selectTask }"
-        class="item" @click="handleSelect(item)" @mouseover="overTaskHandelr(item)" @mouseleave="leaveTaskHandler"
-      >
-        <div class="img-wrapper" :style="{ 'background-image': `url(${item.imgurl})` }" />
-        <div class="check">
-          <n-checkbox
-            v-show="batch" v-model:checked="item.checked" @click.stop
-            @update:checked="onCheckChange($event, item)"
-          />
-        </div>
-        <div class="percent">
-          <SvgIcon size="42" name="tag" />
-          <div class="val">
-            {{ getPercent(item.pictureid) }}
+        <div style="display: flex;justify-content: space-between;padding: 12px 0px;">
+          <div><span style="font-size: 21px;font-weight: bold;">相似图片</span><span>({{ totalCount }})</span></div>
+          <div style="display: flex;align-items: center;" @click="sortHandler('fromuptime')">
+            <div style="cursor: pointer;">
+              <span>按时间排序</span>
+              <SvgIcon style="margin-left: 8px;" name="sort" size="12" />
+            </div>
+            <div style="margin-left: 15px;cursor: pointer" @click="sortHandler('pictureResult')">
+              <span>相似度排序</span>
+              <SvgIcon style="margin-left: 8px;" name="sort" size="12" />
+            </div>
           </div>
         </div>
-        <div class="mark">
-          <SvgIcon v-show="item.iztrueorfalse === 0" name="jia" />
-        </div>
-        <div class="mark">
-          <SvgIcon v-show="item.iztrueorfalse === 1" name="zhen" />
-        </div>
-        <div v-show="overTask && overTask.id === item.id" class="action">
-          <SvgIcon style="cursor: pointer;" name="t1" @click.stop="trueHandler" />
-          <SvgIcon style="cursor: pointer;" name="t2" @click.stop="falseHandler" />
+        <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.thumburl})` }" />
+            <div class="check">
+              <n-checkbox
+                v-show="batch" v-model:checked="item.checked" @click.stop
+                @update:checked="onCheckChange($event, item)"
+              />
+            </div>
+            <div class="percent">
+              <SvgIcon size="42" name="tag" />
+              <div class="val">
+                {{ getPercent(item.pictureid) }}
+              </div>
+            </div>
+            <div class="mark">
+              <SvgIcon v-show="item.iztrueorfalse === 0" name="jia" />
+            </div>
+            <div class="mark">
+              <SvgIcon v-show="item.iztrueorfalse === 1" name="zhen" />
+            </div>
+            <div v-show="overTask && overTask.id === item.id" class="action">
+              <SvgIcon style="cursor: pointer;" name="t1" @click.stop="trueHandler" />
+              <SvgIcon style="cursor: pointer;" name="t2" @click.stop="falseHandler" />
+            </div>
+          </div>
         </div>
       </div>
-    </div>
+    </n-spin>
     <ConfrimModal ref="confrimModalRef" @commit="setFalse" />
   </div>
 </template>
@@ -453,8 +540,11 @@ const count = computed(() => taskDetailPictureList.value.length)
   background: #FFF;
   border-radius: 3px;
   border: 1px solid rgb(239, 239, 245);
-  height: calc(100vh - 88px);
-  overflow-y: scroll;
+
+  .scroll {
+    height: calc(100vh - 88px - 72px);
+    overflow-y: scroll;
+  }
 
   &-header {
     display: flex;
@@ -635,7 +725,7 @@ const count = computed(() => taskDetailPictureList.value.length)
       background-color: #FFF;
     }
 
-    .item {
+    .grid-item {
       box-sizing: border-box;
       border-radius: 8px;
       padding: 9px 10px;

From b4370dcaffd9fa5bf3c430ffa72ff475789a5955 Mon Sep 17 00:00:00 2001
From: elseif <else.switch@gmail.com>
Date: Mon, 18 Mar 2024 19:57:43 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E5=B7=A5=E5=8D=95=E7=9B=B8=E4=BC=BC?=
 =?UTF-8?q?=E5=BA=A6=E6=8E=92=E5=BA=8F=EF=BC=9B=E7=BB=88=E8=BA=AB=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/home/main.ts                    |  3 ++-
 src/api/work/work.ts                    |  1 -
 src/views/final/comp/Action.vue         |  5 +++--
 src/views/home/content/Content.vue      |  8 +++-----
 src/views/worksheet/content/Content.vue | 15 ++++-----------
 5 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/api/home/main.ts b/src/api/home/main.ts
index 5ef20a6..60e6f24 100644
--- a/src/api/home/main.ts
+++ b/src/api/home/main.ts
@@ -117,9 +117,10 @@ export async function getPictureList(params: any): Promise<any> {
     headers: { 'Content-Type': ContentTypeEnum.FORM_DATA },
   })
 
-  const { data: { records, pages } } = res
+  const { data: { records, pages, total } } = res
   return {
     pageCount: pages,
     data: records,
+    total,
   }
 }
diff --git a/src/api/work/work.ts b/src/api/work/work.ts
index c84322f..78e6923 100644
--- a/src/api/work/work.ts
+++ b/src/api/work/work.ts
@@ -77,7 +77,6 @@ export async function getTaskDetailPictureList(packageid: string, taskchildpictu
   })
 
   const { data: { records, pages, total } } = res
-  debugger
 
   // 精简一下数据
   const list = records.map((item) => {
diff --git a/src/views/final/comp/Action.vue b/src/views/final/comp/Action.vue
index a9e46d2..b50e98f 100644
--- a/src/views/final/comp/Action.vue
+++ b/src/views/final/comp/Action.vue
@@ -17,8 +17,9 @@ const props = defineProps({
 })
 
 const actionConfig = {
-  1: [{ label: '查看', key: 'view' }, { label: '重置审批', key: 'reset' }],
-  5: [{ label: '通过', key: 'approval' }, { label: '不通过', key: 'reject' }, { label: '重置审批', key: 'reset' }],
+  3: [{ label: '查看', key: 'view' }, { label: '重置审批', key: 'reset' }],
+  4: [{ label: '查看', key: 'view' }, { label: '重置审批', key: 'reset' }],
+  2: [{ label: '通过', key: 'approval' }, { label: '不通过', key: 'reject' }, { label: '重置审批', key: 'reset' }],
 }
 
 const actions = computed(() => {
diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 35148cf..523d33c 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -34,6 +34,7 @@ const generateModalRef = ref(null)
 const LoginSuccessModalRef = ref(null)
 const loading = ref(false)
 const message = useMessage()
+const totalCount = ref(0)
 let canloadMore = true
 let filterId = null
 
@@ -130,7 +131,8 @@ async function featchList() {
     const asideParams = unref(configStore.getAsideValue)
     const params = filterId ? { userSearchId: filterId } : asideParams
     const result = await getPictureList({ ...pagination, ...contentParams, ...params })
-    const { data, pageCount } = result
+    const { data, pageCount, total } = result
+    totalCount.value = total
     canloadMore = pageCount >= pagination.pageNo && pageCount > 0
 
     const list = data.map((item) => {
@@ -242,10 +244,6 @@ async function refreshHandler(filtersearchId?: any) {
 function getAvatar(url: string): string {
   return url ? getImgUrl(url) : avatar
 }
-
-const totalCount = computed(() => {
-  return listData.value.length
-})
 </script>
 
 <template>
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 03f0e06..4f3b7ee 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -291,9 +291,6 @@ async function handleSelect(item: any) {
   if (isEmpty(packageid))
     return
 
-  // const { data, total } = await getTaskDetailPictureList(workStore.activeId, taskId, { ...taskpagination, ...sortBy })
-  // taskDetailPictureList.value = data
-  // totalCount.value = total
   refreshHandler()
 }
 
@@ -301,12 +298,8 @@ async function sortHandler(orderby: 'pictureResult' | 'fromuptime') {
   if (!selectTask.value)
     return
 
-  taskpagination.pageNo = 1
-  taskpagination.pageSize = 10
   sortBy.orderbyvalue = orderby
-
-  const res = await getTaskDetailPictureList(workStore.activeId, selectTask.value.id, { ...taskpagination, ...sortBy })
-  taskDetailPictureList.value = res.data
+  refreshHandler()
 }
 
 const propertys = computed(() => {
@@ -357,7 +350,7 @@ function getPercent(pictureid: string) {
   const index = ocpictureid.split(',').indexOf(String(pictureid))
   const results = pictureresult.split(',')
   const percent = results[index] || '0'
-  const val = Number.parseFloat(percent)
+  const val = Math.floor(Number.parseFloat(percent))
   return `${val}%`
 }
 
@@ -481,8 +474,8 @@ function previewHandler(event: MouseEvent) {
         </div>
         <div style="display: flex;justify-content: space-between;padding: 12px 0px;">
           <div><span style="font-size: 21px;font-weight: bold;">相似图片</span><span>({{ totalCount }})</span></div>
-          <div style="display: flex;align-items: center;" @click="sortHandler('fromuptime')">
-            <div style="cursor: pointer;">
+          <div style="display: flex;align-items: center;">
+            <div style="cursor: pointer;" @click="sortHandler('fromuptime')">
               <span>按时间排序</span>
               <SvgIcon style="margin-left: 8px;" name="sort" size="12" />
             </div>