diff --git a/src/App.vue b/src/App.vue
index 7abf926..a68093d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -90,17 +90,20 @@ const getThemeOverrides = computed(() => {
 //   transform: rotate(-90deg) !important;
 // }
 .n-scrollbar-content {
-  padding: 0 7.97px 0 4px;
+  padding: 0 7.97px 16 16px;
 }
 .n-form-item .n-form-item-label {
   font-size: 14px !important;
   color: #333333 !important;
 }
-.n-slider-dots > .n-slider-dot:nth-child(2) {
+.n-slider-dots > .n-slider-dot {
   display: none !important;
 }
 .n-collapse-item-arrow i svg {
   width: 14px !important;
   height: 14px !important;
 }
+.v-binder-follower-content {
+  left: -60px;
+}
 </style>
diff --git a/src/api/task/task.ts b/src/api/task/task.ts
index 5087c50..395607b 100644
--- a/src/api/task/task.ts
+++ b/src/api/task/task.ts
@@ -28,7 +28,7 @@ export async function getApprovalList(page: any) {
 
 /**
  * 审核
- * @param param
+ * @param params
  */
 export async function audit(params) {
   return http.request({
@@ -82,8 +82,6 @@ export async function removeFiles(params) {
 
 /**
  *  获取某个任务详情(相似图片列表)
- * @param packageid 任务包id
- * @param taskchildpictureid 任务详情的id
  * @param params
  * @returns
  */
diff --git a/src/components/DataHeader/index.vue b/src/components/DataHeader/index.vue
index 5c58b41..da586cc 100644
--- a/src/components/DataHeader/index.vue
+++ b/src/components/DataHeader/index.vue
@@ -1,29 +1,68 @@
 <script lang="ts" setup>
-import { defineProps, onMounted, ref } from 'vue'
-import { gettaskToolsCount } from '@/api/home/main'
+import { defineProps, onMounted, ref } from "vue";
+import { gettaskToolsCount } from "@/api/home/main";
 
 defineProps({
   hasColor: {
     type: Boolean,
     default: () => false,
   },
-})
+});
 
-const data = ref()
+const data = ref([
+  {
+    link: "count",
+    title: "任务总数",
+    count: 0,
+  },
+  {
+    link: "wait",
+    title: "待审批",
+    count: 0,
+  },
+  {
+    link: "done",
+    title: "已审批",
+    count: 0,
+  },
+  {
+    link: "resolve",
+    title: "通过",
+    count: 0,
+    color: "#03c984",
+  },
+  {
+    link: "reject",
+    title: "不通过",
+    count: 0,
+    color: "#ff8b8b",
+  },
+  {
+    link: "reimg",
+    title: "图片重复数",
+    count: 0,
+  },
+  {
+    link: "breakcount",
+    title: "小结重复数",
+    count: 0,
+  },
+]);
 
 function initRem() {
-  const designWidth = 1440
-  const rempPx = 16
-  const scale = window.innerWidth / designWidth
-  document.documentElement.style.fontSize = `${scale * rempPx}px`
+  const designWidth = 1440;
+  const rempPx = 16;
+  const scale = window.innerWidth / designWidth;
+  document.documentElement.style.fontSize = `${scale * rempPx}px`;
 }
 onMounted(() => {
-  initRem()
-  getData()
-})
+  initRem();
+  getData();
+});
 async function getData() {
-  const {
-    data: {
+  const { data } = await gettaskToolsCount();
+  if (data) {
+    const {
       total,
       treat,
       alreadyApprove,
@@ -31,62 +70,72 @@ async function getData() {
       repeat,
       approvedCount,
       notGoCount,
-    },
-  } = await gettaskToolsCount()
-  data.value = [
-    {
-      link: 'count',
-      title: '任务总数',
-      count: total,
-    },
-    {
-      link: 'wait',
-      title: '待审批',
-      count: treat,
-    },
-    {
-      link: 'done',
-      title: '已审批',
-      count: alreadyApprove,
-    },
-    {
-      link: 'resolve',
-      title: '通过',
-      count: approvedCount,
-      color: '#03c984',
-    },
-    {
-      link: 'reject',
-      title: '不通过',
-      count: notGoCount,
-      color: '#ff8b8b',
-    },
-    {
-      link: 'reimg',
-      title: '图片重复数',
-      count: repeat,
-    },
-    {
-      link: 'breakcount',
-      title: '小结重复数',
-      count: repeatedNodules,
-    },
-  ]
+    } = data;
+    data.value = [
+      {
+        link: "count",
+        title: "任务总数",
+        count: total,
+      },
+      {
+        link: "wait",
+        title: "待审批",
+        count: treat,
+      },
+      {
+        link: "done",
+        title: "已审批",
+        count: alreadyApprove,
+      },
+      {
+        link: "resolve",
+        title: "通过",
+        count: approvedCount,
+        color: "#03c984",
+      },
+      {
+        link: "reject",
+        title: "不通过",
+        count: notGoCount,
+        color: "#ff8b8b",
+      },
+      {
+        link: "reimg",
+        title: "图片重复数",
+        count: repeat,
+      },
+      {
+        link: "breakcount",
+        title: "小结重复数",
+        count: repeatedNodules,
+      },
+    ];
+  }
 }
 </script>
 
 <template>
-  <div class="header_wrap">
-    <div v-for="(item, index) in data" :key="index" class="header_item">
-      <SvgIcon :name="item.link" />
-      <div class="data_wrap">
-        <div class="data_title" :style="hasColor ? `color:${item.color || ''}` : ''">
-          {{ item.count }}
-        </div>
-        <div class="data_content">
-          {{ item.title }}
+  <div class="header_wrap" :style="hasColor ? '' : 'margin-top: 7.375rem;'">
+    <div v-for="(item, index) in data" :key="index" class="header_box">
+      <div class="header_item">
+        <SvgIcon :name="item.link" :style="index == 0 ? 'margin-left:0.5rem' : ''" />
+        <div class="data_wrap">
+          <div class="data_title" :style="hasColor ? `color:${item.color || ''}` : ''">
+            {{ item.count }}
+          </div>
+          <div class="data_content">
+            {{ item.title }}
+          </div>
         </div>
       </div>
+      <div
+        class="line"
+        :style="
+          hasColor
+            ? 'margin-left:2.5rem;margin-right:2.0625rem'
+            : 'margin-left:1.25rem;margin-right:0.8125rem'
+        "
+      />
     </div>
     <SvgIcon size="14px" style="cursor: pointer" name="setting" class="settingSvg" />
   </div>
@@ -99,41 +148,48 @@ async function getData() {
   align-items: center;
   justify-content: space-between;
   padding: 1rem 1rem 1rem 3.125rem;
-  background: #fff;
+  background: #f5f7f9;
   margin-bottom: 1rem;
-
-  .header_item {
-    min-width: 10%;
+  // 180-62 header
+  padding-left: 2.125rem;
+  .header_box {
     display: flex;
     flex-flow: row nowrap;
     align-items: center;
     justify-content: center;
-    svg {
-      width: 2.75rem !important;
-      height: 2.75rem !important;
-    }
-    .data_wrap {
-      margin-left: 0.8125rem;
-      .data_title {
-        font-size: 1.125rem;
-        font-family: HarmonyOS Sans SC, HarmonyOS Sans SC-Bold;
-        font-weight: 900;
-        text-align: left;
-        color: #202020;
-        line-height: 1.4375rem;
-        text-align: center;
-        white-space: nowrap;
+    min-width: 10%;
+    .header_item {
+      display: flex;
+      flex-flow: row nowrap;
+      align-items: center;
+      justify-content: center;
+      svg {
+        width: 2.75rem !important;
+        height: 2.75rem !important;
       }
-      .data_content {
-        opacity: 0.6;
-        font-size: 0.75rem;
-        font-family: PingFang SC, PingFang SC-Regular;
-        font-weight: 500;
-        text-align: center;
-        color: #202020;
-        line-height: 1rem;
-        text-align: center;
-        white-space: nowrap;
+      .data_wrap {
+        margin-left: 0.75rem;
+        .data_title {
+          font-size: 1.125rem;
+          font-family: HarmonyOS Sans SC, HarmonyOS Sans SC-Bold;
+          font-weight: 900;
+          text-align: left;
+          color: #202020;
+          line-height: 1.4375rem;
+          text-align: center;
+          white-space: nowrap;
+        }
+        .data_content {
+          opacity: 0.6;
+          font-size: 0.75rem;
+          font-family: PingFang SC, PingFang SC-Regular;
+          font-weight: 500;
+          text-align: center;
+          color: #202020;
+          line-height: 1rem;
+          text-align: center;
+          white-space: nowrap;
+        }
       }
     }
   }
@@ -142,4 +198,9 @@ async function getData() {
   width: 1rem !important;
   height: 1rem !important;
 }
+.line {
+  width: 0.0625rem;
+  height: 1.25rem;
+  background: #e8e8e8;
+}
 </style>
diff --git a/src/components/RichEditor/Quill.vue b/src/components/RichEditor/Quill.vue
index c87d0ef..0e03ce6 100644
--- a/src/components/RichEditor/Quill.vue
+++ b/src/components/RichEditor/Quill.vue
@@ -88,9 +88,9 @@ const saveHandler = debounce(() => {
 .title {
   font-size: 18px;
   font-family: PingFang SC, PingFang SC-Medium;
-  font-weight: Medium;
   color: #333333;
   margin-bottom: 24px;
+  font-weight: 500;
 }
 
 .ql-toolbar.ql-snow {
diff --git a/src/components/Search/Search.vue b/src/components/Search/Search.vue
index 2d31538..f422b1b 100644
--- a/src/components/Search/Search.vue
+++ b/src/components/Search/Search.vue
@@ -107,12 +107,19 @@ onMounted(() => {
       <n-input
         v-model:value="value"
         placeholder="搜索任务ID、任务名称、提报人、拜访终端"
+        placeholder-style="width:304px;height:22px;margin:17px 0 17px 12px;"
+        style="font-size: 16px; font-weight: 500; color: #333333"
         type="text"
         @input="inputHandler"
         @mousedown="handlerShowList"
       >
         <template #prefix>
-          <SvgIcon name="magnifying-1" size="18" />
+          <SvgIcon
+            name="magnifying-1"
+            width="21"
+            height="20"
+            style="margin: 10px 0 10px 4px"
+          />
         </template>
       </n-input>
     </div>
@@ -159,7 +166,7 @@ onMounted(() => {
           class="list_item"
           @click="goPath(item, sitem.id)"
         >
-          <SvgIcon name="task-icon" size="16" />
+          <SvgIcon name="task-icon" size="16" style="margin-left: 16px" />
           <span class="name" v-html="highlightText(sitem.name, value)" />
         </div>
       </div>
@@ -169,10 +176,11 @@ onMounted(() => {
 
 <style lang="less" scoped>
 .input_wrap {
-  width: 60%;
+  // width: 60%;
+  width: 808px;
   position: absolute;
   top: 20%;
-  left: 20%;
+  left: 30%;
   box-shadow: none !important;
 
   .ip_box {
@@ -194,6 +202,8 @@ onMounted(() => {
     border-radius: 8px;
     overflow: hidden;
     box-shadow: 0px 12px 12px 0px rgba(80, 122, 253, 0.15), 0px 0px 0px 0.5px #d4e3fc;
+    // width: 808px;
+    // height: 56px;
   }
 
   .list_box {
@@ -203,22 +213,25 @@ onMounted(() => {
     box-shadow: 0px 12px 12px 0px rgba(80, 122, 253, 0.15);
     margin-top: 15px;
     padding: 8px 16px;
-
+    width: 802px;
+    height: 400px;
     .list_classfiy_item {
+      margin-bottom: -2px;
       .list_title {
         font-size: 12px;
         font-family: PingFang SC, PingFang SC-Regular;
         font-weight: Regular;
         color: #999999;
         line-height: 17px;
-        margin: 10px 0 10px 5px;
+        margin: 6px 0 12px 0;
+        font-weight: 500;
       }
 
       .list_item {
         display: flex;
         flex-flow: row nowrap;
         align-items: center;
-        margin-bottom: 10px;
+        margin: 16px 0;
       }
     }
   }
@@ -230,12 +243,15 @@ onMounted(() => {
 
 .history-list {
   align-items: center;
-  padding-bottom: 9px;
+  // 上面有margin-bottom:12;12+26=38
+  padding: 26px 12px 12px 0;
 }
 
 .name {
-  margin-left: 5px;
+  margin-left: 8px;
   cursor: pointer;
+  font-weight: 500;
+  color: #333333;
 }
 
 .tag-wrap {
@@ -244,8 +260,10 @@ onMounted(() => {
   flex: 1;
   overflow-y: hidden;
   overflow-x: auto;
+  margin: 9px 0 9px 29px;
 
   .tag {
+    font-weight: 500;
     padding: 0 12px;
     height: 22px;
     border: 1px solid #e4e7ed;
diff --git a/src/layout/components/Header/QuillModal.vue b/src/layout/components/Header/QuillModal.vue
index 8146b9f..add7b65 100644
--- a/src/layout/components/Header/QuillModal.vue
+++ b/src/layout/components/Header/QuillModal.vue
@@ -1,29 +1,33 @@
 <script lang="ts" setup>
-import { defineOptions, ref } from 'vue'
-import Quill from '@/components/RichEditor/Quill.vue'
+import { defineOptions, ref } from "vue";
+import Quill from "@/components/RichEditor/Quill.vue";
 
-defineOptions({ name: 'FilterModal' })
+defineOptions({ name: "FilterModal" });
 
-const emit = defineEmits(['showNewFilter'])
+const emit = defineEmits(["showNewFilter"]);
 
-const show = ref(false)
+const show = ref(false);
 
 function showModal() {
-  show.value = true
+  show.value = true;
 }
 
 function closeModal() {
-  show.value = false
+  show.value = false;
 }
 
 defineExpose({
   showModal,
-})
+});
 </script>
 
 <template>
   <div>
-    <n-modal v-model:show="show" transform-origin="center">
+    <n-modal
+      v-model:show="show"
+      transform-origin="center"
+      style="margin: calc(13%-147px) auto 0 !important"
+    >
       <Quill @close="show = false" />
     </n-modal>
   </div>
diff --git a/src/layout/components/Header/ShortcutModal.vue b/src/layout/components/Header/ShortcutModal.vue
index 22d720e..2b32541 100644
--- a/src/layout/components/Header/ShortcutModal.vue
+++ b/src/layout/components/Header/ShortcutModal.vue
@@ -1,49 +1,71 @@
 <script lang="ts" setup>
-import { defineOptions, ref } from 'vue'
+import { defineOptions, ref } from "vue";
 
-defineOptions({ name: 'ShortcutModal' })
+defineOptions({ name: "ShortcutModal" });
 
-const show = ref(false)
+const show = ref(false);
 
 const cardStyle = {
-  'width': '800px',
-  '--n-padding-bottom': '10px',
-  '--n-padding-left': '10px',
-  'padding-bottom':'100px'
-}
+  "width": "800px",
+  "--n-padding-bottom": "10px",
+  "--n-padding-left": "10px",
+  "padding-bottom": "100px",
+};
 
 function showModal() {
-  show.value = true
+  show.value = true;
 }
 
 function closeModal() {
-  show.value = false
+  show.value = false;
 }
 
 defineExpose({
   showModal,
-})
+});
 </script>
 
 <template>
   <div>
-    <n-modal v-model:show="show" transform-origin="center">
-      <n-card :style="cardStyle" :bordered="false" size="huge" role="dialog" aria-modal="true">
+    <n-modal
+      v-model:show="show"
+      transform-origin="center"
+      style="width: 808px; height: 606px; margin: -27px auto 0 !important"
+    >
+      <n-card
+        :style="cardStyle"
+        :bordered="false"
+        size="huge"
+        role="dialog"
+        aria-modal="true"
+      >
         <div class="wrapper">
           <div class="wrapper-header">
             <span class="wrapper-left">全局快捷键</span>
             <div class="wrapper-right">
-              按 <img class="img-question" src="@/assets/images/question.png" alt="">查看快捷键的信息
+              按
+              <img
+                class="img-question"
+                src="@/assets/images/question.png"
+                alt=""
+                style="width: 18px; height: 18px"
+              >查看快捷键的信息
 
-              <img class="img-close" src="@/assets/images/close.png" alt="" @click="closeModal">
+              <img
+                class="img-close"
+                src="@/assets/images/close.png"
+                alt=""
+                style="width: 20px; height: 20px"
+                @click="closeModal"
+              >
             </div>
           </div>
-          <n-divider />
+          <n-divider style="margin-bottom: 32px" />
           <div class="title">
             全局快捷方式
           </div>
           <div class="wrapper-global">
-            <table style="margin-left: 100px;">
+            <table style="margin-left: 47px; width: 180px">
               <tr>
                 <td><div class="key" data-key="g h" /></td>
                 <td>进入“一键查看”主页</td>
@@ -73,7 +95,7 @@ defineExpose({
                 <td>打开可疑文件夹</td>
               </tr>
             </table>
-            <table style="height: 30%;margin-left: 180px;">
+            <table style="height: 30%; margin-left: 180px">
               <tr>
                 <td><div class="key" data-key="[" /></td>
                 <td>隐藏/显示当前场景左侧筛选区</td>
@@ -96,29 +118,36 @@ defineExpose({
               </tr>
             </table>
           </div>
-          <n-divider />
-          <div class="title">
+          <n-divider style="margin: 24px 24px 32px 24px; color: #d9d9d9" />
+          <div class="title" style="margin-top: -16.5px">
             任务审批/任务终审/AI工单明细动作
           </div>
           <div class="wrapper-request">
-            <table style="margin-left: 100px;">
-      
+            <table style="margin-left: 47px; width: 180px">
               <tr>
-                <td><div class="key" data-key="p p" /></td>
+                <td style="text-align: left; width: 53px">
+                  <div class="key" data-key="p p" />
+                </td>
                 <td>通过</td>
               </tr>
               <tr>
-                <td><div class="key" data-key="x x" /></td>
+                <td style="text-align: left">
+                  <div class="key" data-key="x x" />
+                </td>
                 <td>不通过</td>
               </tr>
             </table>
-            <table style="margin-left: 155px;">
+            <table style="margin-left: 180px">
               <tr>
                 <td><div class="key" data-key="c" /></td>
                 <td>关闭（关闭当前场景弹窗）</td>
               </tr>
               <tr>
-                <td><div class="key" data-key="&larr;" /><span>/</span><div class="key" data-key="&rarr;" /></td>
+                <td>
+                  <div class="key" data-key="&larr;" />
+                  <span>/</span>
+                  <div class="key" data-key="&rarr;" />
+                </td>
                 <td>打开上一条/下一条信息切换</td>
               </tr>
             </table>
@@ -142,54 +171,56 @@ defineExpose({
 </template>
 
 <style lang="less" scoped>
-.wrapper-footer{
+.wrapper-footer {
   margin-top: -20px;
 }
 .wrapper {
-
-  .wrapper-header{
-    padding: 14px;
+  .wrapper-header {
+    padding: 14px 0 14px 0;
     padding-bottom: 0;
   }
 
-  .img-question{
+  .img-question {
     width: 16px;
     height: 16px;
     margin: 0 2px;
   }
 
-  .img-close{
+  .img-close {
     width: 16px;
     height: 16px;
     margin-left: 16px;
     cursor: pointer;
   }
 
-  .wrapper-right{
+  .wrapper-right {
     font-size: 16px;
     font-family: PingFang SC, PingFang SC-Regular;
-    font-weight: Regular;
+    font-weight: 400;
     text-align: left;
     color: #666666;
     line-height: 22px;
     display: flex;
-    align-items: center
+    align-items: center;
   }
 
-  .wrapper-left{
+  .wrapper-left {
     font-size: 18px;
     font-family: PingFang SC, PingFang SC-Medium;
     font-weight: 600;
     text-align: left;
-    color: #333333;
+    color: #000000;
     line-height: 25px;
   }
 
-  .title{
+  .title {
     font-size: 14px;
     font-weight: 600;
     margin-bottom: 10px;
-    padding-left: 30px;
+    padding-left: 47px;
+    color: #333333;
+    font-weight: 600;
+    // 分割线自带24px间距
   }
   &-header {
     display: flex;
@@ -220,7 +251,7 @@ defineExpose({
     }
 
     &-icon {
-      background: #FFF;
+      background: #fff;
       display: inline-block;
       width: 18px;
       height: 1px;
@@ -228,32 +259,31 @@ defineExpose({
       -webkit-transform: rotate(45deg);
 
       &:after {
-        content: '';
+        content: "";
         display: block;
         width: 18px;
         height: 1px;
-        background: #FFF;
+        background: #fff;
         transform: rotate(-90deg);
         -webkit-transform: rotate(-90deg);
       }
     }
-
   }
 
-  &-request,&-global{
+  &-request,
+  &-global {
     display: flex;
 
-    table{
-      tr td:first-child{
+    table {
+      tr td:first-child {
         text-align: right;
         padding-right: 10px;
         color: #515457;
       }
-      tr td{
+      tr td {
         color: #333333;
-
       }
-      tr span{
+      tr span {
         padding: 0 10px;
       }
     }
@@ -269,13 +299,14 @@ defineExpose({
     display: inline-block;
     box-sizing: content-box;
     font-size: 16px;
-    font-weight: bold;
     text-align: center;
     padding: 2px 6px;
     border: 1px solid #d6d6d6;
     border-left: 3px solid #d6d6d6;
     border-bottom: 3px solid #d6d6d6;
     background-color: #fdfdfd;
+    // color: #333333;
+    font-weight: bold;
   }
 
   .key[data-key]::after {
diff --git a/src/layout/components/Header/UserSettings.vue b/src/layout/components/Header/UserSettings.vue
index 22fb721..7cd5944 100644
--- a/src/layout/components/Header/UserSettings.vue
+++ b/src/layout/components/Header/UserSettings.vue
@@ -1,92 +1,92 @@
 <script lang="ts" setup>
-import { computed, inject, onMounted, ref } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
-import { useUser } from '@/store/modules/user'
-import { getImgUrl } from '@/utils/urlUtils'
-import defaultAvatar from '@/assets/icons/avatar.svg'
+import { computed, inject, onMounted, ref } from "vue";
+import { useRoute, useRouter } from "vue-router";
+import { useUser } from "@/store/modules/user";
+import { getImgUrl } from "@/utils/urlUtils";
+import defaultAvatar from "@/assets/icons/avatar.svg";
 
 const emit = defineEmits<{
-  (e: 'logout'): void
-}>()
+  (e: "logout"): void
+}>();
 
-const router = useRouter()
+const router = useRouter();
 
-const userStore = useUser()
+const userStore = useUser();
 
-const useInfo = userStore.getUserInfo
+const useInfo = userStore.getUserInfo;
 
-const aiDisabled = ref(false)
+const aiDisabled = ref(false);
 
 function handleSelect(row) {
-  userStore.updateTenantId(row.key)
-  location.reload()
+  userStore.updateTenantId(row.key);
+  location.reload();
 }
 
 function logIt(e) {
-  return false
+  return false;
 }
 
 // 一键查看
 function goHome(e) {
-  router.push({ name: 'home' })
+  router.push({ name: "home" });
 }
 
 // 任务审批
 function goTask(e) {
-  router.push({ name: 'task-main' })
+  router.push({ name: "task-main" });
 }
 
 // AI工单
 function goWorksheet(e) {
-  router.push({ name: 'worksheet-main' })
+  router.push({ name: "worksheet-main" });
 }
 
 // 任务终审
 function goFinal(e) {
-  router.push({ name: 'final-main' })
+  router.push({ name: "final-main" });
 }
 
-const mousetrap = inject('mousetrap') as any
+const mousetrap = inject("mousetrap") as any;
 onMounted(() => {
-  mousetrap.bind('g h', goHome)
-  mousetrap.bind('g t', goTask)
-  mousetrap.bind('g a', goWorksheet)
-  mousetrap.bind('g e', goFinal)
-})
+  mousetrap.bind("g h", goHome);
+  mousetrap.bind("g t", goTask);
+  mousetrap.bind("g a", goWorksheet);
+  mousetrap.bind("g e", goFinal);
+});
 
-const showPopover = ref(false)
-const popRef = ref(null)
-const changeFlag = ref(false)
+const showPopover = ref(false);
+const popRef = ref(null);
+const changeFlag = ref(false);
 
 const iconName = computed(() => {
-  return showPopover.value ? 'expand' : 'collapse'
-})
+  return showPopover.value ? "expand" : "collapse";
+});
 
 function handleUpdateShow(show: boolean) {
-  showPopover.value = show
+  showPopover.value = show;
 }
 
 function logOut() {
-  (popRef.value as any).setShow(false)
-  emit('logout')
+  (popRef.value as any).setShow(false);
+  emit("logout");
 }
 
 const currentCompanyName = computed(() => {
-  const deptlist = useInfo.deptlist
-  const currentId = userStore.getTenantId
-  const current = deptlist.find(item => item.deptno === currentId)
-  return current?.departname || 'name'
-})
+  const deptlist = useInfo.deptlist;
+  const currentId = userStore.getTenantId;
+  const current = deptlist.find(item => item.deptno === currentId);
+  return current?.departname || "name";
+});
 
 const options = computed(() => {
-  const deptlist = useInfo.deptlist
+  const deptlist = useInfo.deptlist;
   return deptlist.map((item) => {
     return {
       label: item.departname,
       key: item.deptno,
-    }
-  })
-})
+    };
+  });
+});
 </script>
 
 <template>
@@ -155,9 +155,11 @@ const options = computed(() => {
   .header {
     .user-name {
       font-size: 16px;
+      font-weight: 600;
     }
     .depart-name {
       font-size: 12px;
+      font-weight: 600;
     }
   }
 }
@@ -194,6 +196,8 @@ const options = computed(() => {
     padding: 13px 20px;
     cursor: pointer;
     color: #333333;
+    font-size: 13px;
+    font-weight: 600;
   }
 
   .trigger:hover {
diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue
index 6b0b8b9..d637dac 100644
--- a/src/layout/components/Header/index.vue
+++ b/src/layout/components/Header/index.vue
@@ -1,6 +1,15 @@
 <script lang="ts">
 import { useDialog, useMessage } from 'naive-ui'
-import { defineComponent, inject, onMounted, reactive, ref, toRefs, unref, watch } from 'vue'
+import {
+  defineComponent,
+  inject,
+  onMounted,
+  reactive,
+  ref,
+  toRefs,
+  unref,
+  watch,
+} from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import QuillModal from './QuillModal.vue'
 import RecycleModal from './RecycleModal.vue'
@@ -198,6 +207,7 @@ export default defineComponent({
       <!-- 菜单收起 -->
       <div
         class="ml-1 layout-header-trigger layout-header-trigger-min"
+        style="padding-left: 13px"
         @click="() => $emit('update:collapsed', !collapsed)"
       >
         <SvgIcon name="homepage" size="16" />
@@ -227,7 +237,11 @@ export default defineComponent({
       <!-- 个人中心 -->
       <div class="layout-header-trigger layout-header-trigger-min">
         <!-- <n-avatar :src="getImgUrl(useInfo.usericon)" round /> -->
-        <n-avatar style="width:36px;height:36px;" :src="(useInfo.usericon && getImgUrl(useInfo.usericon)) || defaultAvatarSrc" round />
+        <n-avatar
+          style="width: 36px; height: 36px"
+          :src="(useInfo.usericon && getImgUrl(useInfo.usericon)) || defaultAvatarSrc"
+          round
+        />
       </div>
       <!-- 设置 -->
       <UserSettings @logout="doLogout" />
diff --git a/src/views/final/comp/FilterModal.vue b/src/views/final/comp/FilterModal.vue
index a66639b..82f0cf5 100644
--- a/src/views/final/comp/FilterModal.vue
+++ b/src/views/final/comp/FilterModal.vue
@@ -199,7 +199,7 @@ function editSelection(id = '') {
 }
 
 function deleteSelection(id = '') {
-  if (selectionIds.value.length === 0) {
+  if (id) {
     deleteCondition({ ids: id }).then(() => {
       query(pagination.page, pagination.pageSize)
     })
diff --git a/src/views/final/index.vue b/src/views/final/index.vue
index 52f4440..a996b01 100644
--- a/src/views/final/index.vue
+++ b/src/views/final/index.vue
@@ -5,7 +5,6 @@ import Content from './content/Content.vue'
 import ListContent from './content/ListContent.vue'
 import Robot from '@/components/Robot/index.vue'
 
-
 defineOptions({
   name: 'FinalMain',
 })
@@ -13,9 +12,8 @@ const showList = ref(true)
 const contentRef: any = ref(null)
 const ListRef: any = ref(null)
 function inputChange(keyword) {
- 
   contentRef.value.filterTableData(keyword)
-   ListRef.value.initData(keyword)
+  ListRef.value.initData(keyword)
 }
 </script>
 
diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue
index 0d0cf83..6f66c81 100644
--- a/src/views/home/aside/comp/AdvanceFilter.vue
+++ b/src/views/home/aside/comp/AdvanceFilter.vue
@@ -336,7 +336,7 @@ defineExpose({
               >
                 <SvgIcon
                   name="drag"
-                  size="18"
+                  size="13"
                   color="#333333"
                   style="margin-right: 3px"
                 />
@@ -344,20 +344,21 @@ defineExpose({
                   v-if="item.favorite && !item.isDefaultFilter"
                   name="favorite-fill"
                   color="#fd9b0a"
-                  width="13"
-                  height="12"
+                  size="18"
                   style="margin-right: 3px"
                   @click="unFavoriteHandler($event, item)"
                 />
                 <SvgIcon
                   v-else-if="!item.favorite && !item.isDefaultFilter"
                   name="favorite-unfill"
-                  width="13"
-                  height="12"
+                  size="18"
                   style="margin-right: 3px"
                   @click="favoriteHandler($event, item)"
                 />
-                <div style="color: #333333" v-html="item.name" />
+                <div
+                  style="color: #333333; white-space: nowrap; overflow: hidden"
+                  v-html="item.name"
+                />
               </li>
               <!-- filter=".draggable-li[draggable='false']" -->
               <VueDraggable
@@ -375,13 +376,12 @@ defineExpose({
                   :draggable="true"
                   @click="selectHandler(item)"
                 >
-                  <SvgIcon name="drag" size="10" style="margin-right: 3px" />
+                  <SvgIcon name="drag" size="13" style="margin-right: 3px" />
                   <SvgIcon
                     v-if="item.favorite && !item.isDefaultFilter"
                     name="favorite-fill"
                     color="#fd9b0a"
-                    width="13"
-                    height="12"
+                    size="18"
                     fill="#666666"
                     style="cursor: pointer !important; margin-right: 3px"
                     @click="unFavoriteHandler($event, item)"
@@ -389,13 +389,15 @@ defineExpose({
                   <SvgIcon
                     v-else-if="!item.favorite && !item.isDefaultFilter"
                     name="favorite-unfill"
-                    width="13"
-                    height="12"
+                    size="18"
                     fill="#666666"
                     style="cursor: pointer !important; margin-right: 3px"
                     @click="favoriteHandler($event, item)"
                   />
-                  <div style="color: #333333" v-html="item.name" />
+                  <div
+                    style="color: #333333; white-space: nowrap; overflow: hidden"
+                    v-html="item.name"
+                  />
                 </li>
               </VueDraggable>
             </ul>
@@ -426,13 +428,12 @@ defineExpose({
   justify-content: space-between;
   align-items: center;
   position: absolute;
-  left: 0;
-  top: -10px;
   width: 100%;
   padding: 17px 16px;
   border-bottom: 1px solid #e8e8e8;
   z-index: 10;
   background: #ffffff;
+  left: 0;
 
   &-left {
     display: flex;
@@ -491,6 +492,12 @@ defineExpose({
 .wrapper-left-popover {
   width: 248px;
   height: 288px;
+  position: absolute;
+  left: 0;
+  top: -10px;
+  border: 1px solid #f3f8ff;
+  z-index: 10000;
+  background: #fff;
 }
 ::v-deep(.wrapper-left-popover .n-form-item) {
   display: block !important;
diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue
index 2ada907..d0b3fad 100644
--- a/src/views/home/aside/comp/modals/FilterModal.vue
+++ b/src/views/home/aside/comp/modals/FilterModal.vue
@@ -14,34 +14,31 @@ import type { DataTableColumns, DataTableRowKey } from 'naive-ui'
 import type { SortableEvent } from 'sortablejs'
 import Sortable from 'sortablejs'
 import { debounce } from 'lodash-es'
-import selection from 'naive-ui/es/_internal/selection'
 import Action from '../Action.vue'
 import { deleteCondition, getConditionList, sort } from '@/api/home/filter'
 import type { FilterSearchParam } from '/#/api'
 import SvgIcon from '@/components/Icon/SvgIcon.vue'
 
 defineOptions({ name: 'FilterModal' })
-
 const props = defineProps({
   type: {
     type: Number,
     default: () => 0,
   },
 })
-
 const emit = defineEmits<{
   (e: 'showNewFilter'): void
   (e: 'editFilter', filter: any): void
   (e: 'handleOk', item: any): void
 }>()
-
 const modal = useModal()
+const tableData = ref<Array<RowData>>([])
+const keyword = ref('')
+
+const show = ref(false)
 
 const $message = window.$message
 
-const show = ref(false)
-const tableData = ref<Array<RowData>>([])
-const keyword = ref('')
 const cardStyle = {
   'width': '808px',
   'height': '840px',
@@ -124,7 +121,7 @@ const columns: DataTableColumns<RowData> = [
     sorter: (row1, row2) => {
       // tableData.value.sort(
       //   (a, b) => new Date(a?.createtime).getTime() - new Date(b?.createtime).getTime()
-      // );
+      // )
       return new Date(row1?.createtime).getTime() - new Date(row2?.createtime).getTime()
     },
   },
@@ -205,32 +202,44 @@ function handleCheck(rowKeys: DataTableRowKey[]) {
 }
 
 function select(key: number, id: string) {
-  switch (key) {
-    case 1:
-      editSelection(id)
-      break
-    case 2:
-      deleteSelection(id)
-      // const modalInst = modal.create({
-      //   title: "确认提示",
-      //   content: "确认删除该条过滤条件吗?",
-      //   positiveText: "确定",
-      //   negativeText: "取消",
-      //   preset: "dialog",
-      //   onPositiveClick: () => deleteSelection(id),
-      //   onNegativeClick: () => modalInst.destroy(),
-      // });
-      break
-    default:
-      break
+  if (key == 1) {
+    editSelection(id)
+  }
+  else {
+    const modalInst = modal.create({
+      title: '确认提示',
+      content: '确认删除该条过滤条件吗?',
+      positiveText: '确定',
+      negativeText: '取消',
+      preset: 'dialog',
+      onPositiveClick: () => deleteSelection(id),
+      onNegativeClick: () => modalInst.destroy(),
+    })
   }
+  // switch (key) {
+  //   case 1:
+  //     break;
+  //   case 2:
+  // const modalInst = modal.create({
+  //   title: "确认提示",
+  //   content: "确认删除该条过滤条件吗?",
+  //   positiveText: "确定",
+  //   negativeText: "取消",
+  //   preset: "dialog",
+  //   onPositiveClick: () => deleteSelection(id),
+  //   onNegativeClick: () => modalInst.destroy(),
+  // });
+  //     break;
+  //   default:
+  //     break;
+  // }
 }
 
 function editSelection(id) {
-  // const $message = window["$message"];
+  // const $message = window['$message']
   // if (selectionIds.value.length === 0 || selectionIds.value.length > 1) {
-  //   $message.error("请选中一条过滤");
-  //   return;
+  //   $message.error('请选中一条过滤')
+  //   return
   // }
   const selectedId = id
   const selectedFilter = tableData.value.find((item: any) => {
@@ -242,7 +251,7 @@ function editSelection(id) {
 }
 
 function deleteSelection(id = '') {
-  if (selectionIds.value.length === 0) {
+  if (id) {
     deleteCondition({ ids: id }).then(() => {
       query(pagination.page, pagination.pageSize)
     })
@@ -488,8 +497,9 @@ function handleOk() {
   padding: 14px;
 
   &-title {
-    font-weight: bold;
-    font-size: 20px;
+    font-weight: 600;
+    color: #333333;
+    font-size: 18px;
     height: 24px;
   }
 
@@ -527,7 +537,8 @@ function handleOk() {
   }
 
   &-table {
-    margin-top: 17px;
+    //17->  34-24/2+x
+    margin-top: 12px;
   }
 
   &-footer {
@@ -543,8 +554,9 @@ function handleOk() {
     &:before {
       background-color: #1980ff;
       content: "";
-      width: 5px;
-      border-radius: 2px;
+      width: 4px;
+      height: 18px;
+      border-radius: 3px;
       top: 0;
       left: 3px;
       bottom: 0;
@@ -561,7 +573,6 @@ function handleOk() {
   }
 }
 .del_btn {
-  margin-left: 12px;
   color: #333333;
   font-weight: 500;
 }
@@ -586,9 +597,7 @@ function handleOk() {
   font-size: 14px !important;
   color: #000000 !important;
 }
-::v-deep(.n-data-table
-    .n-data-table-tr:not(.n-data-table-tr--summary):hover
-    > .n-data-table-td) {
+::v-deep(.n-data-table .n-data-table-td) {
   color: #666666 !important;
   font-size: 14px !important;
 }
@@ -596,8 +605,6 @@ function handleOk() {
   position: relative;
   left: -80px;
 }
-.modal_wrapper {
-}
 ::v-deep(.n-input .n-input__input-el) {
   height: 24px;
 }
diff --git a/src/views/home/aside/comp/modals/NewFilterModal.vue b/src/views/home/aside/comp/modals/NewFilterModal.vue
index 4b589cb..2bcb5d2 100644
--- a/src/views/home/aside/comp/modals/NewFilterModal.vue
+++ b/src/views/home/aside/comp/modals/NewFilterModal.vue
@@ -337,9 +337,9 @@ defineExpose({
               <!-- j -->
               <n-input
                 v-model:value="formValue.name"
-                :style="{ width: '780px' }"
+                :style="{ width: '760px', height: '36px' }"
                 maxlength="15"
-                placeholder="请输入过滤名称"
+                placeholder="请输入过滤条件名称"
                 @keydown.enter.prevent
               />
             </n-form-item>
@@ -522,6 +522,7 @@ defineExpose({
     font-weight: bold;
     position: relative;
     background: #f8f8f8;
+    height: 24px;
 
     &:before {
       background-color: #1980ff;
@@ -555,4 +556,8 @@ defineExpose({
   color: #666666;
   font-weight: 500;
 }
+::v-deep(.n-form-item .n-form-item-feedback-wrapper .n-form-item-feedback) {
+  height: 24px;
+  line-height: 24px;
+}
 </style>
diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 3d0d0e1..cc2bd83 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -27,6 +27,9 @@ 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'
+import defaultAvatar from '@/assets/icons/avatar.svg'
+import baseImg from '@/assets/images/baseImg.png'
 import { getImgUrl } from '@/utils/urlUtils'
 import emitter from '@/utils/mitt'
 import { hideDownload } from '@/utils/image'
@@ -44,11 +47,12 @@ import {
   queryPageListByCheckNo,
   removeCheckDuplicate,
 } from '@/api/home/main'
-import type { PictureSortParam } from '/#/api'
-import defaultAvatar from '@/assets/icons/avatar.svg'
-import baseImg from '@/assets/images/baseImg.png'
+
 import bgLoading from '@/assets/images/bg-loading.png'
 
+const listData = ref<any[]>([])
+const timer = ref()
+const showClose = ref(false)
 const deviceHeight = ref(600)
 let _masonry: null | Masonry = null
 let _imagesload: any
@@ -165,13 +169,11 @@ configStore.$subscribe(() => {
   console.log('subscribe', 'configStore')
   isAllowDownload.value = configStore.isAllowDownload
   calNum.value = configStore.getTimeNum
-  // console.log("calNum.value----------", calNum.value)
+  // console.log("calNum.value----------", calNum.value);
   searchValue.value = configStore.getSearchValue
   console.log(configStore.getSearchValue, 'getSearchValue')
 })
 
-const listData = ref<any[]>([])
-
 watch(
   () => searchValue.value,
   async (newVal, oldVal) => {
@@ -181,7 +183,7 @@ watch(
       const more = await featchList()
       listData.value = more
       isInitSeaerch.value = false
-      // configStore.setSearchValue("")
+      // configStore.setSearchValue("");
     }
     else {
       isInitSeaerch.value = true
@@ -293,8 +295,6 @@ const gridHeight = computed(() => {
   return height
 })
 
-const timer = ref()
-
 async function oneCheck() {
   const asideVal = cloneDeep(configStore.getAsideValue)
   asideVal.upUserName = searchValue.value
@@ -580,7 +580,10 @@ function refresh(val?: any) {
     })
   }
 }
-function cancel(val) {
+/**
+ * 取消查重任务
+ */
+function cancel() {
   if (checkTaskStatus.value === 1) {
     removeCheckDuplicate(checkDuplicateNo.value).then((res) => {
       if (res.code === 'OK') {
@@ -618,11 +621,6 @@ const dropdownOptions = ref([
   },
 ])
 
-function loadImgOver(item) {
-  console.log('loadImgOver', item)
-  setTimeout(() => (item.loadOver = true), 2000)
-}
-
 defineExpose({
   showLoginSuccessModal,
 })
@@ -672,7 +670,7 @@ defineExpose({
             <div class="dropdown">
               <!-- <span>{{ viewLabel || '请选择' }}</span> -->
               <span>视图</span>
-              <SvgIcon class="gap" name="arrow-botton" size="14" />
+              <SvgIcon class="gap" name="arrow-botton" size="16" />
             </div>
           </n-popselect>
           <div
@@ -680,19 +678,20 @@ defineExpose({
             @click="sortHandler('fromuptime')"
           >
             <span>时间排序</span>
-            <SvgIcon style="margin-left: 8px" name="sort" size="12" />
+            <SvgIcon style="margin-left: 8px" name="sort" size="16" />
           </div>
           <div
             style="margin-left: 15px; cursor: pointer; color: #323233"
             @click="sortHandler('pictureResult')"
           >
             <span>相似度排序</span>
-            <SvgIcon style="margin-left: 8px" name="sort" size="12" />
+            <SvgIcon style="margin-left: 8px" name="sort" size="16" />
           </div>
         </div>
         <span style="font-size: 16px; color: #333">共
           <span style="color: #507afd; font-weight: 500">{{ totalCount }}</span> 项</span>
       </div>
+
       <n-spin :show="loading">
         <div ref="el" class="scroll" :style="listStyle">
           <!-- <n-scrollbar :on-scroll="scrollHandler"> -->
@@ -708,10 +707,16 @@ defineExpose({
                 class="wrapper-content-item-img" :class="{ 'wrapper-content-item-img-fit': viewMode !== 'masonry' }"
                 :src="item.imgUrl"
               > -->
+
               <n-image
                 ref="imageRef"
                 class="img"
-                :img-props="{ onClick: hideDownload }"
+                :img-props="{
+                  onClick: ($event) => {
+                    hideDownload($event);
+                    showClose = true;
+                  },
+                }"
                 :class="{
                   'img-fit': viewMode === 'horizontalVersion',
                   'img-full': viewMode === '3:4' || viewMode === 'verticalVersion',
@@ -765,7 +770,9 @@ defineExpose({
                       <template #trigger>
                         <span>{{ item.imgName }}</span>
                       </template>
-                      {{ item.imgName }}
+                      <span
+                        style="font-size: 12px; margin-top: 4px; margin-bottom: 16px"
+                      >{{ item.imgName }}</span>
                     </n-tooltip>
                   </div>
                   <div
@@ -812,6 +819,9 @@ defineExpose({
     <LoginSuccessModal ref="LoginSuccessModalRef" />
     <FinishPackageModal :id="packageIdRef" ref="finishPackageModal" />
     <CheckingTaskModal ref="checkingTaskModalRef" @refresh="refresh" @cancel="cancel" />
+    <!-- <div class="close_box" v-show="showClose" @click="showClose = false">
+      <SvgIcon size="24" name="close-none-border" />
+    </div> -->
   </div>
 </template>
 
@@ -934,6 +944,7 @@ defineExpose({
       overflow: hidden;
       position: relative;
       transition: 0.5s;
+      margin: 0 6px 10px 6px;
 
       .tag-status {
         width: 46px;
@@ -968,7 +979,9 @@ defineExpose({
         border-radius: 7px;
 
         .img-name {
-          width: 70%;
+          // width: 70%;
+          width: 15px;
+          height: 15px;
           color: #fff;
           /* 设置文本溢出时的样式为省略号 */
           text-overflow: ellipsis;
@@ -1082,4 +1095,10 @@ defineExpose({
     text-align: center;
   }
 }
+.close_box {
+  position: absolute;
+  right: 10%;
+  top: 20%;
+  z-index: 10000000000000000000;
+}
 </style>
diff --git a/src/views/home/content/modal/PackageSettingsModal.vue b/src/views/home/content/modal/PackageSettingsModal.vue
index 0127675..e592eb5 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 { useMessage } from 'naive-ui';
-import { ref } from 'vue';
+import type { FormInst, FormRules } from 'naive-ui'
+import { useMessage } from 'naive-ui'
+import { ref } from 'vue'
 
 const emit = defineEmits<{
   (e: 'commit', value: any)
@@ -72,18 +72,38 @@ function afterLeave() {
 
 <template>
   <n-modal v-model:show="show" transform-origin="center" @after-leave="afterLeave">
-    <n-card :style="cardStyle" :bordered="false" size="huge" role="dialog" aria-modal="true">
+    <n-card
+      :style="cardStyle"
+      :bordered="false"
+      size="huge"
+      role="dialog"
+      aria-modal="true"
+    >
       <div class="wrapper">
         <span class="wrapper-title">生成任务包设置</span>
         <div class="wrapper-bar">
           <div class="wrapper-info">
-            <span :style="{ 'margin-left': '18px', 'font-size': '16px','font-weight':'600' }">基本信息</span>
+            <span
+              :style="{
+                'margin-left': '18px',
+                'font-size': '16px',
+                'font-weight': '600',
+              }"
+            >基本信息</span>
           </div>
         </div>
         <!-- require-mark-placement="left" -->
-        <n-form ref="formRef" :model="model"  style="margin-top: 8px;" :rules="rules">
-          <n-form-item class="wrapper-task-package-name" path="packagename" label="任务包名称">
-            <n-input v-model:value="model.packagename" maxlength="12" @keydown.enter.prevent />
+        <n-form ref="formRef" :model="model" style="margin-top: 8px" :rules="rules">
+          <n-form-item
+            class="wrapper-task-package-name"
+            path="packagename"
+            label="任务包名称"
+          >
+            <n-input
+              v-model:value="model.packagename"
+              maxlength="12"
+              @keydown.enter.prevent
+            />
           </n-form-item>
           <!-- <n-form-item path="mark" :style="formItemStyle">
             <n-checkbox v-model:checked="model.mark" >
@@ -94,10 +114,23 @@ function afterLeave() {
       </div>
       <template #footer>
         <div class="wrapper-footer">
-          <n-button style="background-color: #507AFD !important;" type="info" @click="handleSumbit">
+          <n-button
+            style="background-color: #507afd !important"
+            type="info"
+            @click="handleSumbit"
+          >
             生成任务包
           </n-button>
-          <n-button secondary style="margin-left:15px;color: #333;background-color: #fff;border: 1px solid #CAD2DD;" @click="closeModal">
+          <n-button
+            secondary
+            style="
+              margin-left: 15px;
+              color: #333;
+              background-color: #fff;
+              border: 1px solid #cad2dd;
+            "
+            @click="closeModal"
+          >
             取消
           </n-button>
         </div>
@@ -110,7 +143,7 @@ function afterLeave() {
 .wrapper {
   display: flex;
   flex-direction: column;
-  padding: 14px 14px 0 14px ;
+  padding: 14px 14px 0 14px;
   &-title {
     font-weight: 600;
     // font-weight: bold;
@@ -123,7 +156,8 @@ function afterLeave() {
     width: 100%;
     margin-top: 24px;
     font-size: 16px;
-    margin-bottom: 16px;
+    // 任务包名称有margin-top:8px;
+    margin-bottom: 8px;
     span {
       color: #333;
     }
@@ -139,7 +173,8 @@ function afterLeave() {
     ::v-deep(.n-form-item-label) {
       color: #666;
       font-weight: 500;
-      margin-bottom: 8px;
+      // label自带padding-bottom 2px  最后得出8-2
+      margin-bottom: 6px;
     }
   }
 
@@ -162,8 +197,8 @@ function afterLeave() {
   &-footer {
     display: flex;
     justify-content: flex-end;
-    padding-bottom:6px ;
-    button{
+    padding-bottom: 6px;
+    button {
       font-size: 14px !important;
       font-weight: 500 !important;
     }
@@ -174,7 +209,7 @@ function afterLeave() {
     position: relative;
 
     &:before {
-      background-color: #1980FF;
+      background-color: #1980ff;
       content: "";
       width: 5px;
       border-radius: 2px;
@@ -185,7 +220,6 @@ function afterLeave() {
   }
 }
 
-::v-deep(.n-button--info-type){
-
+::v-deep(.n-button--info-type) {
 }
 </style>
diff --git a/src/views/home/content/modal/QueryRepeatedTasksModal.vue b/src/views/home/content/modal/QueryRepeatedTasksModal.vue
index de18dc8..4dc1718 100644
--- a/src/views/home/content/modal/QueryRepeatedTasksModal.vue
+++ b/src/views/home/content/modal/QueryRepeatedTasksModal.vue
@@ -1,50 +1,50 @@
 <script lang="ts" setup>
-import { ref } from "vue";
-import { useConfig } from "@/store/modules/asideConfig";
+import { ref } from 'vue'
+import { useConfig } from '@/store/modules/asideConfig'
 
 const emit = defineEmits<{
-  (e: "closeCallback", value: any);
-}>();
+  (e: 'closeCallback', value: any)
+}>()
 
-const show = ref(false);
+const show = ref(false)
 
 const stys = {
-  width: "424px",
-  height: "232px",
-  "--n-padding-bottom": "20px",
-  "--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)",
-};
+  'width': '424px',
+  'height': '232px',
+  '--n-padding-bottom': '20px',
+  '--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;
+  show.value = true
 }
 
 function closeModal() {
-  show.value = false;
-  emit("closeCallback", true);
+  show.value = false
+  emit('closeCallback', true)
 }
 
 function closeOnlyModal() {
-  show.value = false;
+  show.value = false
 }
 
 defineExpose({
   showModal,
   closeModal,
   closeOnlyModal,
-});
+})
 
-const configStore = useConfig();
-const percent = ref(0);
+const configStore = useConfig()
+const percent = ref(0)
 
 configStore.$subscribe(() => {
-  percent.value = configStore.getTimeNum;
-});
+  percent.value = configStore.getTimeNum
+})
 </script>
 
 <template>
@@ -58,13 +58,13 @@ configStore.$subscribe(() => {
       <svg-icon
         size="15"
         name="close"
-        @click="closeModal"
         style="position: absolute; right: 15.7px; top: 6px; cursor: pointer"
+        @click="closeModal"
       />
       <div class="wrapper">
         <svg-icon size="90" name="robot2" />
-        <span style="margin-top: 24px">正在查重中</span>
       </div>
+      <span class="span_box">正在查重中</span>
       <div style="padding: 0 20px">
         <n-progress type="line" :percentage="percent" :show-indicator="false" />
       </div>
@@ -74,10 +74,22 @@ configStore.$subscribe(() => {
 
 <style lang="less" scoped>
 .wrapper {
+  width: 100%;
+  height: 95px;
   display: flex;
-  height: 100%;
-  flex-direction: column;
   justify-content: center;
   align-items: center;
 }
+.span_box {
+  display: flex;
+  justify-content: center;
+}
+.n-modal {
+  // 要求360*157  上下内边距为20px
+  width: 360px !important;
+  height: 157px !important;
+}
+.n-modal > .n-card > .n-card__content:first-child {
+  --n-padding-top: 16px !important;
+}
 </style>
diff --git a/src/views/task/aside/TaskList.vue b/src/views/task/aside/TaskList.vue
index 024f8d4..9575e57 100644
--- a/src/views/task/aside/TaskList.vue
+++ b/src/views/task/aside/TaskList.vue
@@ -1,101 +1,101 @@
 <script lang="ts" setup>
-import { useInfiniteScroll } from '@vueuse/core'
-import { defineProps, onMounted, onUnmounted, reactive, ref, watch } from 'vue'
-import ListItem from './ListItem.vue'
-import emitter from '@/utils/mitt'
-import { useTaskStore } from '@/store/modules/task'
+import { useInfiniteScroll } from "@vueuse/core";
+import { defineProps, onMounted, onUnmounted, reactive, ref, watch } from "vue";
+import ListItem from "./ListItem.vue";
+import emitter from "@/utils/mitt";
+import { useTaskStore } from "@/store/modules/task";
 
 defineProps({
   showFieldList: {
     type: Array,
     default: () => [],
   },
-})
-const taskStore = useTaskStore()
-const data = ref<any[]>([])
-const activeId = ref('')
-const el = ref<HTMLDivElement | null>(null)
-const keyword = ref('')
-const canloadMore = ref(true)
-const isLoading = ref(false)
-const searchId = ref('')
+});
+const taskStore = useTaskStore();
+const data = ref<any[]>([]);
+const activeId = ref("");
+const el = ref<HTMLDivElement | null>(null);
+const keyword = ref("");
+const canloadMore = ref(true);
+const isLoading = ref(false);
+const searchId = ref("");
 
 const pagination = reactive({
   pageNo: 0,
   pageSize: 30,
-})
+});
 
 function selectHandler(item, index: number) {
-  activeId.value = item.id
-  console.log(activeId.value, item.id)
-  console.log(index)
-  taskStore.setActive(index, item.id)
+  activeId.value = item.id;
+  console.log(activeId.value, item.id);
+  console.log(index);
+  taskStore.setActive(index, item.id);
 }
 
 useInfiniteScroll(
   el as any,
   () => {
-    loadMore()
+    loadMore();
   },
   { distance: 10, interval: 1500, canLoadMore: () => canloadMore.value },
-)
+);
 
 async function loadMore() {
   if (isLoading.value || el.value == null)
-    return
-  isLoading.value = true
+    return;
+  isLoading.value = true;
   try {
-    const more = await fetchList()
-    data.value.push(...more)
+    const more = await fetchList();
+    data.value.push(...more);
   }
   finally {
-    isLoading.value = false
+    isLoading.value = false;
   }
 }
 
 // 获取左侧列表
 async function fetchList() {
   try {
-    pagination.pageNo += 1
+    pagination.pageNo += 1;
     const result = await taskStore.fetchApprovalList({
       ...pagination,
       keyword: keyword.value,
       userSearchId: searchId.value,
-    })
-    const { data, pageCount } = result
-    canloadMore.value = pageCount >= pagination.pageNo
-    return data || []
+    });
+    const { data, pageCount } = result;
+    canloadMore.value = pageCount >= pagination.pageNo;
+    return data || [];
   }
   catch (error) {
-    canloadMore.value = false
-    return []
+    canloadMore.value = false;
+    return [];
   }
 }
 
 watch(
   () => taskStore.activeId,
   (newVal) => {
-    activeId.value = newVal
+    activeId.value = newVal;
   },
-)
+);
 
 watch(
   () => taskStore.inFileId,
   async (newVal) => {
-    const newlist = []
-    const filterid = newVal.taskname
-    console.log(filterid)
-    const index = data.value.findIndex(person => person.fromtaskname === filterid)
-    const ovelist = data.value.filter(item => item.fromtaskname !== filterid)
+    const newlist = [];
+    const filterid = newVal.taskname;
+    console.log(filterid);
+    const index = data.value.findIndex(person => person.fromtaskname === filterid);
+    const ovelist = data.value.filter(item => item.fromtaskname !== filterid);
 
     ovelist.map((item) => {
-      newlist.push(item)
-      return item
-    })
-    data.value = newlist
-    activeId.value = newlist[index].id
+      newlist.push(item);
+      return item;
+    });
+    data.value = newlist;
+    activeId.value = newlist[index].id;
 
-    taskStore.setActive(index, newlist[index].id)
+    taskStore.setActive(index, newlist[index].id);
     // taskStore.setActive(index)
     // activeId.value = data[index+1].id
     // selectHandler(data[index].id, index)
@@ -108,55 +108,55 @@ watch(
      taskStore.setActive(2)
     alert(1) */
   },
-)
+);
 function reset() {
-  pagination.pageNo = 0
-  pagination.pageSize = 30
-  canloadMore.value = true
-  data.value.length = 0
-  taskStore.reset()
+  pagination.pageNo = 0;
+  pagination.pageSize = 30;
+  canloadMore.value = true;
+  data.value.length = 0;
+  taskStore.reset();
 }
 
 async function search(word: string) {
-  keyword.value = word
-  reset()
+  keyword.value = word;
+  reset();
   useInfiniteScroll(
     el as any,
     () => {
-      loadMore()
+      loadMore();
     },
     { distance: 10, canLoadMore: () => canloadMore.value },
-  )
+  );
 }
 
 onMounted(() => {
-  emitter.on('refresh', refreshHandler)
-  emitter.on('filter', async (id) => {
-    await reset()
-    searchId.value = id
-    data.value = await fetchList()
-    activeId.value = data.value[0].id
-    console.log(data.value)
-  })
-})
+  emitter.on("refresh", refreshHandler);
+  emitter.on("filter", async (id) => {
+    await reset();
+    searchId.value = id;
+    data.value = await fetchList();
+    activeId.value = data.value[0]?.id;
+    console.log(data.value);
+  });
+});
 
 onUnmounted(() => {
-  emitter.off('refresh', refreshHandler)
-})
+  emitter.off("refresh", refreshHandler);
+});
 
 async function refreshHandler() {
-  search('')
+  search("");
 }
 
 function setStatusName(text) {
-  const index = taskStore.getCurrentIndex
-  data.value[index].statshisText = text
+  const index = taskStore.getCurrentIndex;
+  data.value[index].statshisText = text;
 }
 
 defineExpose({
   search,
   setStatusName,
-})
+});
 </script>
 
 <template>