From a35a1b8ff7cffdd6d98a4191925f33e4cdf8e8a7 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Tue, 26 Mar 2024 21:20:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=89=80=E6=9C=89=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/work/work.ts                        |  2 +-
 src/views/worksheet/aside/Aside.vue         | 30 +++++++------
 src/views/worksheet/aside/ListItem.vue      | 50 +++++++++++++--------
 src/views/worksheet/aside/WorkSheetList.vue | 15 +++++--
 4 files changed, 61 insertions(+), 36 deletions(-)

diff --git a/src/api/work/work.ts b/src/api/work/work.ts
index 77f1d81..4a1c8c3 100644
--- a/src/api/work/work.ts
+++ b/src/api/work/work.ts
@@ -9,7 +9,7 @@ import { ContentTypeEnum } from '@/enums/httpEnum'
  */
 export async function getPackageList(params: PageParam, packagename: string) {
   const res = await http.request({
-    url: `/ocr/ocrPackagetask/list`,
+    url: `/ocr/ocrTaskPackage/getPackageList`,
     method: 'get',
     params: { ...params, packagename },
   })
diff --git a/src/views/worksheet/aside/Aside.vue b/src/views/worksheet/aside/Aside.vue
index a93a52c..c084cbf 100644
--- a/src/views/worksheet/aside/Aside.vue
+++ b/src/views/worksheet/aside/Aside.vue
@@ -1,21 +1,21 @@
 <script lang="ts" setup>
+import { getAllfieldList, getfieldList } from "@/api/home/filter";
+import { useWindowSizeFn } from "@/hooks/event/useWindowSizeFn";
+import { useUser } from "@/store/modules/user";
+import { useWorkOrder } from "@/store/modules/workOrder";
+import { getViewportOffset } from "@/utils/domUtils";
 import { debounce } from "lodash-es";
 import {
-  computed,
-  defineOptions,
-  nextTick,
-  onMounted,
-  ref,
-  unref,
-  watch,
+computed,
+defineOptions,
+nextTick,
+onMounted,
+ref,
+unref,
+watch
 } from "vue";
 import CustomFieldModalVue from "../modal/CustomFieldModal.vue";
 import WorkSheetList from "./WorkSheetList.vue";
-import { getViewportOffset } from "@/utils/domUtils";
-import { useWorkOrder } from "@/store/modules/workOrder";
-import { useWindowSizeFn } from "@/hooks/event/useWindowSizeFn";
-import { useUser } from "@/store/modules/user";
-import { getAllfieldList, getfieldList, savefield } from "@/api/home/filter";
 defineOptions({ name: "AsideContent" });
 
 const collapse = ref(false);
@@ -25,7 +25,7 @@ const packageListRef = ref<HTMLDivElement | null>(null);
 // 展示字段
 const showFieldList = ref<any[]>([]);
 const reviewType = 1;
-
+const dicts = ref<any>([]);
 function collapseHandler() {
   collapse.value = !collapse.value;
 }
@@ -68,6 +68,7 @@ async function getshowFieldList() {
   let res;
   res = await getAllfieldList(reviewType); //所有筛选项目
   const allList = res.data;
+  dicts.value = res.data;
   res = await getfieldList(reviewType, userInfo.id); //当前用户选择的项目
   const useList = res.data;
   /**
@@ -158,7 +159,7 @@ const inputHandler = debounce((word) => {
       <div v-show="!showSearch" class="warpper">
         <div class="left">
           <svg-icon name="all-worksheet" size="32" />
-          <span style="margin-left: 8px">所有工单</span>
+          <span style="margin-left: 8px">所有任务包</span>
         </div>
         <div class="right">
           <SvgIcon
@@ -197,6 +198,7 @@ const inputHandler = debounce((word) => {
       ref="packageListRef"
       class="work-sheet-list"
       :showFieldList="showFieldList"
+      :dicts="dicts"
     />
     <CustomFieldModalVue
       ref="filterModalRef"
diff --git a/src/views/worksheet/aside/ListItem.vue b/src/views/worksheet/aside/ListItem.vue
index 4a6d623..81127bc 100644
--- a/src/views/worksheet/aside/ListItem.vue
+++ b/src/views/worksheet/aside/ListItem.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed } from "vue";
+import { computed, onMounted } from "vue";
 import type { PackageListItem } from "/#/workorder";
 
 defineOptions({ name: "ListItem" });
@@ -17,38 +17,52 @@ const props = defineProps({
     type: Array,
     default: () => [],
   },
+  dicts: {
+    type: Array,
+    default: () => [],
+  },
 });
-
-console.log(props.listItem, "listItem");
+console.log(props.dicts, "dicts");
 const svgName = computed(() => {
   return props.selected ? "taskpack-select" : "taskpack";
 });
+function getValueByLabel(label) {
+  const result = props.dicts.filter(item => item.name === label)
+  if (result.length === 0) {
+    return ""
+  } else {
+    return props.dicts.filter(item => item.name === label)[0].fieldDesc
+  }
+}
+onMounted(async () => {
+})
 </script>
 
 <template>
   <div class="list-item" :class="{ 'list-item-selected': selected }">
-    <div v-for="(item, index) in showFieldList" :key="index">
-      <div class="list-item-header" v-if="item.id == 'packagename'">
+    <div>
+      <div class="list-item-header">
         <div style="display: flex">
           <SvgIcon :name="svgName" size="28" />
-          <span
-            class="list-item-header-name"
-            :class="{ 'list-item-header-selected': selected }"
-          >
-            {{ listItem.packagename }}
+          <span class="list-item-header-name" :class="{ 'list-item-header-selected': selected }">
+            {{ listItem.name }}
           </span>
-          <span class="list-item-header-selected">({{ listItem.pictureno }})</span>
+          <span class="list-item-header-selected">({{ listItem.pictureCount }})</span>
         </div>
         <!-- <SvgIcon v-show="selected" size="14" name="more-ver" /> -->
       </div>
-      <ul class="list-item-detail" v-else>
-        <li>
-          {{
-          item.name
-        }}：{{
-          listItem[item.id]
-        }}
+      <ul class="list-item-detail">
+        <li v-for="(key, index) in Object.keys(listItem.search)" :key="index" v-if="listItem.search">
+          <div v-if="getValueByLabel(key)">
+            {{
+              getValueByLabel(key)
+            }}：{{
+              listItem.search[key]
+            }}
+          </div>
         </li>
+        <!-- <li>筛选时间：{{ listItem.createTime }}</li>
+        <li>执行人：{{ listItem.createBy }}</li> -->
       </ul>
     </div>
     <!-- <div class="list-item-header">
diff --git a/src/views/worksheet/aside/WorkSheetList.vue b/src/views/worksheet/aside/WorkSheetList.vue
index 1395570..548dd8b 100644
--- a/src/views/worksheet/aside/WorkSheetList.vue
+++ b/src/views/worksheet/aside/WorkSheetList.vue
@@ -1,18 +1,22 @@
 <script lang="ts" setup>
+import NotPassed from '@/components/NotPassed.vue'
+import { useWorkOrder } from '@/store/modules/workOrder'
+import { isEmpty } from '@/utils'
 import { useInfiniteScroll } from '@vueuse/core'
 import { reactive, ref, unref, watch } from 'vue'
 import ApprovalModal from '../modal/ApprovalModal.vue'
 import ListItem from './ListItem.vue'
-import NotPassed from '@/components/NotPassed.vue'
 import type { PackageListItem } from '/#/workorder'
-import { isEmpty } from '@/utils'
-import { useWorkOrder } from '@/store/modules/workOrder'
 
 defineProps({
   showFieldList: {
     type: Array,
     default: () => [],
   },
+  dicts: {
+    type: Array,
+    default: () => [],
+  },
 })
 const workStore = useWorkOrder()
 const data = ref<PackageListItem[]>([])
@@ -58,6 +62,10 @@ async function loadMore() {
   isLoading.value = true
   try {
     const more = await fetchList()
+    more.forEach(ele=>{
+      ele.search = JSON.parse(ele.search)
+      ele.search.createTime = ele.search.submit_date_timestamp
+    })
     data.value.push(...more)
   }
   finally {
@@ -134,6 +142,7 @@ defineExpose({
         :selected="activeId === item.id"
         :list-item="item"
         :show-field-list="showFieldList"
+        :dicts="dicts"
         @click="selectHandler(item.id, index)"
       />
     </div>

From a0af7173aca8cfe39c10de8df5a51ffc60f0a091 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Tue, 26 Mar 2024 23:09:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E5=B7=A5=E5=8D=95=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/work/work.ts                        |  45 ++++--
 src/store/modules/workOrder.ts              |  10 +-
 src/views/worksheet/aside/WorkSheetList.vue |   4 +-
 src/views/worksheet/content/Content.vue     | 168 +++++++++++++-------
 src/views/worksheet/index.vue               |   8 +-
 types/api.d.ts                              |   5 +
 types/workorder.d.ts                        |   2 +
 7 files changed, 156 insertions(+), 86 deletions(-)

diff --git a/src/api/work/work.ts b/src/api/work/work.ts
index 4a1c8c3..981987a 100644
--- a/src/api/work/work.ts
+++ b/src/api/work/work.ts
@@ -1,5 +1,5 @@
 import { http } from '@/utils/http/axios'
-import type { PageParam, PictureSortParam, SetTFParam } from '/#/api'
+import type { PageParam, PictureSortParam, SetTFParam, SimilarityPictureSortParam } from '/#/api'
 
 import { ContentTypeEnum } from '@/enums/httpEnum'
 
@@ -21,6 +21,24 @@ export async function getPackageList(params: PageParam, packagename: string) {
   }
 }
 
+/**
+ * 任务包列表主图-新 
+ * @returns
+ */
+export async function getPackagePicture(params: PageParam, packagename: string) {
+  const res = await http.request({
+    url: `/ocr/ocrPicture/getPackagePicture`,
+    method: 'get',
+    params: { ...params, packagename },
+  })
+
+  const { data: { records, pages } } = res
+  return {
+    pageCount: pages,
+    data: records,
+  }
+}
+
 /**
  * 获取某个任务包内任务列表
  * @param id 任务包id
@@ -44,16 +62,14 @@ export async function getPackageTaskList(packageid: string, params: PageParam) {
 }
 
 /**
- * 获取某个任务详情(字段信息)
- * @param id 任务id
- * @param packageid 任务包id
+ * 任务包列表主图-新 
+ * @param checkDuplicateId  查重id
  * @returns
  */
-export async function getTaskDetailInfo(taskId: string, packageid: string) {
-  const pid = packageid || 0
+export async function getTaskDetailInfo(checkDuplicateId: string) {
 
   const res = await http.request({
-    url: `/backstage/jifen/ocrtaskchildpicture/getdata/${taskId}/${pid}`,
+    url: `/ocr/ocrPicture/getPackagePicture?checkDuplicateId=${checkDuplicateId}`,
     method: 'get',
   })
 
@@ -67,11 +83,10 @@ export async function getTaskDetailInfo(taskId: string, packageid: string) {
  * @param params
  * @returns
  */
-export async function getTaskDetailPictureList(packageid: string, taskchildpictureid: string, params: PageParam & PictureSortParam) {
-  const pid = packageid || 0
+export async function getTaskDetailPictureList(params: PageParam & PictureSortParam & SimilarityPictureSortParam) {
 
   const res = await http.request({
-    url: `/backstage/jifen/ocrtaskchildpicture/listbypictureid/${pid}/${taskchildpictureid}`,
+    url: `/backstage/jifen/ocrtaskchildpicture/getPictureSimilarityList`,
     method: 'get',
     params,
   })
@@ -79,20 +94,22 @@ export async function getTaskDetailPictureList(packageid: string, taskchildpictu
   const { data: { records, pages, total } } = res
 
   // 精简一下数据
-  const list = records.map((item) => {
+  const list = records.map((item,index) => {
+
     return {
       id: item.id,
       taskId: item.taskId,
       taskname: item.fromtaskname,
       assignee: item.assignee,
       pictureid: item.pictureid,
-      imgurl: item.ocrPicture.imgurl,
-      thumburl: item.ocrPicture.serverThumbnailUrl || item.ocrPicture.imgurl,
+      imgurl: item.imgUrl,
+      thumburl: item.ocrPicture?.serverThumbnailUrl || item.ocrPicture?.imgurl,
       iztrueorfalse: item.iztrueorfalse,
       states: item.states,
-      history: hasHistory(item.ocpictureid, item.picturecompare),
+      history: item.ocpictureid && item.picturecompare && hasHistory(item.ocpictureid, item.picturecompare),
     }
   })
+  
   return {
     pageCount: pages,
     data: list,
diff --git a/src/store/modules/workOrder.ts b/src/store/modules/workOrder.ts
index 4c73ff4..5470f90 100644
--- a/src/store/modules/workOrder.ts
+++ b/src/store/modules/workOrder.ts
@@ -1,8 +1,8 @@
-import { defineStore } from 'pinia'
-import type { OrderState, PackageListItem } from '/#/workorder'
-import { useMessage } from 'naive-ui'
 import { getPackageList } from '@/api/work/work'
 import { store } from '@/store'
+import { useMessage } from 'naive-ui'
+import { defineStore } from 'pinia'
+import type { OrderState, PackageListItem } from '/#/workorder'
 
 export const useWorkOrderStore = defineStore({
   id: 'work-order',
@@ -11,6 +11,7 @@ export const useWorkOrderStore = defineStore({
     activeId: '',
     packageList: [],
     immersion: false,
+    name: ''
   }),
   getters: {
     getActiveId: (state: OrderState) => state.activeId,
@@ -24,7 +25,7 @@ export const useWorkOrderStore = defineStore({
     setActive(index: number, orderId?: string) {
       this.currentIndex = index
       const order = this.packageList[index]
-      this.activeId = orderId || order?.id
+      this.activeId = orderId || order?.checkDuplicateId
     },
     forward() {
       const len = this.packageList.length
@@ -45,7 +46,6 @@ export const useWorkOrderStore = defineStore({
     },
     async fetchOrderList(pagination, keyword) {
       const res = await getPackageList(pagination, keyword)
-
       if (res.data&&res.data.length > 0) {
         this.packageList.push(...res.data)
         if (!this.activeId)
diff --git a/src/views/worksheet/aside/WorkSheetList.vue b/src/views/worksheet/aside/WorkSheetList.vue
index 548dd8b..98c8b40 100644
--- a/src/views/worksheet/aside/WorkSheetList.vue
+++ b/src/views/worksheet/aside/WorkSheetList.vue
@@ -41,7 +41,7 @@ function showModal(modalRef: any, id) {
 
 function selectHandler(id: string, index: number) {
   workStore.setActive(index)
-  showModal(approvalModalRef, id)
+  // showModal(approvalModalRef, id)
 }
 
 useInfiniteScroll(
@@ -139,7 +139,7 @@ defineExpose({
       <ListItem
         v-for="(item, index) in data"
         :key="item.id"
-        :selected="activeId === item.id"
+        :selected="activeId === item.checkDuplicateId"
         :list-item="item"
         :show-field-list="showFieldList"
         :dicts="dicts"
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 8db7831..bcc339e 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -1,23 +1,22 @@
 <script lang="ts" setup>
-import { computed, onUnmounted, onUpdated, reactive, ref, unref, watch } from "vue";
-import { useDialog, useMessage } from "naive-ui";
-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";
-import { formatToDateHMS } from "@/utils/dateUtil";
 import {
-  clearTF,
-  getPackageTaskList,
-  getTaskDetailInfo,
-  getTaskDetailPictureList,
-  setTF,
+clearTF, getTaskDetailInfo,
+getTaskDetailPictureList,
+setTF
 } from "@/api/work/work";
 import { fieldMap } from "@/config/workorder";
-import { hideDownload } from "@/utils/image";
+import { useWorkOrder } from "@/store/modules/workOrder";
 import { isEmpty } from "@/utils";
+import { formatToDateHMS } from "@/utils/dateUtil";
+import { hideDownload } from "@/utils/image";
+import { useInfiniteScroll } from "@vueuse/core";
+import { format } from 'date-fns';
+import imagesloaded from "imagesloaded";
+import { clone, debounce, pickBy } from "lodash-es";
+import { useDialog, useMessage } from "naive-ui";
+import { computed, onUnmounted, onUpdated, reactive, ref, unref, watch } from "vue";
+import ConfrimModal from "../modal/ConfrimModal.vue";
+import type { SetTFParam, SimilarityPictureSortParam } from "/#/api";
 
 const batch = ref(false);
 const selectItems = ref<any[]>([]);
@@ -54,9 +53,9 @@ const taskpagination = reactive({
   pageNo: 1,
   pageSize: 10,
 });
-const sortBy: PictureSortParam = {
-  orderbyname: "asc",
-  orderbyvalue: "pictureResult",
+const sortBy: SimilarityPictureSortParam = {
+  orderType: "asc",
+  orderName: "similarityScore",
 };
 const workStore = useWorkOrder();
 const selectTask = ref<any>(null);
@@ -208,7 +207,7 @@ async function refreshHandler() {
 
   useInfiniteScroll(
     el as any,
-    () => {
+    () => {      
       loadMore();
     },
     { distance: 10, canLoadMore: () => canloadMore }
@@ -223,20 +222,20 @@ async function loadMore() {
 }
 
 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 }
+      { ...taskpagination, ...sortBy ,checkDuplicateId: workStore.activeId}
     );
+    
     totalCount.value = total;
     canloadMore = pageCount >= taskpagination.pageNo && pageCount > 0;
 
     return data;
   } catch (error) {
+    debugger
     canloadMore = false;
     return [];
   }
@@ -272,23 +271,33 @@ watch(
       totalCount.value = 0;
       return;
     }
-
-    const res = await getPackageTaskList(newValue, packagepagination);
-    const { data } = res;
-    taskList.value = data;
-    if (taskList.value.length > 0) handleSelect(taskList.value[0]);
+    queryDetail(packageid)
+    // const res = await getPackageTaskList(newValue, packagepagination);
+    // const { data } = res;
+    // taskList.value = data;
+    // if (taskList.value.length > 0) handleSelect(taskList.value[0]); // 暂时注释掉
   }
 );
 
 const packageName = computed(() => {
   const index = workStore.getCurrentIndex;
-  return workStore.getOrderList[index]?.packagename || "";
+  return workStore.getOrderList[index]?.name || "";
 });
 
+async function queryDetail(checkDuplicateId: any) {
+  taskDetailInfo.value = await getTaskDetailInfo(checkDuplicateId);
+  const packageid = workStore.getActiveId;
+
+  if (isEmpty(packageid)) {
+    listData.value.length = 0;
+    totalCount.value = 0;
+    return;
+  }
+
+  refreshHandler();
+}
 async function handleSelect(item: any) {
-  selectTask.value = item;
-  const taskId = item.id;
-  taskDetailInfo.value = await getTaskDetailInfo(taskId, workStore.activeId);
+  taskDetailInfo.value = await getTaskDetailInfo( workStore.activeId);
 
   const packageid = workStore.getActiveId;
 
@@ -301,11 +310,10 @@ async function handleSelect(item: any) {
   refreshHandler();
 }
 
-async function sortHandler(orderby: "pictureResult" | "fromuptime") {
-  if (!selectTask.value) return;
+async function sortHandler(orderby: "similarityScore" | "createdate") {
 
-  sortBy.orderbyvalue = orderby;
-  sortBy.orderbyname = sortBy.orderbyname === "asc" ? "desc" : "asc";
+  sortBy.orderName = orderby;
+  sortBy.orderType = sortBy.orderType === "asc" ? "desc" : "asc";
   refreshHandler();
 }
 
@@ -359,8 +367,8 @@ onUnmounted(() => {
 
 function getPercent(pictureid: string) {
   const { ocpictureid, pictureresult } = taskDetailInfo.value;
-  const index = ocpictureid.split(",").indexOf(String(pictureid));
-  const results = pictureresult.split(",");
+  const index = ocpictureid ? ocpictureid.split(",").indexOf(String(pictureid)):'';
+  const results = pictureresult ? pictureresult.split(",") : '';
   const percent = results[index] || "0";
   const val = Math.floor(Number.parseFloat(percent));
   return `${val}%`;
@@ -440,7 +448,7 @@ function previewHandler(event: MouseEvent) {
         <div class="wrapper-detail">
           <div
             class="left"
-            :style="{ 'background-image': `url(${taskDetailInfo?.ocrPicture?.imgurl})` }"
+            :style="{ 'background-image': `url(${taskDetailInfo?.imgurl})` }"
             @click="showAction"
             @mouseleave="leaveTaskHandler"
           >
@@ -461,12 +469,12 @@ function previewHandler(event: MouseEvent) {
             </div>
             <div class="time">
               <SvgIcon color="#FFF" size="16" name="time" />
-              <span>{{ formatToDateHMS(taskDetailInfo.createdate || 0) }}</span>
+              <span>{{ taskDetailInfo.createTime }} </span>
             </div>
             <!-- 右下信息 -->
             <div class="info">
               <n-grid x-gap="16" y-gap="0" :cols="12">
-                <n-gi span="4">
+                <!-- <n-gi span="4">
                   <span style="color: #8b8d8f">
                     <SvgIcon name="m1" />
                   </span>
@@ -482,7 +490,7 @@ function previewHandler(event: MouseEvent) {
                 >
                   <span>{{ mark }}</span>
                   <span>图片标记</span>
-                </n-gi>
+                </n-gi> -->
                 <n-gi span="4">
                   <span style="color: #8b8d8f">
                     <SvgIcon name="m2" />
@@ -511,7 +519,7 @@ function previewHandler(event: MouseEvent) {
               <n-image
                 ref="imageRef"
                 :img-props="{ onClick: hideDownload }"
-                :src="taskDetailInfo?.ocrPicture?.imgurl"
+                :src="taskDetailInfo?.imgurl"
               />
             </div>
             <!-- 操作 -->
@@ -530,20 +538,66 @@ function previewHandler(event: MouseEvent) {
           </div>
           <div class="right">
             <n-scrollbar style="max-height: 100%">
-              <span class="name">图片名称</span>
+              <span class="name">任务ID：{{taskDetailInfo.taskname}}</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 class="property-name top" style=" color: #666666"
+                  >图片大小
+                </span>
+                <span style=" color: #333333; font-size: 16px"
+                  >{{ (taskDetailInfo?.pictureInfo?.imgSize /1000).toFixed(2) }}KB</span
+                >
+              </div>
+              <div class="property">
+                <span class="property-name top" style=" color: #666666"
+                  >图片格式
+                </span>
+                <span style=" color: #333333; font-size: 16px"
+                  >{{ taskDetailInfo?.pictureInfo?.imgSpace }}</span
+                >
+              </div>
+              <div class="property">
+                <span class="property-name top" style=" color: #666666"
+                  >图片尺寸
+                </span>
+                <span style=" color: #333333; font-size: 16px"
+                  >{{ taskDetailInfo?.pictureInfo?.imgMeasure }}</span
+                >
+              </div>
+              <div class="property">
+                <span class="property-name top" style=" color: #666666"
+                  >色彩空间
                 </span>
-                <span style="font-weight: bold; color: #333333; font-size: 16px"
-                  >拜访终端</span
+                <span style=" color: #333333; font-size: 16px"
+                  >{{ taskDetailInfo?.pictureInfo?.imgMeasure }}</span
                 >
               </div>
+              <div class="property">
+                <span class="property-name top" style=" color: #666666"
+                  >提报人
+                </span>
+                <span style=" color: #333333; font-size: 16px"
+                  >{{ taskDetailInfo?.pictureInfo?.source || "-" }}</span
+                >
+              </div>
+              <div class="property">
+                <span class="property-name top" style=" color: #666666"
+                  >创建时间
+                </span>
+                <span style=" color: #333333; font-size: 16px"
+                  >{{ taskDetailInfo?.pictureInfo && format(taskDetailInfo?.pictureInfo?.createTime, 'yyyy-MM-dd HH:mm:ss')}}</span>
+              </div>
+              <div class="property">
+                <span class="property-name top" style=" color: #666666"
+                  >提报时间
+                </span>
+                <span style=" color: #333333; font-size: 16px"
+                  >{{ taskDetailInfo?.uploadTime && format(taskDetailInfo?.pictureInfo?.uploadTime, 'yyyy-MM-dd HH:mm:ss') || '-'}}</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>
@@ -557,13 +611,13 @@ function previewHandler(event: MouseEvent) {
             ><span>({{ totalCount }})</span>
           </div>
           <div style="display: flex; align-items: center">
-            <div style="cursor: pointer" @click="sortHandler('fromuptime')">
+            <div style="cursor: pointer" @click="sortHandler('createdate')">
               <span>按时间排序</span>
               <SvgIcon style="margin-left: 8px" name="sort" size="12" />
             </div>
             <div
               style="margin-left: 15px; cursor: pointer"
-              @click="sortHandler('pictureResult')"
+              @click="sortHandler('similarityScore')"
             >
               <span>相似度排序</span>
               <SvgIcon style="margin-left: 8px" name="sort" size="12" />
@@ -582,7 +636,7 @@ function previewHandler(event: MouseEvent) {
           >
             <div
               class="img-wrapper"
-              :style="{ 'background-image': `url(${item.thumburl})` }"
+              :style="{ 'background-image': `url(${item.imgurl})` }"
             />
             <div class="time">
               <SvgIcon color="#FFF" size="16" name="time" />
@@ -744,7 +798,7 @@ function previewHandler(event: MouseEvent) {
         right: 2%;
         bottom: 2%;
         width: 136px;
-        height: 119px;
+        height: 60px;
         opacity: 0.44;
         background: rgba(216, 216, 216, 0.4);
         border-radius: 7px;
@@ -813,15 +867,7 @@ function previewHandler(event: MouseEvent) {
       }
 
       .top {
-        &::after {
-          position: absolute;
-          left: 72px;
-          top: 4px;
-          content: "";
-          width: 1px;
-          height: 12px;
-          background: #979797;
-        }
+
       }
 
       .property-content {
diff --git a/src/views/worksheet/index.vue b/src/views/worksheet/index.vue
index f7891d5..22109af 100644
--- a/src/views/worksheet/index.vue
+++ b/src/views/worksheet/index.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup>
-import Aside from './aside/Aside.vue'
-import Content from './content/Content.vue'
-import DataHeader from '@/components/DataHeader/index.vue'
+import DataHeader from '@/components/DataHeader/index.vue';
+import Aside from './aside/Aside.vue';
+import Content from './content/Content.vue';
 </script>
 
 <template>
-  <div>
+  <div style="width: 100%;">
     <div class="header">
       <DataHeader  v-show="false"/>
     </div>
diff --git a/types/api.d.ts b/types/api.d.ts
index 5fa6349..7a6c2b5 100644
--- a/types/api.d.ts
+++ b/types/api.d.ts
@@ -7,6 +7,11 @@ export interface PictureSortParam {
   orderbyname?: 'asc' | 'desc'
   orderbyvalue?: 'pictureResult' | 'fromuptime'
 }
+export interface SimilarityPictureSortParam {
+  checkDuplicateId?: string
+  orderType?: 'asc' | 'desc'
+  orderName?: 'similarityScore' | 'createdate'
+}
 
 export interface FilterSearchParam {
   search_searchname?: {
diff --git a/types/workorder.d.ts b/types/workorder.d.ts
index aa77a85..36781d1 100644
--- a/types/workorder.d.ts
+++ b/types/workorder.d.ts
@@ -1,5 +1,6 @@
 // 任务包
 export interface PackageListItem {
+  checkDuplicateId: string
   id: string
   packagename: string
   pictureno: number
@@ -11,6 +12,7 @@ export interface PackageListItem {
 
 // 任务包状态
 export interface OrderState {
+  name: string
   activeId: string
   currentIndex: number
   packageList: PackageListItem[]