From 338802917686356e6bee016d0399ae83b5430178 Mon Sep 17 00:00:00 2001 From: lizijiee <562949697@qq.com> Date: Wed, 27 Mar 2024 23:19:28 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A1=B5=E9=9D=A2=E9=87=8D=E7=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/work/work.ts | 3 + src/assets/icons/camera.svg | 1 + src/assets/icons/save.svg | 1 + src/assets/icons/zoom-out.svg | 28 +- src/views/worksheet/content/Content.vue | 478 ++++++++++++++---------- 5 files changed, 289 insertions(+), 222 deletions(-) create mode 100644 src/assets/icons/camera.svg create mode 100644 src/assets/icons/save.svg diff --git a/src/api/work/work.ts b/src/api/work/work.ts index d62846e..a9dc373 100644 --- a/src/api/work/work.ts +++ b/src/api/work/work.ts @@ -108,6 +108,9 @@ export async function getTaskDetailPictureList(params: PageParam & PictureSortPa iztrueorfalse: item.iztrueorfalse, states: item.states, history: item.ocpictureid && item.picturecompare && hasHistory(item.ocpictureid, item.picturecompare), + historyStates:item.historyStates, + submitDateTimestamp:item.submitDateTimestamp, + photoDateTimestamp:item.photoDateTimestamp, } }) diff --git a/src/assets/icons/camera.svg b/src/assets/icons/camera.svg new file mode 100644 index 0000000..6d4f779 --- /dev/null +++ b/src/assets/icons/camera.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/save.svg b/src/assets/icons/save.svg new file mode 100644 index 0000000..425a8f1 --- /dev/null +++ b/src/assets/icons/save.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/zoom-out.svg b/src/assets/icons/zoom-out.svg index 4226adb..6b3eb45 100644 --- a/src/assets/icons/zoom-out.svg +++ b/src/assets/icons/zoom-out.svg @@ -1,23 +1,19 @@ - + 放大 - + - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue index c0fdc82..e824cd2 100644 --- a/src/views/worksheet/content/Content.vue +++ b/src/views/worksheet/content/Content.vue @@ -5,6 +5,7 @@ getTaskDetailPictureList, setTF } from "@/api/work/work"; import { fieldMap } from "@/config/workorder"; +import { TASK_STATUS_OBJ } from '@/enums/index'; import { useWorkOrder } from "@/store/modules/workOrder"; import { isEmpty } from "@/utils"; import { formatToDateHMS } from "@/utils/dateUtil"; @@ -133,7 +134,7 @@ function trueHandler() { onPositiveClick: () => { setTrue(); }, - onNegativeClick: () => {}, + onNegativeClick: () => { }, }); } @@ -207,7 +208,7 @@ async function refreshHandler() { useInfiniteScroll( el as any, - () => { + () => { loadMore(); }, { distance: 10, canLoadMore: () => canloadMore } @@ -222,14 +223,14 @@ async function loadMore() { } async function featchList() { - + loading.value = true; try { taskpagination.pageNo += 1; const { data, total, pageCount } = await getTaskDetailPictureList( - { ...taskpagination, ...sortBy ,checkDuplicateId: workStore.activeId} + { ...taskpagination, ...sortBy, checkDuplicateId: workStore.activeId } ); - + totalCount.value = total; canloadMore = pageCount >= taskpagination.pageNo && pageCount > 0; @@ -297,7 +298,7 @@ async function queryDetail(checkDuplicateId: any) { refreshHandler(); } async function handleSelect(item: any) { - taskDetailInfo.value = await getTaskDetailInfo( workStore.activeId); + taskDetailInfo.value = await getTaskDetailInfo(workStore.activeId); const packageid = workStore.getActiveId; @@ -334,7 +335,7 @@ async function clearHandler() { onPositiveClick: () => { clearMark(); }, - onNegativeClick: () => {}, + onNegativeClick: () => { }, }); } @@ -367,7 +368,7 @@ onUnmounted(() => { function getPercent(pictureid: string) { const { ocpictureid, pictureresult } = taskDetailInfo.value; - const index = ocpictureid ? ocpictureid.split(",").indexOf(String(pictureid)):''; + 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)); @@ -418,12 +419,7 @@ function previewHandler(event: MouseEvent) { 辨别真假 - +
@@ -447,157 +443,116 @@ function previewHandler(event: MouseEvent) {
-
+ +
- +
- + +
+
+
+ + {{ taskDetailInfo.createTime }} +
+
+ + {{ taskDetailInfo.createTime }} +
-
- - {{ taskDetailInfo.createTime }} +
+ +
-
- - - - - + + {{ TASK_STATUS_OBJ[taskDetailInfo.states] }} + 审批状态 + + + + - - {{ totalCount }} - 相似匹配 + + {{ + totalCount + }}张 + 相似匹配
- +
- +
-
+
- +
+
- 任务ID：{{taskDetailInfo.taskname}} + 任务ID：{{ taskDetailInfo.taskname }}
-
重复图片
-
基线任务
+
已审批
+
通过
- +
- 图片大小 + 图片大小 - {{ taskDetailInfo?.pictureInfo && (taskDetailInfo?.pictureInfo?.imgSize /1000).toFixed(2) }}KB + {{ taskDetailInfo?.pictureInfo && + (taskDetailInfo?.pictureInfo?.imgSize / 1000).toFixed(2) }}KB
- 图片格式 + 图片格式 - {{ taskDetailInfo?.pictureInfo?.imgFormat }} + {{ taskDetailInfo?.pictureInfo?.imgFormat }}
- 图片尺寸 + 图片尺寸 - {{ taskDetailInfo?.pictureInfo?.imgMeasure }} + {{ taskDetailInfo?.pictureInfo?.imgMeasure }}
- 色彩空间 + 色彩空间 - {{ taskDetailInfo?.pictureInfo?.imgSpace }} + {{ taskDetailInfo?.pictureInfo?.imgSpace }}
- 提报人 + 提报人 - {{ taskDetailInfo?.pictureInfo?.source || "-" }} + {{ taskDetailInfo?.pictureInfo?.source || "-" }}
- 创建时间 + 创建时间 - {{ taskDetailInfo?.pictureInfo && format(taskDetailInfo?.pictureInfo?.createTime, 'yyyy-MM-dd HH:mm:ss')}} + {{ taskDetailInfo?.pictureInfo && + format(taskDetailInfo?.pictureInfo?.createTime, 'yyyy-MM-dd HH:mm:ss') }}
- 提报时间 + 提报时间 - {{ taskDetailInfo?.uploadTime && format(taskDetailInfo?.pictureInfo?.uploadTime, 'yyyy-MM-dd HH:mm:ss') || '-'}} + {{ taskDetailInfo?.uploadTime && + format(taskDetailInfo?.pictureInfo?.uploadTime, 'yyyy-MM-dd HH:mm:ss') || '-' }}
{{ fieldMap[key] }} @@ -608,65 +563,57 @@ function previewHandler(event: MouseEvent) {
- 相似图片({{ totalCount }}) + + 任务包图片
- 按时间排序 + 时间排序
-
+
相似度排序
-
-
-
- - {{ formatToDateHMS(item.createdate || 0) }} +
+
+
+
+ + {{ item.photoDateTimestamp ? formatToDateHMS(item.photoDateTimestamp || 0) : '' + }} +
+
+ + {{ item.submitDateTimestamp ? formatToDateHMS(item.submitDateTimestamp || 0) : '' + }} +
- +
- {{ item?.maxSimilarity && Number(item?.maxSimilarity).toFixed(0) }}% + {{ item?.maxSimilarity && Number(item?.maxSimilarity).toFixed(0) }}%
- - - - +
+ +
+
+ +
+
+ +