diff --git a/components.d.ts b/components.d.ts
index e12f925..11049e1 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -11,7 +11,6 @@ declare module 'vue' {
     BasicModal: typeof import('./src/components/Modal/BasicModal.vue')['default']
     DataHeader: typeof import('./src/components/DataHeader/index.vue')['default']
     NAvatar: typeof import('naive-ui')['NAvatar']
-    NBackTop: typeof import('naive-ui')['NBackTop']
     NButton: typeof import('naive-ui')['NButton']
     NCard: typeof import('naive-ui')['NCard']
     NCheckbox: typeof import('naive-ui')['NCheckbox']
@@ -22,8 +21,6 @@ declare module 'vue' {
     NDialogProvider: typeof import('naive-ui')['NDialogProvider']
     NDivider: typeof import('naive-ui')['NDivider']
     NDropdown: typeof import('naive-ui')['NDropdown']
-    NEllipsis: typeof import('naive-ui')['NEllipsis']
-    NEmpty: typeof import('naive-ui')['NEmpty']
     NForm: typeof import('naive-ui')['NForm']
     NFormItem: typeof import('naive-ui')['NFormItem']
     NGi: typeof import('naive-ui')['NGi']
@@ -35,20 +32,16 @@ declare module 'vue' {
     NModal: typeof import('naive-ui')['NModal']
     NNotificationProvider: typeof import('naive-ui')['NNotificationProvider']
     NotPassed: typeof import('./src/components/NotPassed.vue')['default']
-    NPopconfirm: typeof import('naive-ui')['NPopconfirm']
     NPopover: typeof import('naive-ui')['NPopover']
     NPopselect: typeof import('naive-ui')['NPopselect']
+    NProgress: typeof import('naive-ui')['NProgress']
     NScrollbar: typeof import('naive-ui')['NScrollbar']
     NSelect: typeof import('naive-ui')['NSelect']
     NSlider: typeof import('naive-ui')['NSlider']
     NSpace: typeof import('naive-ui')['NSpace']
     NSpin: typeof import('naive-ui')['NSpin']
     NSwitch: typeof import('naive-ui')['NSwitch']
-    NTabPane: typeof import('naive-ui')['NTabPane']
-    NTabs: typeof import('naive-ui')['NTabs']
     NTag: typeof import('naive-ui')['NTag']
-    NTimeline: typeof import('naive-ui')['NTimeline']
-    NTimelineItem: typeof import('naive-ui')['NTimelineItem']
     NTooltip: typeof import('naive-ui')['NTooltip']
     NUpload: typeof import('naive-ui')['NUpload']
     NUploadDragger: typeof import('naive-ui')['NUploadDragger']
diff --git a/src/layout/components/Header/UserSettings.vue b/src/layout/components/Header/UserSettings.vue
index 6340e5c..f787cb6 100644
--- a/src/layout/components/Header/UserSettings.vue
+++ b/src/layout/components/Header/UserSettings.vue
@@ -72,18 +72,18 @@ function logOut() {
 }
 
 const currentCompanyName = computed(() => {
-  const tenantList = useInfo.tenantList
+  const deptlist = useInfo.deptlist
   const currentId = userStore.getTenantId
-  const current = tenantList.find(item => item.id === currentId)
+  const current = deptlist.find(item => item.id === currentId)
   return current.name || 'name'
 })
 
 const options = computed(() => {
-  const tenantList = useInfo.tenantList
-  return tenantList.map((item) => {
+  const deptlist = useInfo.deptlist
+  return deptlist.map((item) => {
     return {
-      label: item.name,
-      key: item.id,
+      label: item.departname,
+      key: item.deptno,
     }
   })
 })
@@ -101,7 +101,7 @@ const options = computed(() => {
   >
     <template #trigger>
       <div class="setting">
-        <span style="color:#333333">{{ useInfo.username }}</span>
+        <span style="color: #333333">{{ useInfo.username }}</span>
         <SvgIcon style="margin-left: 6px" :name="iconName" size="16" />
       </div>
     </template>
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index ab16fb7..1c0613d 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -15,7 +15,7 @@ const TOKEN_REFRESH_SECONDS = 20 * 60
 
 export interface UserInfoType {
   token: string
-  tenantList: any[]
+  deptlist: any[]
   userInfo: any
 }
 
@@ -122,8 +122,8 @@ export const useUserStore = defineStore({
       if (code === ResultEnum.SUCCESS) {
         const ex = 7 * 24 * 60 * 60
         // 默认设置为第一个租户
-        const firstTenant = data.tenantList.length > 0 ? data.tenantList[0] : null
-        const tenantId = firstTenant ? firstTenant.id : ''
+        const firstTenant = data.deptlist.length > 0 ? data.deptlist[0] : null
+        const tenantId = firstTenant ? firstTenant.deptno : ''
         data.frontmenuTList.forEach((ele) => {
           if (ele.description === 'AI工单')
             ele.description = '图审审批'
@@ -175,7 +175,7 @@ export const useUserStore = defineStore({
     // 登出
     async logout() {
       this.setPermissions([])
-      this.setUserInfo({ tenantList: [], userInfo: {}, token: '' })
+      this.setUserInfo({ deptlist: [], userInfo: {}, token: '' })
       this.setTenantId('')
       storage.remove(USER_ACCESS_TOKEN)
       storage.remove(CURRENT_USER)
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index d14ba80..b73f806 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -1,5 +1,4 @@
 <script lang="ts" setup>
-import console from 'node:console'
 import type { DataTableColumns, DataTableRowKey, PaginationProps } from 'naive-ui'
 import { NButton, NDataTable, useDialog, useMessage } from 'naive-ui'
 import {
@@ -55,6 +54,7 @@ const route = useRoute()
 const reviewType = 0
 const sortorder = ref('asc')
 const sortname = ref('states')
+const searchContent = route.query.searchContent as string
 const actionsColumns = {
   title: '操作',
   key: 'actions',
@@ -199,6 +199,7 @@ async function getColumns() {
           width: 120,
         })
       }
+      return v
     })
   }
   else {
@@ -210,6 +211,7 @@ async function getColumns() {
         fixed: 'left',
         width: 120,
       })
+      return v
     })
     userFieldUnFixed.map((v) => {
       const item = allList.find(v2 => v2.name == v)
@@ -218,6 +220,7 @@ async function getColumns() {
         key: item.name,
         width: 120,
       })
+      return v
     })
   }
   // TODO: 会导致排序问题 废弃
@@ -419,6 +422,7 @@ async function formatColumns() {
 const deviceHeight = ref(600)
 
 onMounted(() => {
+  // query(pagination.page, pagination.pageSize);
   emitter.on('filter-final', refreshHandler)
   getColumns()
 
@@ -479,6 +483,7 @@ const message = useMessage()
 const finalStore = useFinal()
 
 async function query(page: number, pageSize: number, filterId?: any, taskName?: string) {
+  console.log('query', taskName)
   const asideParmas = unref(finalStore.getAsideValue)
   // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
   // let params = filterId ? { userSearchId: filterId } : asideParmas
@@ -584,10 +589,6 @@ const scrollX = computed(() => {
 
   return width
 })
-onMounted(() => {
-  query(pagination.page, pagination.pageSize)
-})
-
 const customTabelRef = ref(null)
 const importExcelRef = ref(null)
 const notPassModalRef = ref(null) // 不通过弹窗
@@ -707,7 +708,7 @@ function resetHandler() {
       // TODO：需要支持重置
       // const result = await resetApproval()
     },
-    onNegativeClick: () => { },
+    onNegativeClick: () => {},
   })
 }
 
@@ -814,7 +815,7 @@ function doAudit(param: any) {
         }
       })
     },
-    onNegativeClick: () => { },
+    onNegativeClick: () => {},
   })
 }
 
@@ -853,15 +854,23 @@ function reset() {
 
 async function refreshHandler(searchId?: any) {
   reset()
-  query(pagination.page, pagination.pageSize, searchId)
+  let searchKeyword = ''
+  if (searchContent) {
+    const id_param = searchContent.match(/-\d+-/)
+    if (id_param)
+      searchKeyword = id_param[0].slice(1, -1)
+  }
+  console.log('refreshHandler', searchKeyword)
+  query(pagination.page, pagination.pageSize, searchId, searchKeyword)
 }
 
 function filterTableData(keyword) {
   pagination.page = 1
   pagination.pageSize = 10
-  if (keyword)
+  if (keyword) {
     query(pagination.page, pagination.pageSize, '', keyword)
-  else query(pagination.page, pagination.pageSize)
+  else
+    query(pagination.page, pagination.pageSize)
 }
 
 defineExpose({
@@ -874,10 +883,20 @@ defineExpose({
     <div class="wrapper-header">
       <div class="wrapper-header-left">
         <span class="wrapper-header-font">任务管理列表</span>
-        <SvgIcon style="cursor: pointer" size="16" name="list-mode" @click="changeContent" />
+        <SvgIcon
+          style="cursor: pointer"
+          size="16"
+          name="list-mode"
+          @click="changeContent"
+        />
       </div>
       <div>
-        <SvgIcon style="margin-right: 6px" size="13" name="summary" @click="showModal(repeatModalRef)" />
+        <SvgIcon
+          style="margin-right: 6px"
+          size="13"
+          name="summary"
+          @click="showModal(repeatModalRef)"
+        />
         <NButton class="xjcc" text @click="showModal(repeatModalRef)">
           小结查重
         </NButton>
@@ -897,16 +916,27 @@ defineExpose({
           </NButton>
 
           <img
-            class="btn-approval btn-left" src="@/assets/images/task/btn-not-pass.png" alt=""
+            class="btn-approval btn-left"
+            src="@/assets/images/task/btn-not-pass.png"
+            alt=""
             @click.stop="batchReject"
           >
           <SvgIcon size="24" name="vs" />
-          <img class="btn-approval" src="@/assets/images/task/btn-pass.png" alt="" @click.stop="batchApproval">
+          <img
+            class="btn-approval"
+            src="@/assets/images/task/btn-pass.png"
+            alt=""
+            @click.stop="batchApproval"
+          >
         </div>
 
         <n-popover
-          ref="popover" :style="{ padding: '0px' }" style="width: 148px" :show-arrow="false"
-          placement="bottom-start" trigger="click"
+          ref="popover"
+          :style="{ padding: '0px' }"
+          style="width: 148px"
+          :show-arrow="false"
+          placement="bottom-start"
+          trigger="click"
         >
           <template #trigger>
             <div class="icon-wrap">
@@ -947,22 +977,46 @@ defineExpose({
       </div>
     </div> -->
     <div class="wrapper-settings">
-      <SvgIcon style="cursor: pointer" size="18" name="column" @click="showModal(customTabelRef)" />
+      <SvgIcon
+        style="cursor: pointer"
+        size="18"
+        name="column"
+        @click="showModal(customTabelRef)"
+      />
     </div>
     <div class="wrapper-content">
       <NDataTable
-        id="table" ref="tableRef" v-model:checked-row-keys="checkedRowKeys" remote :columns="columnsRef"
-        :scroll-x="scrollX" :max-height="maxHeight" :data="tableData" :loading="loading" :pagination="pagination"
-        :row-key="rowKey" @update:page="handlePageChange" @update-page-size="handlePageSizeChange"
-        @update:checked-row-keys="handleCheck" @update:sorter="handleSorterChange"
+        id="table"
+        ref="tableRef"
+        v-model:checked-row-keys="checkedRowKeys"
+        remote
+        :columns="columnsRef"
+        :scroll-x="scrollX"
+        :max-height="maxHeight"
+        :data="tableData"
+        :loading="loading"
+        :pagination="pagination"
+        :row-key="rowKey"
+        @update:page="handlePageChange"
+        @update-page-size="handlePageSizeChange"
+        @update:checked-row-keys="handleCheck"
+        @update:sorter="handleSorterChange"
       />
     </div>
 
     <CustomTabelModal ref="customTabelRef" @commit="commitHandler" />
-    <ImportExcelModal ref="importExcelRef" :on-success="sucessHandler" :header-config="headRules" />
+    <ImportExcelModal
+      ref="importExcelRef"
+      :on-success="sucessHandler"
+      :header-config="headRules"
+    />
     <NotPassed ref="notPassModalRef" @success="reload" />
 
-    <RepeatModal ref="repeatModalRef" @reject="repeatBatchReject" @viewrepeat="showModal(repeatTaskTableModalRef)" />
+    <RepeatModal
+      ref="repeatModalRef"
+      @reject="repeatBatchReject"
+      @viewrepeat="showModal(repeatTaskTableModalRef)"
+    />
     <RepeatTaskTableModal ref="repeatTaskTableModalRef" />
   </div>
 </template>
diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue
index c5145c6..94c9755 100644
--- a/src/views/home/aside/Aside.vue
+++ b/src/views/home/aside/Aside.vue
@@ -125,19 +125,23 @@ nextTick(() => {
     const sortKeyList: any = []
     configStore.getFilterConfig.map((item: any) => {
       sortKeyList.push(item?.id)
+      return item
     })
     const showKeys = [...sortKeyList]
 
     Object.keys(config).forEach((key) => {
       if (key.startsWith('iz') && asideMap[key] !== undefined) {
         asideVisible[key]
-        = (showKeys.includes(key) || asideMap[key].isDefaultFilter) && config[key] === 'Y'
+          = (showKeys.includes(key) || asideMap[key].isDefaultFilter)
+          && config[key] === 'Y'
       }
     })
     if (customObjRef.value) {
-    // 赋值
+      // 赋值
       Object.keys(customObjRef.value).map((key) => {
-        if (asideMap.hasOwnProperty(key)) {
+        // TODO hasOwnProperty避免直接调用
+        // if (asideMap.hasOwnProperty(key)) {
+        if (Object.prototype.hasOwnProperty.call(customObjRef.value, key)) {
           const str = key.toLowerCase()
           // console.log("customObjRef.value[str]1111111111111", customObjRef.value[str]);
           if (str == 'izsimilarity') {
@@ -157,7 +161,11 @@ nextTick(() => {
             asideValue[key] = customObjRef.value[str] // 赋值
             console.log('时间2222222222', asideValue[key])
           }
-          else if (str != 'izsimilarity' && str != 'izyear' && customObjRef.value[str]) {
+          else if (
+            str != 'izsimilarity'
+            && str != 'izyear'
+            && customObjRef.value[str]
+          ) {
             console.log('customObjRef.value[str]222222', customObjRef.value[str])
             // let list = customObjRef.value[str].split(',');
             // console.log("list222222", list);
@@ -166,8 +174,9 @@ nextTick(() => {
           else {
             asideValue[key] = null
           }
-        // asideMap[str].defaultValue = customObjRef.value[str];// 赋值
+          // asideMap[str].defaultValue = customObjRef.value[str];// 赋值
         }
+        return key
       })
       customTempObjRef.value = customObjRef.value
       console.log('asideValue直接处理后的结果', asideValue)
@@ -183,20 +192,20 @@ nextTick(() => {
       if (render !== false) {
         const str = key?.toLowerCase()
 
-        const o = {
-          key: str,
-          config: asideMap[str],
-        }
-        return [...acc, o]
-      }
-      else {
-        return acc
-      }
-    }, [])
-    console.log('showItems=================================', items)
-    showItems.value = items
-    configFilterRef.value = configStore.getFilterConfig
-  })
+      const o = {
+        key: str,
+        config: asideMap[str],
+      };
+      return [...acc, o];
+    } else {
+      return acc;
+    }
+  }, []);
+  console.log("showItems=================================", items);
+  showItems.value = items;
+  configFilterRef.value = configStore.getFilterConfig;
+});
+
 })
 const asideEnter = ref(false)
 
@@ -233,8 +242,12 @@ async function filterHandler(searchId: string) {
     customObjRef.value = res.data
     const showKeys: any[] = []
     Object.keys(obj).map((key) => {
-      if (asideMap.hasOwnProperty(key))
+      // TODO hasOwnProperty避免直接调用
+      // if (asideMap.hasOwnProperty(key)) {
+      if (Object.prototype.hasOwnProperty.call(asideMap, key))
         showKeys.push(key)
+
+      return key
     })
     // console.log(showKeys);
     configStore.setCustomConfig(showKeys)
@@ -312,12 +325,12 @@ function handleOk(item: any) {
       </div>
 
       <component
-        :is="item.config.component"
-        v-for="(item, index) in showItems"
+        :is="item.config?.component"
+        v-for="item in showItems"
         :id="item.key"
         :key="item.key"
         v-model:value="asideValue[item.key]"
-        :label="item.config.label"
+        :label="item.config?.label"
         @update:value="(e) => updateComponent(item.key, e)"
       />
 
diff --git a/src/views/home/aside/comp/Search.vue b/src/views/home/aside/comp/Search.vue
index 56efc78..d017c55 100644
--- a/src/views/home/aside/comp/Search.vue
+++ b/src/views/home/aside/comp/Search.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { nextTick, onMounted, ref, watch } from 'vue'
 import { debounce } from 'lodash-es'
-import { useRoute } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import { asideMap } from '@/config/aside'
 import type { SearchEntity } from '/#/home'
 import { useConfig } from '@/store/modules/asideConfig'
@@ -18,6 +18,7 @@ const emit = defineEmits<{
 
 const finalStore = useFinal()
 
+const router = useRouter()
 const route = useRoute()
 const searchContent = route.query.searchContent as string
 const data = ref<SearchEntity[]>([])
@@ -42,7 +43,7 @@ configStore.$subscribe(() => {
     return
 
   const list = keys.map((key) => {
-    const name = asideMap[key].label
+    const name = asideMap[key]?.label
 
     return {
       key,
@@ -69,6 +70,9 @@ function close() {
   searchKeyword.value = ''
   configStore.setSearchValue(searchKeyword.value)
   finalStore.setSearchValue(searchKeyword.value)
+  if (searchContent)
+    router.push(route.path)
+
   emit('close')
 }
 
@@ -90,16 +94,27 @@ onMounted(() => {
 <template>
   <div class="wrapper">
     <n-popover
-      ref="popover" :style="{ padding: '0px' }" style="width: 248px" :show-arrow="false"
-      placement="bottom-start" trigger="focus"
+      ref="popover"
+      :style="{ padding: '0px' }"
+      style="width: 248px"
+      :show-arrow="false"
+      placement="bottom-start"
+      trigger="focus"
     >
       <template #trigger>
         <n-input
-          v-model:value="searchKeyword" style="width: 260px;height: 32px;" placeholder="请输入你需要搜索的内容"
+          v-model:value="searchKeyword"
+          style="width: 260px; height: 32px"
+          placeholder="请输入你需要搜索的内容"
           @input="inputHandler"
         >
           <template #suffix>
-            <SvgIcon size="14px" name="magnifying-1" style="cursor: pointer;" @click="searchName" />
+            <SvgIcon
+              size="14px"
+              name="magnifying-1"
+              style="cursor: pointer"
+              @click="searchName"
+            />
           </template>
         </n-input>
       </template>
@@ -112,7 +127,12 @@ onMounted(() => {
       </div> -->
     </n-popover>
 
-    <SvgIcon size="16px" style="margin-left: 6px;cursor: pointer;" name="clear" @click="close" />
+    <SvgIcon
+      size="16px"
+      style="margin-left: 6px; cursor: pointer"
+      name="clear"
+      @click="close"
+    />
   </div>
 </template>
 
diff --git a/src/views/home/aside/comp/modals/CustomFilterModal.vue b/src/views/home/aside/comp/modals/CustomFilterModal.vue
index 90f9e95..514f677 100644
--- a/src/views/home/aside/comp/modals/CustomFilterModal.vue
+++ b/src/views/home/aside/comp/modals/CustomFilterModal.vue
@@ -14,6 +14,13 @@ const configStore = useConfig()
 const checkAll = ref(false)
 const selectIds = ref<string[]>([])
 const tempList = ref<string[]>([])
+// 左侧隐藏列表
+const offList = ref<any[]>([])
+// 右侧显示列表
+const onList = ref<any[]>([])
+
+const offKeyword = ref('')
+const onKeyword = ref('')
 
 function showModal() {
   show.value = true
@@ -27,7 +34,10 @@ function showModal() {
   if (tempList.value.length > 0 && isEqual(tempList.value, configStore.getFilterConfig))
     return
 
-  console.log('开启了啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦筛选条件----------------', customConfig)
+  console.log(
+    '开启了啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦筛选条件----------------',
+    customConfig,
+  )
   const { showList, hideList } = generatList(config, customConfig)
   tempList.value = cloneDeep(showList)
   if (tempList.value.length > 0)
@@ -46,11 +56,6 @@ function closeModal() {
   show.value = false
 }
 
-// 左侧隐藏列表
-const offList = ref<any[]>([])
-// 右侧显示列表
-const onList = ref<any[]>([])
-
 const allCount = computed(() => {
   return `全部筛选(共${offList.value.length}个)`
 })
@@ -138,7 +143,8 @@ function generatList(config, customConfig) {
 
   const sortKeyList: any = []
   configStore.getFilterConfig.map((item: any) => {
-    sortKeyList.push(item.id)
+    sortKeyList.push(item?.id)
+    return item
   })
   console.log('原始筛选条件sortKeyList', sortKeyList)
   const sortList: any = []
@@ -146,12 +152,14 @@ function generatList(config, customConfig) {
     sortKeyList.map((key) => {
       const tempItem = tempOnList.find(item => item.id == key)
       sortList.push(tempItem)
+      return key
     })
   }
   else {
     customConfig.map((key) => {
       const tempItem = tempOnList.find(item => item.id == key)
       sortList.push(tempItem)
+      return key
     })
   }
   console.log('原始筛选条件sortList', sortList)
@@ -185,9 +193,11 @@ configStore.$subscribe(() => {
 
 async function handleSumbit(e: MouseEvent) {
   e.preventDefault()
-  const param = onList.value.map((item) => {
-    return item.id
-  }).join(',')
+  const param = onList.value
+    .map((item) => {
+      return item.id
+    })
+    .join(',')
 
   await setFilter({ searchcount: param, type: 0 })
   const obj = await configStore.fetchCustomConfig()
@@ -198,6 +208,7 @@ async function handleSumbit(e: MouseEvent) {
   obj.map((key) => {
     const tempItem = tempOnList.find(item => item.id == key)
     sortList.push(tempItem)
+    return key
   })
   console.log('configStore.sortList---------------', sortList)
   // setTimeout(() => {
@@ -228,8 +239,7 @@ function onCheckChange(checked: any, item: any) {
 
   if (index === -1 && checked)
     selectIds.value.push(item.id)
-  else
-    index !== -1 && selectIds.value.splice(index, 1)
+  else index !== -1 && selectIds.value.splice(index, 1)
 
   checkAll.value = offList.value.every(item => item.checked)
 }
@@ -247,7 +257,10 @@ watch(
       return
 
     const action = newVal > oldVal ? 'add' : 'remove'
-    const diff = action === 'add' ? difference(selectIds.value, showIds.value) : difference(showIds.value, selectIds.value)
+    const diff
+      = action === 'add'
+        ? difference(selectIds.value, showIds.value)
+        : difference(showIds.value, selectIds.value)
 
     if (diff.length === 0)
       return
@@ -314,9 +327,6 @@ function removeHandler(id: string) {
     onList.value.splice(index, 1)
 }
 
-const offKeyword = ref('')
-const onKeyword = ref('')
-
 const leftInputHandler = debounce((keyword) => {
   offKeyword.value = keyword
 }, 300)
@@ -345,7 +355,13 @@ onMounted(() => {
 
 <template>
   <n-modal v-model:show="show" transform-origin="center" :mask-closable="false">
-    <n-card class="cardstyle" :bordered="false" size="huge" role="dialog" aria-modal="true">
+    <n-card
+      class="cardstyle"
+      :bordered="false"
+      size="huge"
+      role="dialog"
+      aria-modal="true"
+    >
       <div class="wrapper">
         <span class="wrapper-title">自定义筛选</span>
         <div class="wrapper-bar">
@@ -357,7 +373,10 @@ onMounted(() => {
         <n-grid cols="24" class="mt-4 proCard" responsive="screen" :x-gap="24">
           <n-grid-item span="11">
             <NCard
-              :title="allCount" class="dragcardStyle" :segmented="{ content: true, footer: true }" size="small"
+              :title="allCount"
+              class="dragcardStyle"
+              :segmented="{ content: true, footer: true }"
+              size="small"
               :bordered="false"
             >
               <div class="input_wrap">
@@ -366,17 +385,29 @@ onMounted(() => {
                     <SvgIcon size="14px" name="magnifying-1-color999" />
                   </template>
                 </n-input>
-                <n-scrollbar style="max-height: 500px;border: 1px solid #cad2dd;border-radius: 2px;">
+                <n-scrollbar
+                  style="max-height: 500px; border: 1px solid #cad2dd; border-radius: 2px"
+                >
                   <div class="draggable-ul">
                     <div class="draggable-li">
-                      <n-checkbox v-model:checked="checkAll" label="全选" :indeterminate="!checkAll" @update:checked="onCheckAllChange" />
+                      <n-checkbox
+                        v-model:checked="checkAll"
+                        label="全选"
+                        :indeterminate="!checkAll"
+                        @update:checked="onCheckAllChange"
+                      />
                     </div>
                     <div
-                      v-for="item in offList" v-show="item.name.includes(offKeyword)" :key="item.id" :class="{ 'disable-check': item.fix }"
+                      v-for="item in offList"
+                      v-show="item.name.includes(offKeyword)"
+                      :key="item.id"
+                      :class="{ 'disable-check': item.fix }"
                       class="draggable-li"
                     >
                       <n-checkbox
-                        v-model:checked="item.checked" :label="item.name" :disabled="item.fix"
+                        v-model:checked="item.checked"
+                        :label="item.name"
+                        :disabled="item.fix"
                         @update:checked="onCheckChange($event, item)"
                       />
                     </div>
@@ -385,12 +416,15 @@ onMounted(() => {
               </div>
             </NCard>
           </n-grid-item>
-          <n-grid-item style="display: flex;align-items: center;" span="2">
+          <n-grid-item style="display: flex; align-items: center" span="2">
             <SvgIcon size="20" name="switchsvg" />
           </n-grid-item>
           <n-grid-item span="11">
             <NCard
-              :title="selectCount" class="dragcardStyle" :segmented="{ content: true, footer: true }" size="small"
+              :title="selectCount"
+              class="dragcardStyle"
+              :segmented="{ content: true, footer: true }"
+              size="small"
               :bordered="false"
             >
               <template #header-extra>
@@ -402,14 +436,31 @@ onMounted(() => {
                     <SvgIcon size="14px" name="magnifying-1-color999" />
                   </template>
                 </n-input>
-                <n-scrollbar style="max-height: 500px;border: 1px solid #cad2dd;border-radius: 2px;" class="scroll">
-                  <VueDraggable v-model="onList" class="draggable-ul" :animation="150" group="shared">
-                    <div v-for="item in onList" v-show="item.name.includes(onKeyword)" :key="item.id" :draggable="true" class="cursor-move draggable-li">
+                <n-scrollbar
+                  style="max-height: 500px; border: 1px solid #cad2dd; border-radius: 2px"
+                  class="scroll"
+                >
+                  <VueDraggable
+                    v-model="onList"
+                    class="draggable-ul"
+                    :animation="150"
+                    group="shared"
+                  >
+                    <div
+                      v-for="item in onList"
+                      v-show="item.name.includes(onKeyword)"
+                      :key="item.id"
+                      :draggable="true"
+                      class="cursor-move draggable-li"
+                    >
                       <SvgIcon name="drag" size="24" />
                       <span class="ml-2">{{ item.name }}</span>
                       <SvgIcon
-                        v-if="!item.fix" size="16px" style="display:block;margin-left: auto;cursor: pointer;"
-                        name="clear" @click="removeHandler(item.id)"
+                        v-if="!item.fix"
+                        size="16px"
+                        style="display: block; margin-left: auto; cursor: pointer"
+                        name="clear"
+                        @click="removeHandler(item.id)"
                       />
                     </div>
                   </VueDraggable>
@@ -424,7 +475,11 @@ onMounted(() => {
           <n-button type="info" @click="handleSumbit">
             确定
           </n-button>
-          <n-button secondary style="margin-left:15px; border: 1px solid #CAD2DD;" @click="closeModal">
+          <n-button
+            secondary
+            style="margin-left: 15px; border: 1px solid #cad2dd"
+            @click="closeModal"
+          >
             取消
           </n-button>
         </div>
@@ -453,10 +508,10 @@ onMounted(() => {
   &-footer {
     display: flex;
     justify-content: flex-end;
-    .n-button--info-type{
-      background: #507AFD !important;
+    .n-button--info-type {
+      background: #507afd !important;
     }
-    .n-button--default-type{
+    .n-button--default-type {
       background: #fff !important;
       color: #333333;
     }
@@ -468,7 +523,7 @@ onMounted(() => {
     font-size: 14px;
 
     &:before {
-      background-color: #1980FF;
+      background-color: #1980ff;
       content: "";
       width: 5px;
       border-radius: 2px;
@@ -498,7 +553,7 @@ onMounted(() => {
 
 .textbtnStyle {
   cursor: pointer;
-  color: #1980FF;
+  color: #1980ff;
 }
 
 .draggable-ul {
@@ -531,33 +586,33 @@ onMounted(() => {
   --n-padding-top: 0px;
   --n-padding-bottom: 12px;
 }
-::v-deep(.n-card > .n-card-header .n-card-header__main){
+::v-deep(.n-card > .n-card-header .n-card-header__main) {
   font-weight: lighter !important;
   font-size: 14px;
   color: #666;
 }
-::v-deep(.n-scrollbar){
+::v-deep(.n-scrollbar) {
   border-left: 1px solid #cad2dd !important;
   border-right: 1px solid #cad2dd !important;
-  border-bottom: 1px solid #E8E8E8 !important;
-  border-top: 1px solid #E8E8E8 !important;
+  border-bottom: 1px solid #e8e8e8 !important;
+  border-top: 1px solid #e8e8e8 !important;
 }
-::v-deep(.n-card__content){
-  padding: 20px 24px  0 24px !important;
+::v-deep(.n-card__content) {
+  padding: 20px 24px 0 24px !important;
 }
-::v-deep(.n-card__footer){
+::v-deep(.n-card__footer) {
   padding: 0 24px 16px 24px !important;
 }
-::v-deep(.n-input .n-input-wrapper){
+::v-deep(.n-input .n-input-wrapper) {
   height: 44px !important;
   border: 1px solid #cad2dd !important;
   border-bottom: none !important;
   // margin-bottom: -3px;
-  .n-input__input input{
+  .n-input__input input {
     height: 44px !important;
   }
 }
-::v-deep(.n-button--info-type){
-  background: #507AFD !important;
+::v-deep(.n-button--info-type) {
+  background: #507afd !important;
 }
 </style>