From 26ebe5e79789d431d8092dd9f88a53d3e8781187 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Mon, 25 Mar 2024 22:59:15 +0800
Subject: [PATCH 1/6] =?UTF-8?q?feat:=20=E4=BB=BB=E5=8A=A1=E5=8C=85?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/home/main.ts                          | 104 +++++++++++++++-
 src/views/home/content/Content.vue            | 112 ++++++++++++++----
 .../content/modal/PackageSettingsModal.vue    |  14 +--
 3 files changed, 193 insertions(+), 37 deletions(-)

diff --git a/src/api/home/main.ts b/src/api/home/main.ts
index ea24139..8072c2c 100644
--- a/src/api/home/main.ts
+++ b/src/api/home/main.ts
@@ -1,9 +1,9 @@
-import { pickBy } from 'lodash-es'
-import { http } from '@/utils/http/axios'
-import type { CheckParam, PageParam, QueryPictureParam, UploadParam } from '/#/api'
 import { ContentTypeEnum } from '@/enums/httpEnum'
 import { notEmpty } from '@/utils'
 import { formatToDate2 } from '@/utils/dateUtil'
+import { http } from '@/utils/http/axios'
+import { pickBy } from 'lodash-es'
+import type { CheckParam, PageParam, QueryPictureParam, UploadParam } from '/#/api'
 
 /**
  * 获取查重列表
@@ -103,6 +103,104 @@ export async function oneClickCheck(params: Partial<CheckParam> = { search_histo
   })
 }
 
+/**
+ * 增加生成任务包逻辑—一键查重
+ * @param note
+ * @returns
+ */
+ export async function oneClickCheckTaskPackage(params: Partial<CheckParam> = { search_history: '0' }) {
+  const notEmptyParams = pickBy(params, notEmpty)
+
+  Object.keys(notEmptyParams).forEach((key) => {
+    const val = notEmptyParams[key]
+
+    if (Array.isArray(val))
+      notEmptyParams[key] = val.join(',')
+  })
+
+  return http.request({
+    url: `/ocr/checkDuplicate/openCheckDuplicate`,
+    method: 'get',
+    params: notEmptyParams,
+    headers: { 'Content-Type': ContentTypeEnum.FORM_DATA },
+  })
+}
+
+/**
+ * 获取任务编号
+ * @param note
+ * @returns
+ */
+ export async function getLastCheckNo() {
+
+  return http.request({
+    url: `/ocr/checkDuplicate/getLastCheckNo`,
+    method: 'get',
+    headers: { 'Content-Type': ContentTypeEnum.FORM_DATA },
+  })
+}
+/**
+ * 获取查重任务状态
+ * @param note
+ * @returns
+ */
+ export async function getCheckDuplicateStatus(checkDuplicateNo) {
+
+  return http.request({
+    url: `/ocr/checkDuplicate/getCheckDuplicateStatus`,
+    method: 'get',
+    params: { checkDuplicateNo },
+    headers: { 'Content-Type': ContentTypeEnum.FORM_DATA },
+  })
+}
+/**
+ * 创建任务包
+ * @param 
+ * @returns
+ */
+ export async function createPackage(params) {
+
+  return http.request({
+    url: `/ocr/ocrTaskPackage/createPackage`,
+    method: 'post',
+    params
+  })
+}
+/**
+ * 任务完成——创建任务包前——获取图片列表
+ * @param 
+ * @returns
+ */
+export async function queryPageListByCheckNo(params: any): Promise<any> {
+  const notEmptyParams = pickBy(params, notEmpty)
+
+  Object.keys(notEmptyParams).forEach((key) => {
+    const val = notEmptyParams[key]
+
+    if (key === 'izyear') {
+      const start = formatToDate2(val[0])
+      const end = formatToDate2(val[1])
+      notEmptyParams[key] = `${start}-${end}`
+    }
+
+    if (Array.isArray(notEmptyParams[key]))
+      notEmptyParams[key] = val.join(',')
+  })
+
+  const res = await http.request({
+    url: `/ocr/checkDuplicate/queryPageListByCheckNo`,
+    method: 'get',
+    params: notEmptyParams,
+    headers: { 'Content-Type': ContentTypeEnum.FORM_DATA },
+  })
+
+  const { data: { records, pages, total } } = res
+  return {
+    pageCount: pages,
+    data: records,
+    total,
+  }
+}
 /**
  * 获取图片列表
  * @param params
diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 46e5ce1..9ef76b2 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { getPictureList, oneClickCheck } from '@/api/home/main'
+import { createPackage, getCheckDuplicateStatus, getLastCheckNo, getPictureList, oneClickCheckTaskPackage, queryPageListByCheckNo } from '@/api/home/main'
 import avatar from '@/assets/images/avatar.jpg'
 import { timeOptions, viewOptions } from '@/config/home'
 import { useWindowSizeFn } from '@/hooks/event/useWindowSizeFn'
@@ -9,8 +9,9 @@ import { hideDownload } from '@/utils/image'
 import emitter from '@/utils/mitt'
 import { getImgUrl } from '@/utils/urlUtils'
 import { useInfiniteScroll } from '@vueuse/core'
+import dayjs from 'dayjs'
 import imagesloaded from 'imagesloaded'
-import { debounce } from 'lodash-es'
+import { cloneDeep, debounce } from 'lodash-es'
 import Masonry from 'masonry-layout'
 import { useMessage } from 'naive-ui'
 import { computed, nextTick, onMounted, onUnmounted, onUpdated, reactive, ref, unref, watch } from 'vue'
@@ -41,6 +42,10 @@ const sortBy: PictureSortParam = {
   orderbyvalue: "pictureResult",
 };
 const imageRef = ref<ComponentElRef | null>()
+const checkDuplicateNo = ref('')
+const checkTaskStatus = ref(null) // 1.执行中 2.执行完毕  3.执行失败
+const isRefresh = ref(true) // 生成任务包前，点击刷新数据，并将【一键查重】切换按钮为【生成任务包】
+
 let canloadMore = true
 let filterId = null
 
@@ -132,7 +137,16 @@ async function featchList() {
 
     const asideParams = unref(configStore.getAsideValue)
     const params = filterId ? { userSearchId: filterId } : asideParams
-    const result = await getPictureList({ ...pagination, ...contentParams, ...params, ...sortBy })
+    let result = {
+      pageCount: 0,
+      data: [],
+      total: 0,
+    }
+    if (checkTaskStatus.value === 2 && isRefresh) {
+      result = await queryPageListByCheckNo({ ...pagination, ...contentParams, ...params, ...sortBy, checkDuplicateNo: checkDuplicateNo.value })
+    } else {
+      result = await getPictureList({ ...pagination, ...contentParams, ...params, ...sortBy })
+    }
     const { data, pageCount, total } = result
     totalCount.value = total
     canloadMore = pageCount >= pagination.pageNo && pageCount > 0
@@ -180,8 +194,38 @@ const gridHeight = computed(() => {
 })
 
 async function oneCheck() {
-  const modal = packageModalRef.value as any
-  modal.showModal()
+  const asideVal = cloneDeep(configStore.getAsideValue)
+  asideVal.izyear = dayjs(asideVal.izyear[0]).format("YYYY/MM/DD") + '-' + dayjs(asideVal.izyear[1]).format("YYYY/MM/DD")
+  delete asideVal.izsimilarity
+  if (checkDuplicateNo.value) {
+    getCheckDuplicateStatus(checkDuplicateNo.value).then((res) => {
+      if (res.code === "OK") {
+        checkTaskStatus.value = res.data.status // 1.执行中 2.执行完毕
+        if (isRefresh.value === false) {
+          const modal = packageModalRef.value as any
+          modal.showModal()
+          return
+        }
+
+        if (checkTaskStatus.value === 2 && isRefresh) {
+          isRefresh.value = false
+          message.success('任务执行完毕，正在刷新数据...');
+          reset()
+          loadMore()
+        } else if (checkTaskStatus.value === 1) {
+          return
+        }
+      }
+    })
+    return
+  }
+  oneClickCheckTaskPackage(asideVal).then((res) => {
+    if (res.code === "OK") {
+      checkDuplicateNo.value = res.data.checkDuplicateNo
+    } else {
+      message.error(res.message || '查重失败')
+    }
+  })
 }
 
 async function showLoginSuccessModal() {
@@ -190,28 +234,42 @@ async function showLoginSuccessModal() {
 }
 
 async function commitHandler(settingParam) {
-  const contentParams = {
-    search_month: timeRange.value,
+  // comparehistory: false
+  // mark: false // 是否给重复图片添加重复标识
+  // packagename: "22222"
+  const params = {
+    name: settingParam.packagename,
+    checkDuplicateNo: checkDuplicateNo.value,
+    // mark: settingParam.mark
   }
+  createPackage(params).then((res) => {
+    if (res.code === "OK") {
+      message.success(res.data);
+    }
+  })
+  // const asideVal = configStore.getAsideValue
+  // const finalParam = { ...contentParams, ...asideVal }
+  // finalParam.buessinessno = settingParam.packagename
+  // finalParam.search_history = settingParam.comparehistory ? 1 : 0
 
-  const asideVal = configStore.getAsideValue
-  const finalParam = { ...contentParams, ...asideVal }
-  finalParam.buessinessno = settingParam.packagename
-  finalParam.search_history = settingParam.comparehistory ? 1 : 0
-
-  const modal = generateModalRef.value as any
-  modal.showModal()
+  // const modal = generateModalRef.value as any
+  // modal.showModal()
 
-  oneClickCheck(finalParam).then(() => {
-    modal.closeModal()
-  }, () => {
-    modal.closeModal()
-  })
+  // oneClickCheck(finalParam).then(() => {
+  //   modal.closeModal()
+  // }, () => {
+  //   modal.closeModal()
+  // })
 }
 
 onMounted(() => {
   emitter.on('filter', refreshHandler)
-
+  // 一件键重——获取任务编号
+  getLastCheckNo().then((res) => {
+    if (res.code === "OK") {
+      checkDuplicateNo.value = res.data
+    }
+  })
   nextTick(() => {
     computeListHeight()
     // 登录后展示成功
@@ -310,7 +368,7 @@ async function downloadImage(item) {
   }
 }
 
-function previewHandler(index: number,event: MouseEvent) {
+function previewHandler(index: number, event: MouseEvent) {
   event.stopImmediatePropagation();
   event.stopPropagation();
   if (imageRef.value?.[index] && (imageRef.value[index] as any).src)
@@ -325,7 +383,11 @@ function previewHandler(index: number,event: MouseEvent) {
         <SvgIcon size="32" name="magnifying" />
         <span class="font">AI一键查重</span>
       </div>
-      <SvgIcon style="cursor: pointer;" size="105" name="yijianchachong" @click="oneCheck" />
+      <SvgIcon v-show="checkTaskStatus !== 2" style="cursor: pointer;" size="105" name="yijianchachong"
+        @click="oneCheck" />
+      <div v-show="checkTaskStatus === 2" style="cursor: pointer;" size="105" name="magnifying" @click="oneCheck">
+        生成任务包
+      </div>
     </div>
     <div class="wrapper-content">
       <div style="display: flex;justify-content: space-between;">
@@ -352,7 +414,8 @@ function previewHandler(index: number,event: MouseEvent) {
             <SvgIcon style="margin-left: 8px;" name="sort" size="12" />
           </div>
         </div>
-        <span style="font-size: 16px;color:#494949">共 <span style="color:#7899fd;font-weight: 500;">{{ totalCount }}</span> 项</span>
+        <span style="font-size: 16px;color:#494949">共 <span style="color:#7899fd;font-weight: 500;">{{ totalCount
+        }}</span> 项</span>
       </div>
       <n-spin :show="loading">
         <div ref="el" class="scroll" :style="listStyle">
@@ -508,7 +571,7 @@ function previewHandler(index: number,event: MouseEvent) {
       flex-direction: row;
       align-items: center;
       margin-right: 24px;
-      color:#323233;
+      color: #323233;
 
       .gap {
         margin-left: 5px;
@@ -546,6 +609,7 @@ function previewHandler(index: number,event: MouseEvent) {
         padding: 0 10px;
         background: rgba(0, 0, 0, .35);
         border-radius: 7px;
+
         .img-name {
           width: 70%;
           color: #FFF;
diff --git a/src/views/home/content/modal/PackageSettingsModal.vue b/src/views/home/content/modal/PackageSettingsModal.vue
index 31e6c15..75859a9 100644
--- a/src/views/home/content/modal/PackageSettingsModal.vue
+++ b/src/views/home/content/modal/PackageSettingsModal.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
-import type { FormInst, FormRules } from 'naive-ui'
-import { ref } from 'vue'
-import { useMessage } from 'naive-ui'
+import type { FormInst, FormRules } from 'naive-ui';
+import { useMessage } from 'naive-ui';
+import { ref } from 'vue';
 
 const emit = defineEmits<{
   (e: 'commit', value: any)
@@ -42,7 +42,7 @@ const rules: FormRules = {
 
 const model = ref({
   packagename: '',
-  comparehistory: false,
+  // comparehistory: false,
   mark: false,
 })
 
@@ -66,7 +66,6 @@ const formItemStyle = {
 
 function afterLeave() {
   model.value.packagename = ''
-  model.value.comparehistory = false
   model.value.mark = false
 }
 </script>
@@ -85,11 +84,6 @@ function afterLeave() {
           <n-form-item path="packagename" label="任务包名称">
             <n-input v-model:value="model.packagename" max="12" @keydown.enter.prevent />
           </n-form-item>
-          <n-form-item path="comparehistory" :style="formItemStyle">
-            <n-checkbox v-model:checked="model.comparehistory">
-              是否对比历史数据
-            </n-checkbox>
-          </n-form-item>
           <n-form-item path="mark" :style="formItemStyle">
             <n-checkbox v-model:checked="model.mark">
               是否给重复图片添加重复标识

From 3d146eb543d36a81a10a746c9b01d67ad89eee78 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Mon, 25 Mar 2024 23:14:32 +0800
Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=8C=85=E5=92=8C=E6=9F=A5=E9=87=8D=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                    |  8 --------
 src/views/home/content/Content.vue | 27 ++++++++++-----------------
 2 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index 615d417..3b65693 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -17,18 +17,14 @@ declare module 'vue' {
     NCollapse: typeof import('naive-ui')['NCollapse']
     NCollapseItem: typeof import('naive-ui')['NCollapseItem']
     NConfigProvider: typeof import('naive-ui')['NConfigProvider']
-    NDataTable: typeof import('naive-ui')['NDataTable']
     NDatePicker: typeof import('naive-ui')['NDatePicker']
     NDialogProvider: typeof import('naive-ui')['NDialogProvider']
     NDivider: typeof import('naive-ui')['NDivider']
     NDropdown: typeof import('naive-ui')['NDropdown']
-    NEmpty: typeof import('naive-ui')['NEmpty']
     NForm: typeof import('naive-ui')['NForm']
     NFormItem: typeof import('naive-ui')['NFormItem']
-    NGi: typeof import('naive-ui')['NGi']
     NGrid: typeof import('naive-ui')['NGrid']
     NGridItem: typeof import('naive-ui')['NGridItem']
-    NIcon: typeof import('naive-ui')['NIcon']
     NImage: typeof import('naive-ui')['NImage']
     NInput: typeof import('naive-ui')['NInput']
     NMessageProvider: typeof import('naive-ui')['NMessageProvider']
@@ -43,11 +39,7 @@ declare module 'vue' {
     NSpace: typeof import('naive-ui')['NSpace']
     NSpin: typeof import('naive-ui')['NSpin']
     NSwitch: typeof import('naive-ui')['NSwitch']
-    NTabPane: typeof import('naive-ui')['NTabPane']
-    NTabs: typeof import('naive-ui')['NTabs']
     NTag: typeof import('naive-ui')['NTag']
-    NTimeline: typeof import('naive-ui')['NTimeline']
-    NTimelineItem: typeof import('naive-ui')['NTimelineItem']
     NTooltip: typeof import('naive-ui')['NTooltip']
     NUpload: typeof import('naive-ui')['NUpload']
     NUploadDragger: typeof import('naive-ui')['NUploadDragger']
diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 9ef76b2..1574f02 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -213,12 +213,14 @@ async function oneCheck() {
           reset()
           loadMore()
         } else if (checkTaskStatus.value === 1) {
+          message.success("请等待，查重任务正在创建中...");
           return
         }
       }
     })
     return
   }
+  message.success("请等待，查重任务正在创建中...");
   oneClickCheckTaskPackage(asideVal).then((res) => {
     if (res.code === "OK") {
       checkDuplicateNo.value = res.data.checkDuplicateNo
@@ -234,32 +236,23 @@ async function showLoginSuccessModal() {
 }
 
 async function commitHandler(settingParam) {
-  // comparehistory: false
-  // mark: false // 是否给重复图片添加重复标识
-  // packagename: "22222"
   const params = {
     name: settingParam.packagename,
-    checkDuplicateNo: checkDuplicateNo.value,
-    // mark: settingParam.mark
+    checkDuplicateNo: checkDuplicateNo.value
   }
+  const modal = generateModalRef.value as any
+  modal.showModal()
   createPackage(params).then((res) => {
     if (res.code === "OK") {
       message.success(res.data);
+      modal.closeModal()
     }
   })
-  // const asideVal = configStore.getAsideValue
-  // const finalParam = { ...contentParams, ...asideVal }
-  // finalParam.buessinessno = settingParam.packagename
-  // finalParam.search_history = settingParam.comparehistory ? 1 : 0
+  const asideVal = configStore.getAsideValue
+  const finalParam = { ...asideVal }
+  finalParam.buessinessno = settingParam.packagename
+  finalParam.search_history = settingParam.comparehistory ? 1 : 0
 
-  // const modal = generateModalRef.value as any
-  // modal.showModal()
-
-  // oneClickCheck(finalParam).then(() => {
-  //   modal.closeModal()
-  // }, () => {
-  //   modal.closeModal()
-  // })
 }
 
 onMounted(() => {

From b8b9db8294247ea5edaa69fabfc3593cf2faa487 Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Tue, 26 Mar 2024 00:01:41 +0800
Subject: [PATCH 3/6] ui

---
 src/views/task/content/Content.vue      |  9 +++
 src/views/task/content/History.vue      | 53 ++++++++++++++---
 src/views/task/content/PictureTable.vue | 75 ++++++++++++++++++++++---
 3 files changed, 121 insertions(+), 16 deletions(-)

diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index b445f99..5733124 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -582,6 +582,15 @@ function getPercent(pictureid: string) {
 </template>
 
 <style lang="less" scoped>
+::v-deep(.n-tabs-tab__label) {
+  font-size: 14px;
+  font-family: PingFang SC, PingFang SC-Regular;
+  font-weight: 400;
+  color: #666666;
+}
+::v-deep(.n-tabs-tab--active .n-tabs-tab__label) {
+  color: #507AFD;
+}
 .wrapper {
   display: flex;
   flex: 1;
diff --git a/src/views/task/content/History.vue b/src/views/task/content/History.vue
index f4be090..c84f668 100644
--- a/src/views/task/content/History.vue
+++ b/src/views/task/content/History.vue
@@ -92,14 +92,16 @@ onMounted(() => {
             <div class="card">
               <n-collapse arrow-placement="right" :default-expanded-names="['1']">
                 <template #header-extra>
-                  审批结果：{{ getLabel(props.data.states) }}
+                  <div class="status">
+                    审批结果：{{ getLabel(props.data.states) }}
+                  </div>
                 </template>
 
                 <n-collapse-item title="收起" name="1">
                   <div v-for="items in props.data.userapproveList" :key="items.nodeName" class="item">
                     <div class="header">
                       <SvgIcon class="icon" name="approve" size="16" />
-                      <div class="title">
+                      <div class="item-title">
                         {{ items.nodeName }}
                       </div>
                     </div>
@@ -131,11 +133,23 @@ onMounted(() => {
 </template>
 
 <style lang="less" scoped>
+  ::v-deep(.n-timeline-item-timeline__line) {
+    width: 1px!important;
+  }
+  ::v-deep(.n-collapse-item__header) {
+    flex-direction: row-reverse;
+  }
+  ::v-deep(.n-collapse-item__header-main) {
+    flex: none!important;
+  }
+  ::v-deep(.n-collapse-item__header-extra) {
+    flex: 1;
+  }
   .info-header {
     display: flex;
+    padding: 6px 0 15px 0;
     align-items: center;
     justify-content: space-between;
-    margin-bottom: 18px;
     .left_box {
       display: flex;
       align-items: center;
@@ -144,15 +158,13 @@ onMounted(() => {
         align-items: center;
         font-size: 16px;
         font-family: PingFang SC, PingFang SC-Medium;
-        font-weight: Medium;
-        text-align: left;
+        font-weight: 500;
         color: #333333;
-        line-height: 22px;
 
         &:before {
           content: "";
           width: 4px;
-          height: 18px;
+          height: 12px;
           background: #507afd;
           border-radius: 3px;
           display: inline-block;
@@ -160,6 +172,18 @@ onMounted(() => {
         }
       }
     }
+    .right_box {
+      display: flex;
+      align-items: center;
+      cursor: pointer;
+      font-size: 14px;
+      font-family: PingFang SC, PingFang SC-Regular;
+      color: #666666;
+
+      .icon{
+        margin-left: 7px
+      }
+    }
   }
 
   .point-line{
@@ -210,6 +234,14 @@ onMounted(() => {
     padding: 16px;
   }
 
+  .status{
+    font-size: 14px;
+    font-family: PingFang SC, PingFang SC-Medium;
+    font-weight: 500;
+    text-align: center;
+    color: #333333;
+  }
+
   .point{
     width: 4px;
     height: 4px;
@@ -218,6 +250,13 @@ onMounted(() => {
     margin-right: 6px;
   }
 
+  .item-title{
+    font-size: 14px;
+    font-family: PingFang SC, PingFang SC-Medium;
+    font-weight: 500;
+    color: #333333;
+  }
+
   .header{
     display: flex;
     align-items: center;
diff --git a/src/views/task/content/PictureTable.vue b/src/views/task/content/PictureTable.vue
index a2192f9..d2fa022 100644
--- a/src/views/task/content/PictureTable.vue
+++ b/src/views/task/content/PictureTable.vue
@@ -8,6 +8,13 @@ defineProps({
 </script>
 
 <template>
+  <div class="info-header">
+    <div class="left_box">
+      <div class="title">
+        基本信息
+      </div>
+    </div>
+  </div>
   <table class="description">
     <tr>
       <th>图片名称</th>
@@ -15,15 +22,13 @@ defineProps({
         {{ data?.ocrPicture?.imgname }}
       </td>
       <th>图片格式</th>
-      <td class="blue">
-        
-      </td>
+      <td class="blue" />
     </tr>
     <tr>
       <th>图片大小</th>
-      <td></td>
+      <td />
       <th>图片尺寸</th>
-      <td></td>
+      <td />
     </tr>
     <tr>
       <th>上传时间</th>
@@ -33,18 +38,62 @@ defineProps({
     </tr>
     <tr>
       <th>标记时间</th>
-      <td> </td>
+      <td />
       <th>色彩空间</th>
       <td>{{ data?.ocrPicture?.space }}</td>
     </tr>
     <tr>
-      <th>来源</th>
-      <td> {{ data?.ocrPicture?.source }}</td>
+      <th>
+        来源
+      </th>
+      <td colspan="3">
+        {{ data?.ocrPicture?.source }}
+      </td>
     </tr>
   </table>
 </template>
 
 <style lang="less" scoped>
+.info-header {
+  display: flex;
+  padding: 6px 0 15px 0;
+  align-items: center;
+  justify-content: space-between;
+  .left_box {
+    display: flex;
+    align-items: center;
+    .title {
+      display: flex;
+      align-items: center;
+      font-size: 16px;
+      font-family: PingFang SC, PingFang SC-Medium;
+      font-weight: 500;
+      color: #333333;
+
+      &:before {
+        content: "";
+        width: 4px;
+        height: 12px;
+        background: #507afd;
+        border-radius: 3px;
+        display: inline-block;
+        margin-right: 10px;
+      }
+    }
+  }
+  .right_box {
+    display: flex;
+    align-items: center;
+    cursor: pointer;
+    font-size: 14px;
+    font-family: PingFang SC, PingFang SC-Regular;
+    color: #666666;
+
+    .icon{
+      margin-left: 7px
+    }
+  }
+}
 .description {
   width: 100%;
   font-size: 14px;
@@ -54,16 +103,24 @@ th {
   width: 20%;
   background-color: #fafafa;
   color: #666666;
+  font-size: 14px;
+  font-family: PingFang SC, PingFang SC-Regular;
+  font-weight: 400;
+  line-height: 22px;
 }
 
 td {
   width: 30%;
+  font-size: 14px;
+  font-family: PingFang SC, PingFang SC-Regular;
+  font-weight: 400;
+  color: #666666;
 }
 
 th,
 td {
   border: 1px solid #ebebeb;
-  padding: 12px 24px;
+  padding: 10px 24px;
   text-align: left;
 }
 

From 931571cf9f01c18c06b53688eee11ee80ba668df Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Tue, 26 Mar 2024 00:08:56 +0800
Subject: [PATCH 4/6] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=9F=A5=E9=87=8D=E4=BB=BB=E5=8A=A1loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/content/Content.vue            |  8 ++-
 .../content/modal/QueryRepeatedTasksModal.vue | 50 +++++++++++++++++++
 2 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 src/views/home/content/modal/QueryRepeatedTasksModal.vue

diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 1574f02..665bc0b 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -18,6 +18,7 @@ import { computed, nextTick, onMounted, onUnmounted, onUpdated, reactive, ref, u
 import GeneratePackageModal from './modal/GeneratePackageModal.vue'
 import LoginSuccessModal from './modal/LoginSuccessModal.vue'
 import PackageSettingsModal from './modal/PackageSettingsModal.vue'
+import QueryRepeatedTasksModal from './modal/QueryRepeatedTasksModal.vue'
 import type { PictureSortParam } from "/#/api"
 
 const deviceHeight = ref(600)
@@ -33,6 +34,7 @@ const pagination = reactive({
 const configStore = useConfig()
 const packageModalRef = ref(null)
 const generateModalRef = ref(null)
+const queryRepeatedTasksModalRef = ref(null)
 const LoginSuccessModalRef = ref(null)
 const loading = ref(false)
 const message = useMessage()
@@ -196,6 +198,7 @@ const gridHeight = computed(() => {
 async function oneCheck() {
   const asideVal = cloneDeep(configStore.getAsideValue)
   asideVal.izyear = dayjs(asideVal.izyear[0]).format("YYYY/MM/DD") + '-' + dayjs(asideVal.izyear[1]).format("YYYY/MM/DD")
+  const tasksLoadingModal = queryRepeatedTasksModalRef.value as any
   delete asideVal.izsimilarity
   if (checkDuplicateNo.value) {
     getCheckDuplicateStatus(checkDuplicateNo.value).then((res) => {
@@ -213,14 +216,14 @@ async function oneCheck() {
           reset()
           loadMore()
         } else if (checkTaskStatus.value === 1) {
-          message.success("请等待，查重任务正在创建中...");
+          tasksLoadingModal.showModal()
           return
         }
       }
     })
     return
   }
-  message.success("请等待，查重任务正在创建中...");
+  tasksLoadingModal.showModal()
   oneClickCheckTaskPackage(asideVal).then((res) => {
     if (res.code === "OK") {
       checkDuplicateNo.value = res.data.checkDuplicateNo
@@ -458,6 +461,7 @@ function previewHandler(index: number, event: MouseEvent) {
     </div>
     <PackageSettingsModal ref="packageModalRef" @commit="commitHandler" />
     <GeneratePackageModal ref="generateModalRef" />
+    <QueryRepeatedTasksModal ref="queryRepeatedTasksModalRef" />
     <LoginSuccessModal ref="LoginSuccessModalRef" />
   </div>
 </template>
diff --git a/src/views/home/content/modal/QueryRepeatedTasksModal.vue b/src/views/home/content/modal/QueryRepeatedTasksModal.vue
new file mode 100644
index 0000000..f0f2a4a
--- /dev/null
+++ b/src/views/home/content/modal/QueryRepeatedTasksModal.vue
@@ -0,0 +1,50 @@
+<script lang="ts" setup>
+import { ref } from 'vue'
+
+const show = ref(false)
+
+const stys = {
+  'width': '424px',
+  'height': '192px',
+  '--n-padding-bottom': '0px',
+  '--n-padding-left': '0px',
+  'background': 'linear-gradient(132deg, rgba(255, 255, 255, 0.32) 21%, rgba(152, 172, 255, 0.14) 100%)',
+  'border-radius': '4px',
+  'box-shadow': '0px 12px 48px 16px rgba(0, 0, 0, 0.03)',
+  'backdrop-filter': ' blur(10px)',
+}
+
+function showModal() {
+  show.value = true
+}
+
+function closeModal() {
+  show.value = false
+}
+
+defineExpose({
+  showModal,
+  closeModal,
+})
+</script>
+
+<template>
+  <n-modal v-model:show="show" :mask-closable="false" transform-origin="center">
+    <n-card :style="stys" :bordered="false" role="dialog" aria-modal="true">
+      <div class="wrapper">
+        <svg-icon size="90" name="robot2" />
+        <span style="margin-top: 24px;">正在查重中</span>
+      </div>
+    </n-card>
+  </n-modal>
+</template>
+
+<style lang="less" scoped>
+.wrapper {
+  display: flex;
+  height: 100%;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+</style>

From 07622e3a5aa0258b1480945e08d626197eba5572 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Tue, 26 Mar 2024 00:09:32 +0800
Subject: [PATCH 5/6] =?UTF-8?q?feat:=20=E7=BB=84=E4=BB=B6=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/components.d.ts b/components.d.ts
index 3b65693..06ebe68 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -21,8 +21,10 @@ declare module 'vue' {
     NDialogProvider: typeof import('naive-ui')['NDialogProvider']
     NDivider: typeof import('naive-ui')['NDivider']
     NDropdown: typeof import('naive-ui')['NDropdown']
+    NEmpty: typeof import('naive-ui')['NEmpty']
     NForm: typeof import('naive-ui')['NForm']
     NFormItem: typeof import('naive-ui')['NFormItem']
+    NGi: typeof import('naive-ui')['NGi']
     NGrid: typeof import('naive-ui')['NGrid']
     NGridItem: typeof import('naive-ui')['NGridItem']
     NImage: typeof import('naive-ui')['NImage']
@@ -39,7 +41,11 @@ declare module 'vue' {
     NSpace: typeof import('naive-ui')['NSpace']
     NSpin: typeof import('naive-ui')['NSpin']
     NSwitch: typeof import('naive-ui')['NSwitch']
+    NTabPane: typeof import('naive-ui')['NTabPane']
+    NTabs: typeof import('naive-ui')['NTabs']
     NTag: typeof import('naive-ui')['NTag']
+    NTimeline: typeof import('naive-ui')['NTimeline']
+    NTimelineItem: typeof import('naive-ui')['NTimelineItem']
     NTooltip: typeof import('naive-ui')['NTooltip']
     NUpload: typeof import('naive-ui')['NUpload']
     NUploadDragger: typeof import('naive-ui')['NUploadDragger']

From 283491284169b89706a6fc4e143c01fe9d75c280 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Tue, 26 Mar 2024 00:54:53 +0800
Subject: [PATCH 6/6] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=8C=85=E5=88=9B=E5=BB=BA=E5=AE=8C=E6=88=90=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/content/Content.vue            |  5 ++
 .../home/content/modal/FinishPackageModal.vue | 81 +++++++++++++++++++
 2 files changed, 86 insertions(+)
 create mode 100644 src/views/home/content/modal/FinishPackageModal.vue

diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 665bc0b..3ebc5d2 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -15,6 +15,7 @@ import { cloneDeep, debounce } from 'lodash-es'
 import Masonry from 'masonry-layout'
 import { useMessage } from 'naive-ui'
 import { computed, nextTick, onMounted, onUnmounted, onUpdated, reactive, ref, unref, watch } from 'vue'
+import FinishPackageModal from './modal/FinishPackageModal.vue'
 import GeneratePackageModal from './modal/GeneratePackageModal.vue'
 import LoginSuccessModal from './modal/LoginSuccessModal.vue'
 import PackageSettingsModal from './modal/PackageSettingsModal.vue'
@@ -36,6 +37,7 @@ const packageModalRef = ref(null)
 const generateModalRef = ref(null)
 const queryRepeatedTasksModalRef = ref(null)
 const LoginSuccessModalRef = ref(null)
+const finishPackageModal = ref(null)
 const loading = ref(false)
 const message = useMessage()
 const totalCount = ref(0)
@@ -244,11 +246,13 @@ async function commitHandler(settingParam) {
     checkDuplicateNo: checkDuplicateNo.value
   }
   const modal = generateModalRef.value as any
+  const finishModal = finishPackageModal.value as any
   modal.showModal()
   createPackage(params).then((res) => {
     if (res.code === "OK") {
       message.success(res.data);
       modal.closeModal()
+      finishModal.showModal()
     }
   })
   const asideVal = configStore.getAsideValue
@@ -463,6 +467,7 @@ function previewHandler(index: number, event: MouseEvent) {
     <GeneratePackageModal ref="generateModalRef" />
     <QueryRepeatedTasksModal ref="queryRepeatedTasksModalRef" />
     <LoginSuccessModal ref="LoginSuccessModalRef" />
+    <FinishPackageModal ref="finishPackageModal" />
   </div>
 </template>
 
diff --git a/src/views/home/content/modal/FinishPackageModal.vue b/src/views/home/content/modal/FinishPackageModal.vue
new file mode 100644
index 0000000..bb0961a
--- /dev/null
+++ b/src/views/home/content/modal/FinishPackageModal.vue
@@ -0,0 +1,81 @@
+<script lang="ts" setup>
+import { defineOptions, ref } from 'vue';
+import { useRouter } from 'vue-router';
+
+defineOptions({ name: 'ShortcutModal' })
+
+const show = ref(false)
+const router = useRouter()
+
+const cardStyle = {
+  'width': '29vw',
+  '--n-padding-bottom': '10px',
+  '--n-padding-left': '10px',
+}
+
+function showModal() {
+  show.value = true
+}
+
+function closeModal(path) {
+  show.value = false
+  router.push(path)
+}
+
+defineExpose({
+  showModal,
+})
+</script>
+
+<template>
+  <div>
+    <n-modal v-model:show="show" transform-origin="center" style="padding: 8px;">
+      <n-card :style="cardStyle" :bordered="false" size="huge" role="dialog" aria-modal="true">
+        <div style="display: flex;">
+          <div><svg-icon size="80" name="robot2" /></div>
+          <div style="height: 130px;text-align: center;margin-left: 20px;">
+            <div class="msg-title">生成任务提示</div>
+            <div class="msg-text">AI已根据您的配置要求生成任务包。</div>
+          </div>
+        </div>
+
+        <template #footer>
+          <div class="wrapper-footer">
+            <n-button type="info" @click="closeModal('/worksheet')">
+              进入AI工单
+            </n-button>
+            <n-button style="margin-left:10px;color: #666666;" @click="closeModal('/task')">
+              进入任务审批
+            </n-button>
+          </div>
+        </template>
+      </n-card>
+    </n-modal>
+  </div>
+</template>
+
+<style lang="less" scoped>
+.wrapper-footer {
+  margin-top: -20px;
+  text-align: right;
+}
+
+.msg-title {
+  font-size: 16px;
+  font-family: PingFang SC, PingFang SC-Medium;
+  font-weight: Medium;
+  text-align: left;
+  color: #333333;
+  line-height: 24px;
+  margin: 12px 0;
+}
+
+.msg-text {
+  font-size: 14px;
+  font-family: PingFang SC, PingFang SC-Regular;
+  font-weight: Regular;
+  text-align: left;
+  color: #666666;
+  line-height: 22px;
+}
+</style>