From cbc2d20e56c47447271d8d5df4b298bc0b3d67da Mon Sep 17 00:00:00 2001
From: lihui_ocr <lihui1@qq.com>
Date: Sat, 11 May 2024 14:43:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=BF=AB=E9=80=9F=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=BC=B9=E7=AA=97=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=20=E7=AD=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icons/qianyue.svg                  | 26 +++++++++
 src/components/DataHeader/index.vue           |  5 ++
 src/layout/components/Header/QuillModal.vue   |  3 +-
 src/layout/components/Header/SearchModal.vue  |  6 +-
 .../components/Header/ShortcutModal.vue       |  3 +-
 src/layout/components/Header/index.vue        | 20 ++++++-
 src/views/final/comp/CustomFilterModalVue.vue | 12 +++-
 src/views/final/comp/NewFilterModal.vue       |  2 +-
 src/views/home/aside/Aside.vue                |  1 +
 src/views/home/aside/comp/AdvanceFilter.vue   |  8 +++
 .../aside/comp/modals/CustomFilterModal.vue   | 10 +++-
 .../home/aside/comp/modals/FilterModal.vue    |  1 +
 .../home/aside/comp/modals/NewFilterModal.vue |  2 +-
 src/views/home/content/Content.vue            | 17 +++---
 src/views/message/content/List.vue            |  7 ++-
 src/views/task/content/Content.vue            |  2 +-
 src/views/task/modal/ImgDetailModal.vue       | 55 ++++++++++---------
 src/views/task/modal/NewFilterModal.vue       |  2 +-
 src/views/worksheet/content/Content.vue       |  2 +-
 19 files changed, 132 insertions(+), 52 deletions(-)
 create mode 100644 src/assets/icons/qianyue.svg

