From f961c2725562b736f34d2d70844a7f52e0c4310b Mon Sep 17 00:00:00 2001
From: zhouxiaoan <13598091228@139.com>
Date: Fri, 19 Apr 2024 10:48:05 +0800
Subject: [PATCH 1/6] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84taskindex?=
 =?UTF-8?q?=E5=8F=96=E5=80=BC=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/aside/TaskList.vue   | 10 +++++++---
 src/views/task/content/Content.vue  |  3 +--
 src/views/task/modal/BatchModal.vue |  3 ++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/views/task/aside/TaskList.vue b/src/views/task/aside/TaskList.vue
index 72ca637..e4bf28a 100644
--- a/src/views/task/aside/TaskList.vue
+++ b/src/views/task/aside/TaskList.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { useInfiniteScroll } from "@vueuse/core";
-import { defineProps, onMounted, onUnmounted, reactive, ref, watch } from "vue";
+import { defineProps, nextTick, onMounted, onUnmounted, reactive, ref, watch } from "vue";
 import ListItem from "./ListItem.vue";
 import emitter from "@/utils/mitt";
 import { useTaskStore } from "@/store/modules/task";
@@ -77,8 +77,12 @@ async function fetchList() {
 watch(
   () => taskStore.activeId,
   (newVal) => {
-    activeId.value = newVal;
-    taskIndex.value = taskStore.getApprovalList.find(i => i.id === newVal)?.taskIndex
+    activeId.value = newVal
+    nextTick(() => {
+      const taskPackage = taskStore.getApprovalList[taskStore.getCurrentIndex]||{}
+      taskIndex.value = taskPackage.taskIndex
+
+    })
   },
 );
 
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index 35ae621..d334675 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -517,8 +517,7 @@ watch(
       packageId.value = taskStore.getPackageid
       taskId.value = taskStore.getActiveId
       // 找到当前选中的数据
-      const task = taskStore.getApprovalList.find(i => i.id === taskStore.activeId)
-      taskIndex.value = task.taskIndex
+      taskIndex.value = taskStore.getApprovalList[taskStore.currentIndex].taskIndex
       getDetail()
     }
   },
