Merge pull request 'bug' (#18) from shen into test

Reviewed-on: #18

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

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
 

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) {
           />
         </div>
         <div class="big-mark" />
+        <div class="preview" @click="previewHandler">
+          <SvgIcon size="16" name="zoom-out" />
+        </div>
         <div class="info img-info">
           <n-grid x-gap="12" y-gap="10" :cols="12">
             <n-gi span="4" class="gi1">
@@ -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;

src/views/task/content/PictureTable.vue

@@ -19,35 +19,42 @@ defineProps({
     <tr>
       <th>图片名称</th>
       <td class="blue">
-        {{ data?.ocrPicture?.imgname }}
+        {{ data?.pictureInfo?.imgname }}
       </td>
       <th>图片格式</th>
-      <td class="blue" />
+      <td class="blue">
+        {{ data?.pictureInfo?.imgFormat }}
+      </td>
     </tr>
     <tr>
       <th>图片大小</th>
-      <td />
+      <td class="blue">
+        {{ (data?.pictureInfo?.imgSize / 1024).toFixed(2) }}kb
+      </td>
       <th>图片尺寸</th>
-      <td />
+      <td class="blue">
+        {{ data?.pictureInfo?.imgMeasure }}
+      </td>
     </tr>
     <tr>
       <th>上传时间</th>
-      <td> {{ data?.ocrPicture?.uptime }}</td>
+      <td> {{ data?.pictureInfo?.uploadTime }}</td>
       <th>生成时间</th>
-      <td> {{ data?.ocrPicture?.gentime }}</td>
+      <td> {{ data?.pictureInfo?.createTime }}</td>
     </tr>
     <tr>
       <th>标记时间</th>
-      <td />
+      <td> {{ data?.pictureInfo?.tagTime }}</td>
+
       <th>色彩空间</th>
-      <td>{{ data?.ocrPicture?.space }}</td>
+      <td>{{ data?.pictureInfo?.imgSpace }}</td>
     </tr>
     <tr>
       <th>
         来源
       </th>
       <td colspan="3">
-        {{ data?.ocrPicture?.source }}
+        {{ data?.pictureInfo?.source }}
       </td>
     </tr>
   </table>
@@ -125,7 +132,7 @@ td {
 }
 
 .blue {
-  color: #507afd;
+  // color: #507afd;
 }
 
 .black {