diff --git a/src/assets/icons/qianyue.svg b/src/assets/icons/qianyue.svg
new file mode 100644
index 0000000..7f5ace2
--- /dev/null
+++ b/src/assets/icons/qianyue.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>签约管理</title>
+    <defs>
+        <rect id="path-1" x="0" y="0" width="18" height="18"></rect>
+    </defs>
+    <g id="任务审批" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="相似图片审批" transform="translate(-208, -690)">
+            <g id="编组-32备份" transform="translate(155, 164)">
+                <g id="直线-4" transform="translate(0.0571, 0)">
+                    <g id="编组-21" transform="translate(32.9429, 110.5)">
+                        <g id="编组-7" transform="translate(20, 412.5)">
+                            <g id="签约管理" transform="translate(0, 3)">
+                                <mask id="mask-2" fill="white">
+                                    <use xlink:href="#path-1"></use>
+                                </mask>
+                                <g id="蒙版" fill-rule="nonzero"></g>
+                                <path d="M14.4953437,9.36140625 C14.7821424,9.65198854 15.0074842,9.8803032 15.1713692,10.0463502 L15.2481902,10.1241848 C15.365141,10.2426784 15.5405672,10.4204189 15.7744688,10.6574063 C16.0979063,10.9839375 16.0979063,11.5160625 15.7739063,11.8431563 L11.845125,15.8228438 C11.7137813,15.9550313 11.5315313,16.03125 11.3450625,16.03125 L9.703125,16.03125 C9.3155625,16.03125 9,15.7159688 9,15.328125 L9,13.6670625 C9,13.4727188 9.0815625,13.2854063 9.22359375,13.1529375 L13.32,9.3369375 C13.6555313,9.0241875 14.1719063,9.034875 14.4953437,9.36140625 Z M14.6131708,1.94507501 C14.9238309,1.94507501 15.1756708,2.19691484 15.1756708,2.50757501 L15.1753401,7.85284327 C15.1753401,8.00817335 15.0494201,8.13409327 14.8940901,8.13409327 L14.0503401,8.13409327 C13.89501,8.13409327 13.7690901,8.00817335 13.7690901,7.85284327 L13.768782,3.35225 L4.23478204,3.35225 L4.23478204,14.62525 L8.16153204,14.625 C8.31686212,14.625 8.44278204,14.7509199 8.44278204,14.90625 L8.44278204,15.75 C8.44278204,15.9053301 8.31686212,16.03125 8.16153204,16.03125 L3.38028204,16.03125 C3.06962186,16.03125 2.81778204,15.7794102 2.81778204,15.46875 L2.81778204,15.1875 C2.81778204,15.1503636 2.82138079,15.1140678 2.82824859,15.0789422 L2.82927465,2.50856976 C2.82927465,2.19790959 3.08111448,1.94606976 3.39177465,1.94606976 L3.40478204,1.94625 L3.41673374,1.94507501 L14.6131708,1.94507501 Z M12.47,11.6652602 L10.125,13.8507188 L10.125,14.90625 L11.169,14.90625 L13.458,12.5862602 L12.47,11.6652602 Z M13.8867188,10.346625 L13.295,10.8962602 L14.248,11.7852602 L14.7788438,11.25 L13.8867188,10.346625 Z M9.597121,7.03125 C9.75245108,7.03125 9.878371,7.15716991 9.878371,7.3125 L9.878371,8.15625 C9.878371,8.31158009 9.75245108,8.4375 9.597121,8.4375 L5.34375,8.4375 C5.18841991,8.4375 5.0625,8.31158009 5.0625,8.15625 L5.0625,7.3125 C5.0625,7.15716991 5.18841991,7.03125 5.34375,7.03125 L9.597121,7.03125 Z M11.6609261,4.50687861 C11.8162562,4.50687861 11.9421761,4.63279852 11.9421761,4.78812861 L11.9421761,5.63187861 C11.9421761,5.78720869 11.8162562,5.91312861 11.6609261,5.91312861 L5.365379,5.91312861 C5.21004892,5.91312861 5.084129,5.78720869 5.084129,5.63187861 L5.084129,4.78812861 C5.084129,4.63279852 5.21004892,4.50687861 5.365379,4.50687861 L11.6609261,4.50687861 Z" id="形状结合" fill="#FFFFFF" mask="url(#mask-2)"></path>
+                            </g>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/components/DataHeader/index.vue b/src/components/DataHeader/index.vue
index 213fe63..003164f 100644
--- a/src/components/DataHeader/index.vue
+++ b/src/components/DataHeader/index.vue
@@ -158,7 +158,12 @@ defineExpose({
         "
       />
     </div>
+     <n-tooltip  placement="left" trigger="hover">
+    <template #trigger>
     <SvgIcon size="14px" style="cursor: pointer" name="setting" class="settingSvg" />
+    </template>
+       <span>二期功能开发中...</span>
+     </n-tooltip>
   </div>
 </template>
 
diff --git a/src/layout/components/Header/QuillModal.vue b/src/layout/components/Header/QuillModal.vue
index add7b65..e3626ea 100644
--- a/src/layout/components/Header/QuillModal.vue
+++ b/src/layout/components/Header/QuillModal.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import { defineOptions, ref } from "vue";
 import Quill from "@/components/RichEditor/Quill.vue";
+import { useKeydown } from '@/hooks/event/useKeydown'
 
 defineOptions({ name: "FilterModal" });
 
@@ -17,7 +18,7 @@ function closeModal() {
 }
 
 defineExpose({
-  showModal,
+  showModal,closeModal
 });
 </script>
 
diff --git a/src/layout/components/Header/SearchModal.vue b/src/layout/components/Header/SearchModal.vue
index 74e384e..dee2fc5 100644
--- a/src/layout/components/Header/SearchModal.vue
+++ b/src/layout/components/Header/SearchModal.vue
@@ -1,14 +1,18 @@
 <script setup>
 import { ref } from 'vue'
 import Search from '@/components/Search/Search.vue'
+import { useKeydown } from '@/hooks/event/useKeydown'
 
 const show = ref(false)
 function showModal() {
   show.value = true
 }
+function closeModal() {
+  show.value = false
+}
 
 defineExpose({
-  showModal,
+  showModal,closeModal
 })
 </script>
 
diff --git a/src/layout/components/Header/ShortcutModal.vue b/src/layout/components/Header/ShortcutModal.vue
index a87cfd2..6aaf89f 100644
--- a/src/layout/components/Header/ShortcutModal.vue
+++ b/src/layout/components/Header/ShortcutModal.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import { defineOptions, ref } from 'vue'
+import { useKeydown } from '@/hooks/event/useKeydown'
 
 defineOptions({ name: 'ShortcutModal' })
 
@@ -21,7 +22,7 @@ function closeModal() {
 }
 
 defineExpose({
-  showModal,
+  showModal,closeModal
 })
 </script>
 
diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue
index 5906d7c..fdf19e7 100644
--- a/src/layout/components/Header/index.vue
+++ b/src/layout/components/Header/index.vue
@@ -4,6 +4,7 @@ import {
   defineComponent,
   inject,
   onMounted,
+onUnmounted,
   reactive,
   ref,
   toRefs,
@@ -21,6 +22,7 @@ import { getImgUrl } from '@/utils/urlUtils'
 import { useUser } from '@/store/modules/user'
 import { useTaskStore } from '@/store/modules/task'
 import defaultAvatar from '@/assets/icons/avatar.svg'
+import { useKeydown } from '@/hooks/event/useKeydown'
 
 const taskStore = useTaskStore()
 export default defineComponent({
@@ -125,7 +127,8 @@ export default defineComponent({
       })
     }
 
-    const quillModalRef = ref(null)
+
+const quillModalRef = ref(null)
     const shortcutModal = ref(null)
     const recycleModalRef = ref(null)
     const SearchModalRef = ref(null)
@@ -165,14 +168,27 @@ export default defineComponent({
     }, 5000)
 
     const mousetrap = inject('mousetrap') as any
+    function handleKeydown(){
+   const modal = unref(quillModalRef)! as any
+      modal.closeModal()
+       const modal1 = unref(shortcutModal)! as any
+      modal1.closeModal()
+      const modal2 = unref(recycleModalRef)! as any
+      modal2.closeModal()
+          const modal3 = unref(SearchModalRef)! as any
+      modal3.closeModal()
+    }
     onMounted(() => {
       getMessage()
       mousetrap.bind('n r', quillHandler)
       mousetrap.bind('n t', quillHandler)
       mousetrap.bind('n n', recycleHandler)
       mousetrap.bind('/', searchHandler)
+        window.addEventListener('keydown', handleKeydown)
     })
-
+onUnmounted(() => {
+  window.removeEventListener('keydown', handleKeydown)
+})
     const defaultAvatarSrc = ref(defaultAvatar)
 
     return {
diff --git a/src/views/final/comp/CustomFilterModalVue.vue b/src/views/final/comp/CustomFilterModalVue.vue
index 7034413..aeeae8d 100644
--- a/src/views/final/comp/CustomFilterModalVue.vue
+++ b/src/views/final/comp/CustomFilterModalVue.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { cloneDeep, debounce, difference, isEqual } from 'lodash-es'
-import { computed, onMounted, ref, watch } from 'vue'
+import { computed, onMounted, ref, watch,onUnmounted } from 'vue'
 import { VueDraggable } from 'vue-draggable-plus'
 import { setFilter } from '@/api/home/filter'
 import { asideMap } from '@/config/final'
@@ -371,9 +371,15 @@ function onMove(e) {
   if (e?.related?.className?.indexOf('fix') !== -1)
     return false
 }
-
+function handleKeydown2(){
+  closeModal()
+}
+onUnmounted(() => {
+  window.removeEventListener('keydown', handleKeydown2)
+})
 onMounted(() => {
-  // getfield()
+   window.addEventListener('keydown', handleKeydown2)
+
 })
 </script>
 
diff --git a/src/views/final/comp/NewFilterModal.vue b/src/views/final/comp/NewFilterModal.vue
index b8a44f6..a5af712 100644
--- a/src/views/final/comp/NewFilterModal.vue
+++ b/src/views/final/comp/NewFilterModal.vue
@@ -379,7 +379,7 @@ defineExpose({
       <template #footer>
         <div class="wrapper-footer">
           <n-button type="info" @click="handleSumbit">
-            确定
+            保存
           </n-button>
           <n-button secondary style="margin-left: 15px" @click="closeModal">
             取消
diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue
index b71c396..1f19857 100644
--- a/src/views/home/aside/Aside.vue
+++ b/src/views/home/aside/Aside.vue
@@ -288,6 +288,7 @@ function handleOk(item: any) {
   }
 }
 useKeydown('s', () => setShowSearch(true))
+
 // watch(asideValue, (newVal) => {
 //   console.log("asideValue处理后", newVal);
 //   configStore.setAsideValue(newVal)
diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue
index 7313ee8..b10c1c7 100644
--- a/src/views/home/aside/comp/AdvanceFilter.vue
+++ b/src/views/home/aside/comp/AdvanceFilter.vue
@@ -333,6 +333,13 @@ defineExpose({
             </n-form>
 
             <ul ref="el" class="wrapper-left-list" @scroll="handleScroll">
+                 <VueDraggable
+           
+                class="draggable-ul"
+                :animation="150"
+                group="shared"
+               
+              >
               <li
                 v-for="(item, index) in data"
                 :key="index"
@@ -365,6 +372,7 @@ defineExpose({
                   v-html="item.name"
                 />
               </li>
+                 </VueDraggable>
               <!-- filter=".draggable-li[draggable='false']" -->
               <VueDraggable
                 v-model="unData"
diff --git a/src/views/home/aside/comp/modals/CustomFilterModal.vue b/src/views/home/aside/comp/modals/CustomFilterModal.vue
index f6fda88..ed4bced 100644
--- a/src/views/home/aside/comp/modals/CustomFilterModal.vue
+++ b/src/views/home/aside/comp/modals/CustomFilterModal.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { cloneDeep, debounce, difference, isEqual } from 'lodash-es'
-import { computed, defineOptions, onMounted, ref, watch } from 'vue'
+import { computed, defineOptions, onMounted, ref, watch ,onUnmounted} from 'vue'
 import { VueDraggable } from 'vue-draggable-plus'
 import { getAllfieldList, getfieldList, setFilter } from '@/api/home/filter'
 import { asideMap } from '@/config/aside'
@@ -328,8 +328,14 @@ function onMove(e) {
   if (e?.related?.className?.indexOf('fix') !== -1)
     return false
 }
-
+function handleKeydown2(){
+  closeModal()
+}
+onUnmounted(() => {
+  window.removeEventListener('keydown', handleKeydown2)
+})
 onMounted(() => {
+   window.addEventListener('keydown', handleKeydown2)
   getfield()
 })
 </script>
diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue
index 0b802a0..4de6c22 100644
--- a/src/views/home/aside/comp/modals/FilterModal.vue
+++ b/src/views/home/aside/comp/modals/FilterModal.vue
@@ -57,6 +57,7 @@ interface RowData {
   updatetime: string
 }
 useKeydown('n t', handleClick)
+useKeydown('c', closeModal)
 function sortData(row) {
   console.log('sortData', row)
   if (row.order == 'descend') {
diff --git a/src/views/home/aside/comp/modals/NewFilterModal.vue b/src/views/home/aside/comp/modals/NewFilterModal.vue
index 3d01b18..9f88623 100644
--- a/src/views/home/aside/comp/modals/NewFilterModal.vue
+++ b/src/views/home/aside/comp/modals/NewFilterModal.vue
@@ -452,7 +452,7 @@ defineExpose({
       <template #footer>
         <div class="wrapper-footer">
           <n-button style="background-color: #507afd" type="info" @click="handleSumbit">
-            确定
+            保存
           </n-button>
           <n-button
             secondary
diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 0d1308a..b3bf829 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -969,9 +969,9 @@ defineExpose({
                     "
                   >
                     <SvgIcon
-                      size="13"
+                      size="16"
                       name="magnifying-2"
-                      style="cursor: pointer; color: #898481"
+                      style="cursor: pointer; color: #666666"
                     />
                   </div>
                 </div>
@@ -1091,7 +1091,7 @@ defineExpose({
                     <SvgIcon
                       size="13"
                       name="magnifying-2"
-                      style="cursor: pointer; color: #898481"
+                      style="cursor: pointer; color: #666666"
                     />
                   </div>
                 </div>
@@ -1288,8 +1288,8 @@ defineExpose({
         justify-content: space-between;
         align-items: center;
         padding: 0 10px;
-        background: rgba(0, 0, 0, 0.35);
-        border-radius: 7px;
+       background: linear-gradient(180deg,rgba(0,0,0,0.00), rgba(3,0,0,0.73));
+       border-radius: 7px;
 
         .img-name {
           // width: 70%;
@@ -1306,12 +1306,13 @@ defineExpose({
         }
 
         .icon-wrap {
-          width: 22px;
-          height: 22px;
-          line-height: 22px;
+          width: 24px;
+          height: 24px;
+          line-height: 24px;
           text-align: center;
           background-color: #fff;
           border-radius: 6px;
+          backdrop-filter: blur(10px);
         }
       }
 
diff --git a/src/views/message/content/List.vue b/src/views/message/content/List.vue
index 084a9c5..03ad896 100644
--- a/src/views/message/content/List.vue
+++ b/src/views/message/content/List.vue
@@ -172,11 +172,11 @@ console.log(tabList)
         <div
           v-for="(item, index) in list"
           :key="item.id"
-          :class="{ 'pt0': index === 0, 'item-disabled': item.readFlag }"
+          :class="{ 'pt0': index === 0,  }"
           class="item"
           @click="goDetail(item)"
         >
-          <div class="left">
+          <div class="left" :style="item.readFlag==1?{opacity:0.5}:{}">
             <div class="num">
               {{ format(item.sendTime, "dd") }}
               <div v-if="!item.readFlag" class="point" />
@@ -185,7 +185,8 @@ console.log(tabList)
               {{ format(item.sendTime, "yyyy-MM") }}
             </div>
           </div>
-          <div class="middle">
+          <div class="middle" :style="item.readFlag==1?{opacity:0.5}:{}">
+        
             <div v-if="tab === 1" class="title">
               {{ `<任务ID：${item.tag.taskId}>` }}{{ item.tag.taskName }}
             </div>
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index b3a4f21..935ba97 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -795,7 +795,7 @@ function cancel() {
                   @click="immersionHandler"
                 />
               </template>
-              <span>沉浸模式</span>
+              <span>进入沉浸模式</span>
             </n-tooltip>
           </div>
         </div>
diff --git a/src/views/task/modal/ImgDetailModal.vue b/src/views/task/modal/ImgDetailModal.vue
index 7d72f97..7a3a3f0 100644
--- a/src/views/task/modal/ImgDetailModal.vue
+++ b/src/views/task/modal/ImgDetailModal.vue
@@ -133,11 +133,11 @@ defineExpose({
       <div class="topline" />
       <div class="bottomline" />
       <div class="wrapper">
-        <div class="wrapper-title" style="color: #333;font-size:20px">
+        <div class="wrapper-title" style="color: #333333;font-size: 21px;">
           任务ID:{{ detailobj.fromTaskName }}
         </div>
         <div class="close" @click="closeModal">
-          <SvgIcon size="20" class="icon" name="close-none-border" />
+          <SvgIcon size="16" class="icon" name="close-none-border" />
         </div>
       </div>
       <div style="display:flex;margin-top:25px">
@@ -156,12 +156,12 @@ defineExpose({
           <div class="big-mark" />
           <div class="time">
             <div class="time-item">
-              <SvgIcon class="svg-time" color="#FFF" size="16" name="camera-time" />
+              <SvgIcon class="svg-time" color="#FFF" size="18" name="camera-time" />
 
               <span>{{ detailobj?.photoDateTimestamp ?? "- -" }}</span>
             </div>
             <div class="time-item time-item2">
-              <SvgIcon class="svg-time" color="#FFF" size="16" name="submit-time" />
+              <SvgIcon class="svg-time" color="#FFF" size="18" name="qianyue" />
 
               <span>{{
                 detailobj?.submitDateTimestamp
@@ -190,8 +190,9 @@ defineExpose({
                   white-space: nowrap;
                   overflow: hidden;
                   text-overflow: ellipsis;
-                     padding-left: 10px;
-                "
+                  padding-left: 10px;
+                  height: 30px;
+                  margin-top:16px;"
             >
               <n-ellipsis style="font-size:22px;font-weight:550">
                 {{ detailobj.fromTaskName }}
@@ -240,7 +241,7 @@ defineExpose({
                   <div
                     :style="{
                       width: '115px',
-                      borderRight: '2px solid',
+                      borderRight: '1px solid 2px solid #d8d8d8',
                       marginTop: '4px',
                       color: '#333333',
                       fontWeight: 'bold',
@@ -333,17 +334,17 @@ defineExpose({
       background: #E0DFDF;
     height: 0.5px;
     width: 1200px;
-    margin-left: -40px;
     position: absolute;
     top: 85px;
+     left: 0px;
 }
 .bottomline{
      background: #E0DFDF;
     height: 1px;
     width: 1200px;
-    margin-left: -40px;
     position: absolute;
-    bottom: 73px;
+   bottom: 83px;
+    left: 0px;
 }
  .big-mark {
         width: 100%;
@@ -368,11 +369,12 @@ defineExpose({
         .time-item {
           display: flex;
           align-items: center;
-          font-size: 14px;
+          font-size: 17px;
           font-family: PingFang SC, PingFang SC-Medium;
           font-weight: 500;
           color: #ffffff;
           margin-bottom: 4px;
+          line-height: 24px;
         }
 
         .time-item2 {
@@ -408,12 +410,9 @@ defineExpose({
   display: flex;
   flex-direction: column;
  // border-bottom: 1px solid #e8e8e8;
-  padding-bottom: 32px;
-
-  &-title {
-    font-weight: bold;
-    font-size: 16px;
-  }
+  padding-bottom: 24px;
+padding-top: 24px;
+ 
 
   &-bar {
     width: 100%;
@@ -455,7 +454,7 @@ defineExpose({
   --n-padding-left: 24px;
 }
 .left{
-     width: 65%;
+     width:720px;
      height: 456px;
      //     flex: 0.6;
       background-size: auto 100%;
@@ -466,9 +465,9 @@ defineExpose({
     background-color: #f2f2f2;
 }
 .right{
-    width: 30%;
+   width: 390px;
 //flex:0.4;
-  margin-left: 16px;
+  margin-left: 26px;
   height: 463px;
   background: #FAFAFA;
   border-radius: 8px;
@@ -477,7 +476,7 @@ defineExpose({
 
 }
 .viewlabel {
-  margin-top: 10px;
+  margin-top: 16px;
   font-size: 14px;
   font-family: PingFang SC, PingFang SC-Regular;
   font-weight: Regular;
@@ -494,14 +493,14 @@ defineExpose({
   color: #333333;
   line-height: 20px;
   height: 100%;
-  margin: 3px 0 10px 0;
-  max-width: 650px;
+  margin: 3px 0 8px 0;
+  max-width: 359px;
 }
 .tags {
       padding-left: 22px;
     display: flex;
-    margin-top: 8px;
-        margin-bottom: -12px;
+     margin-top: 12px;
+    margin-bottom: -4px;
   }
 
   .tag {
@@ -546,7 +545,8 @@ defineExpose({
 }
 
 .btnlist{
-       width: 165px;
+    width: 165px;
+    margin-bottom:0px;
     display: flex;
     float: right;
     margin-right: 90px;
@@ -596,6 +596,9 @@ defineExpose({
   background-color: #fff !important;
   border: 1px solid #cad2dd !important;
 }
+::v-deep(.n-card__content){
+  padding: 0 32px !important;
+}
 .btn3{
 border: 1px solid #cad2dd !important;
 color: black;
diff --git a/src/views/task/modal/NewFilterModal.vue b/src/views/task/modal/NewFilterModal.vue
index 92cd758..62d0e6b 100644
--- a/src/views/task/modal/NewFilterModal.vue
+++ b/src/views/task/modal/NewFilterModal.vue
@@ -377,7 +377,7 @@ defineExpose({
       <template #footer>
         <div class="wrapper-footer">
           <n-button type="info" @click="handleSumbit">
-            确定
+            保存
           </n-button>
           <n-button secondary style="margin-left: 15px" @click="closeModal">
             取消
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 0740c24..ddb42e9 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -685,7 +685,7 @@ defineExpose({
                   @click="immersionHandler"
                 />
               </template>
-              <span>沉浸模式</span>
+              <span>进入沉浸模式</span>
             </n-tooltip>
           </div>
         </div>
-- 
2.39.3