From 3eb873aa4088e80a3a1a27c17a7af67293fa7b24 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Thu, 21 Mar 2024 10:35:31 +0800
Subject: [PATCH 1/6] =?UTF-8?q?feat:=20=E5=B7=A5=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/aside/ListItem.vue | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/views/worksheet/aside/ListItem.vue b/src/views/worksheet/aside/ListItem.vue
index 2cc5351..de8de02 100644
--- a/src/views/worksheet/aside/ListItem.vue
+++ b/src/views/worksheet/aside/ListItem.vue
@@ -19,7 +19,7 @@ const props = defineProps({
   },
 });
 
-console.log(props.listItem,'listItem')
+console.log(props.listItem, "listItem");
 const svgName = computed(() => {
   return props.selected ? "taskpack-select" : "taskpack";
 });
@@ -37,14 +37,18 @@ const svgName = computed(() => {
           >
             {{ listItem.packagename }}
           </span>
-          <span class="list-item-header-selected"
-            >({{ listItem.pictureno }})</span
-          >
+          <span class="list-item-header-selected">({{ listItem.pictureno }})</span>
         </div>
         <SvgIcon v-show="selected" size="14" name="more-ver" />
       </div>
       <ul class="list-item-detail" v-else>
-        {{ item.name }}：{{ listItem[item.id] }}
+        <li>
+          {{
+          item.name
+        }}：{{
+          listItem[item.id]
+        }}
+        </li>
       </ul>
     </div>
     <!-- <div class="list-item-header">
@@ -95,10 +99,15 @@ const svgName = computed(() => {
     margin-left: 36px;
 
     li {
-      font-size: 13px;
       color: #666666;
       line-height: 18px;
       margin-bottom: 8px;
+      font-size: 13px;
+      font-family: PingFang SC, PingFang SC-Regular;
+      font-weight: Regular;
+      text-align: left;
+      color: #666666;
+      line-height: 18px;
     }
   }
 

From 79debdf061ae0b65fa8d89763bd57b0ee3f12633 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Thu, 21 Mar 2024 11:17:18 +0800
Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=E7=A7=BB=E9=99=A4=E5=B8=B8?=
 =?UTF-8?q?=E9=87=8F=E7=94=A8=E6=88=B7=E5=90=8D=E5=AF=86=E7=A0=81=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/components/Login.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue
index 8841942..0bf5bf9 100644
--- a/src/views/login/components/Login.vue
+++ b/src/views/login/components/Login.vue
@@ -35,9 +35,12 @@ const show = ref(false)
 const flag = ref(true)
 
 const formInline: FormState = reactive({
-  enterprisecode: '演示公司',
-  username: 'yanshi01',
-  password: '123456',
+  // enterprisecode: '演示公司',
+  // username: 'yanshi01',
+  // password: '123456',
+  enterprisecode: '',
+  username: '',
+  password: '',
 })
 
 const formSms: FormSms = reactive({

From a93ed2c06a68a526ab0a13e2e30e333f386e5f8e Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Thu, 21 Mar 2024 11:30:06 +0800
Subject: [PATCH 3/6] =?UTF-8?q?feat:=20=E9=AB=98=E7=BA=A7=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84=EF=BC=8C=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=AE=A1=E6=89=B9=E9=A1=B5=E8=A1=A5=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/aside/comp/AdvanceFilter.vue | 229 ++++++++++++--------
 src/views/task/aside/Aside.vue              |  42 +++-
 2 files changed, 176 insertions(+), 95 deletions(-)

diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue
index 9388c82..42b03f2 100644
--- a/src/views/home/aside/comp/AdvanceFilter.vue
+++ b/src/views/home/aside/comp/AdvanceFilter.vue
@@ -1,13 +1,13 @@
 <script lang="ts" setup>
-import { favorite, getConditionList, unfavorite } from '@/api/home/filter'
-import { asideMap } from '@/config/aside'
-import { useInfiniteScroll } from '@vueuse/core'
-import { debounce } from 'lodash-es'
-import { onMounted, reactive, ref } from 'vue'
-import type { FilterSearchParam } from '/#/api'
-import type { Filter, FilterEntity } from '/#/home'
+import { favorite, getConditionList, unfavorite } from "@/api/home/filter";
+import { asideMap } from "@/config/aside";
+import { useInfiniteScroll } from "@vueuse/core";
+import { debounce } from "lodash-es";
+import { onMounted, reactive, ref,watch } from "vue";
+import type { FilterSearchParam } from "/#/api";
+import type { Filter, FilterEntity } from "/#/home";
 
-defineOptions({ name: 'AdvanceFilter' })
+defineOptions({ name: "AdvanceFilter" });
 
 const props = defineProps({
   type: {
@@ -15,109 +15,115 @@ const props = defineProps({
     default: 0,
     required: true,
   },
-})
+});
 
 const emit = defineEmits<{
-  (e: 'show-filter'): void
-  (e: 'show-custom'): void
-  (e: 'update:search'): void
-  (e: 'select', id: string)
-}>()
-
-const data = ref<FilterEntity[]>([])
-let loading = false
-const canloadMore = true
-const el = ref<HTMLDivElement | null>(null)
-const popover = ref<ComponentRef | null>(null)
+  (e: "show-filter"): void;
+  (e: "show-custom"): void;
+  (e: "update:search"): void;
+  (e: "select", id: string);
+}>();
+
+const data = ref<FilterEntity[]>([]);
+let loading = false;
+const canloadMore = true;
+const el = ref<HTMLDivElement | null>(null);
+const popover = ref<ComponentRef | null>(null);
 const pagination = reactive({
   pageNo: 1,
   pageSize: 300,
-})
-const keyword = ref('')
+});
+const keyword = ref("");
 
 onMounted(() => {
   // data.value = generateDefaultConfig()
-})
+});
 
 // 默认的过滤配置
 function generateDefaultConfig(): FilterEntity[] {
   return Object.keys(asideMap).reduce((acc, key) => {
-    const { label, defaultValue, isDefaultFilter } = asideMap[key]
+    const { label, defaultValue, isDefaultFilter } = asideMap[key];
 
     if (isDefaultFilter === true) {
       const config = {
-        id: '',
+        id: "",
         name: label,
         favorite: false,
         isDefaultFilter,
-        filterList: [{
-          key,
-          value: defaultValue,
-        }],
-      }
-      return [...acc, config]
-    }
-    else {
-      return acc
+        filterList: [
+          {
+            key,
+            value: defaultValue,
+          },
+        ],
+      };
+      return [...acc, config];
+    } else {
+      return acc;
     }
-  }, [])
+  }, []);
 }
 
 useInfiniteScroll(
   el as any,
   () => {
-    loadMore()
+    loadMore();
   },
-  { distance: 10, interval: 300, canLoadMore: () => false },
-)
+  { distance: 10, interval: 300, canLoadMore: () => false }
+);
+const showClick = ()=>{
+  console.log('showClick')
+  inputHandler('')
+}
 
 async function loadMore() {
-  if (loading || el.value == null)
-    return
+  if (loading || el.value == null) return;
 
-  const more = await featchList()
+  const more = await featchList();
 
-  if (more.length === 0)
-    return
+  if (more.length === 0) return;
 
-  data.value.push(...more)
+  data.value.push(...more);
 }
 
 async function featchList() {
-  loading = true
+  loading = true;
   try {
-    const searchParam: FilterSearchParam = { search_searchname: { value: keyword.value, op: 'like', type: 'string' } }
-    const result = await getConditionList(pagination, searchParam, props.type)
-    const { data } = result
+    const searchParam: FilterSearchParam = {
+      search_searchname: { value: keyword.value, op: "like", type: "string" },
+    };
+    const result = await getConditionList(pagination, searchParam, props.type);
+    const { data } = result;
     // pagination.pageNo += 1
     // canloadMore = pageCount >= pagination.pageNo
-    const entityList = generateFilterEntityList(data)
-    return entityList
-  }
-  catch (error) {
-    return []
-  }
-  finally {
-    loading = false
+    const entityList = generateFilterEntityList(data);
+    return entityList;
+  } catch (error) {
+    return [];
+  } finally {
+    loading = false;
   }
 }
 
 // 转换服务器数据格式
 function generateFilterEntityList(data) {
   const filterEntityList = data.map((item) => {
-    const { searchname, iztop, ocrUsersearchchildList, id } = item
+    const { searchname, iztop, ocrUsersearchchildList, id } = item;
 
     const list = ocrUsersearchchildList.map((item) => {
-      const { searchfield, searchvalue } = item
+      const { searchfield, searchvalue } = item;
 
       return {
         key: searchfield,
         value: searchvalue,
-      }
-    })
+      };
+    });
 
-    const reg = new RegExp(keyword.value, 'gi')
-    const hilightText = searchname.replace(reg, `<span style='color:#FF0000'>${keyword.value}</span>`)
+    const reg = new RegExp(keyword.value, "gi");
+    const hilightText = searchname.replace(
+      reg,
+      `<span style='color:#FF0000'>${keyword.value}</span>`
+    );
 
     return {
       id,
@@ -125,45 +131,45 @@ function generateFilterEntityList(data) {
       favorite: iztop,
       isDefaultFilter: false,
       filterList: list,
-    }
-  })
+    };
+  });
 