diff --git a/src/views/task/modal/BatchModal.vue b/src/views/task/modal/BatchModal.vue
index 27ab9ad..a433950 100644
--- a/src/views/task/modal/BatchModal.vue
+++ b/src/views/task/modal/BatchModal.vue
@@ -346,7 +346,8 @@ async function refreshHandler() {
   reset()
   if (!taskId.value)
     return
-  taskDetailInfo.value = await getTaskDetailInfo(taskId.value, '')
+  const taskPackage = taskStore.getApprovalList[taskStore.getCurrentIndex] || {}
+  taskDetailInfo.value = await getTaskDetailInfo(taskId.value, taskPackage.packageid,taskPackage?.taskIndex || '')
 
   nextTick(() => {
     setTimeout(() => {

From 37b46395eff9cea2a77b13b3e8f9672b8b132c47 Mon Sep 17 00:00:00 2001
From: lihui_ocr <lihui1@qq.com>
Date: Fri, 19 Apr 2024 14:26:53 +0800
Subject: [PATCH 2/6] =?UTF-8?q?fix:=E9=A1=B6=E9=83=A8=E9=97=B4=E8=B7=9D?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E6=9F=A5=E9=87=8D=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E5=90=8D=E5=AD=97=E4=B8=8D=E5=85=A8=20=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86=E5=81=8F=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                         | 2 +-
 src/components/DataHeader/index.vue | 2 +-
 src/views/home/content/Content.vue  | 5 +++--
 src/views/task/index.vue            | 3 +++
 src/views/worksheet/index.vue       | 3 +++
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index a68093d..cb93f85 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -104,6 +104,6 @@ const getThemeOverrides = computed(() => {
   height: 14px !important;
 }
 .v-binder-follower-content {
-  left: -60px;
+  //left: -60px;
 }
 </style>
diff --git a/src/components/DataHeader/index.vue b/src/components/DataHeader/index.vue
index da586cc..f51cbe9 100644
--- a/src/components/DataHeader/index.vue
+++ b/src/components/DataHeader/index.vue
@@ -113,7 +113,7 @@ async function getData() {
   }
 }
 </script>
-
+1
 <template>
   <div class="header_wrap" :style="hasColor ? '' : 'margin-top: 7.375rem;'">
     <div v-for="(item, index) in data" :key="index" class="header_box">
diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 7db42bb..0823f59 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -1005,8 +1005,9 @@ defineExpose({
 
         .img-name {
           // width: 70%;
-          width: 15px;
-          height: 15px;
+          font-size: 12px;
+          width: 115px;
+          height: 20px;
           color: #fff;
           /* 设置文本溢出时的样式为省略号 */
           text-overflow: ellipsis;
diff --git a/src/views/task/index.vue b/src/views/task/index.vue
index 467e92d..f89095f 100644
--- a/src/views/task/index.vue
+++ b/src/views/task/index.vue
@@ -35,6 +35,9 @@ function setAsideItemName(text) {
 :deep(.ip_box){
  z-index: 50;
 }
+:deep(.header_wrap){
+  margin-top: 3px !important;
+}
 .main {
   display: flex;
   flex-direction: row;
diff --git a/src/views/worksheet/index.vue b/src/views/worksheet/index.vue
index 2c6ccfd..b3a4b66 100644
--- a/src/views/worksheet/index.vue
+++ b/src/views/worksheet/index.vue
@@ -32,6 +32,9 @@ const ApprovalOver = (packageId) => {
 </template>
 
 <style lang="less" scoped>
+:deep(.header_wrap){
+  margin-top: 3px !important;
+}
 .main {
   display: flex;
   flex-direction: row;

From 9957c9e4938ccb24ddcd3c1216bc2590c07b34bd Mon Sep 17 00:00:00 2001
From: lihui_ocr <lihui1@qq.com>
Date: Fri, 19 Apr 2024 15:23:21 +0800
Subject: [PATCH 3/6] =?UTF-8?q?fix:=E9=80=9A=E8=BF=87=E4=B8=8D=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E5=90=8E=E7=8A=B6=E6=80=81=E7=9A=84=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/content/ListContent.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/final/content/ListContent.vue b/src/views/final/content/ListContent.vue
index 3261ece..fa18e9b 100644
--- a/src/views/final/content/ListContent.vue
+++ b/src/views/final/content/ListContent.vue
@@ -314,9 +314,11 @@ function doAudit(param: any, row: any) {
     initData(1, 20,{},props.taskvalue)
           num = 1
           reload()
+              selectionIds.value = []
         }
         else {
           message.error(res.message)
+              selectionIds.value = []
         }
       })
     },
@@ -467,6 +469,10 @@ function changesort(sortnamex) {
     initData(1, 20,{},props.taskvalue)
   num = 1
 }
+function notpass (){
+  initData(1, 20,{},props.taskvalue)
+        selectionIds.value = []
+}
 watch(
   () => finalStore.asideValue,
   (newVal, oldVal) => {
@@ -714,7 +720,7 @@ defineExpose({
         </div>
       </div>
     </div>
-    <NotPassed ref="notPassModalRef" @success="    initData(1, 20,{},props.taskvalue)" />
+    <NotPassed ref="notPassModalRef" @success="notpass" />
     <RepeatModal
       ref="repeatModalRef"
       @reject="repeatBatchReject"

From 8d4dcc04be320945eee04a167cf7d5ac3710d40e Mon Sep 17 00:00:00 2001
From: lihui_ocr <lihui1@qq.com>
Date: Sat, 20 Apr 2024 09:50:21 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix:=E4=BB=BB=E5=8A=A1=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=94=80=E6=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/aside/Aside.vue      | 4 ++++
 src/views/task/content/Content.vue  | 1 +
 src/views/task/modal/BatchModal.vue | 6 ++++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/views/task/aside/Aside.vue b/src/views/task/aside/Aside.vue
index e3297ec..5289b59 100644
--- a/src/views/task/aside/Aside.vue
+++ b/src/views/task/aside/Aside.vue
@@ -5,6 +5,7 @@ import {
   inject,
   onBeforeMount,
   onMounted,
+  onUnmounted,
   ref,
   shallowRef,
   unref,
@@ -142,6 +143,9 @@ onMounted(() => {
   window.addEventListener('keydown', handleKeydown)
   init()
 })
+onUnmounted(()=>{
+  window.removeEventListener('keydown', handleKeydown)
+})
 async function init() {
   try {
     const searchParam: FilterSearchParam = {
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index d334675..823ec18 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -484,6 +484,7 @@ function showActionsModal() {
 onUnmounted(() => {
   taskStore.reset()
   window.removeEventListener('keydown', handleKeydown)
+   window.removeEventListener('scroll', checkBottom)
 })
 
 function immersionHandler() {
diff --git a/src/views/task/modal/BatchModal.vue b/src/views/task/modal/BatchModal.vue
index a433950..11ada8d 100644
--- a/src/views/task/modal/BatchModal.vue
+++ b/src/views/task/modal/BatchModal.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, nextTick, onMounted, reactive, ref, watch } from 'vue'
+import { computed, nextTick, onMounted,onUnmounted, reactive, ref, watch } from 'vue'
 import Masonry from 'masonry-layout'
 import { useInfiniteScroll } from '@vueuse/core'
 import { debounce } from 'lodash-es'
@@ -257,7 +257,9 @@ onMounted(() => {
   show.value && addListeners()
   window.addEventListener('keydown', handleKeydown)
 })
-
+onUnmounted(()=>{
+  window.removeEventListener('keydown', handleKeydown)
+})
 // 键盘左右箭头快捷切换
 function handleKeydown(event) {
   // 在这里执行右箭头的逻辑

From 40018c0899c40eb5b9154f329aa9afdd1a55d0b7 Mon Sep 17 00:00:00 2001
From: lihui_ocr <lihui1@qq.com>
Date: Sat, 20 Apr 2024 11:26:00 +0800
Subject: [PATCH 5/6] =?UTF-8?q?feat:=E5=B1=95=E7=A4=BA=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=B0=86=E9=AB=98=E7=AD=9B=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=B8=80=E5=B9=B6=E5=B8=A6=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/content/Content.vue     | 22 ++++++++++++----------
 src/views/final/content/ListContent.vue | 20 +++++++++++---------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index 8118947..e19ff70 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -496,7 +496,7 @@ async function query(
 ) {
   console.log('query', taskName)
   const asideParmas = cloneDeep(unref(finalStore.getAsideValue))
-  // console.log(asideParmas);
+ console.log(asideParmas);
 
   if (asideParmas.izyear) {
     asideParmas.izuptime = cloneDeep(asideParmas.izyear)
@@ -515,10 +515,12 @@ async function query(
   // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
   // let params = filterId ? { userSearchId: filterId } : asideParmas
   let params = asideParmas
-  if (params?.izshowall == false)
-    params.isFail = false
-
-  params = params?.izshowall ? { isFail: true } : params
+ if (params?.izshowall == true)
+  {
+    params.isFail = true
+      delete params.izshowall;
+  }
+//  params = params?.izshowall ? { isFail: true } : params
 
   const result = await getFinalList({
     sortorder: sortorder.value,
@@ -925,11 +927,11 @@ async function initData(pageSize, page,  filterId?: any,
   // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
   // let params = filterId ? { userSearchId: filterId } : asideParmas
   let params = asideParmas
-  if (params?.izshowall == false)
-    params.isFail = false
-
-  params = params?.izshowall ? { isFail: true } : params
-
+  if (params?.izshowall == true)
+  {
+    params.isFail = true
+    delete params.izshowall;
+  }
   const result = await getFinalList({
     sortorder: sortorder.value,
     pageSize,
diff --git a/src/views/final/content/ListContent.vue b/src/views/final/content/ListContent.vue
index fa18e9b..bdd3d2c 100644
--- a/src/views/final/content/ListContent.vue
+++ b/src/views/final/content/ListContent.vue
@@ -116,11 +116,11 @@ async function initData(
   // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
   // let params = filterId ? { userSearchId: filterId } : asideParmas
   let params = asideParmas
-  if (params?.izshowall == false)
-    params.isFail = false
-
-  params = params?.izshowall ? { isFail: true } : params
-
+  if (params?.izshowall == true)
+  {
+    params.isFail = true
+      delete params.izshowall;
+  }
   const result = await getFinalList({
     sortorder: sortorder.value,
     pageSize,
@@ -172,9 +172,11 @@ async function query(
      // delete asideParmas.izyear
     
   }
-let params = asideParmas;
-  if(params?.izshowall==false){
-    params.isFail=false
+  let params = asideParmas
+  if (params?.izshowall == true)
+  {
+    params.isFail = true
+      delete params.izshowall;
   }
   params = params?.izshowall ? {isFail:true} : params;
   const result = await getFinalList({
@@ -685,7 +687,7 @@ defineExpose({
                         : item.states == 2
                           ? "待审核"
                           : item.states == 5
-                            ? "未通过"
+                            ? "不通过"
                             : ""
                       : item.fromusername
                   }}

From 682063c2633cb0909d0e34f95e2be2257071f9bb Mon Sep 17 00:00:00 2001
From: zhouxiaoan <13598091228@139.com>
Date: Sat, 20 Apr 2024 12:36:20 +0800
Subject: [PATCH 6/6] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=BF=AB?=
 =?UTF-8?q?=E6=8D=B7=E9=94=AE=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Search/Search.vue              |  2 ++
 src/hooks/event/useKeydown.ts                 | 14 +++++++++++
 .../components/Header/ShortcutModal.vue       |  2 +-
 src/layout/components/Header/UserSettings.vue | 23 +++++++++++++++++-
 src/layout/components/Header/index.vue        |  2 +-
 src/views/final/aside/Aside.vue               |  2 ++
 src/views/final/comp/FilterModal.vue          |  5 ++--
 src/views/final/comp/NewFilterModal.vue       |  3 +++
 src/views/home/aside/Aside.vue                |  3 ++-
 .../home/aside/comp/modals/FilterModal.vue    |  6 +++--
 .../home/aside/comp/modals/NewFilterModal.vue |  3 +++
 src/views/task/content/Content.vue            | 21 +++++++++++-----
 src/views/task/modal/NewFilterModal.vue       |  3 +++
 src/views/worksheet/content/Content.vue       | 24 ++++++++++++-------
 14 files changed, 91 insertions(+), 22 deletions(-)
 create mode 100644 src/hooks/event/useKeydown.ts

diff --git a/src/components/Search/Search.vue b/src/components/Search/Search.vue
index f422b1b..218c1d8 100644
--- a/src/components/Search/Search.vue
+++ b/src/components/Search/Search.vue
@@ -26,6 +26,8 @@ const inputHandler = debounce((keyword) => {
 
 // 搜索
 async function handlerSearch(value) {
+  // 快捷键触发不做接口请求
+  if(value === '/') return
   const res = await getSearchList({
     search: value,
   })
diff --git a/src/hooks/event/useKeydown.ts b/src/hooks/event/useKeydown.ts
new file mode 100644
index 0000000..93dddf7
--- /dev/null
+++ b/src/hooks/event/useKeydown.ts
@@ -0,0 +1,14 @@
+import { inject, onMounted, onUnmounted, ref } from "vue"
+
+export const useKeydown = (key,handler) => {
+    const mousetrap = inject('mousetrap') as any
+    const event = ref()
+    onMounted(() => {
+        event.value = mousetrap.bind(key, handler)
+        
+    })
+    onUnmounted(() => {
+        event.value.unbind(key, handler)
+    })
+
+}
\ No newline at end of file
diff --git a/src/layout/components/Header/ShortcutModal.vue b/src/layout/components/Header/ShortcutModal.vue
index 2b32541..0dd7e7c 100644
--- a/src/layout/components/Header/ShortcutModal.vue
+++ b/src/layout/components/Header/ShortcutModal.vue
@@ -76,7 +76,7 @@ defineExpose({
               </tr>
               <tr>
                 <td><div class="key" data-key="g a" /></td>
-                <td>进入“AI工单”主页</td>
+                <td>进入“图检审批”主页</td>
               </tr>
               <tr>
                 <td><div class="key" data-key="g e" /></td>
diff --git a/src/layout/components/Header/UserSettings.vue b/src/layout/components/Header/UserSettings.vue
index 7cd5944..4b85d96 100644
--- a/src/layout/components/Header/UserSettings.vue
+++ b/src/layout/components/Header/UserSettings.vue
@@ -5,6 +5,18 @@ import { useUser } from "@/store/modules/user";
 import { getImgUrl } from "@/utils/urlUtils";
 import defaultAvatar from "@/assets/icons/avatar.svg";
 
+/**
+ * 用户权限菜单
+ */
+interface IUserMenu {
+  id: number,
+  name: string,
+  resKey: string,
+  resUrl: string
+  icon: string,
+  level: number,
+  parentId: number
+}
 const emit = defineEmits<{
   (e: "logout"): void
 }>();
@@ -16,7 +28,10 @@ const userStore = useUser();
 const useInfo = userStore.getUserInfo;
 
 const aiDisabled = ref(false);
+const userMenus = computed<IUserMenu[]>(() => {
+  return userStore.getUserInfo.frontmenuTList
 
+})
 function handleSelect(row) {
   userStore.updateTenantId(row.key);
   location.reload();
@@ -25,24 +40,30 @@ function handleSelect(row) {
 function logIt(e) {
   return false;
 }
-
+function hasPerm(resKey) {
+  return userMenus.value.some(i => i.resKey === resKey)
+}
 // 一键查看
 function goHome(e) {
+  if (!hasPerm('home_main')) return
   router.push({ name: "home" });
 }
 
 // 任务审批
 function goTask(e) {
+  if (!hasPerm('task-main')) return
   router.push({ name: "task-main" });
 }
 
 // AI工单
 function goWorksheet(e) {
+  if (!hasPerm('worksheet-main')) return
   router.push({ name: "worksheet-main" });
 }
 
 // 任务终审
 function goFinal(e) {
+  if (!hasPerm('final-main')) return
   router.push({ name: "final-main" });
 }
 
diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue
index d637dac..5906d7c 100644
--- a/src/layout/components/Header/index.vue
+++ b/src/layout/components/Header/index.vue
@@ -170,7 +170,7 @@ export default defineComponent({
       mousetrap.bind('n r', quillHandler)
       mousetrap.bind('n t', quillHandler)
       mousetrap.bind('n n', recycleHandler)
-      mousetrap.bind('m m', searchHandler)
+      mousetrap.bind('/', searchHandler)
     })
 
     const defaultAvatarSrc = ref(defaultAvatar)
diff --git a/src/views/final/aside/Aside.vue b/src/views/final/aside/Aside.vue
index 80bc3cb..035df9f 100644
--- a/src/views/final/aside/Aside.vue
+++ b/src/views/final/aside/Aside.vue
@@ -24,6 +24,7 @@ import { asideMap } from '@/config/final'
 import type { AsideConfig } from '/#/api'
 import emitter from '@/utils/mitt'
 import { getFilterList } from '@/api/home/main'
+import { useKeydown } from '@/hooks/event/useKeydown'
 
 const emit = defineEmits(['inputChange',])
 const finalStore = useFinal()
@@ -336,6 +337,7 @@ function updateComponent(key, e) {
 defineExpose({
   showSearch,
 });
+useKeydown('s', () => setShowSearch(true))
 </script>
 
 <template>
diff --git a/src/views/final/comp/FilterModal.vue b/src/views/final/comp/FilterModal.vue
index 82f0cf5..0c771b7 100644
--- a/src/views/final/comp/FilterModal.vue
+++ b/src/views/final/comp/FilterModal.vue
@@ -20,6 +20,7 @@ import { deleteCondition, getConditionList, sort } from '@/api/home/filter'
 import type { FilterSearchParam } from '/#/api'
 
 import SvgIcon from '@/components/Icon/SvgIcon.vue'
+import { useKeydown } from '@/hooks/event/useKeydown'
 
 defineOptions({ name: 'FilterModal' })
 
@@ -242,7 +243,7 @@ function handleClick() {
   // show.value = false;
   closeModal()
 }
-
+useKeydown('n t', handleClick)
 let sortTable: Sortable | null = null
 const tableRef = ref<InstanceType<typeof NDataTable>>()
 
@@ -391,7 +392,7 @@ function handleOk() {
 
           <div v-else class="wrapper-form">
             <div class="del_btn">
-              <NButton icon-placement="left" size="medium" @click="deleteSelection">
+              <NButton icon-placement="left" size="medium" @click="deleteSelection()">
                 <template #icon>
                   <SvgIcon name="delete-history" size="16" />
                 </template>
diff --git a/src/views/final/comp/NewFilterModal.vue b/src/views/final/comp/NewFilterModal.vue
index 2d30431..65abfcf 100644
--- a/src/views/final/comp/NewFilterModal.vue
+++ b/src/views/final/comp/NewFilterModal.vue
@@ -193,6 +193,9 @@ watch(
 
 function showModal() {
   show.value = true
+  setTimeout(() => {
+    formValue.name = ''
+  }, 300);
 }
 
 function closeModal() {
diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue
index 04e198b..e498ba0 100644
--- a/src/views/home/aside/Aside.vue
+++ b/src/views/home/aside/Aside.vue
@@ -25,6 +25,7 @@ import { asideMap } from '@/config/aside'
 import type { AsideConfig } from '/#/api'
 import emitter from '@/utils/mitt'
 import { getFilterList } from '@/api/home/main'
+import { useKeydown } from '@/hooks/event/useKeydown'
 
 const configStore = useConfig()
 
@@ -285,7 +286,7 @@ function handleOk(item: any) {
     filterHandler('')
   }
 }
-
+useKeydown('s', () => setShowSearch(true))
 // watch(asideValue, (newVal) => {
 //   console.log("asideValue处理后", newVal);
 //   configStore.setAsideValue(newVal)
diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue
index d0b3fad..cd76aa1 100644
--- a/src/views/home/aside/comp/modals/FilterModal.vue
+++ b/src/views/home/aside/comp/modals/FilterModal.vue
@@ -18,6 +18,7 @@ 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'
+import { useKeydown } from '@/hooks/event/useKeydown'
 
 defineOptions({ name: 'FilterModal' })
 const props = defineProps({
@@ -26,6 +27,7 @@ const props = defineProps({
     default: () => 0,
   },
 })
+
 const emit = defineEmits<{
   (e: 'showNewFilter'): void
   (e: 'editFilter', filter: any): void
@@ -54,7 +56,7 @@ interface RowData {
   updateby: string
   updatetime: string
 }
-
+useKeydown('n t', handleClick)
 function sortData(row) {
   console.log('sortData', row)
   if (row.order == 'descend') {
@@ -438,7 +440,7 @@ function handleOk() {
 
           <div v-else class="wrapper-form">
             <div class="del_btn">
-              <n-button icon-placement="left" size="medium" @click="deleteSelection">
+              <n-button icon-placement="left" size="medium" @click="deleteSelection()">
                 <template #icon>
                   <SvgIcon name="delete-history" size="16" />
                 </template>
diff --git a/src/views/home/aside/comp/modals/NewFilterModal.vue b/src/views/home/aside/comp/modals/NewFilterModal.vue
index 2bcb5d2..26f6de9 100644
--- a/src/views/home/aside/comp/modals/NewFilterModal.vue
+++ b/src/views/home/aside/comp/modals/NewFilterModal.vue
@@ -216,6 +216,9 @@ function showModal() {
   const list = generateAllData(configStore.systemConfig)
   typeOptions.value = list
   show.value = true
+  setTimeout(() => {
+    formValue.name = ''
+  }, 300);
 }
 
 function closeModal() {
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index 823ec18..2366e97 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -34,6 +34,7 @@ import { isEmpty } from '@/utils'
 import { formatToDateHMS } from '@/utils/dateUtil'
 import { hideDownload } from '@/utils/image'
 import bgLoading from '@/assets/images/bg-loading.png'
+import { useKeydown } from '@/hooks/event/useKeydown'
 
 const emit = defineEmits(['setAsideItemName'])
 
@@ -492,6 +493,7 @@ function immersionHandler() {
   // taskStore.updateImmersion()
   toggleFullScreen()
 }
+useKeydown('k k', immersionHandler)
 // 切换全屏状态
 function toggleFullScreen() {
   isFullScreen.value = !isFullScreen.value
@@ -728,13 +730,20 @@ function sortHandler(orderby: 'similarityScore' | 'createdate') {
               style="cursor: pointer"
               @click="immersionHandler"
             />
-            <SvgIcon
+            <n-tooltip
               v-else
-              size="20"
-              name="immersion-model"
-              style="cursor: pointer"
-              @click="immersionHandler"
-            />
+              placement="bottom"
+            >
+              <template #trigger>
+                <SvgIcon
+                  size="20"
+                  name="immersion-model"
+                  style="cursor: pointer"
+                  @click="immersionHandler"
+                />
+              </template>
+              <span>沉浸模式</span>
+            </n-tooltip>
           </div>
         </div>
         <div v-show="showActions" class="batch">
diff --git a/src/views/task/modal/NewFilterModal.vue b/src/views/task/modal/NewFilterModal.vue
index fde0df0..e15bcf7 100644
--- a/src/views/task/modal/NewFilterModal.vue
+++ b/src/views/task/modal/NewFilterModal.vue
@@ -193,6 +193,9 @@ watch(
 
 function showModal() {
   show.value = true
+  setTimeout(() => {
+    formValue.name = ''
+  }, 300);
 }
 
 function closeModal() {
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index ae31440..2304627 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -27,6 +27,7 @@ import { hideDownload } from '@/utils/image'
 import emitter from '@/utils/mitt'
 import type { ApprovalParam, SimilarityPictureSortParam } from '/#/api'
 import bgLoading from '@/assets/images/bg-loading.png'
+import { useKeydown } from '@/hooks/event/useKeydown'
 
 const batch = ref(false) // 批量审批状态
 const selectItems = ref<any[]>([])
@@ -338,7 +339,7 @@ function onEsc(event: KeyboardEvent) {
     else keyXLastTime = currentKTime
   }
 }
-
+useKeydown('k k', immersionHandler)
 onUnmounted(() => {
   workStore.reset()
   document.removeEventListener('keydown', onEsc)
@@ -590,13 +591,20 @@ defineExpose({
               style="cursor: pointer"
               @click="immersionHandler"
             />
-            <SvgIcon
-              v-else
-              size="20"
-              name="immersion-model"
-              style="cursor: pointer"
-              @click="immersionHandler"
-            />
+            <n-tooltip  
+              v-else 
+              placement="bottom"
+              >
+              <template #trigger>
+                <SvgIcon
+                  size="20"
+                  name="immersion-model"
+                  style="cursor: pointer"
+                  @click="immersionHandler"
+                />
+              </template>
+              <span>沉浸模式</span>
+            </n-tooltip>
           </div>
         </div>