diff --git a/src/api/task/task.ts b/src/api/task/task.ts index 5dc1654..572e5f7 100644 --- a/src/api/task/task.ts +++ b/src/api/task/task.ts @@ -7,11 +7,15 @@ import { ContentTypeEnum } from '@/enums/httpEnum' * 获取审核列表 * @returns */ -export async function getApprovalList(page: PageParam) { +export async function getApprovalList(page: any) { const res = await http.request({ url: `/flow/task/listalldata`, method: 'get', - params: { pageSize: page.pageSize, currPage: page.pageNo }, + params: { + pageSize: page.pageSize, + currPage: page.pageNo, + keyword: page.keyword, + }, }) const { data: { list, totalCount } } = res diff --git a/src/views/task/aside/TaskList.vue b/src/views/task/aside/TaskList.vue index eb88cf6..5044a60 100644 --- a/src/views/task/aside/TaskList.vue +++ b/src/views/task/aside/TaskList.vue @@ -37,6 +37,7 @@ useInfiniteScroll( ) async function loadMore() { + console.log(77888) if (isLoading.value || el.value == null) return isLoading.value = true @@ -53,7 +54,10 @@ async function loadMore() { async function fetchList() { try { pagination.pageNo += 1 - const result = await taskStore.fetchApprovalList(pagination) + const result = await taskStore.fetchApprovalList({ + ...pagination, + keyword: keyword.value, + }) const { data, pageCount } = result canloadMore.value = pageCount >= pagination.pageNo return data || [] @@ -73,7 +77,7 @@ watch( function reset() { pagination.pageNo = 0 - pagination.pageSize = 100 + pagination.pageSize = 30 canloadMore.value = true data.value.length = 0 diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue index af253a2..52766bf 100644 --- a/src/views/task/content/Content.vue +++ b/src/views/task/content/Content.vue @@ -303,9 +303,11 @@ function previewHandler(event: MouseEvent) { watch( () => [taskStore.activeId], () => { - packageId.value = taskStore.getPackageid - taskId.value = taskStore.getActiveId - getDetail() + if (!isEmpty(taskStore.getActiveId)) { + packageId.value = taskStore.getPackageid + taskId.value = taskStore.getActiveId + getDetail() + } }, ) @@ -456,6 +458,9 @@ function reloadList(param, text) { />
+
+ +
@@ -740,6 +745,22 @@ function reloadList(param, text) { border-radius: 8px; position: relative; + .preview { + position: absolute; + right: 10px; + top: 10px; + z-index: 3; + width: 30px; + height: 30px; + background: rgba(255, 255, 255, 0.20); + border-radius: 6px; + backdrop-filter: blur(10px); + display: flex; + align-items: center; + justify-content: center; + cursor: pointer; + } + .big-mark{ width: 100%; height: 151px; diff --git a/src/views/task/content/PictureTable.vue b/src/views/task/content/PictureTable.vue index d2fa022..68d0512 100644 --- a/src/views/task/content/PictureTable.vue +++ b/src/views/task/content/PictureTable.vue @@ -19,35 +19,42 @@ defineProps({ 图片名称 - {{ data?.ocrPicture?.imgname }} + {{ data?.pictureInfo?.imgname }} 图片格式 - + + {{ data?.pictureInfo?.imgFormat }} + 图片大小 - + + {{ (data?.pictureInfo?.imgSize / 1024).toFixed(2) }}kb + 图片尺寸 - + + {{ data?.pictureInfo?.imgMeasure }} + 上传时间 - {{ data?.ocrPicture?.uptime }} + {{ data?.pictureInfo?.uploadTime }} 生成时间 - {{ data?.ocrPicture?.gentime }} + {{ data?.pictureInfo?.createTime }} 标记时间 - + {{ data?.pictureInfo?.tagTime }} + 色彩空间 - {{ data?.ocrPicture?.space }} + {{ data?.pictureInfo?.imgSpace }} 来源 - {{ data?.ocrPicture?.source }} + {{ data?.pictureInfo?.source }} @@ -125,7 +132,7 @@ td { } .blue { - color: #507afd; + // color: #507afd; } .black {