diff --git a/src/api/work/work.ts b/src/api/work/work.ts index 77f1d81..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' @@ -9,7 +9,25 @@ 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 }, + }) + + const { data: { records, pages } } = res + return { + pageCount: pages, + data: records, + } +} + +/** + * 任务包列表主图-新 + * @returns + */ +export async function getPackagePicture(params: PageParam, packagename: string) { + const res = await http.request({ + url: `/ocr/ocrPicture/getPackagePicture`, method: 'get', params: { ...params, packagename }, }) @@ -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/Aside.vue b/src/views/worksheet/aside/Aside.vue index 44a2200..de65660 100644 --- a/src/views/worksheet/aside/Aside.vue +++ b/src/views/worksheet/aside/Aside.vue @@ -1,21 +1,21 @@