-  return filterEntityList
+  return filterEntityList;
 }
 
 function selectHandler(item: FilterEntity) {
-  (popover.value as any).setShow(false)
-  emit('select', item.id)
+  (popover.value as any).setShow(false);
+  emit("select", item.id);
 }
 
 const inputHandler = debounce((word) => {
-  keyword.value = word
+  keyword.value = word;
   featchList().then((list) => {
-    data.value = list
-  })
-}, 300)
+    data.value = list;
+  });
+}, 300);
 
 function favoriteHandler(event: MouseEvent, item: any) {
-  event.stopImmediatePropagation()
-  event.stopPropagation()
+  event.stopImmediatePropagation();
+  event.stopPropagation();
 
-  const { isDefaultFilter, id } = item
+  const { isDefaultFilter, id } = item;
 
   if (!isDefaultFilter) {
-    item.favorite = true
-    favorite(id)
+    item.favorite = true;
+    favorite(id);
   }
 }
 
 function unFavoriteHandler(event: MouseEvent, item) {
-  event.stopImmediatePropagation()
-  event.stopPropagation()
+  event.stopImmediatePropagation();
+  event.stopPropagation();
 
-  const { isDefaultFilter, id } = item
+  const { isDefaultFilter, id } = item;
 
   if (!isDefaultFilter) {
-    item.favorite = false
-    unfavorite(id)
+    item.favorite = false;
+    unfavorite(id);
   }
 }
 </script>
