From 729d290199ba2af71dc4b54db4352b227e4cb0bd Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Mon, 25 Mar 2024 22:00:09 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8Fbug,=E4=BC=98=E5=8C=96formRule,=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/RichEditor/Quill.vue           |   2 +-
 .../aside/comp/modals/CustomFilterModal.vue   |  31 ++-
 src/views/login/components/Login.vue          | 188 +++++++++++-------
 src/views/login/index.vue                     |   5 +
 src/views/message/content/List.vue            |  15 +-
 5 files changed, 161 insertions(+), 80 deletions(-)

diff --git a/src/components/RichEditor/Quill.vue b/src/components/RichEditor/Quill.vue
index 36a416f..471eeba 100644
--- a/src/components/RichEditor/Quill.vue
+++ b/src/components/RichEditor/Quill.vue
@@ -61,7 +61,7 @@ const saveHandler = debounce(() => {
   </div>
 </template>
 
-<style lang="less">
+<style lang="less" scoped>
   .title{
     font-size: 18px;
     font-family: PingFang SC, PingFang SC-Medium;
diff --git a/src/views/home/aside/comp/modals/CustomFilterModal.vue b/src/views/home/aside/comp/modals/CustomFilterModal.vue
index ce3c89e..0d74258 100644
--- a/src/views/home/aside/comp/modals/CustomFilterModal.vue
+++ b/src/views/home/aside/comp/modals/CustomFilterModal.vue
@@ -304,7 +304,7 @@ onMounted(() => {
               :title="allCount" class="dragcardStyle" :segmented="{ content: true, footer: true }" size="small"
               :bordered="false"
             >
-              <div>
+              <div class="input_wrap">
                 <n-input placeholder="搜索关键词" @input="leftInputHandler">
                   <template #suffix>
                     <SvgIcon size="14px" name="magnifying-1-color999" />
@@ -340,7 +340,7 @@ onMounted(() => {
               <template #header-extra>
                 <span class="textbtnStyle" @click="clearDragSource">清空</span>
               </template>
-              <div>
+              <div class="input_wrap">
                 <n-input placeholder="搜索关键词" @input="rightInputHandler">
                   <template #suffix>
                     <SvgIcon size="14px" name="magnifying-1-color999" />
@@ -395,6 +395,13 @@ onMounted(() => {
   &-footer {
     display: flex;
     justify-content: flex-end;
+    .n-button--info-type{
+      background: #507AFD !important;
+    }
+    .n-button--default-type{
+      background: #CAD2DD !important;
+      color: #333333;
+    }
   }
 
   &-info {
@@ -464,7 +471,25 @@ onMounted(() => {
   font-weight: bolder !important;
 }
 ::v-deep(.n-scrollbar){
-  border-top: none !important;
+  border-left: 1px solid #cad2dd !important;
+  border-right: 1px solid #cad2dd !important;
+  border-bottom: 1px solid #E8E8E8 !important;
+  border-top: 1px solid #E8E8E8 !important;
+}
+::v-deep(.n-card__content){
+  padding: 20px 24px  0 24px !important;
+}
+::v-deep(.n-card__footer){
+  padding: 0 24px 16px 24px !important;
+}
+::v-deep(.n-input .n-input-wrapper){
+  height: 44px !important;
+  border: 1px solid #cad2dd !important;
+  border-bottom: none !important;
+  // margin-bottom: -3px;
+  .n-input__input input{
+    height: 44px !important;
+  }
 }
 
 </style>
diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue
index 60eca32..768d96d 100644
--- a/src/views/login/components/Login.vue
+++ b/src/views/login/components/Login.vue
@@ -42,7 +42,7 @@ let formInline: FormState = reactive({
   // password: "123456",
   enterprisecode: "",
   username: "",
-  password: ""
+  password: "",
 });
 
 let formSms: FormSms = reactive({
@@ -54,38 +54,52 @@ const tab = ref(0);
 const countTime = ref("获取验证码");
 const rules = {
   enterprisecode: [
-    { required: true, message: "请输入企业编码", trigger: "blur" },
     {
-      trigger: ["blur"],
+      trigger: ["blur","input","change"],
       level: "error",
       validator(_rule, value) {
         if (loginSuccess.value) {
           return true;
-        } else {
-          return new Error(loginRejectMessge.value);
         }
+        if (!value) {
+          return new Error("请输入企业编码");
+        }
+        return new Error(loginRejectMessge.value);
       },
     },
   ],
   agentcode: [
-    { required: true, message: "请输入企业编码", trigger: "blur" },
     {
-      trigger: ["blur"],
+      trigger: ["blur","input","change"],
       level: "error",
       validator(_rule, value) {
         if (loginSuccess.value) {
           return true;
-        } else {
-          return new Error(loginRejectMessge.value);
         }
+        if (!value) {
+          return new Error("请输入验证码");
+        }
+        return new Error(loginRejectMessge.value);
       },
     },
   ],
-  phone: { required: true, message: "请输入手机号", trigger: "blur" },
+  phone: [
+  {
+      trigger: ["blur","input","change"],
+      level: "error",
+      validator(_rule, value) {
+        if (loginSuccess.value) {
+          return true;
+        }
+        if (!value) {
+          return new Error("请输入手机号");
+        }
+        return new Error(loginRejectMessge.value);
+      },
+    },],
   phonecode: [
-    { required: true, message: "请输入验证码", trigger: "blur" },
     {
-      trigger: ["blur"],
+      trigger: ["blur","input","change"],
       level: "error",
       validator(_rule, value) {
         if (value.length < 4 && value.length > 0) {
@@ -93,32 +107,49 @@ const rules = {
         }
         if (loginSuccess.value) {
           return true;
-        } else {
-          return new Error("验证码错误");
         }
+        if (!value) {
+          return new Error("请输入验证码");
+        }
+        return new Error(loginRejectMessge.value);
       },
     },
   ],
   username: [
-    { required: true, message: "请输入用户名", trigger: "blur" },
     {
-      trigger: ["blur"],
+      trigger: ["blur","input","change"],
       level: "error",
       validator(_rule, value) {
         if (loginSuccess.value) {
           return true;
-        } else {
-          return new Error(loginRejectMessge.value);
         }
+        if (!value) {
+          return new Error("请输入账号");
+        }
+        return new Error(loginRejectMessge.value);
       },
     },
   ],
-  password: { required: true, message: "请输入密码", trigger: "blur" },
-  captcha: { required: true, message: "请输入验证码", trigger: "blur" },
+  password: [
+  {
+      trigger: ["blur","input","change"],
+      level: "error",
+      validator(_rule, value) {
+        if (loginSuccess.value) {
+          return true;
+        }
+        if (!value) {
+          return new Error("请输入密码");
+        }
+        return new Error(loginRejectMessge.value);
+      },
+    },],
+  captcha: [{ required: true, message: "请输入验证码", trigger: "blur" }],
 };
 
 function handleSubmit(e) {
   e.preventDefault();
+  loginSuccess.value = true;
   formRef.value.validate(async (errors) => {
     if (!errors) {
       const { username, password, enterprisecode } = formInline;
@@ -163,9 +194,9 @@ function handleSubmit(e) {
 }
 
 onMounted(() => {
-  let data:any = localStorage.getItem("LOGIN_FORM_SMS");
+  let data: any = localStorage.getItem("LOGIN_FORM_SMS");
   if (data) {
-    data = JSON.parse(data) as any
+    data = JSON.parse(data) as any;
     formSms.agentcode = data.agentcode;
     formSms.phone = data.phone;
     formSms.phonecode = "";
@@ -175,7 +206,7 @@ onMounted(() => {
   if (data) {
     data = JSON.parse(data) as any;
     formInline.username = data.username;
-    formInline.password = '';
+    formInline.password = "";
     // formInline.password = data.password;
     formInline.enterprisecode = data.enterprisecode;
     autoLogin.value = true;
@@ -184,6 +215,7 @@ onMounted(() => {
 
 function handleSmsSubmit(e) {
   e.preventDefault();
+  loginSuccess.value = true;
   formRefSms.value.validate(async (errors) => {
     if (!errors) {
       const { phone, agentcode, phonecode } = formSms;
@@ -346,20 +378,20 @@ function forget() {
             </template>
           </n-input>
         </n-form-item>
-        <n-form-item class="form-item">
-          <n-button
-            :class="{ 'btn-disabled': computedForm() }"
-            class="btn"
-            type="primary"
-            size="large"
-            :loading="loading"
-            block
-            @click="handleSubmit"
-            :disabled="computedForm()"
-          >
-            登录
-          </n-button>
-        </n-form-item>
+        <!-- <n-form-item class="form-item"> -->
+        <n-button
+          :class="{ 'btn-disabled': computedForm() }"
+          class="btn"
+          type="primary"
+          size="large"
+          :loading="loading"
+          block
+          @click="handleSubmit"
+          :disabled="computedForm()"
+        >
+          登录
+        </n-button>
+        <!-- </n-form-item> -->
         <n-form-item class="default-color">
           <div class="flex justify-between w-full">
             <div class="flex-initial">
@@ -440,23 +472,23 @@ function forget() {
             </template>
           </n-input>
         </n-form-item>
-        <n-form-item class="form-item">
-          <n-button
-            :class="{ 'btn-disabled': computedForm() }"
-            class="btn"
-            type="primary"
-            size="large"
-            :loading="loading"
-            block
-            @click="handleSmsSubmit"
-            :disabled="computedForm()"
-          >
-            登录
-          </n-button>
-        </n-form-item>
+        <!-- <n-form-item class="form-item"> -->
+        <n-button
+          :class="{ 'btn-disabled': computedForm() }"
+          class="btn"
+          type="primary"
+          size="large"
+          :loading="loading"
+          block
+          @click="handleSmsSubmit"
+          :disabled="computedForm()"
+        >
+          登录
+        </n-button>
+        <!-- </n-form-item> -->
         <n-form-item class="default-color">
           <div class="flex justify-between w-full">
-            <div class="flex-initial">
+            <div class="flex-initial save-btn">
               <n-checkbox v-model:checked="autoLogin">
                 <span class="forgetSpan">记住账号</span>
               </n-checkbox>
@@ -474,7 +506,7 @@ function forget() {
 <style lang="less" scoped>
 .form-login {
   width: 26.25rem;
-  height: 26.0625rem;
+  height: 28.0625rem;
   box-sizing: border-box;
   background: linear-gradient(
     136deg,
@@ -486,7 +518,7 @@ function forget() {
   box-shadow: 0px 6px 12px 0px rgba(0, 0, 0, 0.04);
   backdrop-filter: blur(12px);
   position: relative;
-  padding: 3rem 1.6875rem 0;
+  padding: 3rem 1.6875rem 2rem;
 
   .img-close {
     position: absolute;
@@ -528,10 +560,10 @@ function forget() {
 
       .line {
         width: 2rem;
-        height: .25rem;
+        height: 0.25rem;
         border-radius: 2px;
         margin: 0 auto;
-        margin-top: .5625rem;
+        margin-top: 0.5625rem;
       }
     }
   }
@@ -540,14 +572,16 @@ function forget() {
     margin-top: 1.8125rem;
 
     .form-item {
-      height: 3.75rem;
+      height: 4.75rem;
     }
 
     .item-input {
       width: 22.875rem;
-      // height: 44px;
+      // height: 2.75rem;
       background: rgba(255, 255, 255, 0.5);
       border-radius: 4px;
+      // margin-bottom: 1rem;
+      font-size: 1rem;
     }
 
     .btn {
@@ -555,8 +589,8 @@ function forget() {
       height: 2.75rem;
       background: linear-gradient(234deg, #96aaff 0%, #1c43ff 100%);
       border-radius: 3px;
-      margin-top: .625rem;
-      margin-bottom: .875rem;
+      // margin-top: 1rem;
+      // margin-bottom: -0.875rem;
 
       &-disabled {
         opacity: 0.5;
@@ -571,38 +605,56 @@ function forget() {
   }
 
   .order-last {
-    font-size: .875rem;
+    font-size: 1rem;
     font-family: PingFang SC, PingFang SC-Regular;
     font-weight: Regular;
     color: #507afd;
   }
 
   .code {
-    font-size: .9375rem;
+    font-size: 0.9375rem;
     font-family: PingFang SC, PingFang SC-Regular;
     font-weight: Regular;
     color: #507afd;
-    margin-left: .75rem;
+    margin-left: 0.75rem;
     cursor: pointer;
 
     &-count {
-      font-size: .875rem;
+      font-size: 0.875rem;
       color: #999999;
     }
   }
 }
 ::v-deep(.n-form-item-feedback--error) {
-  // color: #FF4E4F !important;
+  color: #ff4e4f !important;
 }
 .forgetSpan {
-  font-size: .9375rem;
+  font-size: 0.9375rem;
   font-family: PingFang SC, PingFang SC-Regular;
   font-weight: Regular;
   text-align: center;
   color: #999999;
-  line-height: 1.3125rem;
+  line-height: 1rem;
 }
-::v-deep(.n-base-clear>.n-base-clear__clear>.n-base-icon>svg){
+::v-deep(.n-base-clear > .n-base-clear__clear > .n-base-icon > svg) {
   color: #c9c9c9;
 }
+::v-deep(.n-input .n-input__input-el) {
+  height: 2.75rem !important;
+  font-size: 1rem !important;
+}
+::v-deep(.n-input .n-input-wrapper) {
+  height: 2.75rem !important;
+}
+.save-btn {
+  font-size: 0.9375rem;
+}
+::v-deep(.n-form-item .n-form-item-feedback-wrapper) {
+  height: 1rem;
+  padding: 0 !important;
+  margin: 0 !important;
+  line-height: normal !important;
+  min-height: 0 !important;
+  // margin-bottom: .5rem;
+}
 </style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index bc6f938..fbfb86e 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -293,4 +293,9 @@ function close() {
     margin-left: -30.3125rem;
   }
 }
+::v-deep(.n-form-item .n-form-item-feedback-wrapper .n-form-item-feedback.n-form-item-feedback--error){
+  color: #FF4E4F !important;
+  font-size: .75rem !important;
+}
+
 </style>
diff --git a/src/views/message/content/List.vue b/src/views/message/content/List.vue
index 3f4e740..565d9fc 100644
--- a/src/views/message/content/List.vue
+++ b/src/views/message/content/List.vue
@@ -103,7 +103,7 @@ function getMore() {
 
 <template>
   <div class="wrapper-message">
-    <div class="header flex justify-between">
+    <div class="flex justify-between header">
       <div class="header-title">
         消息通知
       </div>
@@ -118,10 +118,10 @@ function getMore() {
           v-for="(item) in tabList"
           :key="item.value"
           :class="{ 'item-active': tab === item.value }"
-          class="item flex"
+          class="flex item"
           @click="switchTab(item.value)"
         >
-          <div class="item-left flex align-center">
+          <div class="flex item-left align-center">
             <img class="icon" :src="tab === item.value ? item.activeIcon : item.icon" alt="">
             <div :class="{ 'text-active': tab === item.value }" class="text">
               {{ item.name }}
@@ -133,7 +133,7 @@ function getMore() {
       </div>
       <div class="list">
         <div v-for="(item, index) in list" :key="item.id" :class="{ 'pt0': index === 0, 'item-disabled': item.readFlag }" class="item" @click="goDetail(item)">
-          <div class="left left">
+          <div class="left">
             <div class="num">
               {{ format(item.sendTime, 'dd') }}
               <div v-if="!item.readFlag" class="point" />
@@ -240,7 +240,6 @@ function getMore() {
         align-items: center;
         justify-content: space-between;
         cursor: pointer;
-
         &-active{
           background: rgba(80,122,253,.1);
         }
@@ -311,7 +310,7 @@ function getMore() {
         align-items: center;
         justify-content: space-between;
         flex: 1;
-        padding: 16px 0 16px 25px;
+        padding: 16px 0 8px 25px;
         border-bottom: 1px solid #eeeeee;
 
         &-disabled{
@@ -369,7 +368,7 @@ function getMore() {
       .status{
         display: flex;
         align-items: center;
-        margin-top: 8px;
+        // margin-top: 8px;
       }
 
       .tag{
@@ -415,7 +414,7 @@ function getMore() {
         text-align: left;
         color: #999999;
         line-height: 19px;
-        margin-top: 8px;
+        // margin-top: 8px;
       }
 
       .name{

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 2/3] =?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 3/3] =?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(() => {