@@ -173,29 +179,58 @@ function unFavoriteHandler(event: MouseEvent, item) {
     <div class="wrapper-left">
       <svg-icon name="shield" size="32" />
       <n-popover
-        ref="popover" :style="{ padding: '0px' }" style="width: 248px" :show-arrow="false"
-        placement="bottom-start" trigger="click"
+        ref="popover"
+        :style="{ padding: '0px' }"
+        style="width: 248px"
+        :show-arrow="false"
+        placement="bottom-start"
+        trigger="click"
       >
         <template #trigger>
-          <div class="wrapper-left-dropdown">
+          <div class="wrapper-left-dropdown" @click="showClick">
             <span>高级筛选</span>
             <SvgIcon :style="{ marginLeft: '5px' }" name="down" size="14" />
           </div>
         </template>
         <n-spin :show="loading">
           <div class="wrapper-left-popover">
-            <n-input :style="{ '--n-border': '0px' }" placeholder="请输入关键字" @input="inputHandler">
+            <n-input
+              :style="{ '--n-border': '0px' }"
+              placeholder="请输入关键字"
+              @input="inputHandler"
+            >
               <template #prefix>
                 <SvgIcon size="14px" name="magnifying-1" />
               </template>
               <template #suffix>
-                <SvgIcon size="14px" style="cursor: pointer;" name="setting" @click="emit('show-filter')" />
+                <SvgIcon
+                  size="14px"
+                  style="cursor: pointer"
+                  name="setting"
+                  @click="emit('show-filter')"
+                />
               </template>
             </n-input>
             <ul ref="el" class="wrapper-left-list">
-              <li v-for="(item, index) in data" :key="index" style="display: flex;align-items: center;" @click="selectHandler(item)">
-                <SvgIcon v-if="item.favorite && !item.isDefaultFilter" name="favorite-fill" color="#fd9b0a" size="18" @click="unFavoriteHandler($event, item)" />
-                <SvgIcon v-else-if="!item.favorite && !item.isDefaultFilter" name="favorite-unfill" size="18" @click="favoriteHandler($event, item)" />
+              <li
+                v-for="(item, index) in data"
+                :key="index"
+                style="display: flex; align-items: center"
+                @click="selectHandler(item)"
+              >
+                <SvgIcon
+                  v-if="item.favorite && !item.isDefaultFilter"
+                  name="favorite-fill"
+                  color="#fd9b0a"
+                  size="18"
+                  @click="unFavoriteHandler($event, item)"
+                />
+                <SvgIcon
+                  v-else-if="!item.favorite && !item.isDefaultFilter"
+                  name="favorite-unfill"
+                  size="18"
+                  @click="favoriteHandler($event, item)"
+                />
                 <div v-html="item.name" />
               </li>
             </ul>
@@ -204,8 +239,18 @@ function unFavoriteHandler(event: MouseEvent, item) {
       </n-popover>
     </div>
     <div class="wrapper-right">
-      <SvgIcon style="display: block;cursor: pointer;" size="18" name="magnifying-1" @click="emit('update:search')" />
-      <SvgIcon style="display: block;cursor: pointer;margin-left: 10px;" size="18" name="filter" @click="emit('show-custom')" />
+      <SvgIcon
+        style="display: block; cursor: pointer"
+        size="18"
+        name="magnifying-1"
+        @click="emit('update:search')"
+      />
+      <SvgIcon
+        style="display: block; cursor: pointer; margin-left: 10px"
+        size="18"
+        name="filter"
+        @click="emit('show-custom')"
+      />
     </div>
   </div>
 </template>
@@ -243,7 +288,7 @@ function unFavoriteHandler(event: MouseEvent, item) {
       scrollbar-width: none; /* firefox */
       -ms-overflow-style: none; /* IE 10+ */
 
-      &::-webkit-scrollbar{
+      &::-webkit-scrollbar {
         display: none;
       }
 
diff --git a/src/views/task/aside/Aside.vue b/src/views/task/aside/Aside.vue
index 1753057..7ac8ab7 100644
--- a/src/views/task/aside/Aside.vue
+++ b/src/views/task/aside/Aside.vue
@@ -1,13 +1,18 @@
 <script lang="ts" setup>
 import { useTaskStore } from "@/store/modules/task";
 import { debounce } from "lodash-es";
-import { computed, onMounted, ref, unref, watch } from "vue";
+import { computed, onMounted, ref, unref, watch,shallowRef } from "vue";
 import CustomFieldModal from "../modal/CustomFieldModal.vue";
+import type { AsideEntity } from '@/config/aside'
 
 import { useUser } from "@/store/modules/user";
 import { getAllfieldList, getfieldList, savefield } from "@/api/home/filter";
 
 import TaskList from "./TaskList.vue";
+import AdvanceFilter from '../../home/aside/comp/AdvanceFilter.vue'
+
+import emitter from '@/utils/mitt'
+
 
 const CustomFieldModalRef = ref(null);
 const collapse = ref(false);
@@ -110,6 +115,30 @@ async function getshowFieldList() {
 onMounted(() => {
   getshowFieldList();
 });
+
+// 滚动容器，让key对应模块处于可视区域
+function scrollHandler(key: string) {
+  const element = document.querySelector(`#${key}`)
+  element?.scrollIntoView(true)
+}
+// 选择某个过滤配置，刷新图片墙
+function filterHandler(searchId: string) {
+  emitter.emit('filter', searchId)
+}
+function showModal(modalRef: any) {
+  const modal = unref(modalRef)! as any
+  modal.showModal()
+}
+// 当前显示的模块，按照数组顺序显示
+const showItems = shallowRef<{ key: string, config: AsideEntity }[]>([])
+const filterModalRef = ref(null)
+const newFilterModalRef = ref(null)
+const customModalRef = ref(null)
+function editFilter(filter: any) {
+  const modal = unref(newFilterModalRef)! as any
+  modal.showModal()
+  modal.edit(filter)
+}
 </script>
 
 <template>
@@ -125,7 +154,7 @@ onMounted(() => {
       </div>
     </div>
     <div class="aside-header">
-      <div v-show="!showSearch" class="warpper">
+      <!-- <div v-show="!showSearch" class="warpper">
         <div class="left">
           <svg-icon name="all-worksheet" size="32" />
           <span style="margin-left: 8px">所有请求</span>
@@ -144,7 +173,13 @@ onMounted(() => {
             @click="showFilter"
           />
         </div>
-      </div>
+      </div> -->
+      <!-- 高级筛选 -->
+      <AdvanceFilter
+          v-show="!showSearch" :type="2" @select="filterHandler" @update:search="setShowSearch(true)"
+          @show-custom="showModal(customModalRef)" @show-filter="showModal(filterModalRef)"
+        />
+
       <div v-show="showSearch" class="warpper">
         <n-input
           style="flex: 1; height: 32px"
@@ -162,6 +197,7 @@ onMounted(() => {
           @click="setShowSearch(false)"
         />
       </div>
+    
     </div>
     <TaskList
       ref="taskListRef"

From c490172e4e3b12cfd1e699c46b255ea89002519f Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Thu, 21 Mar 2024 13:29:47 +0800
Subject: [PATCH 4/6] =?UTF-8?q?feat:=20=E6=89=80=E6=9C=89=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E9=80=89=E9=A1=B9=E6=A1=86=E6=96=B0=E5=A2=9E=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/comp/NewFilterModal.vue             | 8 ++++----
 src/views/final/comp/RejectModal.vue                | 4 ++--
 src/views/home/aside/comp/items/IzCustomlevel.vue   | 2 +-
 src/views/home/aside/comp/items/IzCustomname.vue    | 2 +-
 src/views/home/aside/comp/items/IzCustomtype.vue    | 2 +-
 src/views/home/aside/comp/items/IzCustomtypes.vue   | 2 +-
 src/views/home/aside/comp/items/IzProduct.vue       | 2 +-
 src/views/home/aside/comp/items/IzProject.vue       | 2 +-
 src/views/home/aside/comp/items/IzProjecttype.vue   | 2 +-
 src/views/home/aside/comp/items/IzSearch.vue        | 2 +-
 src/views/home/aside/comp/items/IzSearchManager.vue | 2 +-
 src/views/home/aside/comp/items/IzShow.vue          | 2 +-
 src/views/home/aside/comp/items/IzStatus.vue        | 2 +-
 src/views/home/aside/comp/items/IzVisitcity.vue     | 2 +-
 src/views/home/aside/comp/items/Izfiled17.vue       | 2 +-
 src/views/home/aside/comp/items/Izfiled2.vue        | 2 +-
 src/views/home/aside/comp/items/Izfiled3.vue        | 2 +-
 src/views/home/aside/comp/items/Izfiled6.vue        | 2 +-
 src/views/home/aside/comp/items/Izfirm.vue          | 2 +-
 src/views/home/aside/comp/items/Iztaskrrom.vue      | 2 +-
 src/views/home/aside/comp/items/Iztaskstatus.vue    | 2 +-
 src/views/home/aside/comp/items/Izvisitpro.vue      | 2 +-
 src/views/home/aside/comp/items/Plan.vue            | 2 +-
 src/views/home/aside/comp/items/ReportUser.vue      | 3 ++-
 src/views/home/aside/comp/modals/NewFilterModal.vue | 8 ++++----
 src/views/task/modal/ConfrimModal.vue               | 4 ++--
 src/views/worksheet/modal/ConfrimModal.vue          | 2 +-
 27 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/src/views/final/comp/NewFilterModal.vue b/src/views/final/comp/NewFilterModal.vue
index 68ecf26..2b35613 100644
--- a/src/views/final/comp/NewFilterModal.vue
+++ b/src/views/final/comp/NewFilterModal.vue
@@ -270,16 +270,16 @@ defineExpose({
               <n-input v-model:value="formValue.name" :style="{ width: '780px' }" @keydown.enter.prevent />
             </n-form-item>
             <n-form-item path="logic" label="逻辑关系">
-              <n-select v-model:value="formValue.logic" placeholder="请选择逻辑关系" :options="logicOptions" />
+              <n-select filterable v-model:value="formValue.logic" placeholder="请选择逻辑关系" :options="logicOptions" />
             </n-form-item>
             <n-form-item
               v-for="(item, index) in formValue.conditions" :key="index" :style="formItemStyle"
               path="conditions" :label="formLabel(index)"
             >
-              <n-select
+              <n-select filterable
                 v-model:value="item.type" placeholder="请选择筛选项名称" :options="typeOptions"
               />
-              <n-select
+              <n-select filterable
                 v-model:value="item.operator" style="margin-left: 8px;" placeholder="请选择"
                 :options="operatorOptions"
               />
@@ -289,7 +289,7 @@ defineExpose({
                   clearable
                 />
               </n-space>
-              <n-select
+              <n-select filterable
                 v-else v-model:value="item.result" style="margin-left: 8px;" placeholder="请选择" :options="getOptions(item.type!)"
               />
               <n-button :style="noBorderInput" icon-placement="right" @click="removeCondition(index)">
diff --git a/src/views/final/comp/RejectModal.vue b/src/views/final/comp/RejectModal.vue
index 0b71c23..b852065 100644
--- a/src/views/final/comp/RejectModal.vue
+++ b/src/views/final/comp/RejectModal.vue
@@ -78,11 +78,11 @@ onBeforeMount(async () => {
         </div>
         <div class="wrapper-content">
           <span>处理方式</span>
-          <n-select v-model:value="selectBackId" style="margin-top: 10px;" :options="backOptions" />
+          <n-select filterable v-model:value="selectBackId" style="margin-top: 10px;" :options="backOptions" />
         </div>
         <div class="wrapper-content">
           <span>不通过原因</span>
-          <n-select v-model:value="selectRejectId" style="margin-top: 10px;" :options="reasonOptions" />
+          <n-select filterable v-model:value="selectRejectId" style="margin-top: 10px;" :options="reasonOptions" />
           <n-input v-show="showOther" v-model:value="otherValue" type="textarea" placeholder="备注内容" style="margin-top: 10px;" />
         </div>
       </div>
diff --git a/src/views/home/aside/comp/items/IzCustomlevel.vue b/src/views/home/aside/comp/items/IzCustomlevel.vue
index 3039c99..47ee014 100644
--- a/src/views/home/aside/comp/items/IzCustomlevel.vue
+++ b/src/views/home/aside/comp/items/IzCustomlevel.vue
@@ -45,7 +45,7 @@ function onChange(value: Array<string>) {
 <template>
   <n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
     <n-form-item :label="label" path="plans" :label-style="labStyle">
-      <n-select
+      <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择拜访客户级别" multiple
         :options="options" @update:value="onChange"
       />
diff --git a/src/views/home/aside/comp/items/IzCustomname.vue b/src/views/home/aside/comp/items/IzCustomname.vue
index 584d956..d1a4e9e 100644
--- a/src/views/home/aside/comp/items/IzCustomname.vue
+++ b/src/views/home/aside/comp/items/IzCustomname.vue
@@ -45,7 +45,7 @@ function onChange(value: Array<string>) {
 <template>
   <n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
     <n-form-item :label="label" path="plans" :label-style="labStyle">
-      <n-select
+      <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择拜访客户名称" multiple
         :options="options" @update:value="onChange"
       />
diff --git a/src/views/home/aside/comp/items/IzCustomtype.vue b/src/views/home/aside/comp/items/IzCustomtype.vue
index 332d518..0f4533b 100644
--- a/src/views/home/aside/comp/items/IzCustomtype.vue
+++ b/src/views/home/aside/comp/items/IzCustomtype.vue
@@ -45,7 +45,7 @@ function onChange(value: Array<string>) {
 <template>
   <n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
     <n-form-item :label="label" path="plans" :label-style="labStyle">
-      <n-select
+      <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择拜访客户类型" multiple
         :options="options" @update:value="onChange"
       />
diff --git a/src/views/home/aside/comp/items/IzCustomtypes.vue b/src/views/home/aside/comp/items/IzCustomtypes.vue
index a057cff..5baba2a 100644
--- a/src/views/home/aside/comp/items/IzCustomtypes.vue
+++ b/src/views/home/aside/comp/items/IzCustomtypes.vue
@@ -51,7 +51,7 @@ function onChange(value: Array<string>) {
 <template>
   <n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
     <n-form-item :label="label" path="plans" :label-style="labStyle">
-      <n-select
+      <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择izcustomtype" multiple
         :options="options" @update:value="onChange"
       />
diff --git a/src/views/home/aside/comp/items/IzProduct.vue b/src/views/home/aside/comp/items/IzProduct.vue
index 17ac7cf..2184b5a 100644
--- a/src/views/home/aside/comp/items/IzProduct.vue
+++ b/src/views/home/aside/comp/items/IzProduct.vue
@@ -45,7 +45,7 @@ function onChange(value: Array<string>) {
 <template>
   <n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
     <n-form-item :label="label" path="plans" :label-style="labStyle">
-      <n-select
+      <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择产品名称" multiple
         :options="options" @update:value="onChange"
       />
diff --git a/src/views/home/aside/comp/items/IzProject.vue b/src/views/home/aside/comp/items/IzProject.vue
index 3594529..5c9f3de 100644
--- a/src/views/home/aside/comp/items/IzProject.vue
+++ b/src/views/home/aside/comp/items/IzProject.vue
@@ -45,7 +45,7 @@ function onChange(value: Array<string>) {
 <template>
   <n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
     <n-form-item :label="label" path="plans" :label-style="labStyle">
-      <n-select
+      <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择所属项目" multiple
         :options="options" @update:value="onChange"
       />
diff --git a/src/views/home/aside/comp/items/IzProjecttype.vue b/src/views/home/aside/comp/items/IzProjecttype.vue
index fe97cc5..da321f2 100644
--- a/src/views/home/aside/comp/items/IzProjecttype.vue
+++ b/src/views/home/aside/comp/items/IzProjecttype.vue
@@ -45,7 +45,7 @@ function onChange(value: Array<string>) {
 <template>
   <n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
     <n-form-item :label="label" path="plans" :label-style="labStyle">
-      <n-select
+      <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择拜访项目类别" multiple
         :options="options" @update:value="onChange"
       />
diff --git a/src/views/home/aside/comp/items/IzSearch.vue b/src/views/home/aside/comp/items/IzSearch.vue
index ae2a3e2..8af0b99 100644
--- a/src/views/home/aside/comp/items/IzSearch.vue
+++ b/src/views/home/aside/comp/items/IzSearch.vue
@@ -51,7 +51,7 @@ function onChange(value: Array<string>) {
 <template>
   <n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
     <n-form-item :label="label" path="plans" :label-style="labStyle">
-      <n-select
+      <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择IzSearch" multiple
         :options="options" @update:value="onChange"
       />
diff --git a/src/views/home/aside/comp/items/IzSearchManager.vue b/src/views/home/aside/comp/items/IzSearchManager.vue
index 5c698e6..5f16e02 100644
--- a/src/views/home/aside/comp/items/IzSearchManager.vue
+++ b/src/views/home/aside/comp/items/IzSearchManager.vue
@@ -51,7 +51,7 @@ function onChange(value: Array<string>) {
 <template>
   <n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
     <n-form-item :label="label" path="plans" :label-style="labStyle">
-      <n-select
+      <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择IzSearchManager" multiple :options="options"
         @update:value="onChange"
       />
diff --git a/src/views/home/aside/comp/items/IzShow.vue b/src/views/home/aside/comp/items/IzShow.vue
index fe374ee..52b1e68 100644
--- a/src/views/home/aside/comp/items/IzShow.vue
+++ b/src/views/home/aside/comp/items/IzShow.vue
@@ -45,7 +45,7 @@ function onChange(value: Array<string>) {
 <template>
   <n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
     <n-form-item :label="label" path="plans" :label-style="labStyle">
-      <n-select
+      <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择分类" multiple :options="options"
         @update:value="onChange"
       />
diff --git a/src/views/home/aside/comp/items/IzStatus.vue b/src/views/home/aside/comp/items/IzStatus.vue
index 19ae003..84912c3 100644
--- a/src/views/home/aside/comp/items/IzStatus.vue
+++ b/src/views/home/aside/comp/items/IzStatus.vue
@@ -45,7 +45,7 @@ function onChange(value: Array<string>) {
 <template>
   <n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
     <n-form-item :label="label" path="plans" :label-style="labStyle">
-      <n-select
+      <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择审核状态" multiple
         :options="options" @update:value="onChange"
       />
diff --git a/src/views/home/aside/comp/items/IzVisitcity.vue b/src/views/home/aside/comp/items/IzVisitcity.vue
index 86e3fd9..27da07d 100644
--- a/src/views/home/aside/comp/items/IzVisitcity.vue
+++ b/src/views/home/aside/comp/items/IzVisitcity.vue
@@ -45,7 +45,7 @@ function onChange(value: Array<string>) {
 <template>
   <n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
     <n-form-item :label="label" path="plans" :label-style="labStyle">
-      <n-select
+      <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择发布地区" multiple
         :options="options" @update:value="onChange"
       />
diff --git a/src/views/home/aside/comp/items/Izfiled17.vue b/src/views/home/aside/comp/items/Izfiled17.vue
index 90ee99c..d0c3fea 100644
--- a/src/views/home/aside/comp/items/Izfiled17.vue
+++ b/src/views/home/aside/comp/items/Izfiled17.vue
@@ -51,7 +51,7 @@ function onChange(value: Array<string>) {
 <template>
   <n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
     <n-form-item :label="label" path="plans" :label-style="labStyle">
-      <n-select
+      <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择拜访项目类别" multiple
         :options="options" @update:value="onChange"
       />
diff --git a/src/views/home/aside/comp/items/Izfiled2.vue b/src/views/home/aside/comp/items/Izfiled2.vue
index d9e982e..9afd54f 100644
--- a/src/views/home/aside/comp/items/Izfiled2.vue
+++ b/src/views/home/aside/comp/items/Izfiled2.vue
@@ -51,7 +51,7 @@ function onChange(value: Array<string>) {
 <template>
   <n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
     <n-form-item :label="label" path="plans" :label-style="labStyle">
-      <n-select
+      <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择拜访客户类型" multiple
         :options="options" @update:value="onChange"
       />
diff --git a/src/views/home/aside/comp/items/Izfiled3.vue b/src/views/home/aside/comp/items/Izfiled3.vue
index 4c39065..290df05 100644
--- a/src/views/home/aside/comp/items/Izfiled3.vue
+++ b/src/views/home/aside/comp/items/Izfiled3.vue
@@ -51,7 +51,7 @@ function onChange(value: Array<string>) {
 <template>
   <n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
     <n-form-item :label="label" path="plans" :label-style="labStyle">
-      <n-select
+      <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择拜访客户名称" multiple
         :options="options" @update:value="onChange"
       />
diff --git a/src/views/home/aside/comp/items/Izfiled6.vue b/src/views/home/aside/comp/items/Izfiled6.vue
index 534ad11..c73f4eb 100644
--- a/src/views/home/aside/comp/items/Izfiled6.vue
+++ b/src/views/home/aside/comp/items/Izfiled6.vue
@@ -51,7 +51,7 @@ function onChange(value: Array<string>) {
 <template>
   <n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
     <n-form-item :label="label" path="plans" :label-style="labStyle">
-      <n-select
+      <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择拜访客户级别" multiple
         :options="options" @update:value="onChange"
       />
diff --git a/src/views/home/aside/comp/items/Izfirm.vue b/src/views/home/aside/comp/items/Izfirm.vue
index 71ae602..4fd09d4 100644
--- a/src/views/home/aside/comp/items/Izfirm.vue
+++ b/src/views/home/aside/comp/items/Izfirm.vue
@@ -45,7 +45,7 @@ function onChange(value: Array<string>) {
 <template>
   <n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
     <n-form-item :label="label" path="plans" :label-style="labStyle">
-      <n-select
+      <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择厂商" multiple
         :options="options" @update:value="onChange"
       />
diff --git a/src/views/home/aside/comp/items/Iztaskrrom.vue b/src/views/home/aside/comp/items/Iztaskrrom.vue
index dd2bf42..4d19625 100644
--- a/src/views/home/aside/comp/items/Iztaskrrom.vue
+++ b/src/views/home/aside/comp/items/Iztaskrrom.vue
@@ -45,7 +45,7 @@ function onChange(value: Array<string>) {
 <template>
   <n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
     <n-form-item :label="label" path="plans" :label-style="labStyle">
-      <n-select
+      <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择任务来源" multiple :options="options"
         @update:value="onChange"
       />
diff --git a/src/views/home/aside/comp/items/Iztaskstatus.vue b/src/views/home/aside/comp/items/Iztaskstatus.vue
index 8810cdb..fe1029f 100644
--- a/src/views/home/aside/comp/items/Iztaskstatus.vue
+++ b/src/views/home/aside/comp/items/Iztaskstatus.vue
@@ -45,7 +45,7 @@ function onChange(value: Array<string>) {
 <template>
   <n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
     <n-form-item :label="label" path="plans" :label-style="labStyle">
-      <n-select
+      <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择任务状态" multiple :options="options"
         @update:value="onChange"
       />
diff --git a/src/views/home/aside/comp/items/Izvisitpro.vue b/src/views/home/aside/comp/items/Izvisitpro.vue
index e1f3701..ba41a11 100644
--- a/src/views/home/aside/comp/items/Izvisitpro.vue
+++ b/src/views/home/aside/comp/items/Izvisitpro.vue
@@ -45,7 +45,7 @@ function onChange(value: Array<string>) {
 <template>
   <n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
     <n-form-item :label="label" path="plans" :label-style="labStyle">
-      <n-select
+      <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择省份" multiple :options="options"
         @update:value="onChange"
       />
diff --git a/src/views/home/aside/comp/items/Plan.vue b/src/views/home/aside/comp/items/Plan.vue
index 80bcda1..a877913 100644
--- a/src/views/home/aside/comp/items/Plan.vue
+++ b/src/views/home/aside/comp/items/Plan.vue
@@ -45,7 +45,7 @@ function onChange(value: Array<string>) {
 <template>
   <n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
     <n-form-item :label="label" path="plans" :label-style="labStyle">
-      <n-select
+      <n-select filterable
         v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择计划" multiple :options="planOptons"
         @update:value="onChange"
       />
diff --git a/src/views/home/aside/comp/items/ReportUser.vue b/src/views/home/aside/comp/items/ReportUser.vue
index 51da5d9..ba44abb 100644
--- a/src/views/home/aside/comp/items/ReportUser.vue
+++ b/src/views/home/aside/comp/items/ReportUser.vue
@@ -45,7 +45,8 @@ function onChange(value: Array<string>) {
 <template>
   <n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
     <n-form-item :label="label" path="users" :label-style="labStyle">
-      <n-select
+      <n-select filterable
+      
         v-model:value="formValue.users" :max-tag-count="2" multiple placeholder="请选择提报人(可多选)"
         :options="personOptions" @update:value="onChange"
       />
diff --git a/src/views/home/aside/comp/modals/NewFilterModal.vue b/src/views/home/aside/comp/modals/NewFilterModal.vue
index d7e5b5b..1a253ba 100644
--- a/src/views/home/aside/comp/modals/NewFilterModal.vue
+++ b/src/views/home/aside/comp/modals/NewFilterModal.vue
@@ -303,16 +303,16 @@ defineExpose({
               <n-input v-model:value="formValue.name" :style="{ width: '780px' }" @keydown.enter.prevent />
             </n-form-item>
             <n-form-item path="logic" label="逻辑关系">
-              <n-select v-model:value="formValue.logic" placeholder="请选择逻辑关系" :options="logicOptions" />
+              <n-select filterable v-model:value="formValue.logic" placeholder="请选择逻辑关系" :options="logicOptions" />
             </n-form-item>
             <n-form-item
               v-for="(item, index) in formValue.conditions" :key="index" :style="formItemStyle"
               path="conditions" :label="formLabel(index)"
             >
-              <n-select
+              <n-select filterable
                 v-model:value="item.type" placeholder="请选择筛选项名称" :options="typeOptions"
               />
-              <n-select
+              <n-select filterable
                 v-model:value="item.operator" style="margin-left: 8px;" placeholder="请选择"
                 :options="operatorOptions"
               />
@@ -322,7 +322,7 @@ defineExpose({
                   clearable
                 />
               </n-space>
-              <n-select
+              <n-select filterable
                 v-else v-model:value="item.result" style="margin-left: 8px;" placeholder="请选择" :options="getOptions(item.type!)"
               />
               <n-button :style="noBorderInput" icon-placement="right" @click="removeCondition(index)">
diff --git a/src/views/task/modal/ConfrimModal.vue b/src/views/task/modal/ConfrimModal.vue
index a60f02f..05bfc6e 100644
--- a/src/views/task/modal/ConfrimModal.vue
+++ b/src/views/task/modal/ConfrimModal.vue
@@ -86,11 +86,11 @@ async function selectChange(id){
         </div>
         <div class="wrapper-content">
           <span>处理方式</span>
-          <n-select v-model:value="selectBackId" style="margin-top: 10px;" :options="backOptions" />
+          <n-select filterable v-model:value="selectBackId" style="margin-top: 10px;" :options="backOptions" />
         </div>
         <div class="wrapper-content">
           <span>不通过原因</span>
-          <n-select v-model:value="selectRejectId" @change="selectChange" style="margin-top: 10px;" :options="reasonOptions" />
+          <n-select filterable v-model:value="selectRejectId" @change="selectChange" style="margin-top: 10px;" :options="reasonOptions" />
           <n-input v-show="showOther" v-model:value="otherValue" type="textarea" placeholder="备注内容" style="margin-top: 10px;" />
         </div>
 
diff --git a/src/views/worksheet/modal/ConfrimModal.vue b/src/views/worksheet/modal/ConfrimModal.vue
index 0873fc2..2d32de3 100644
--- a/src/views/worksheet/modal/ConfrimModal.vue
+++ b/src/views/worksheet/modal/ConfrimModal.vue
@@ -66,7 +66,7 @@ onBeforeMount(async () => {
         </div>
         <div class="wrapper-content">
           <span>判假原因</span>
-          <n-select v-model:value="selectId" style="margin-top: 10px;" :options="options" />
+          <n-select filterable v-model:value="selectId" style="margin-top: 10px;" :options="options" />
           <n-input v-show="showOther" v-model:value="otherValue" style="margin-top: 10px;" type="textarea" />
         </div>
       </div>

From 8940f6c5549031ba254316cbf50bca1c88a761b5 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Thu, 21 Mar 2024 13:37:00 +0800
Subject: [PATCH 5/6] =?UTF-8?q?feat:=20=E6=89=80=E6=9C=89=E7=9B=B8?=
 =?UTF-8?q?=E4=BC=BC=E5=BA=A6=E9=98=88=E5=80=BC=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/content/Content.vue      |   6 +
 src/views/worksheet/content/Content.vue | 590 +++++++++++++-----------
 2 files changed, 331 insertions(+), 265 deletions(-)

diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index a6acb86..2eac964 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -449,6 +449,12 @@ function sortHandler() {
           display: flex;
           align-items: center;
           justify-content: center;
+          font-size: 12px;
+          font-family: PingFang SC, PingFang SC-Semibold;
+          font-weight: Semibold;
+          text-align: left;
+          color: #ffffff;
+          line-height: 24px;
         }
       }
 
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index caa4195..84ea06f 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -1,77 +1,79 @@
 <script lang="ts" setup>
-import { computed, onUnmounted, onUpdated, reactive, ref, unref, watch } from 'vue'
-import { useDialog, useMessage } from 'naive-ui'
-import { clone, debounce, pickBy } from 'lodash-es'
-import { useInfiniteScroll } from '@vueuse/core'
-import imagesloaded from 'imagesloaded'
-import ConfrimModal from '../modal/ConfrimModal.vue'
-import type { PictureSortParam, SetTFParam } from '/#/api'
-import { useWorkOrder } from '@/store/modules/workOrder'
-import { clearTF, getPackageTaskList, getTaskDetailInfo, getTaskDetailPictureList, setTF } from '@/api/work/work'
-import { fieldMap } from '@/config/workorder'
-import { hideDownload } from '@/utils/image'
-import { isEmpty } from '@/utils'
-
-const batch = ref(false)
-const selectItems = ref<any[]>([])
-const message = useMessage()
-const dialog = useDialog()
-const totalCount = ref(0)
-let _imagesload: any
+import { computed, onUnmounted, onUpdated, reactive, ref, unref, watch } from "vue";
+import { useDialog, useMessage } from "naive-ui";
+import { clone, debounce, pickBy } from "lodash-es";
+import { useInfiniteScroll } from "@vueuse/core";
+import imagesloaded from "imagesloaded";
+import ConfrimModal from "../modal/ConfrimModal.vue";
+import type { PictureSortParam, SetTFParam } from "/#/api";
+import { useWorkOrder } from "@/store/modules/workOrder";
+import {
+  clearTF,
+  getPackageTaskList,
+  getTaskDetailInfo,
+  getTaskDetailPictureList,
+  setTF,
+} from "@/api/work/work";
+import { fieldMap } from "@/config/workorder";
+import { hideDownload } from "@/utils/image";
+import { isEmpty } from "@/utils";
+
+const batch = ref(false);
+const selectItems = ref<any[]>([]);
+const message = useMessage();
+const dialog = useDialog();
+const totalCount = ref(0);
+let _imagesload: any;
 
 function setBatch(value: boolean) {
-  batch.value = value
+  batch.value = value;
   if (value === false) {
-    selectItems.value.forEach(item => item.checked = false)
-    selectItems.value.length = 0
+    selectItems.value.forEach((item) => (item.checked = false));
+    selectItems.value.length = 0;
   }
 }
 
 function onCheckChange(checked: any, item: any) {
-  const index = selectItems.value.indexOf(item)
-  item.checked = checked
+  const index = selectItems.value.indexOf(item);
+  item.checked = checked;
 
-  if (index === -1 && checked)
-    selectItems.value.push(item)
-
-  else
-    selectItems.value.splice(index, 1)
+  if (index === -1 && checked) selectItems.value.push(item);
+  else selectItems.value.splice(index, 1);
 }
 
 const showActions = computed(() => {
-  return selectItems.value.length > 0 && batch
-})
+  return selectItems.value.length > 0 && batch;
+});
 
 const packagepagination = reactive({
   pageNo: 1,
   pageSize: 10,
-})
+});
 const taskpagination = reactive({
   pageNo: 1,
   pageSize: 10,
-})
+});
 const sortBy: PictureSortParam = {
-  orderbyname: 'asc',
-  orderbyvalue: 'pictureResult',
-}
-const workStore = useWorkOrder()
-const selectTask = ref<any>(null)
-const overTask = ref<any>(null)
-const taskList = ref<any[]>([])
-const taskDetailInfo = ref<any>({})
-const confrimModalRef = ref(null)
-const imageRef = ref<ComponentElRef | null>()
-const listData = ref<any[]>([])
-const loading = ref(false)
-const el = ref<HTMLDivElement | null>(null)
-
-let canloadMore = true
-
-let processItems: any[] = []
+  orderbyname: "asc",
+  orderbyvalue: "pictureResult",
+};
+const workStore = useWorkOrder();
+const selectTask = ref<any>(null);
+const overTask = ref<any>(null);
+const taskList = ref<any[]>([]);
+const taskDetailInfo = ref<any>({});
+const confrimModalRef = ref(null);
+const imageRef = ref<ComponentElRef | null>();
+const listData = ref<any[]>([]);
+const loading = ref(false);
+const el = ref<HTMLDivElement | null>(null);
+
+let canloadMore = true;
+
+let processItems: any[] = [];
 
 function validate(items: any[]) {
-  if (items.length === 0)
-    return '至少选中一个任务'
+  if (items.length === 0) return "至少选中一个任务";
 
   // for (const item of items) {
   //   const { iztrueorfalse, history, states } = item
@@ -85,304 +87,302 @@ function validate(items: any[]) {
   //     return '审批状态不合法'
   // }
 
-  return null
+  return null;
 }
 
 function falseHandler() {
-  let cloneItem: any
-  if (batch.value) { processItems = selectItems.value }
-  else if (overTask.value) {
-    cloneItem = clone(overTask.value)
-    processItems = [cloneItem]
+  let cloneItem: any;
+  if (batch.value) {
+    processItems = selectItems.value;
+  } else if (overTask.value) {
+    cloneItem = clone(overTask.value);
+    processItems = [cloneItem];
   }
-  const msg = validate(processItems)
+  const msg = validate(processItems);
 
   if (msg !== null) {
-    message.error(msg)
-    return
+    message.error(msg);
+    return;
   }
 
-  const modal = unref(confrimModalRef)! as any
-  modal.showModal()
+  const modal = unref(confrimModalRef)! as any;
+  modal.showModal();
 }
 
 function trueHandler() {
-  let cloneItem: any
-  if (batch.value) { processItems = selectItems.value }
-  else if (overTask.value) {
-    cloneItem = clone(overTask.value)
-    processItems = [cloneItem]
+  let cloneItem: any;
+  if (batch.value) {
+    processItems = selectItems.value;
+  } else if (overTask.value) {
+    cloneItem = clone(overTask.value);
+    processItems = [cloneItem];
   }
 
-  const msg = validate(processItems)
+  const msg = validate(processItems);
 
   if (msg !== null) {
-    message.error(msg)
-    return
+    message.error(msg);
+    return;
   }
 
   dialog.info({
-    title: '确认提示',
-    content: '确认给该任务图判真吗?',
-    positiveText: '确定',
-    negativeText: '取消',
+    title: "确认提示",
+    content: "确认给该任务图判真吗?",
+    positiveText: "确定",
+    negativeText: "取消",
     onPositiveClick: () => {
-      setTrue()
+      setTrue();
     },
-    onNegativeClick: () => { },
-  })
+    onNegativeClick: () => {},
+  });
 }
 
 function setTrue() {
-  const ids: any[] = processItems.map(item => item.id)
+  const ids: any[] = processItems.map((item) => item.id);
 
   const param: SetTFParam = {
-    taskchildpictureids: ids.join(','),
+    taskchildpictureids: ids.join(","),
     iztrueorfalse: 1,
     packageid: workStore.getActiveId,
-    judgeid: '0',
-  }
+    judgeid: "0",
+  };
 
-  doSetTF(param)
+  doSetTF(param);
 }
 
 function setFalse(id: string, desc: null | string) {
-  const ids: any[] = processItems.map(item => item.id)
+  const ids: any[] = processItems.map((item) => item.id);
 
   const param: SetTFParam = {
-    taskchildpictureids: ids.join(','),
+    taskchildpictureids: ids.join(","),
     iztrueorfalse: 0,
     packageid: workStore.getActiveId,
     judgeid: id,
-  }
+  };
 
-  if (desc)
-    param.judgedesc = desc
+  if (desc) param.judgedesc = desc;
 
-  doSetTF(param)
+  doSetTF(param);
 }
 
 function doSetTF(param: SetTFParam) {
   setTF(param).then((res) => {
-    const { code } = res
-    processItems.length = 0
-    if (code === 'OK')
-      updateList(param)
-    else
-      message.error(res.message)
-  })
+    const { code } = res;
+    processItems.length = 0;
+    if (code === "OK") updateList(param);
+    else message.error(res.message);
+  });
 }
 
 function updateList(param: SetTFParam) {
-  const list = listData.value
-  const ids = param.taskchildpictureids.split(',')
+  const list = listData.value;
+  const ids = param.taskchildpictureids.split(",");
 
   for (const item of list) {
-    if (ids.includes(item.id))
-      item.iztrueorfalse = param.iztrueorfalse
+    if (ids.includes(item.id)) item.iztrueorfalse = param.iztrueorfalse;
   }
 
   if (ids.includes(taskDetailInfo.value.id))
-    taskDetailInfo.value.iztrueorfalse = param.iztrueorfalse
+    taskDetailInfo.value.iztrueorfalse = param.iztrueorfalse;
 }
 
 function forwardHandler() {
-  workStore.forward()
+  workStore.forward();
 }
 
 function backHandler() {
-  workStore.back()
+  workStore.back();
 }
 
 function reset() {
-  taskpagination.pageNo = 0
-  taskpagination.pageSize = 20
-  listData.value.length = 0
-  loading.value = false
-  canloadMore = true
+  taskpagination.pageNo = 0;
+  taskpagination.pageSize = 20;
+  listData.value.length = 0;
+  loading.value = false;
+  canloadMore = true;
 }
 
 async function refreshHandler() {
-  reset()
+  reset();
 
   useInfiniteScroll(
     el as any,
     () => {
-      loadMore()
+      loadMore();
     },
-    { distance: 10, canLoadMore: () => canloadMore },
-  )
+    { distance: 10, canLoadMore: () => canloadMore }
+  );
 }
 
 async function loadMore() {
-  if (loading.value || el.value == null)
-    return
+  if (loading.value || el.value == null) return;
 
-  const more = await featchList()
-  listData.value.push(...more)
+  const more = await featchList();
+  listData.value.push(...more);
 }
 
 async function featchList() {
-  loading.value = true
+  loading.value = true;
   try {
-    taskpagination.pageNo += 1
-    const taskId = selectTask.value.id
-    const { data, total, pageCount } = await getTaskDetailPictureList(workStore.activeId, taskId, { ...taskpagination, ...sortBy })
-    totalCount.value = total
-    canloadMore = pageCount >= taskpagination.pageNo && pageCount > 0
-
-    return data
-  }
-  catch (error) {
-    canloadMore = false
-    return []
+    taskpagination.pageNo += 1;
+    const taskId = selectTask.value.id;
+    const { data, total, pageCount } = await getTaskDetailPictureList(
+      workStore.activeId,
+      taskId,
+      { ...taskpagination, ...sortBy }
+    );
+    totalCount.value = total;
+    canloadMore = pageCount >= taskpagination.pageNo && pageCount > 0;
+
+    return data;
+  } catch (error) {
+    canloadMore = false;
+    return [];
   }
 }
 
 const layout = debounce(() => {
-  if (el.value == null)
-    return
+  if (el.value == null) return;
 
-  _imagesload = imagesloaded('.grid-item')
+  _imagesload = imagesloaded(".grid-item");
 
-  _imagesload.on('done', (instance) => {
-    if (!el.value)
-      return
-    loading.value = false
-  })
+  _imagesload.on("done", (instance) => {
+    if (!el.value) return;
+    loading.value = false;
+  });
 
-  _imagesload.on('fail', (instance) => {
-    message.error('图片错误')
-    loading.value = false
-  })
-}, 300)
+  _imagesload.on("fail", (instance) => {
+    message.error("图片错误");
+    loading.value = false;
+  });
+}, 300);
 
 onUpdated(() => {
-  layout()
-})
-
-watch(() => workStore.activeId, async (newValue, oldValue) => {
-  const packageid = workStore.getActiveId
+  layout();
+});
+
+watch(
+  () => workStore.activeId,
+  async (newValue, oldValue) => {
+    const packageid = workStore.getActiveId;
+
+    if (isEmpty(packageid)) {
+      listData.value.length = 0;
+      totalCount.value = 0;
+      return;
+    }
 
-  if (isEmpty(packageid)) {
-    listData.value.length = 0
-    totalCount.value = 0
-    return
+    const res = await getPackageTaskList(newValue, packagepagination);
+    const { data } = res;
+    taskList.value = data;
+    if (taskList.value.length > 0) handleSelect(taskList.value[0]);
   }
-
-  const res = await getPackageTaskList(newValue, packagepagination)
-  const { data } = res
-  taskList.value = data
-  if (taskList.value.length > 0)
-    handleSelect(taskList.value[0])
-})
+);
 
 const packageName = computed(() => {
-  const index = workStore.getCurrentIndex
-  return workStore.getOrderList[index]?.packagename || ''
-})
+  const index = workStore.getCurrentIndex;
+  return workStore.getOrderList[index]?.packagename || "";
+});
 
 async function handleSelect(item: any) {
-  selectTask.value = item
-  const taskId = item.id
-  taskDetailInfo.value = await getTaskDetailInfo(taskId, workStore.activeId)
+  selectTask.value = item;
+  const taskId = item.id;
+  taskDetailInfo.value = await getTaskDetailInfo(taskId, workStore.activeId);
 
-  const packageid = workStore.getActiveId
+  const packageid = workStore.getActiveId;
 
   if (isEmpty(packageid)) {
-    listData.value.length = 0
-    totalCount.value = 0
-    return
+    listData.value.length = 0;
+    totalCount.value = 0;
+    return;
   }
 
-  refreshHandler()
+  refreshHandler();
 }
 
-async function sortHandler(orderby: 'pictureResult' | 'fromuptime') {
-  if (!selectTask.value)
-    return
+async function sortHandler(orderby: "pictureResult" | "fromuptime") {
+  if (!selectTask.value) return;
 
-  sortBy.orderbyvalue = orderby
-  sortBy.orderbyname = sortBy.orderbyname === 'asc' ? 'desc' : 'asc'
-  refreshHandler()
+  sortBy.orderbyvalue = orderby;
+  sortBy.orderbyname = sortBy.orderbyname === "asc" ? "desc" : "asc";
+  refreshHandler();
 }
 
 const propertys = computed(() => {
-  const { ocrPicture } = taskDetailInfo.value
+  const { ocrPicture } = taskDetailInfo.value;
   const v = pickBy(ocrPicture, (value, key: string) => {
-    return key.startsWith('field') && value !== null
-  })
-  return v
-})
+    return key.startsWith("field") && value !== null;
+  });
+  return v;
+});
 
 async function clearHandler() {
   dialog.info({
-    title: '确认提示',
-    content: '确认给该任务图片的标记印记吗?',
-    positiveText: '确定',
-    negativeText: '取消',
+    title: "确认提示",
+    content: "确认给该任务图片的标记印记吗?",
+    positiveText: "确定",
+    negativeText: "取消",
     onPositiveClick: () => {
-      clearMark()
+      clearMark();
     },
-    onNegativeClick: () => { },
-  })
+    onNegativeClick: () => {},
+  });
 }
 
 async function clearMark() {
-  const res = await clearTF(workStore.activeId, selectTask.value.id)
-  if (res.code === 'OK') {
-    taskDetailInfo.value.iztrueorfalse = null
-    message.info('清除标记成功')
+  const res = await clearTF(workStore.activeId, selectTask.value.id);
+  if (res.code === "OK") {
+    taskDetailInfo.value.iztrueorfalse = null;
+    message.info("清除标记成功");
+  } else {
+    message.error(res.message);
   }
-  else { message.error(res.message) }
 }
 
 function overTaskHandelr(item: any) {
-  if (validate([item]) == null && batch.value === false)
-    overTask.value = item
+  if (validate([item]) == null && batch.value === false) overTask.value = item;
 }
 
 function leaveTaskHandler() {
-  overTask.value = null
+  overTask.value = null;
 }
 
 onUnmounted(() => {
-  workStore.reset()
-})
+  workStore.reset();
+});
 
 function getPercent(pictureid: string) {
-  const { ocpictureid, pictureresult } = taskDetailInfo.value
-  const index = ocpictureid.split(',').indexOf(String(pictureid))
-  const results = pictureresult.split(',')
-  const percent = results[index] || '0'
-  const val = Math.floor(Number.parseFloat(percent))
-  return `${val}%`
+  const { ocpictureid, pictureresult } = taskDetailInfo.value;
+  const index = ocpictureid.split(",").indexOf(String(pictureid));
+  const results = pictureresult.split(",");
+  const percent = results[index] || "0";
+  const val = Math.floor(Number.parseFloat(percent));
+  return `${val}%`;
 }
 
 const mark = computed(() => {
-  return taskDetailInfo.value.iztrueorfalse === null ? '未标记' : '已标记'
-})
+  return taskDetailInfo.value.iztrueorfalse === null ? "未标记" : "已标记";
+});
 
 function immersionHandler() {
-  workStore.updateImmersion()
+  workStore.updateImmersion();
 }
 
 function showAction() {
-  const item = taskDetailInfo.value
-  if (batch.value === false)
-    overTask.value = item
+  const item = taskDetailInfo.value;
+  if (batch.value === false) overTask.value = item;
 }
 
 function hideAction() {
-  overTask.value = null
+  overTask.value = null;
 }
 
 function previewHandler(event: MouseEvent) {
-  event.stopImmediatePropagation()
-  event.stopPropagation()
+  event.stopImmediatePropagation();
+  event.stopPropagation();
 
   if (imageRef.value && (imageRef.value as any).src)
-    (imageRef.value as any).mergedOnClick()
+    (imageRef.value as any).mergedOnClick();
 }
 </script>
 
@@ -395,16 +395,21 @@ function previewHandler(event: MouseEvent) {
         <SvgIcon size="22" class="back" name="arrow-right" @click="forwardHandler" />
       </div>
       <div class="right">
-        <div v-show="!showActions" style="display: flex;align-items: center;">
+        <div v-show="!showActions" style="display: flex; align-items: center">
           <n-button text @click="clearHandler">
             <SvgIcon size="12" name="delete" />
             清除标记
           </n-button>
-          <div class="btn" style="margin: 0px 10px;" @click="setBatch(true)">
-            <SvgIcon style="margin-right: 6px;" size="14" name="tf" />
+          <div class="btn" style="margin: 0px 10px" @click="setBatch(true)">
+            <SvgIcon style="margin-right: 6px" size="14" name="tf" />
             辨别真假
           </div>
-          <SvgIcon style="cursor: pointer;" size="20" name="immersion-model" @click="immersionHandler" />
+          <SvgIcon
+            style="cursor: pointer"
+            size="20"
+            name="immersion-model"
+            @click="immersionHandler"
+          />
         </div>
 
         <div v-show="showActions" class="batch">
@@ -414,11 +419,11 @@ function previewHandler(event: MouseEvent) {
             </template>
             返回
           </n-button>
-          <div style="cursor: pointer;margin-left: 16px;" @click="falseHandler">
+          <div style="cursor: pointer; margin-left: 16px" @click="falseHandler">
             <SvgIcon width="64" height="28" name="t4" />
           </div>
           <SvgIcon size="24" name="vs" />
-          <div style="cursor: pointer;" @click="trueHandler">
+          <div style="cursor: pointer" @click="trueHandler">
             <SvgIcon width="64" height="28" name="t3" />
           </div>
         </div>
@@ -428,34 +433,60 @@ function previewHandler(event: MouseEvent) {
       <div ref="el" class="scroll">
         <div class="wrapper-detail">
           <div
-            class="left" :style="{ 'background-image': `url(${taskDetailInfo?.ocrPicture?.imgurl})` }"
-            @click="showAction" @mouseleave="leaveTaskHandler"
+            class="left"
+            :style="{ 'background-image': `url(${taskDetailInfo?.ocrPicture?.imgurl})` }"
+            @click="showAction"
+            @mouseleave="leaveTaskHandler"
           >
             <!-- 真假标记 -->
             <div class="mark">
-              <SvgIcon v-show="taskDetailInfo?.iztrueorfalse === 0" size="128" name="jia" />
+              <SvgIcon
+                v-show="taskDetailInfo?.iztrueorfalse === 0"
+                size="128"
+                name="jia"
+              />
             </div>
             <div class="mark">
-              <SvgIcon v-show="taskDetailInfo?.iztrueorfalse === 1" size="128" name="zhen" />
+              <SvgIcon
+                v-show="taskDetailInfo?.iztrueorfalse === 1"
+                size="128"
+                name="zhen"
+              />
             </div>
             <!-- 右下信息 -->
             <div class="info">
               <n-grid x-gap="16" y-gap="0" :cols="12">
                 <n-gi span="4">
-                  <span style="color:#8b8d8f;">
+                  <span style="color: #8b8d8f">
                     <SvgIcon name="m1" />
                   </span>
                 </n-gi>
-                <n-gi span="8" style="display: flex;align-items: left;flex-direction: column;justify-content: center;">
+                <n-gi
+                  span="8"
+                  style="
+                    display: flex;
+                    align-items: left;
+                    flex-direction: column;
+                    justify-content: center;
+                  "
+                >
                   <span>{{ mark }}</span>
                   <span>图片标记</span>
                 </n-gi>
                 <n-gi span="4">
-                  <span style="color:#8b8d8f;">
+                  <span style="color: #8b8d8f">
                     <SvgIcon name="m2" />
                   </span>
                 </n-gi>
-                <n-gi span="8" style="display: flex;align-items: left;flex-direction: column;justify-content: center;">
+                <n-gi
+                  span="8"
+                  style="
+                    display: flex;
+                    align-items: left;
+                    flex-direction: column;
+                    justify-content: center;
+                  "
+                >
                   <span>{{ totalCount }}</span>
                   <span>相似匹配</span>
                 </n-gi>
@@ -466,65 +497,88 @@ function previewHandler(event: MouseEvent) {
               <SvgIcon size="30" name="zoom-out" />
             </div>
             <!-- 预览大图组件 -->
-            <div style="display: none;">
+            <div style="display: none">
               <n-image
-                ref="imageRef" :img-props="{ onClick: hideDownload }"
+                ref="imageRef"
+                :img-props="{ onClick: hideDownload }"
                 :src="taskDetailInfo?.ocrPicture?.imgurl"
               />
             </div>
             <!-- 操作 -->
-            <div v-show="overTask && overTask.id === taskDetailInfo.id" class="action" @click.stop="hideAction">
-              <SvgIcon style="cursor: pointer;" name="t1" @click.stop="trueHandler" />
-              <SvgIcon style="cursor: pointer;margin-left: 30px;" name="t2" @click.stop="falseHandler" />
+            <div
+              v-show="overTask && overTask.id === taskDetailInfo.id"
+              class="action"
+              @click.stop="hideAction"
+            >
+              <SvgIcon style="cursor: pointer" name="t1" @click.stop="trueHandler" />
+              <SvgIcon
+                style="cursor: pointer; margin-left: 30px"
+                name="t2"
+                @click.stop="falseHandler"
+              />
             </div>
           </div>
           <div class="right">
-            <n-scrollbar style="max-height: 100%;">
+            <n-scrollbar style="max-height: 100%">
               <span class="name">图片名称</span>
               <div class="tags">
-                <div class="tag tag-actived">
-                  重复图片
-                </div>
-                <div class="tag">
-                  基线任务
-                </div>
+                <div class="tag tag-actived">重复图片</div>
+                <div class="tag">基线任务</div>
               </div>
               <n-divider />
               <div class="property">
-                <span class="property-name top" style="font-weight: bold;color: #333333;">拜访终端
+                <span class="property-name top" style="font-weight: bold; color: #333333"
+                  >拜访终端
                 </span>
-                <span style="font-weight: bold;color: #333333;font-size: 16px;">拜访终端</span>
+                <span style="font-weight: bold; color: #333333; font-size: 16px"
+                  >拜访终端</span
+                >
               </div>
-              <div v-for="(key) in Object.keys(propertys)" :key="key" class="property">
+              <div v-for="key in Object.keys(propertys)" :key="key" class="property">
                 <span class="property-name">{{ fieldMap[key] }}</span>
-                <span class="property-content ">{{ propertys[key] }}</span>
+                <span class="property-content">{{ propertys[key] }}</span>
               </div>
             </n-scrollbar>
           </div>
         </div>
-        <div style="display: flex;justify-content: space-between;padding: 12px 0px;">
-          <div><span style="font-size: 21px;font-weight: bold;">相似图片</span><span>({{ totalCount }})</span></div>
-          <div style="display: flex;align-items: center;">
-            <div style="cursor: pointer;" @click="sortHandler('fromuptime')">
+        <div style="display: flex; justify-content: space-between; padding: 12px 0px">
+          <div>
+            <span style="font-size: 21px; font-weight: bold">相似图片</span
+            ><span>({{ totalCount }})</span>
+          </div>
+          <div style="display: flex; align-items: center">
+            <div style="cursor: pointer" @click="sortHandler('fromuptime')">
               <span>按时间排序</span>
-              <SvgIcon style="margin-left: 8px;" name="sort" size="12" />
+              <SvgIcon style="margin-left: 8px" name="sort" size="12" />
             </div>
-            <div style="margin-left: 15px;cursor: pointer" @click="sortHandler('pictureResult')">
+            <div
+              style="margin-left: 15px; cursor: pointer"
+              @click="sortHandler('pictureResult')"
+            >
               <span>相似度排序</span>
-              <SvgIcon style="margin-left: 8px;" name="sort" size="12" />
+              <SvgIcon style="margin-left: 8px" name="sort" size="12" />
             </div>
           </div>
         </div>
         <div class="wrapper-list">
           <div
-            v-for="(item, index) in listData" :key="index" :class="{ 'item-selected': item === selectTask }"
-            class="grid-item" @click="handleSelect(item)" @mouseover="overTaskHandelr(item)"
+            v-for="(item, index) in listData"
+            :key="index"
+            :class="{ 'item-selected': item === selectTask }"
+            class="grid-item"
+            @click="handleSelect(item)"
+            @mouseover="overTaskHandelr(item)"
             @mouseleave="leaveTaskHandler"
           >
-            <div class="img-wrapper" :style="{ 'background-image': `url(${item.thumburl})` }" />
+            <div
+              class="img-wrapper"
+              :style="{ 'background-image': `url(${item.thumburl})` }"
+            />
             <div class="check">
               <n-checkbox
-                v-show="batch" v-model:checked="item.checked" @click.stop
+                v-show="batch"
+                v-model:checked="item.checked"
+                @click.stop
                 @update:checked="onCheckChange($event, item)"
               />
             </div>
@@ -541,8 +595,8 @@ function previewHandler(event: MouseEvent) {
               <SvgIcon v-show="item.iztrueorfalse === 1" name="zhen" />
             </div>
             <div v-show="overTask && overTask.id === item.id" class="action">
-              <SvgIcon style="cursor: pointer;" name="t1" @click.stop="trueHandler" />
-              <SvgIcon style="cursor: pointer;" name="t2" @click.stop="falseHandler" />
+              <SvgIcon style="cursor: pointer" name="t1" @click.stop="trueHandler" />
+              <SvgIcon style="cursor: pointer" name="t2" @click.stop="falseHandler" />
             </div>
           </div>
         </div>
@@ -560,7 +614,7 @@ function previewHandler(event: MouseEvent) {
   box-sizing: border-box;
   margin-left: 16px;
   padding: 16px 16px 0px 16px;
-  background: #FFF;
+  background: #fff;
   border-radius: 3px;
   border: 1px solid rgb(239, 239, 245);
 
@@ -573,7 +627,7 @@ function previewHandler(event: MouseEvent) {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    background: #FFF;
+    background: #fff;
     box-sizing: border-box;
     border-radius: 3px;
     margin-bottom: 16px;
@@ -604,11 +658,11 @@ function previewHandler(event: MouseEvent) {
         height: 36px;
         background: linear-gradient(135deg, #5b85f8, #3c6cf0);
         border-radius: 17px;
-        box-shadow: 0px 2px 6px 0px rgba(116, 153, 253, 0.30);
+        box-shadow: 0px 2px 6px 0px rgba(116, 153, 253, 0.3);
         display: flex;
         align-items: center;
         justify-content: center;
-        color: #FFF;
+        color: #fff;
         cursor: pointer;
       }
 
@@ -629,7 +683,7 @@ function previewHandler(event: MouseEvent) {
 
   &-detail {
     display: flex;
-    height: calc((100vh - 88px - 72px)/2);
+    height: calc((100vh - 88px - 72px) / 2);
 
     .left {
       flex: 1;
@@ -728,8 +782,8 @@ function previewHandler(event: MouseEvent) {
       }
 
       .tag-actived {
-        color: #FE9800;
-        border: 1px solid #FE9800;
+        color: #fe9800;
+        border: 1px solid #fe9800;
       }
 
       .property {
@@ -749,7 +803,7 @@ function previewHandler(event: MouseEvent) {
           position: absolute;
           left: 72px;
           top: 4px;
-          content: '';
+          content: "";
           width: 1px;
           height: 12px;
           background: #979797;
@@ -772,7 +826,7 @@ function previewHandler(event: MouseEvent) {
 
     .item-selected {
       box-shadow: 0px 2px 8px 0px rgba(0, 65, 207, 0.28);
-      background-color: #FFF;
+      background-color: #fff;
     }
 
     .grid-item {
@@ -804,7 +858,7 @@ function previewHandler(event: MouseEvent) {
         z-index: 3;
         right: 12px;
         top: 2px;
-        color: #FFF;
+        color: #fff;
 
         .val {
           position: absolute;
@@ -816,6 +870,12 @@ function previewHandler(event: MouseEvent) {
           display: flex;
           align-items: center;
           justify-content: center;
+          font-size: 12px;
+          font-family: PingFang SC, PingFang SC-Semibold;
+          font-weight: Semibold;
+          text-align: left;
+          color: #ffffff;
+          line-height: 24px;
         }
       }
 

From 4b64a4c25fed5847eb279b537cf615666841c464 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Thu, 21 Mar 2024 15:05:20 +0800
Subject: [PATCH 6/6] =?UTF-8?q?feat:=20=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E6=96=B0=E5=A2=9E=E6=82=AC=E6=B5=AE=E5=90=8E=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E5=AE=A1=E6=89=B9=E6=9D=A1=E4=BB=B6=E8=8B=A5=E5=B7=B2?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=88=99=E4=B8=8D=E5=B1=95=E7=A4=BA=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/content/Content.vue      |  2 +-
 src/views/task/aside/ListItem.vue       |  2 +-
 src/views/task/content/Content.vue      |  5 +++++
 src/views/worksheet/aside/ListItem.vue  |  2 +-
 src/views/worksheet/content/Content.vue | 15 +++++++++++++++
 5 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 2eac964..e9dce18 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -23,7 +23,7 @@ let _masonry: null | Masonry = null
 let _imagesload: any
 const masonryRef = ref<ComponentRef>(null)
 const el = ref<HTMLDivElement | null>(null)
-const viewMode = ref('masonry')
+const viewMode = ref('tile')
 const pagination = reactive({
   pageNo: 0,
   pageSize: 30,
diff --git a/src/views/task/aside/ListItem.vue b/src/views/task/aside/ListItem.vue
index bd0d1ee..309b87b 100644
--- a/src/views/task/aside/ListItem.vue
+++ b/src/views/task/aside/ListItem.vue
@@ -39,7 +39,7 @@ const svgName = computed(() => {
             任务ID:{{ listItem.fromtaskname }}
           </span>
         </div>
-        <SvgIcon v-show="selected" size="14" name="more-ver" />
+        <!-- <SvgIcon v-show="selected" size="14" name="more-ver" /> -->
       </div>
       <ul class="list-item-detail" v-else>
         <li v-if="item.id == 'statshisText'">
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index d4f690b..172647b 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -238,6 +238,7 @@ watch(
     if (isEmpty(taskId))
       return
     taskDetailInfo.value = await getTaskDetailInfo(taskId, packageid)
+    console.log(taskDetailInfo.value,'taskDetailInfo')
     getTableData()
     // TODO mock备份 确认逻辑无误后删除
     // let showFieldData = taskDetailInfo.value.ocrPicture;
@@ -282,6 +283,10 @@ const currentTaskId = computed(() => {
 
 function overTaskHandle() {
   const item = taskDetailInfo.value
+  if(item?.userapprove?.statshis == 2 || item?.userapprove?.statshis == 3){
+    overTask.value = null;
+    return
+  }
 
   if (validate([item]) == null && batch.value === false)
     overTask.value = item
diff --git a/src/views/worksheet/aside/ListItem.vue b/src/views/worksheet/aside/ListItem.vue
index de8de02..4a6d623 100644
--- a/src/views/worksheet/aside/ListItem.vue
+++ b/src/views/worksheet/aside/ListItem.vue
@@ -39,7 +39,7 @@ const svgName = computed(() => {
           </span>
           <span class="list-item-header-selected">({{ listItem.pictureno }})</span>
         </div>
-        <SvgIcon v-show="selected" size="14" name="more-ver" />
+        <!-- <SvgIcon v-show="selected" size="14" name="more-ver" /> -->
       </div>
       <ul class="list-item-detail" v-else>
         <li>
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 84ea06f..2856fa2 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -7,6 +7,7 @@ import imagesloaded from "imagesloaded";
 import ConfrimModal from "../modal/ConfrimModal.vue";
 import type { PictureSortParam, SetTFParam } from "/#/api";
 import { useWorkOrder } from "@/store/modules/workOrder";
+import { formatToDateHMS } from '@/utils/dateUtil'
 import {
   clearTF,
   getPackageTaskList,
@@ -453,6 +454,10 @@ function previewHandler(event: MouseEvent) {
                 name="zhen"
               />
             </div>
+            <div class="time">
+          <SvgIcon color="#FFF" size="16" name="time" />
+          <span>{{ formatToDateHMS(taskDetailInfo.createdate || 0) }}</span>
+        </div>
             <!-- 右下信息 -->
             <div class="info">
               <n-grid x-gap="16" y-gap="0" :cols="12">
@@ -916,4 +921,14 @@ function previewHandler(event: MouseEvent) {
   margin-top: 12px;
   margin-bottom: 12px;
 }
+
+.time {
+        position: absolute;
+        z-index: 3;
+        left: 2%;
+        bottom: 2%;
+        color: #fff;
+        display: flex;
+        align-items: center;
+      }
 </style>