From 37441ceec6ff8c7481660339be7d47f920cf56ae Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Fri, 29 Mar 2024 11:53:54 +0800
Subject: [PATCH 001/143] =?UTF-8?q?feat:=20=E7=BB=BC=E5=90=88=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=A8=A1=E6=9D=BF=E5=8E=BB=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 patches/naive-ui+2.38.1.patch                | 91 ++++++++++++++++++++
 src/components/Search/Search.vue             |  2 +-
 src/layout/components/Header/SearchModal.vue |  2 +-
 3 files changed, 93 insertions(+), 2 deletions(-)

diff --git a/patches/naive-ui+2.38.1.patch b/patches/naive-ui+2.38.1.patch
index 8748dc4..83ce776 100644
--- a/patches/naive-ui+2.38.1.patch
+++ b/patches/naive-ui+2.38.1.patch
@@ -27,6 +27,29 @@ index 3aacec9..a63ab54 100644
              key: "controlled-success",
              class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--success`
            }, feedbackNodes) : h("div", {
+diff --git a/node_modules/naive-ui/es/modal/src/Modal.mjs b/node_modules/naive-ui/es/modal/src/Modal.mjs
+index 9508b72..63f417b 100644
+--- a/node_modules/naive-ui/es/modal/src/Modal.mjs
++++ b/node_modules/naive-ui/es/modal/src/Modal.mjs
+@@ -13,6 +13,10 @@ import { modalInjectionKey, modalProviderInjectionKey } from "./interface.mjs";
+ import style from "./styles/index.cssr.mjs";
+ export const modalProps = Object.assign(Object.assign(Object.assign(Object.assign({}, useTheme.props), {
+   show: Boolean,
++  showMask: {
++    type: Boolean,
++    default: true
++  },
+   unstableShowMask: {
+     type: Boolean,
+     default: true
+@@ -309,6 +313,7 @@ export default defineComponent({
+                   "aria-hidden": true,
+                   ref: "containerRef",
+                   class: `${mergedClsPrefix}-modal-mask`,
++                  style: this.showMask ? '' :  {background:'none'},
+                   onClick: this.handleClickoutside
+                 }) : null;
+               }
 diff --git a/node_modules/naive-ui/es/pagination/src/Pagination.mjs b/node_modules/naive-ui/es/pagination/src/Pagination.mjs
 index 5bd975b..e1c6ebc 100644
 --- a/node_modules/naive-ui/es/pagination/src/Pagination.mjs
@@ -161,3 +184,71 @@ index 4f47aad..6dae078 100644
                          });
                      }
                  }))) : null));
+diff --git a/node_modules/naive-ui/lib/modal/src/Modal.js b/node_modules/naive-ui/lib/modal/src/Modal.js
+index 47f6ac2..801e8e7 100644
+--- a/node_modules/naive-ui/lib/modal/src/Modal.js
++++ b/node_modules/naive-ui/lib/modal/src/Modal.js
+@@ -17,7 +17,11 @@ const presetProps_1 = require("./presetProps");
+ const BodyWrapper_1 = __importDefault(require("./BodyWrapper"));
+ const interface_1 = require("./interface");
+ const index_cssr_1 = __importDefault(require("./styles/index.cssr"));
+-exports.modalProps = Object.assign(Object.assign(Object.assign(Object.assign({}, _mixins_1.useTheme.props), { show: Boolean, unstableShowMask: {
++exports.modalProps = Object.assign(Object.assign(Object.assign(Object.assign({}, _mixins_1.useTheme.props), {
++    show: Boolean, showMask: {
++        type: Boolean,
++        default: true,
++    }, unstableShowMask: {
+         type: Boolean,
+         default: true
+     }, maskClosable: {
+@@ -38,7 +42,8 @@ exports.modalProps = Object.assign(Object.assign(Object.assign(Object.assign({},
+     }, closeOnEsc: {
+         type: Boolean,
+         default: true
+-    }, blockScroll: { type: Boolean, default: true } }), presetProps_1.presetProps), { 
++    }, blockScroll: { type: Boolean, default: true }
++}), presetProps_1.presetProps), {
+     // events
+     onEsc: Function, 'onUpdate:show': [Function, Array], onUpdateShow: [Function, Array], onAfterEnter: Function, onBeforeLeave: Function, onAfterLeave: Function, onClose: Function, onPositiveClick: Function, onNegativeClick: Function, onMaskClick: Function,
+     // private
+@@ -47,7 +52,8 @@ exports.modalProps = Object.assign(Object.assign(Object.assign(Object.assign({},
+         default: undefined
+     },
+     // deprecated
+-    overlayStyle: [String, Object], onBeforeHide: Function, onAfterHide: Function, onHide: Function });
++    overlayStyle: [String, Object], onBeforeHide: Function, onAfterHide: Function, onHide: Function
++});
+ exports.default = (0, vue_1.defineComponent)({
+     name: 'Modal',
+     inheritAttrs: false,
+@@ -226,21 +232,25 @@ exports.default = (0, vue_1.defineComponent)({
+                 var _a;
+                 (_a = this.onRender) === null || _a === void 0 ? void 0 : _a.call(this);
+                 const { unstableShowMask } = this;
+-                return (0, vue_1.withDirectives)((0, vue_1.h)("div", { role: "none", ref: "containerRef", class: [
++                return (0, vue_1.withDirectives)((0, vue_1.h)("div", {
++                    role: "none", ref: "containerRef", class: [
+                         `${mergedClsPrefix}-modal-container`,
+                         this.themeClass,
+                         this.namespace
+-                    ], style: this.cssVars },
+-                    (0, vue_1.h)(BodyWrapper_1.default, Object.assign({ style: this.overlayStyle }, this.$attrs, { ref: "bodyWrapper", displayDirective: this.displayDirective, show: this.show, preset: this.preset, autoFocus: this.autoFocus, trapFocus: this.trapFocus, blockScroll: this.blockScroll }, this.presetProps, { onEsc: this.handleEsc, onClose: this.handleCloseClick, onNegativeClick: this.handleNegativeClick, onPositiveClick: this.handlePositiveClick, onBeforeLeave: this.handleBeforeLeave, onAfterEnter: this.onAfterEnter, onAfterLeave: this.handleAfterLeave, onClickoutside: unstableShowMask ? undefined : this.handleClickoutside, renderMask: unstableShowMask
++                    ], style: this.cssVars
++                },
++                    (0, vue_1.h)(BodyWrapper_1.default, Object.assign({ style: this.overlayStyle }, this.$attrs, { ref: "bodyWrapper", displayDirective: this.displayDirective, show: this.show, preset: this.preset, autoFocus: this.autoFocus, trapFocus: this.trapFocus, blockScroll: this.blockScroll }, this.presetProps, {
++                        onEsc: this.handleEsc, onClose: this.handleCloseClick, onNegativeClick: this.handleNegativeClick, onPositiveClick: this.handlePositiveClick, onBeforeLeave: this.handleBeforeLeave, onAfterEnter: this.onAfterEnter, onAfterLeave: this.handleAfterLeave, onClickoutside: unstableShowMask ? undefined : this.handleClickoutside, renderMask: unstableShowMask
+                             ? () => {
+                                 var _a;
+                                 return ((0, vue_1.h)(vue_1.Transition, { name: "fade-in-transition", key: "mask", appear: (_a = this.internalAppear) !== null && _a !== void 0 ? _a : this.isMounted }, {
+                                     default: () => {
+-                                        return this.show ? ((0, vue_1.h)("div", { "aria-hidden": true, ref: "containerRef", class: `${mergedClsPrefix}-modal-mask`, onClick: this.handleClickoutside })) : null;
++                                        return this.show ? ((0, vue_1.h)("div", { "aria-hidden": true, ref: "containerRef", class: `${mergedClsPrefix}-modal-mask` ,style:this.showMask ? '' : {background:'none'}, onClick: this.handleClickoutside })) : null;
+                                     }
+                                 }));
+                             }
+-                            : undefined }), this.$slots)), [
++                            : undefined
++                    }), this.$slots)), [
+                     [
+                         vdirs_1.zindexable,
+                         {
diff --git a/src/components/Search/Search.vue b/src/components/Search/Search.vue
index b628761..ebd6294 100644
--- a/src/components/Search/Search.vue
+++ b/src/components/Search/Search.vue
@@ -115,7 +115,7 @@ function highlightText(text, query) {
         <div class="list_title">
           历史搜索
         </div>
-        <div class="history-list flex">
+        <div class="flex history-list">
           <div class="tag-wrap">
             <div v-for="(item, index) of historyList" :key="index" class="tag" @click="handlerHistory(item.historyname)">
               {{ item.historyname }}
diff --git a/src/layout/components/Header/SearchModal.vue b/src/layout/components/Header/SearchModal.vue
index 9f45470..729194a 100644
--- a/src/layout/components/Header/SearchModal.vue
+++ b/src/layout/components/Header/SearchModal.vue
@@ -14,7 +14,7 @@ defineExpose({
 
 <template>
   <div>
-    <n-modal v-model:show="show" :mask="false" transform-origin="center">
+    <n-modal v-model:show="show" :mask="false" :showMask="false" transform-origin="center">
       <Search @close="show = false" />
     </n-modal>
   </div>
-- 
2.39.3


From 19a53076c03d4ac98de4b8c304418f2244cd87ee Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Fri, 29 Mar 2024 13:35:38 +0800
Subject: [PATCH 002/143] =?UTF-8?q?=E4=B8=8D=E9=80=9A=E8=BF=87=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/task/task.ts                  |   5 +-
 src/components/Approval/NotPassed.vue | 228 ++++++++++++++------------
 src/store/modules/dictonary.ts        |   2 +-
 src/views/task/content/Content.vue    |  40 ++---
 4 files changed, 149 insertions(+), 126 deletions(-)

diff --git a/src/api/task/task.ts b/src/api/task/task.ts
index 8692465..5dc1654 100644
--- a/src/api/task/task.ts
+++ b/src/api/task/task.ts
@@ -25,12 +25,11 @@ export async function getApprovalList(page: PageParam) {
  * 审核
  * @param param
  */
-export async function audit(params: ApprovalParam) {
+export async function audit(params) {
   return http.request({
     url: `/flow/task/completeBatchFlow?`,
     method: 'post',
-    params: qs.stringify(params, { indices: false }),
-    headers: { 'Content-Type': ContentTypeEnum.FORM_DATA },
+    params,
   })
 }
 
diff --git a/src/components/Approval/NotPassed.vue b/src/components/Approval/NotPassed.vue
index baef5f7..e2d4031 100644
--- a/src/components/Approval/NotPassed.vue
+++ b/src/components/Approval/NotPassed.vue
@@ -1,19 +1,20 @@
 <script lang="ts" setup>
-import { computed, onBeforeMount, reactive, ref, toRefs, unref } from 'vue'
-import { useDialog, useMessage } from 'naive-ui'
+import { computed, onBeforeMount, reactive, ref } from 'vue'
+import { useMessage } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
 import { audit } from '@/api/task/task'
 
 const emit = defineEmits<{
-  (e: 'commit', rejectId: any, backId: any, isOther: boolean)
+  (e: 'success')
 }>()
 const message = useMessage()
+const loading = ref(false)
 
 const dictonaryStore = useDictionary()
 const state: any = reactive({
-  detail: {},
+  idItemList: [],
 })
-const { detail } = toRefs(state)
+const formRef = ref()
 const show = ref(false)
 const cardStyle = {
   'width': '520px',
@@ -21,9 +22,23 @@ const cardStyle = {
   '--n-padding-left': '0px',
 }
 
+const rules = {
+  disposeTypeId: [
+    { required: true, message: '请选择处理方式', trigger: 'blur' },
+  ],
+  failCauseId: [
+    { required: true, message: '请选择不通过原因', trigger: 'blur' },
+  ],
+}
+
+const formData = reactive({
+  disposeTypeId: '',
+  failCauseId: '',
+  comment: '',
+})
+
 function showModal(value) {
-  console.log(value)
-  state.detail = value
+  state.idItemList = value
   show.value = true
 }
 
@@ -35,60 +50,75 @@ defineExpose({
   showModal,
 })
 
-const backOptions = ref<any[]>([])
-const reasonOptions = ref<any[]>([])
-const selectBackId = ref(null)
-const selectRejectId = ref(null)
+const disposeOptions = ref<any[]>([]) // 处理方式
+const failCauseOptions = ref<any[]>([]) // 不通过原因
 const selectItem = ref(null)
-const otherValue = ref(null)
-const showOther = computed(() => {
-  return (selectItem.value as any)?.label === '其他'
-})
-
-const comomitValue = computed(() => {
-  return (selectItem.value as any)?.label === '其他' ? otherValue.value : selectRejectId.value
-})
-
-async function handleSumbit(e: MouseEvent) {
-  e.preventDefault()
-
-  // selectRejectId.value === 'other'
-  // emit('commit', unref(comomitValue), unref(selectBackId), showOther.value)
-  console.log(state.detail)
-  console.log(comomitValue)
-  const param = {
-    formid: [state.detail.id],
-    taskId: ['66b06dda-e673-11ee-a934-0242bc74e4f3'],
-    approvd: false,
-    taskComment: comomitValue.value,
-    taskname: showOther.value ? state.detail.detail.tasks : ['其他'],
-  }
-  audit(param).then((res) => {
-    const { code } = res
-    if (code === 'OK')
-      closeModal()
-    else message.error(res.message)
-  })
-}
 
 onBeforeMount(async () => {
   const rejectList = await dictonaryStore.fetchTFList()
   const backList = await dictonaryStore.fetchBackList()
 
-  reasonOptions.value = rejectList
-  backOptions.value = backList
+  failCauseOptions.value = rejectList
+  disposeOptions.value = backList
+})
 
-  // TODO 删除此项 通过name=其他 判断
-  // 添加其他选项
-  // reasonOptions.value.push({
-  //   label: '其他',
-  //   value: 'other',
-  // })
+const showOther = computed(() => {
+  const failCauseItem = failCauseOptions.value.find(item => item.value === formData.failCauseId)
+  return failCauseItem?.label === '其他'
 })
+/*
+ * 需要的参数字段结构
+ * [{
+ *    id: ''
+ *    taskId:''
+ *    fromTaskName: ''
+*  }]
+*/
+async function handleSumbit(e: MouseEvent) {
+  e.preventDefault()
+  formRef.value.validate(async (errors) => {
+    if (!errors) {
+      try {
+        const list: any = []
+        state.idItemList.forEach((item) => {
+          list.push({
+            formId: item.id,
+            taskId: item.taskId,
+            taskName: item.fromTaskName,
+          })
+        })
+        const disposeTypeItem = disposeOptions.value.find(item => item.value === formData.disposeTypeId)
+        const failCauseItem = failCauseOptions.value.find(item => item.value === formData.failCauseId)
+
+        const param = {
+          result: false,
+          comment: showOther.value ? formData.comment : '',
+          disposeType: disposeTypeItem.label,
+          disposeTypeId: formData.disposeTypeId,
+          failCauseId: formData.failCauseId,
+          failCauseName: failCauseItem.label,
+          flowTaskInfoList: list,
+        }
+
+        audit(param).then((res) => {
+          const { code } = res
+          if (code === 'OK') {
+            message.success('审核成功')
+            emit('success')
+            closeModal()
+          }
+          else { message.error(res.message) }
+        })
+      }
+      finally {
+        loading.value = false
+      }
+    }
+  })
+}
 
 async function selectChange(id) {
-  console.log(id, 'selectChange')
-  selectItem.value = reasonOptions.value.find(v => v.id == id)
+  selectItem.value = failCauseOptions.value.find(v => v.id === id)
 }
 </script>
 
@@ -98,27 +128,33 @@ async function selectChange(id) {
       <div class="wrapper">
         <div class="wrapper-header">
           <span class="wrapper-left">选择不通过原因</span>
-          <div class="wrapper-right">
-            <div class="wrapper-right-close" @pointerdown="closeModal">
-              <div class="wrapper-right-icon" />
-            </div>
-          </div>
-        </div>
-        <div class="wrapper-content">
-          <span>处理方式</span>
-          <n-select v-model:value="selectBackId" filterable style="margin-top: 10px;" :options="backOptions" />
-        </div>
-        <div class="wrapper-content">
-          <span>不通过原因</span>
-          <n-select v-model:value="selectRejectId" filterable style="margin-top: 10px;" :options="reasonOptions" @change="selectChange" />
-          <n-input v-show="showOther" v-model:value="otherValue" type="textarea" placeholder="备注内容" style="margin-top: 10px;" />
+          <SvgIcon
+            size="22"
+            class="icon"
+            name="close-none-border"
+            @click="closeModal"
+          />
         </div>
-
-        <!-- <div class="wrapper-content">
-          <n-input
-          type="textarea"
-          placeholder="备注内容" v-model="showOther"></n-input>
-        </div> -->
+        <n-form
+          ref="formRef"
+          size="large"
+          :model="formData"
+          :rules="rules"
+          require-mark-placement="left"
+        >
+          <div class="wrapper-content">
+            <n-form-item class="form-item" label="处理方式" path="disposeTypeId">
+              <n-select v-model:value="formData.disposeTypeId" filterable :options="disposeOptions" />
+            </n-form-item>
+
+            <n-form-item class="form-item" label="不通过原因" path="failCauseId">
+              <n-select v-model:value="formData.failCauseId" filterable :options="failCauseOptions" @change="selectChange" />
+            </n-form-item>
+            <n-form-item v-show="showOther" class="form-item-area" label="" path="">
+              <n-input v-model:value="formData.comment" type="textarea" placeholder="备注内容" />
+            </n-form-item>
+          </div>
+        </n-form>
       </div>
       <template #footer>
         <div class="wrapper-footer">
@@ -140,49 +176,31 @@ async function selectChange(id) {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    padding: 10px;
+    height: 56px;
+    border-bottom: 0.5px solid #d9d9d9;
+    padding: 0 24px
   }
 
   &-left {
-    font-weight: bold;
-    font-size: 16px;
+    font-size: 18px;
+    font-family: PingFang SC, PingFang SC-Medium;
+    font-weight: 500;
+    color: #333333;
   }
 
-  &-right {
-    &-close {
-      width: 18px;
-      height: 18px;
-      cursor: pointer;
-    }
-
-    &-icon {
-      background: #000;
-      display: inline-block;
-      width: 18px;
-      height: 1px;
-      transform: rotate(45deg);
-      -webkit-transform: rotate(45deg);
-      margin-bottom: 8px;
-
-      &:after {
-        content: '';
-        display: block;
-        width: 18px;
-        height: 1px;
-        background: #000;
-        transform: rotate(-90deg);
-        -webkit-transform: rotate(-90deg);
-      }
-    }
+  .icon{
+    cursor: pointer;
   }
 
   &-content {
-    padding: 18px 10px;
+    padding: 24px;
   }
 
   &-footer {
     display: flex;
     justify-content: flex-end;
+    padding-right: 24px;
+    padding-bottom: 10px;
   }
 
   &-info {
@@ -199,10 +217,14 @@ async function selectChange(id) {
       position: absolute;
     }
   }
+
+  .form-item-area{
+    margin-top: -30px;
+  }
 }
 
-::v-deep(.n-card.n-card--content-segmented > .n-card__content:not(:first-child)) {
-  border: 0px;
+::v-deep(.n-card__content) {
+  padding: 0!important;
 }
 
 ::v-deep(.n-card > .n-card-header) {
diff --git a/src/store/modules/dictonary.ts b/src/store/modules/dictonary.ts
index a206445..e54fb1b 100644
--- a/src/store/modules/dictonary.ts
+++ b/src/store/modules/dictonary.ts
@@ -216,7 +216,7 @@ export const useDictionaryStore = defineStore({
     // 退回方式
     async fetchBackList() {
       const list = await getBackList()
-      this.backList = generateOptions(list, 'codeno', 'name')
+      this.backList = generateOptions2(list)
       return this.backList
     },
     // 退回方式
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index c976bdc..cad5a84 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -15,7 +15,6 @@ import { isEmpty } from '@/utils'
 import { formatToDateHMS } from '@/utils/dateUtil'
 import { hideDownload } from '@/utils/image'
 import emitter from '@/utils/mitt'
-import ConfrimModal from '../modal/ConfrimModal.vue'
 import CustomSettingModal from '../modal/CustomSettingModal.vue'
 import PictureTable from './PictureTable.vue'
 import TaskTable from './TaskTable.vue'
@@ -154,27 +153,27 @@ function approvalHandler(items?: any) {
 }
 
 function rejectHandler(items?: any) {
-  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]
+  // }
 
-  if (items !== undefined && !(items instanceof PointerEvent))
-    processItems = items
+  // if (items !== undefined && !(items instanceof PointerEvent))
+  //   processItems = items
 
-  const msg = validate(processItems)
+  // const msg = validate(processItems)
 
-  if (msg !== null) {
-    message.error(msg)
-    return
-  }
+  // if (msg !== null) {
+  //   message.error(msg)
+  //   return
+  // }
 
   const modal = unref(notPassModalRef)! as any
-  modal.showModal()
+  modal.showModal(selectItems.value)
 }
 
 function approval() {
@@ -343,6 +342,10 @@ function previewHandler(event: MouseEvent) {
   if (imageRef.value && (imageRef.value as any).src)
     (imageRef.value as any).mergedOnClick()
 }
+
+function reloadList() {
+  getImgList()
+}
 </script>
 
 <template>
@@ -589,8 +592,7 @@ function previewHandler(event: MouseEvent) {
         <History :data="taskDetailInfo" />
       </n-tab-pane>
     </n-tabs>
-    <NotPassed />
-    <ConfrimModal ref="notPassModalRef" @commit="reject" />
+    <NotPassed ref="notPassModalRef" @success="reloadList" />
     <BatchModal
       ref="batchModalRef"
       @reject="rejectHandler"
-- 
2.39.3


From 8b175cadf34b981eb6d6f75920a209bc3060be27 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Fri, 29 Mar 2024 13:41:54 +0800
Subject: [PATCH 003/143] =?UTF-8?q?fix:=20=E7=99=BB=E5=BD=95=E5=90=8E?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5=E6=9C=89=E6=9D=83=E9=99=90=E7=9A=84=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2,=E8=B0=83=E6=95=B4=E8=8F=9C=E5=8D=95=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Menu/index.vue |  2 +-
 src/views/login/components/Login.vue | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/layout/components/Menu/index.vue b/src/layout/components/Menu/index.vue
index e665776..a1eda0d 100644
--- a/src/layout/components/Menu/index.vue
+++ b/src/layout/components/Menu/index.vue
@@ -62,7 +62,7 @@ export default defineComponent({
             path: item.resUrl,
             name: item.resKey,
             svgname: item.icon,
-            svgsize: 32,
+            svgsize: item.resUrl == "/home" ? 60 : 22,
             title: item.name,
           };
           return v;
diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue
index 62a7681..4c019b6 100644
--- a/src/views/login/components/Login.vue
+++ b/src/views/login/components/Login.vue
@@ -152,7 +152,6 @@ const rules = {
 
 function handleSubmit(e) {
   e.preventDefault();
-  console.log(formRef.value,'formRef')
   loginSuccess.value = true;
   formRef.value.validate(async (errors) => {
     if (!errors) {
@@ -165,7 +164,6 @@ function handleSubmit(e) {
         codetoken: userStore.getCapToken,
         agentcode: enterprisecode,
       };
-
       try {
         const { code, message: msg } = await userStore.login(params);
         loginRejectMessge.value = msg;
@@ -177,11 +175,11 @@ function handleSubmit(e) {
             localStorage.removeItem("LOGIN_FORM_PASS");
           }
           loginSuccess.value = true;
-          await userStore.getInformation();
+          const userInfo =  await userStore.getInformation();
           message.destroyAll();
           const toPath = decodeURIComponent((route.query?.redirect || "/") as string);
           message.success("登录成功，即将进入系统");
-          if (route.name === LOGIN_NAME) router.replace("/");
+          if (route.name === LOGIN_NAME) router.replace(userInfo.frontmenuTList[0]['resUrl']);
           else router.replace(toPath);
         } else {
           loginSuccess.value = false;
@@ -245,11 +243,11 @@ function handleSmsSubmit(e) {
           loginSuccess.value = true;
           // const { code, message: msg } = await userStore.login(params)
           await userStore.setStorageToken(res.data);
-          await userStore.getInformation();
+          const userInfo =  await userStore.getInformation();
           message.destroyAll();
           const toPath = decodeURIComponent((route.query?.redirect || "/") as string);
           message.success("登录成功，即将进入系统");
-          if (route.name === LOGIN_NAME) router.replace("/");
+          if (route.name === LOGIN_NAME) router.replace(userInfo.frontmenuTList[0]['resUrl']);
           else router.replace(toPath);
         } else {
           message.destroyAll();
-- 
2.39.3


From 6b61f93599dc9af3a9e057029dd0e1d0077b0f91 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Fri, 29 Mar 2024 14:07:00 +0800
Subject: [PATCH 004/143] =?UTF-8?q?feat:=20=E7=99=BB=E5=BD=95=E4=B8=8E?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=9D=83=E9=99=90=E8=81=94=E8=B0=83=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/components/Login.vue | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue
index 4c019b6..2e4d5a9 100644
--- a/src/views/login/components/Login.vue
+++ b/src/views/login/components/Login.vue
@@ -175,11 +175,14 @@ function handleSubmit(e) {
             localStorage.removeItem("LOGIN_FORM_PASS");
           }
           loginSuccess.value = true;
-          const userInfo =  await userStore.getInformation();
+          const { data: userInfo } = await userStore.getInformation();
           message.destroyAll();
           const toPath = decodeURIComponent((route.query?.redirect || "/") as string);
           message.success("登录成功，即将进入系统");
-          if (route.name === LOGIN_NAME) router.replace(userInfo.frontmenuTList[0]['resUrl']);
+          if (route.name === LOGIN_NAME)
+            router.replace(
+              userInfo.frontmenuTList ? userInfo.frontmenuTList[0]["resUrl"] : "/"
+            );
           else router.replace(toPath);
         } else {
           loginSuccess.value = false;
@@ -243,11 +246,14 @@ function handleSmsSubmit(e) {
           loginSuccess.value = true;
           // const { code, message: msg } = await userStore.login(params)
           await userStore.setStorageToken(res.data);
-          const userInfo =  await userStore.getInformation();
+          const { data: userInfo } = await userStore.getInformation();
           message.destroyAll();
           const toPath = decodeURIComponent((route.query?.redirect || "/") as string);
           message.success("登录成功，即将进入系统");
-          if (route.name === LOGIN_NAME) router.replace(userInfo.frontmenuTList[0]['resUrl']);
+          if (route.name === LOGIN_NAME)
+            router.replace(
+              userInfo.frontmenuTList ? userInfo.frontmenuTList[0]["resUrl"] : "/"
+            );
           else router.replace(toPath);
         } else {
           message.destroyAll();
-- 
2.39.3


From b07da2616cec6088bd7eed27c310bf17c27548db Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Fri, 29 Mar 2024 14:19:43 +0800
Subject: [PATCH 005/143] =?UTF-8?q?feat:=20=E8=8F=9C=E5=8D=95=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E6=82=AC=E6=B5=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Menu/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/layout/components/Menu/index.vue b/src/layout/components/Menu/index.vue
index a1eda0d..0ecf5f8 100644
--- a/src/layout/components/Menu/index.vue
+++ b/src/layout/components/Menu/index.vue
@@ -54,16 +54,16 @@ export default defineComponent({
                 : "",
             icon: undefined,
             key: item.resKey,
-            label: item.name,
+            label: item.description,
             meta: {
-              title: item.name,
+              title: item.description,
               permissions: [item.resKey],
             },
             path: item.resUrl,
             name: item.resKey,
             svgname: item.icon,
             svgsize: item.resUrl == "/home" ? 60 : 22,
-            title: item.name,
+            title: item.description,
           };
           return v;
         });
-- 
2.39.3


From 83dcc8400ebd17f881366658d085342edbacb075 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Fri, 29 Mar 2024 15:39:40 +0800
Subject: [PATCH 006/143] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E7=9B=B8?=
 =?UTF-8?q?=E4=BC=BC=E5=9B=BE=E7=89=87=E6=80=BB=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/aside/ListItem.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/worksheet/aside/ListItem.vue b/src/views/worksheet/aside/ListItem.vue
index b9b4b06..10dac90 100644
--- a/src/views/worksheet/aside/ListItem.vue
+++ b/src/views/worksheet/aside/ListItem.vue
@@ -46,6 +46,7 @@ onMounted(async () => {
           <SvgIcon :name="svgName" size="28" />
           <span class="list-item-header-name" :class="{ 'list-item-header-selected': selected }">
             {{ listItem.name }}
+            <span class="list-item-header-selected">({{ listItem.pictureCount }})</span>
           </span>
         </div>
       </div>
-- 
2.39.3


From f6aefd96fad2e0f2fe5d6072a0735504aada226e Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Fri, 29 Mar 2024 15:44:27 +0800
Subject: [PATCH 007/143] =?UTF-8?q?feat:=20=E6=89=80=E6=9C=89=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E8=B7=B3=E8=BD=AC=E6=B7=BB=E5=8A=A0=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/FilterModal.vue             | 2 +-
 src/views/final/comp/RepeatTaskTableModal.vue    | 2 +-
 src/views/final/content/Content.vue              | 2 +-
 src/views/home/aside/comp/modals/FilterModal.vue | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/final/comp/FilterModal.vue b/src/views/final/comp/FilterModal.vue
index 749f695..7923eaa 100644
--- a/src/views/final/comp/FilterModal.vue
+++ b/src/views/final/comp/FilterModal.vue
@@ -194,7 +194,7 @@ function deleteSelection() {
 
 async function handlePageChange(currentPage) {
   if (loading.value) return;
-
+  pagination.page = currentPage;
   const { pageSize } = pagination;
   await query(currentPage, pageSize);
 }
diff --git a/src/views/final/comp/RepeatTaskTableModal.vue b/src/views/final/comp/RepeatTaskTableModal.vue
index 1a6d42a..d0f6d99 100644
--- a/src/views/final/comp/RepeatTaskTableModal.vue
+++ b/src/views/final/comp/RepeatTaskTableModal.vue
@@ -148,7 +148,7 @@ async function query(page: number, pageSize: number) {
 
 async function handlePageChange(currentPage) {
   if (loading.value) return;
-
+  pagination.page = currentPage;
   const { pageSize } = pagination;
   await query(currentPage, pageSize);
 }
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index 20624e6..d0b8596 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -419,8 +419,8 @@ async function query(page: number, pageSize: number, filterId?: any) {
 
 async function handlePageChange(currentPage) {
   if (loading.value) return;
-
   const { pageSize } = pagination;
+  pagination.page = currentPage;
   await query(currentPage, pageSize);
 }
 async function handlePageSizeChange(currentPageSize) {
diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue
index 2296008..5bb7cf9 100644
--- a/src/views/home/aside/comp/modals/FilterModal.vue
+++ b/src/views/home/aside/comp/modals/FilterModal.vue
@@ -186,7 +186,7 @@ function deleteSelection() {
 
 async function handlePageChange(currentPage) {
   if (loading.value) return;
-
+  pagination.page = currentPage;
   const { pageSize } = pagination;
   await query(currentPage, pageSize);
 }
-- 
2.39.3


From 656ea3b2b410ca483f06b6625a2fd37d097bf83e Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Fri, 29 Mar 2024 16:27:23 +0800
Subject: [PATCH 008/143] =?UTF-8?q?feat:=20bug2786=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/components/Forget.vue | 101 +++++++++++++++++++++++---
 1 file changed, 92 insertions(+), 9 deletions(-)

diff --git a/src/views/login/components/Forget.vue b/src/views/login/components/Forget.vue
index 3137f70..5588ac0 100644
--- a/src/views/login/components/Forget.vue
+++ b/src/views/login/components/Forget.vue
@@ -50,14 +50,86 @@ const formSure: FormSure = reactive({
   loginname: "13311111111",
 });
 const tab = ref(0);
+const loginSuccess = ref(true);
+const loginRejectMessge = ref("");
 const countTime = ref("获取验证码");
 const rules = {
-  enterprisecode: { required: true, message: "请输入企业编码", trigger: "blur" },
-  agentcode: { required: true, message: "请输入企业编码", trigger: "blur" },
-  loginname: { required: true, message: "请输入用户名", trigger: "blur" },
-  phone: { required: true, message: "请输入手机号", trigger: "blur" },
+  enterprisecode: [
+    { required: true, message: "请输入企业编码", trigger: "blur" },
+    {
+      trigger: ["blur", "input", "change"],
+      level: "error",
+      validator(_rule, value) {
+        if (loginSuccess.value || !value) {
+          return true;
+        }
+        if (loginRejectMessge.value.indexOf("企业") > -1) {
+          return new Error(loginRejectMessge.value);
+        }
+      },
+    },
+  ],
+  agentcode: [
+    { required: true, message: "请输入企业编码", trigger: "blur" },
+    {
+      trigger: ["blur", "input", "change"],
+      level: "error",
+      validator(_rule, value) {
+        if (loginSuccess.value || !value) {
+          return true;
+        }
+        if (loginRejectMessge.value.indexOf("企业") > -1) {
+          return new Error(loginRejectMessge.value);
+        }
+      },
+    },
+  ],
+  loginname: [
+    { required: true, message: "请输入用户名", trigger: "blur" },
+    {
+      trigger: ["blur", "input", "change"],
+      level: "error",
+      validator(_rule, value) {
+        if (loginSuccess.value || !value) {
+          return true;
+        }
+        if (loginRejectMessge.value.indexOf("用户名") > -1) {
+          return new Error(loginRejectMessge.value);
+        }
+      },
+    },
+  ],
+  phone: [
+    { required: true, message: "请输入手机号", trigger: "blur" },
+    {
+      trigger: ["blur", "input", "change"],
+      level: "error",
+      validator(_rule, value) {
+        if (loginSuccess.value || !value) {
+          return true;
+        }
+        if (loginRejectMessge.value.indexOf("手机号") > -1) {
+          return new Error(loginRejectMessge.value);
+        }
+      },
+    },
+  ],
   password: { required: true, message: "请输入密码", trigger: "blur" },
-  phonecode: { required: true, message: "请输入验证码", trigger: "blur" },
+  phonecode: [
+    { required: true, message: "请输入验证码", trigger: "blur" },
+    {
+      trigger: ["blur", "input", "change"],
+      level: "error",
+      validator(_rule, value) {
+        if (loginSuccess.value || !value) {
+          return true;
+        }
+        if (loginRejectMessge.value.indexOf("验证码") > -1) {
+          return new Error(loginRejectMessge.value);
+        }
+      },
+    },
+  ],
   newPassword: { required: true, message: "请输入新密码", trigger: "blur" },
   rePasswrod: [
     {
@@ -74,35 +146,46 @@ const rules = {
 };
 
 function validatePasswordSame(rule: any, value: string): boolean {
-  return value === formSure.newPassword;
+  if (Boolean(formSure.rePasswrod)) {
+    if (value == formSure.newPassword) {
+      return true;
+    } else {
+      return false;
+    }
+  } else {
+    return true;
+  }
 }
 
 function handleSubmit(e) {
   e.preventDefault();
+  loginSuccess.value = true;
   formRef.value.validate(async (errors) => {
     if (!errors) {
       const { loginname, phone, phonecode, agentcode } = formForget;
       loading.value = true;
-
       const params = {
         loginname,
         phone,
         phonecode,
         agentcode,
       };
-
       try {
         const res = await forgetPassword(params);
         if (res.code === "OK") {
+          loginSuccess.value = true;
           formSure.loginname = res.data?.loginname;
           tab.value = 1;
         } else {
+          loginSuccess.value = false;
           message.error(res.message);
+          loginRejectMessge.value = res.message;
+          formRef.value.validate();
         }
       } finally {
         loading.value = false;
       }
-    } 
+    }
   });
 }
 
-- 
2.39.3


From ab4adcb70f6c08df2b1a5e28376aa3646831c9d6 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Fri, 29 Mar 2024 16:32:18 +0800
Subject: [PATCH 009/143] =?UTF-8?q?fix:=202785=E3=80=812786=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/components/Forget.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/login/components/Forget.vue b/src/views/login/components/Forget.vue
index 5588ac0..e6c4e10 100644
--- a/src/views/login/components/Forget.vue
+++ b/src/views/login/components/Forget.vue
@@ -237,6 +237,9 @@ function computedFormSure() {
 async function sendCode(value) {
   if (!flag.value) return;
   flag.value = false;
+  if(!(formForget.phone.length == 11)){
+    return
+  }
   const res = await getCode({
     phone: formForget.phone,
     agentcode: formForget.agentcode,
-- 
2.39.3


From 34937aeabf4cd48a0172c443c94b291f1ca96a27 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Fri, 29 Mar 2024 16:38:36 +0800
Subject: [PATCH 010/143] =?UTF-8?q?fix:=20=E6=89=80=E6=9C=89=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E9=83=BD=E8=BE=93=E5=85=A5=E6=95=B0=E6=8D=AE=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8B=E4=B8=80=E6=AD=A5=E6=8C=89=E9=92=AE=E5=BA=94?=
 =?UTF-8?q?=E8=AF=A5=E5=8F=96=E6=B6=88=E7=BD=AE=E7=81=B0=E8=A3=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/components/Forget.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/login/components/Forget.vue b/src/views/login/components/Forget.vue
index e6c4e10..01a5bc0 100644
--- a/src/views/login/components/Forget.vue
+++ b/src/views/login/components/Forget.vue
@@ -228,7 +228,7 @@ function switchTab(type: number) {
 }
 
 function computedForm() {
-  return !formInline.enterprisecode || !formInline.username || !formInline.password;
+  return !formForget.phonecode || !formForget.phone || !formForget.loginname || !formForget.agentcode;
 }
 
 function computedFormSure() {
-- 
2.39.3


From 9c137112f2104b24b0ddbc3d5f9b3a67d19930b9 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Fri, 29 Mar 2024 16:52:29 +0800
Subject: [PATCH 011/143] =?UTF-8?q?feat:=20=E3=80=90=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E3=80=91=E7=82=B9=E5=87=BB=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E6=8C=89=E9=92=AE=EF=BC=8C=E5=8D=B3=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E6=89=80=E6=9C=89=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8=E6=98=BE=E7=A4=BA=E3=80=82=E6=AD=A4=E6=97=B6=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E6=9B=B4=E5=A4=9A=E6=8C=89=E9=92=AE=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=EF=BC=8C=E6=97=A0=E9=9C=80=E5=86=8D=E6=AC=A1=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/message/content/List.vue | 260 ++++++++++++++++-------------
 1 file changed, 145 insertions(+), 115 deletions(-)

diff --git a/src/views/message/content/List.vue b/src/views/message/content/List.vue
index 1b1ccf2..3c13e54 100644
--- a/src/views/message/content/List.vue
+++ b/src/views/message/content/List.vue
@@ -1,32 +1,32 @@
 <script lang="ts" setup>
-import { reactive, ref, toRefs } from 'vue'
-import { format } from 'date-fns'
-import { useRoute, useRouter } from 'vue-router'
-import { getMessageList, readAllMsg, readMsg } from '@/api/message/message'
-import iconApproveActive from '@/assets/images/message/approve-active.png'
-import iconApprove from '@/assets/images/message/approve.png'
-import iconSystemActive from '@/assets/images/message/system-active.png'
-import iconSystem from '@/assets/images/message/system.png'
-import iconArrowActive from '@/assets/images/message/arrow-active.png'
-import iconArrow from '@/assets/images/message/arrow.png'
-import iconClear from '@/assets/images/message/clear.png'
-import iconArrowDown from '@/assets/images/message/arrow-down.png'
-
-const emit = defineEmits(['goDetail'])
-const router = useRouter()
-const route = useRoute()
-const hasNextPage = ref(false)
+import { reactive, ref, toRefs } from "vue";
+import { format } from "date-fns";
+import { useRoute, useRouter } from "vue-router";
+import { getMessageList, readAllMsg, readMsg } from "@/api/message/message";
+import iconApproveActive from "@/assets/images/message/approve-active.png";
+import iconApprove from "@/assets/images/message/approve.png";
+import iconSystemActive from "@/assets/images/message/system-active.png";
+import iconSystem from "@/assets/images/message/system.png";
+import iconArrowActive from "@/assets/images/message/arrow-active.png";
+import iconArrow from "@/assets/images/message/arrow.png";
+import iconClear from "@/assets/images/message/clear.png";
+import iconArrowDown from "@/assets/images/message/arrow-down.png";
+
+const emit = defineEmits(["goDetail"]);
+const router = useRouter();
+const route = useRoute();
+const hasNextPage = ref(false);
 
 const state = reactive({
   tabList: [
     {
-      name: '审批通知',
+      name: "审批通知",
       icon: iconApprove,
       activeIcon: iconApproveActive,
       value: 1,
     },
     {
-      name: '系统消息',
+      name: "系统消息",
       icon: iconSystem,
       activeIcon: iconSystemActive,
       value: 2,
@@ -34,112 +34,147 @@ const state = reactive({
   ],
   list: [] as any,
   pageNo: 1,
-})
+});
 
-const { list, tabList } = toRefs(state)
+const { list, tabList } = toRefs(state);
 
-const tab = ref(1)
+const tab = ref(1);
 
-async function getList() {
-  const res = await getMessageList({
+async function getList(type = "") {
+  let res = await getMessageList({
     pageNo: state.pageNo,
-    pageSize: '7',
+    pageSize: "7",
     msgCategory: tab.value,
-  })
-  if (res.code === 'OK') {
-    hasNextPage.value = res.data.hasNextPage
-    if (tab.value === 1) {
-      res.data.list.forEach((item) => {
-        item.tag = JSON.parse(item.busJson)
-      })
+  });
+  if (type == "more") {
+    while (res.data.endRow > 0) {
+      if (res.code == "OK") {
+        if (tab.value === 1) {
+          res.data.list.forEach((item) => {
+            item.tag = JSON.parse(item.busJson);
+          });
+        }
+        state.list = state.list.concat(res.data.list);
+        state.pageNo++;
+        res = await getMessageList({
+          pageNo: state.pageNo,
+          pageSize: "7",
+          msgCategory: tab.value,
+        });
+      }
+    }
+    hasNextPage.value = res.data.hasNextPage;
+  } else {
+    if (res.code === "OK") {
+      hasNextPage.value = res.data.hasNextPage;
+      if (tab.value === 1) {
+        res.data.list.forEach((item) => {
+          item.tag = JSON.parse(item.busJson);
+        });
+      }
+      state.list = state.list.concat(res.data.list);
     }
-    console.log(res.data.list)
-    state.list = state.list.concat(res.data.list)
   }
 }
 
-getList()
+getList();
 
 async function clearMsg() {
-  const res = await readAllMsg({ msgCategory: tab.value })
-  if (res.code === 'OK') {
-    state.list = []
-    state.pageNo = 1
-    getList()
+  const res = await readAllMsg({ msgCategory: tab.value });
+  if (res.code === "OK") {
+    state.list = [];
+    state.pageNo = 1;
+    getList();
   }
 }
 
 function switchTab(type: number) {
-  tab.value = type
-  state.list = []
-  state.pageNo = 1
-  getList()
+  tab.value = type;
+  state.list = [];
+  state.pageNo = 1;
+  getList();
 }
 
 function goFinalDetail(row) {
-  console.log(row)
-  router.push({ name: 'final-detail', query: { id: row.tag.taskId, packageid: row.packageid } })
+  console.log(row);
+  router.push({
+    name: "final-detail",
+    query: { id: row.tag.taskId, packageid: row.packageid },
+  });
 }
 
 function goDetail(item) {
   if (tab.value === 1) {
-    clearMsgOne(item.id)
-    goFinalDetail(item)
+    clearMsgOne(item.id);
+    goFinalDetail(item);
   }
-  else
   // emit('goDetail', item.id)
-  { router.push({ name: 'message-detail', query: { id: item.id } }) }
+  else {
+    router.push({ name: "message-detail", query: { id: item.id } });
+  }
 }
 
 async function clearMsgOne(id) {
-  const res = await readMsg({ msgid: id })
+  const res = await readMsg({ msgid: id });
 }
 
 function getMore() {
-  state.pageNo += 1
-  getList()
+  state.pageNo += 1;
+  getList("more");
 }
 </script>
 
 <template>
   <div class="wrapper-message">
     <div class="flex justify-between header">
-      <div class="header-title">
-        消息通知
-      </div>
+      <div class="header-title">消息通知</div>
       <div class="clear" @click="clearMsg">
-        <img class="icon-clear" :src="iconClear" alt="">
+        <img class="icon-clear" :src="iconClear" alt="" />
         清除未读
       </div>
     </div>
     <div class="content">
       <div class="slider">
         <div
-          v-for="(item) in tabList"
+          v-for="item in tabList"
           :key="item.value"
           :class="{ 'item-active': tab === item.value }"
           class="flex item"
           @click="switchTab(item.value)"
         >
           <div class="flex item-left align-center">
-            <img class="icon" :src="tab === item.value ? item.activeIcon : item.icon" alt="">
+            <img
+              class="icon"
+              :src="tab === item.value ? item.activeIcon : item.icon"
+              alt=""
+            />
             <div :class="{ 'text-active': tab === item.value }" class="text">
               {{ item.name }}
             </div>
           </div>
-          <img class="icon-arrow" :src="tab === item.value ? iconArrowActive : iconArrow" alt="">
+          <img
+            class="icon-arrow"
+            :src="tab === item.value ? iconArrowActive : iconArrow"
+            alt=""
+          />
           <div v-if="tab === item.value" class="line" />
         </div>
       </div>
       <div class="list">
-        <div v-for="(item, index) in list" :key="item.id" :class="{ 'pt0': index === 0, 'item-disabled': item.readFlag }" class="item" @click="goDetail(item)">
+        <div
+          v-for="(item, index) in list"
+          :key="item.id"
+          :class="{ pt0: index === 0, 'item-disabled': item.readFlag }"
+          class="item"
+          @click="goDetail(item)"
+        >
           <div class="left">
             <div class="num">
-              {{ format(item.sendTime, 'dd') }}
+              {{ format(item.sendTime, "dd") }}
               <div v-if="!item.readFlag" class="point" />
             </div>
             <div class="date">
-              {{ format(item.sendTime, 'yyyy-MM') }}
+              {{ format(item.sendTime, "yyyy-MM") }}
             </div>
           </div>
           <div class="middle">
@@ -150,29 +185,25 @@ function getMore() {
               {{ item.titile }}
             </div>
             <div v-if="tab === 1" class="status">
-              <div class="tag tag-blue">
-                审批节点：{{ item.tag.nodeName }}
-              </div>
+              <div class="tag tag-blue">审批节点：{{ item.tag.nodeName }}</div>
               <div :class="item.tag.states === 5 ? 'tag-red' : 'tag-green'" class="tag">
                 审批状态：{{ item.tag.states }}
               </div>
             </div>
             <div v-if="tab === 1" class="subtitle">
               <span class="name">{{ item.tag.sendUserName }}</span>
-              <span class="time">{{ format(item.sendTime, 'yyyy-MM-dd HH:mm:ss') }}</span>
+              <span class="time">{{ format(item.sendTime, "yyyy-MM-dd HH:mm:ss") }}</span>
             </div>
             <div v-else class="subtitle">
               <span class="name">{{ item.userName }}</span>
-              <span class="time">{{ format(item.sendTime, 'yyyy-MM-dd HH:mm:ss') }}</span>
+              <span class="time">{{ format(item.sendTime, "yyyy-MM-dd HH:mm:ss") }}</span>
             </div>
           </div>
-          <div class="look">
-            查看
-          </div>
+          <div class="look">查看</div>
         </div>
 
         <div v-if="hasNextPage" class="more" @click="getMore">
-          查看更多<img class="icon-more" :src="iconArrowDown" alt="">
+          查看更多<img class="icon-more" :src="iconArrowDown" alt="" />
         </div>
       </div>
     </div>
@@ -185,15 +216,15 @@ function getMore() {
   flex: 1;
   flex-direction: column;
   box-sizing: border-box;
-  background: #FFF;
+  background: #fff;
   border-radius: 3px;
   height: calc(100vh - 88px);
   position: relative;
 
-  .header{
+  .header {
     padding: 24px;
 
-    &-title{
+    &-title {
       font-size: 20px;
       font-family: PingFang SC, PingFang SC-Medium;
       font-weight: 600;
@@ -201,7 +232,7 @@ function getMore() {
       line-height: 28px;
     }
 
-    .clear{
+    .clear {
       font-size: 14px;
       font-family: PingFang SC, PingFang SC-Regular;
       color: #666666;
@@ -210,7 +241,7 @@ function getMore() {
       display: flex;
       align-items: center;
 
-      .icon-clear{
+      .icon-clear {
         width: 16px;
         height: 16px;
         margin-right: 6px;
@@ -218,20 +249,20 @@ function getMore() {
     }
   }
 
-  .content{
+  .content {
     display: flex;
-    .slider{
-      .icon{
+    .slider {
+      .icon {
         width: 17px;
         height: 17px;
       }
 
-      .icon-arrow{
+      .icon-arrow {
         width: 14px;
         height: 14px;
       }
 
-      .item{
+      .item {
         width: 200px;
         height: 44px;
         position: relative;
@@ -240,32 +271,32 @@ function getMore() {
         align-items: center;
         justify-content: space-between;
         cursor: pointer;
-        &-active{
-          background: rgba(80,122,253,.1);
+        &-active {
+          background: rgba(80, 122, 253, 0.1);
         }
       }
 
-      .item-left{
+      .item-left {
         align-items: center;
       }
 
-      .text{
+      .text {
         font-size: 14px;
         font-family: PingFang SC, PingFang SC-Medium;
         font-weight: 600;
         color: #333333;
         margin-left: 12px;
-        &-active{
-          color: #507AFD;
+        &-active {
+          color: #507afd;
         }
       }
 
-      .icon-arrow{
+      .icon-arrow {
         width: 14px;
         height: 14px;
       }
 
-      .line{
+      .line {
         position: absolute;
         width: 3px;
         height: 44px;
@@ -275,7 +306,7 @@ function getMore() {
       }
     }
 
-    .list{
+    .list {
       margin-left: 24px;
       flex: 1;
       overflow-y: auto;
@@ -284,7 +315,7 @@ function getMore() {
       height: calc(100vh - 88px - 76px);
       padding-right: 24px;
 
-      .more{
+      .more {
         display: flex;
         align-items: center;
         justify-content: center;
@@ -298,14 +329,14 @@ function getMore() {
         background: #fff;
         cursor: pointer;
 
-        .icon-more{
+        .icon-more {
           width: 14px;
           height: 14px;
           margin-left: 6px;
         }
       }
 
-      .item{
+      .item {
         display: flex;
         align-items: center;
         justify-content: space-between;
@@ -313,16 +344,16 @@ function getMore() {
         padding: 16px 0 8px 25px;
         border-bottom: 1px solid #eeeeee;
 
-        &-disabled{
+        &-disabled {
           opacity: 0.5;
         }
       }
 
-      .pt0{
+      .pt0 {
         padding-top: 0;
       }
 
-      .num{
+      .num {
         font-size: 32px;
         font-family: HarmonyOS Sans SC, HarmonyOS Sans SC-Medium;
         font-weight: 600;
@@ -332,7 +363,7 @@ function getMore() {
         position: relative;
       }
 
-      .date{
+      .date {
         font-size: 12px;
         font-family: PingFang SC, PingFang SC-Regular;
         text-align: left;
@@ -340,7 +371,7 @@ function getMore() {
         line-height: 17px;
       }
 
-      .point{
+      .point {
         position: absolute;
         right: -2px;
         top: 5px;
@@ -350,7 +381,7 @@ function getMore() {
         background: #ff4e4f;
       }
 
-      .left{
+      .left {
         width: 80px;
         height: 64px;
         border-right: 1px solid #e8e8e8;
@@ -360,18 +391,18 @@ function getMore() {
         justify-content: center;
       }
 
-      .middle{
+      .middle {
         flex: 1;
         padding-left: 20px;
       }
 
-      .status{
+      .status {
         display: flex;
         align-items: center;
         // margin-top: 8px;
       }
 
-      .tag{
+      .tag {
         padding: 0 8px;
         height: 24px;
         border-radius: 2px;
@@ -384,22 +415,22 @@ function getMore() {
         align-items: center;
       }
 
-      .tag-blue{
-        background: rgba(80,122,253,0.10);
+      .tag-blue {
+        background: rgba(80, 122, 253, 0.1);
         color: #507afd;
       }
 
-      .tag-red{
+      .tag-red {
         color: #ff4e4f;
-        background: rgba(255,78,79,0.10);
+        background: rgba(255, 78, 79, 0.1);
       }
 
-      .tag-green{
-        color: #3EE199;
-        background: rgba(62,225,153,0.10);
+      .tag-green {
+        color: #3ee199;
+        background: rgba(62, 225, 153, 0.1);
       }
 
-      .title{
+      .title {
         font-size: 16px;
         font-family: PingFang SC, PingFang SC-Medium;
         font-weight: 600;
@@ -408,7 +439,7 @@ function getMore() {
         line-height: 25px;
       }
 
-      .subtitle{
+      .subtitle {
         font-size: 12px;
         font-family: PingFang SC, PingFang SC-Regular;
         text-align: left;
@@ -417,11 +448,11 @@ function getMore() {
         // margin-top: 8px;
       }
 
-      .name{
+      .name {
         margin-right: 16px;
       }
 
-      .look{
+      .look {
         font-size: 14px;
         font-family: PingFang SC, PingFang SC-Regular;
         text-align: left;
@@ -430,7 +461,6 @@ function getMore() {
         cursor: pointer;
       }
     }
-
   }
 }
 
-- 
2.39.3


From e616e186b81bc98a35c58573cc2caf8b513e6457 Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Fri, 29 Mar 2024 16:54:52 +0800
Subject: [PATCH 012/143] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=AE=A1=E6=89=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                         |   1 +
 src/assets/images/task/btn-not-pass.png | Bin 0 -> 2870 bytes
 src/assets/images/task/btn-pass.png     | Bin 0 -> 2840 bytes
 src/views/task/aside/ListItem.vue       |  16 +--
 src/views/task/content/Content.vue      | 145 +++++++++++-------------
 src/views/task/modal/BatchModal.vue     |   2 +-
 6 files changed, 77 insertions(+), 87 deletions(-)
 create mode 100644 src/assets/images/task/btn-not-pass.png
 create mode 100644 src/assets/images/task/btn-pass.png

diff --git a/components.d.ts b/components.d.ts
index 896d6e9..2e87e2e 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -21,6 +21,7 @@ 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']
diff --git a/src/assets/images/task/btn-not-pass.png b/src/assets/images/task/btn-not-pass.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef7ad59d43a8f8d7c6042acd2a54c4a9ef191b9c
GIT binary patch
literal 2870
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
UAP80eqW}N^07*qoM6N<$g2z;wo&W#<

literal 0
HcmV?d00001

diff --git a/src/assets/images/task/btn-pass.png b/src/assets/images/task/btn-pass.png
new file mode 100644
index 0000000000000000000000000000000000000000..31b38c134066cef3a3a941666dc255818067ad3c
GIT binary patch
literal 2840
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

literal 0
HcmV?d00001

diff --git a/src/views/task/aside/ListItem.vue b/src/views/task/aside/ListItem.vue
index e4c2bc1..473aec1 100644
--- a/src/views/task/aside/ListItem.vue
+++ b/src/views/task/aside/ListItem.vue
@@ -33,7 +33,9 @@ const svgName = computed(() => {
             class="list-item-header-name"
             :class="{ 'list-item-header-selected': selected }"
           >
-            任务ID:{{ listItem.fromtaskname }}
+            <n-ellipsis style="max-width: 226px">
+              任务ID:{{ listItem.fromtaskname }}
+            </n-ellipsis>
           </span>
         </div>
         <!-- <SvgIcon v-show="selected" size="14" name="more-ver" /> -->
@@ -55,7 +57,9 @@ const svgName = computed(() => {
           提交时间：{{ format(listItem.createdate, "yyyy-MM-dd HH:mm:ss") }}
         </li>
         <li v-else class="ellipsis">
-          <span class="label">{{ item.name }}：</span>{{ listItem[item.id] }}
+          <n-ellipsis style="max-width: 226px">
+            <span class="label">{{ item.name }}：</span>{{ listItem[item.id] }}
+          </n-ellipsis>
         </li>
       </ul>
     </div>
@@ -145,14 +149,6 @@ const svgName = computed(() => {
     line-height: 18px;
   }
 
-  .ellipsis{
-    display: block;
-    width: 226px;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-
   &-selected {
     background: rgba(68,113,232,0.07);
   }
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index cad5a84..452a5d1 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -3,8 +3,12 @@ import { computed, onMounted, onUnmounted, reactive, ref, unref, watch } from 'v
 import { chunk, clone } from 'lodash-es'
 import { useDialog, useMessage } from 'naive-ui'
 import { useRoute } from 'vue-router'
-import NotPassed from '@/components/Approval/NotPassed.vue'
 import BatchModal from '../modal/BatchModal.vue'
+import CustomSettingModal from '../modal/CustomSettingModal.vue'
+import PictureTable from './PictureTable.vue'
+import TaskTable from './TaskTable.vue'
+import History from './History.vue'
+import NotPassed from '@/components/Approval/NotPassed.vue'
 import { getAllfieldList, getfieldList } from '@/api/home/filter'
 import { TASK_STATUS_OBJ } from '@/enums/index'
 
@@ -14,12 +18,6 @@ import { useUser } from '@/store/modules/user'
 import { isEmpty } from '@/utils'
 import { formatToDateHMS } from '@/utils/dateUtil'
 import { hideDownload } from '@/utils/image'
-import emitter from '@/utils/mitt'
-import CustomSettingModal from '../modal/CustomSettingModal.vue'
-import PictureTable from './PictureTable.vue'
-import TaskTable from './TaskTable.vue'
-import History from './History.vue'
-import type { ApprovalParam } from '/#/api'
 
 const batch = ref(false)
 const selectItems = ref<any[]>([])
@@ -28,12 +26,14 @@ const dialog = useDialog()
 const notPassModalRef = ref(null)
 const batchModalRef = ref(null)
 const totalCount = ref(0)
+const taskId: any = ref('') // 任务id
+const packageId: any = ref('') // 包id
 const CustomSettingModalRef = ref(null)
 const taskTableData = ref<any[]>([])
 const route = useRoute()
 
 const sortBy: any = {
-  orderType: 'asc',
+  orderType: 'desc',
   orderName: 'similarityScore',
 }
 
@@ -77,8 +77,11 @@ let processItems: any[] = []
 
 onMounted(() => {
   window.addEventListener('keydown', handleKeydown)
-  if (route.query.id)
-    getDetail(route.query.id, route.query.packageid)
+  if (route.query.id) {
+    taskId.value = route.query.id
+    packageId.value = route.query.packageid
+    getDetail()
+  }
 })
 
 // 键盘左右箭头快捷切换
@@ -91,12 +94,6 @@ function handleKeydown(event) {
   // 在这里执行右箭头的逻辑
 }
 
-// 从任务终审列表跳转过来的
-async function getDetail(taskId, packageid) {
-  taskDetailInfo.value = await getTaskDetailInfo(taskId, packageid)
-  getTableData()
-  getImgList()
-}
 // states:1未提交，2待审批，3通过，4不通过
 function validate(items: any[]) {
   if (items.length === 0)
@@ -140,13 +137,32 @@ function approvalHandler(items?: any) {
     return
   }
 
+  const list: any = []
+  processItems.forEach((item) => {
+    list.push({
+      formId: item.id,
+      taskId: item.taskId,
+      taskName: item.fromTaskName,
+    })
+  })
+
+  const param = {
+    result: true,
+    comment: '',
+    disposeType: '',
+    disposeTypeId: '',
+    failCauseId: '',
+    failCauseName: '',
+    flowTaskInfoList: list,
+  }
+
   dialog.info({
     title: '确认提示',
     content: '确认给该任务审批为【通过】吗?',
     positiveText: '确定',
     negativeText: '取消',
     onPositiveClick: () => {
-      approval()
+      doAudit(param)
     },
     onNegativeClick: () => {},
   })
@@ -176,46 +192,17 @@ function rejectHandler(items?: any) {
   modal.showModal(selectItems.value)
 }
 
-function approval() {
-  const formIds: string[] = processItems.map(item => item.id)
-  const taskIds: string[] = processItems.map(item => item.taskId)
-  const tasknames: string[] = processItems.map(item => item.taskname)
-
-  const param: ApprovalParam = {
-    formid: formIds,
-    taskId: taskIds,
-    approvd: true,
-    taskComment: 'approval',
-    taskname: tasknames,
-  }
-
-  doAudit(param)
-}
-
 function doAudit(param: any) {
   audit(param).then((res) => {
     const { code } = res
     setBatch(false)
-    if (code === 'OK')
-      emitter.emit('refresh')
-    else message.error(res.message)
-  })
-}
-
-function reject(idOrDesc: string, backId: string, isOther: boolean) {
-  const formIds: string[] = processItems.map(item => item.id)
-  const taskIds: string[] = processItems.map(item => item.taskId)
-  const tasknames: string[] = processItems.map(item => item.taskname)
-
-  const param: ApprovalParam = {
-    formid: formIds,
-    taskId: taskIds,
-    approvd: false,
-    taskComment: idOrDesc,
-    taskname: isOther ? tasknames : ['其他'],
-  }
+    if (code === 'OK') {
+      message.success('审核成功')
+      reloadList()
+    }
 
-  doAudit(param)
+    else { message.error(res.message) }
+  })
 }
 
 function showModal(modalRef: any) {
@@ -286,20 +273,6 @@ async function getImgList() {
   }
 }
 
-watch(
-  () => [taskStore.activeId],
-  async () => {
-    const packageid = taskStore.getPackageid
-    const taskId = taskStore.getActiveId
-    setBatch(false)
-    if (isEmpty(taskId))
-      return
-    taskDetailInfo.value = await getTaskDetailInfo(taskId, packageid)
-    getTableData()
-    getImgList()
-  },
-)
-
 // 从store里面获取任务id
 const currentTaskId = computed(() => {
   const index = taskStore.getCurrentIndex
@@ -343,9 +316,26 @@ function previewHandler(event: MouseEvent) {
     (imageRef.value as any).mergedOnClick()
 }
 
-function reloadList() {
+watch(
+  () => [taskStore.activeId],
+  () => {
+    taskId.value = taskStore.getPackageid
+    packageId.value = taskStore.getActiveId
+    getDetail()
+  },
+)
+
+// 获取数据
+async function getDetail() {
+  taskDetailInfo.value = await getTaskDetailInfo(taskId.value, packageId.value)
+  setBatch(false)
+  getTableData()
   getImgList()
 }
+
+function reloadList() {
+  getDetail()
+}
 </script>
 
 <template>
@@ -415,16 +405,9 @@ function reloadList() {
             </template>
             返回
           </n-button>
-          <div
-            style="cursor: pointer; margin-left: 16px"
-            @click.stop="rejectHandler"
-          >
-            <SvgIcon width="64" height="28" name="a1" />
-          </div>
+          <img class="btn-approval btn-left" src="@/assets/images/task/btn-not-pass.png" alt="" @click.stop="rejectHandler">
           <SvgIcon size="24" name="vs" />
-          <div style="cursor: pointer" @click.stop="approvalHandler">
-            <SvgIcon width="64" height="28" name="a2" />
-          </div>
+          <img class="btn-approval" src="@/assets/images/task/btn-pass.png" alt="" @click.stop="approvalHandler">
         </div>
       </div>
     </div>
@@ -733,6 +716,16 @@ function reloadList() {
       .batch {
         display: flex;
         align-items: center;
+
+        .btn-approval{
+          width: 68px;
+          height: 28px;
+          cursor: pointer;
+        }
+
+        .btn-left{
+          margin-left: 16px;
+        }
       }
     }
 
diff --git a/src/views/task/modal/BatchModal.vue b/src/views/task/modal/BatchModal.vue
index dfd2f6f..54b7b46 100644
--- a/src/views/task/modal/BatchModal.vue
+++ b/src/views/task/modal/BatchModal.vue
@@ -57,7 +57,7 @@ let _masonry: null | Masonry = null
 const show = ref(false)
 
 const sortBy: any = {
-  orderType: 'asc',
+  orderType: 'desc',
   orderName: 'similarityScore',
 }
 const batch = ref(false)
-- 
2.39.3


From 6286f6b272558a2aacc0d7f85a38ab4a2f67224d Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Fri, 29 Mar 2024 17:05:25 +0800
Subject: [PATCH 013/143] =?UTF-8?q?=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/content/Content.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index 452a5d1..73016c1 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -319,8 +319,8 @@ function previewHandler(event: MouseEvent) {
 watch(
   () => [taskStore.activeId],
   () => {
-    taskId.value = taskStore.getPackageid
-    packageId.value = taskStore.getActiveId
+    packageId.value = taskStore.getPackageid
+    taskId.value = taskStore.getActiveId
     getDetail()
   },
 )
-- 
2.39.3


From 6eb9a6e4c91ec7a55e86aeb56e1b6ffcdd010953 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Fri, 29 Mar 2024 17:06:36 +0800
Subject: [PATCH 014/143] =?UTF-8?q?fix:=20=E6=89=93=E5=BC=80=E9=AB=98?=
 =?UTF-8?q?=E7=BA=A7=E7=AD=9B=E9=80=89=E5=88=97=E8=A1=A8=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E5=A7=8B=E7=BB=88=E5=A4=84=E4=BA=8ELoading=E7=8A=B6=E6=80=81bu?=
 =?UTF-8?q?g=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/comp/FilterModal.vue             | 4 ++--
 src/views/home/aside/comp/modals/FilterModal.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/final/comp/FilterModal.vue b/src/views/final/comp/FilterModal.vue
index 7923eaa..e1f1ebf 100644
--- a/src/views/final/comp/FilterModal.vue
+++ b/src/views/final/comp/FilterModal.vue
@@ -119,8 +119,8 @@ async function query(page: number, pageSize: number) {
     search_searchname: { value: keyword.value, op: "like", type: "string" },
   };
   const result = await getConditionList({ pageNo: page, pageSize }, searchParam, 1);
-  const { data, pageCount,total } = result;
-  total.value = total;
+  const { data, pageCount,total:totalCount } = result;
+  total.value = totalCount;
   tableData.value = data;
   pagination.page = page;
   pagination.pageCount = pageCount;
diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue
index 5bb7cf9..aa1924f 100644
--- a/src/views/home/aside/comp/modals/FilterModal.vue
+++ b/src/views/home/aside/comp/modals/FilterModal.vue
@@ -111,10 +111,10 @@ async function query(page: number, pageSize: number) {
     search_searchname: { value: keyword.value, op: "like", type: "string" },
   };
   const result = await getConditionList({ pageNo: page, pageSize }, searchParam, 0);
-  const { data, pageCount, total } = result;
+  const { data, pageCount, total:totalCount } = result;
   tableData.value = data;
   pagination.page = page;
-  total.value = total;
+  total.value = totalCount;
   pagination.pageCount = pageCount;
   loading.value = false;
 }
-- 
2.39.3


From 38aa8118c66d2f1552dcf7db28b25bfe82895da1 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Fri, 29 Mar 2024 17:39:26 +0800
Subject: [PATCH 015/143] =?UTF-8?q?feat:=20=E5=AF=B9=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=9B=E8=A1=8C=E5=8B=BE=E9=80=89=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E7=95=8C=E9=9D=A2=E7=9A=84=E7=8A=B6=E6=80=81=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E4=B8=8ERP=E8=A6=81=E6=B1=82=E4=B8=8D=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/comp/FilterModal.vue          | 38 +++++++++++++++++--
 .../home/aside/comp/modals/FilterModal.vue    | 16 +++++++-
 2 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/src/views/final/comp/FilterModal.vue b/src/views/final/comp/FilterModal.vue
index e1f1ebf..b2b4278 100644
--- a/src/views/final/comp/FilterModal.vue
+++ b/src/views/final/comp/FilterModal.vue
@@ -8,6 +8,7 @@ import {
   reactive,
   ref,
   unref,
+  computed,
 } from "vue";
 import { NDataTable } from "naive-ui";
 import type { DataTableColumns, DataTableRowKey } from "naive-ui";
@@ -26,6 +27,7 @@ const emit = defineEmits<{
 }>();
 
 const show = ref(false);
+const checkedRowKeys = ref([]);
 
 const cardStyle = {
   width: "800px",
@@ -109,7 +111,7 @@ const pagination = reactive({
     },
   ],
   showQuickJumper: true,
-  prefix:()=>`共 ${total.value} 条数据`
+  prefix: () => `共 ${total.value} 条数据`,
 });
 const tableData = ref<Array<RowData>>([]);
 const keyword = ref("");
@@ -119,7 +121,7 @@ async function query(page: number, pageSize: number) {
     search_searchname: { value: keyword.value, op: "like", type: "string" },
   };
   const result = await getConditionList({ pageNo: page, pageSize }, searchParam, 1);
-  const { data, pageCount,total:totalCount } = result;
+  const { data, pageCount, total: totalCount } = result;
   total.value = totalCount;
   tableData.value = data;
   pagination.page = page;
@@ -283,6 +285,10 @@ const inputHandler = debounce((word) => {
   keyword.value = word;
   query(1, 5);
 }, 300);
+
+const showSearch = computed(() => {
+  return selectionIds.value.length > 0;
+});
 </script>
 
 <template>
@@ -307,7 +313,7 @@ const inputHandler = debounce((word) => {
               <span :style="{ 'margin-left': '18px' }">基本信息</span>
             </div>
           </div>
-          <div class="wrapper-form">
+          <div class="wrapper-form" v-if="!showSearch">
             <n-input
               :style="{ width: '360px', border: '1px solid #cad2dd' }"
               placeholder="请输入过滤条件名称搜索"
@@ -324,6 +330,21 @@ const inputHandler = debounce((word) => {
               </template>
             </n-button>
           </div>
+
+          <div class="wrapper-form" v-else>
+            <div class="del_btn">
+              <n-button icon-placement="left" size="medium">
+                <template #icon>
+                  <SvgIcon  name="delete-history" size="16" />
+                </template>
+                删除</n-button>
+            </div>
+            <div class="msg">
+              <span>已选中 <span style="color:#507afd;font-size:16px">{{ selectionIds.length }}</span> 项</span>
+              <a @click="selectionIds = []">清空</a>
+            </div>
+          </div>
+
           <div class="wrapper-table">
             <NDataTable
               ref="tableRef"
@@ -337,6 +358,7 @@ const inputHandler = debounce((word) => {
               @update:page="handlePageChange"
               @update-page-size="handlePageSizeChange"
               @update:checked-row-keys="handleCheck"
+              :checked-row-keys="selectionIds"
             />
           </div>
         </div>
@@ -378,6 +400,16 @@ const inputHandler = debounce((word) => {
       width: 300px;
       border: 1px solid gray;
     }
+    .del_btn{
+
+    }
+    .msg{
+      a{
+        margin-left: 30px;
+        cursor: pointer;
+        color: #507afd;
+      }
+    }
   }
 
   &-table {
diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue
index aa1924f..ef8428e 100644
--- a/src/views/home/aside/comp/modals/FilterModal.vue
+++ b/src/views/home/aside/comp/modals/FilterModal.vue
@@ -1,5 +1,14 @@
 <script lang="ts" setup>
-import { defineOptions, h, nextTick, onUnmounted, reactive, ref, unref } from "vue";
+import {
+  computed,
+  defineOptions,
+  h,
+  nextTick,
+  onUnmounted,
+  reactive,
+  ref,
+  unref,
+} from "vue";
 import { NDataTable } from "naive-ui";
 import type { DataTableColumns, DataTableRowKey } from "naive-ui";
 import type { SortableEvent } from "sortablejs";
@@ -111,7 +120,7 @@ async function query(page: number, pageSize: number) {
     search_searchname: { value: keyword.value, op: "like", type: "string" },
   };
   const result = await getConditionList({ pageNo: page, pageSize }, searchParam, 0);
-  const { data, pageCount, total:totalCount } = result;
+  const { data, pageCount, total: totalCount } = result;
   tableData.value = data;
   pagination.page = page;
   total.value = totalCount;
@@ -265,6 +274,7 @@ defineExpose({
   showModal,
 });
 
+
 const inputHandler = debounce((word) => {
   keyword.value = word;
   query(1, 5);
@@ -317,6 +327,7 @@ const inputHandler = debounce((word) => {
               </template>
             </n-button>
           </div>
+
           <div class="wrapper-table">
             <NDataTable
               ref="tableRef"
@@ -331,6 +342,7 @@ const inputHandler = debounce((word) => {
               @update:page="handlePageChange"
               @update-page-size="handlePageSizeChange"
               @update:checked-row-keys="handleCheck"
+
             />
           </div>
         </div>
-- 
2.39.3


From 63356a7179f51004fca5ceda2e059724157dc255 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Fri, 29 Mar 2024 18:24:27 +0800
Subject: [PATCH 016/143] =?UTF-8?q?feat:=20=E5=BC=B9=E7=AA=97=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E5=8F=8A=E4=BA=A4=E4=BA=92=E8=A7=84=E5=88=99=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/final/comp/FilterModal.vue                | 2 +-
 src/views/final/comp/NewFilterModal.vue             | 2 +-
 src/views/home/aside/comp/modals/FilterModal.vue    | 2 +-
 src/views/home/aside/comp/modals/NewFilterModal.vue | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/final/comp/FilterModal.vue b/src/views/final/comp/FilterModal.vue
index b2b4278..9ac92c5 100644
--- a/src/views/final/comp/FilterModal.vue
+++ b/src/views/final/comp/FilterModal.vue
@@ -211,7 +211,7 @@ async function handlePageSizeChange(currentPageSize) {
 
 function handleClick() {
   emit("showNewFilter");
-  show.value = false;
+  // show.value = false;
 }
 
 let sortTable: Sortable | null = null;
diff --git a/src/views/final/comp/NewFilterModal.vue b/src/views/final/comp/NewFilterModal.vue
index 2b35613..ae1e823 100644
--- a/src/views/final/comp/NewFilterModal.vue
+++ b/src/views/final/comp/NewFilterModal.vue
@@ -308,7 +308,7 @@ defineExpose({
       <template #footer>
         <div class="wrapper-footer">
           <n-button type="info" @click="handleSumbit">
-            确认
+            保存
           </n-button>
           <n-button secondary style="margin-left:15px" @click="closeModal">
             取消
diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue
index ef8428e..597e2cc 100644
--- a/src/views/home/aside/comp/modals/FilterModal.vue
+++ b/src/views/home/aside/comp/modals/FilterModal.vue
@@ -210,7 +210,7 @@ async function handlePageSizeChange(currentPageSize) {
 
 function handleClick() {
   emit("showNewFilter");
-  show.value = false;
+  // show.value = false;
 }
 
 let sortTable: Sortable | null = null;
diff --git a/src/views/home/aside/comp/modals/NewFilterModal.vue b/src/views/home/aside/comp/modals/NewFilterModal.vue
index 1a253ba..8dc60d6 100644
--- a/src/views/home/aside/comp/modals/NewFilterModal.vue
+++ b/src/views/home/aside/comp/modals/NewFilterModal.vue
@@ -341,7 +341,7 @@ defineExpose({
       <template #footer>
         <div class="wrapper-footer">
           <n-button type="info" @click="handleSumbit">
-            确认
+            保存
           </n-button>
           <n-button secondary style="margin-left:15px" @click="closeModal">
             取消
-- 
2.39.3


From 800d898e87d85c434711ca62a1ec1839fd26f84b Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Fri, 29 Mar 2024 19:03:32 +0800
Subject: [PATCH 017/143] =?UTF-8?q?feat:=20=E6=B5=81=E7=A8=8B=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/work/work.ts                    |  4 +-
 src/views/worksheet/content/Content.vue | 77 ++++++++++---------------
 types/workorder.d.ts                    |  1 +
 3 files changed, 34 insertions(+), 48 deletions(-)

diff --git a/src/api/work/work.ts b/src/api/work/work.ts
index a9dc373..70e76c3 100644
--- a/src/api/work/work.ts
+++ b/src/api/work/work.ts
@@ -95,11 +95,10 @@ export async function getTaskDetailPictureList(params: PageParam & PictureSortPa
 
   // 精简一下数据
   const list = records.map((item,index) => {
-
     return {
       id: item.id,
       taskId: item.taskId,
-      taskname: item.fromtaskname,
+      taskname: item.fromTaskName,
       assignee: item.assignee,
       pictureid: item.pictureid,
       imgurl: item.serverThumbnailUrl,
@@ -113,7 +112,6 @@ export async function getTaskDetailPictureList(params: PageParam & PictureSortPa
       photoDateTimestamp:item.photoDateTimestamp,
     }
   })
-  
   return {
     pageCount: pages,
     data: list,
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index e467427..14cae00 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -4,6 +4,7 @@ import {
 getTaskDetailInfo,
 getTaskDetailPictureList
 } from "@/api/work/work";
+import NotPassed from '@/components/Approval/NotPassed.vue';
 import { fieldMap } from "@/config/workorder";
 import { TASK_STATUS_OBJ } from '@/enums/index';
 import { useWorkOrder } from "@/store/modules/workOrder";
@@ -47,10 +48,6 @@ const showActions = computed(() => {
   return selectItems.value.length > 0 && batch;
 });
 
-const packagepagination = reactive({
-  pageNo: 1,
-  pageSize: 10,
-});
 const taskpagination = reactive({
   pageNo: 1,
   pageSize: 10,
@@ -70,6 +67,7 @@ const loading = ref(false);
 const el = ref<HTMLDivElement | null>(null);
 const selectedSortName = ref('');
 const isFullScreen = ref(false);
+const notPassModalRef = ref(null)
 
 let canloadMore = true;
 
@@ -134,7 +132,7 @@ async function featchList() {
   try {
     taskpagination.pageNo += 1;
     const { data, total, pageCount } = await getTaskDetailPictureList(
-      { ...taskpagination, ...sortBy, checkDuplicateId: workStore.activeId, pictureId: taskDetailInfo.value.pictureid}
+      { ...taskpagination, ...sortBy, checkDuplicateId: workStore.activeId, pictureId: taskDetailInfo.value.pictureid }
     );
 
     totalCount.value = total;
@@ -188,6 +186,7 @@ watch(
   async (newValue, oldValue) => {
     const packageid = workStore.getActiveId;
 
+
     if (isEmpty(packageid)) {
       listData.value.length = 0;
       totalCount.value = 0;
@@ -229,7 +228,7 @@ async function handleSelect(item: any) {
     return;
   }
 
-  refreshHandler();
+  // refreshHandler();
 }
 
 async function sortHandler(orderby: "similarityScore" | "createdate") {
@@ -247,7 +246,7 @@ const propertys = computed(() => {
   return v;
 });
 function overTaskHandelr(item: any) {
-  if (item?.userapprove?.statshis === 2 || item?.userapprove?.statshis == 3) {
+  if (item?.historyStates === 2 || item?.historyStates == 3) {
     overTask.value = null;
     return;
   }
@@ -285,28 +284,9 @@ function previewHandler(event: MouseEvent) {
   if (imageRef.value && (imageRef.value as any).src)
     (imageRef.value as any).mergedOnClick();
 }
-function rejectHandler(items?: any) {
-  let cloneItem: any
-  if (batch.value) {
-    processItems = selectItems.value
-  }
-  else if (overTask.value) {
-    cloneItem = clone(overTask.value)
-    processItems = [cloneItem]
-  }
-
-  if (items !== undefined && !(items instanceof PointerEvent))
-    processItems = items
-
-  const msg = validate(processItems)
-
-  if (msg !== null) {
-    message.error(msg)
-    return
-  }
-
-  const modal = unref(confrimModalRef)! as any
-  modal.showModal()
+function rejectHandler() {
+  const modal = unref(notPassModalRef)! as any
+  modal.showModal(selectItems.value)
 }
 function reject(idOrDesc: string, backId: string, isOther: boolean) {
   const formIds: string[] = processItems.map(item => item.id)
@@ -323,30 +303,23 @@ function reject(idOrDesc: string, backId: string, isOther: boolean) {
 
   doAudit(param)
 }
-function doAudit(param: any) {
-  audit(param).then((res) => {
-    const { code } = res
-    setBatch(false)
-    if (code === 'OK') {
-      emitter.emit('refresh')
-      refreshHandler()
-    }
-    else message.error(res.message)
-  })
-}
-
 function approvalHandler(items?: any) {
   let cloneItem: any
   if (batch.value) {
     processItems = selectItems.value
   }
   else if (overTask.value) {
+    //  主图点击 => 点击 => 通过/不通过按钮
     cloneItem = clone(overTask.value)
+    // 接口问题，暂时先这样处理
+    // if (!cloneItem.taskId) {
+    //   cloneItem.taskId = "taskIdtaskIdtaskIdtaskIdtaskId"
+    // }
     processItems = [cloneItem]
   }
-
+  //  任务包图片 => 点击 => 通过/不通过按钮
   if (items !== undefined && !(items instanceof PointerEvent))
-    processItems = items
+    processItems = [items]
 
   const msg = validate(processItems)
 
@@ -370,7 +343,6 @@ function approval() {
   const formIds: string[] = processItems.map(item => item.id)
   const taskIds: string[] = processItems.map(item => item.taskId)
   const tasknames: string[] = processItems.map(item => item.taskname)
-
   const param: ApprovalParam = {
     formid: formIds,
     taskId: taskIds,
@@ -381,6 +353,21 @@ function approval() {
 
   doAudit(param)
 }
+function doAudit(param: any) {
+  audit(param).then((res) => {
+    const { code } = res
+    setBatch(false)
+    if (code === 'OK') {
+      emitter.emit('refresh')
+      refreshHandler()
+    }
+    else message.error(res.message)
+  })
+}
+
+function reloadList() {
+  loadMore()
+}
 </script>
 
 <template>
@@ -547,7 +534,6 @@ function approval() {
         </div>
         <div style="display: flex; justify-content: space-between; padding: 12px 0px 3px 0">
           <div>
-            <!-- <span style="font-size: 21px; font-weight: bold">任务包图片</span><span>({{ totalCount }})</span> -->
             <span
               style="font-size: 18px; font-weight: Medium;color: #333333;font-family: PingFang SC, PingFang SC-Medium;">任务包图片</span>
           </div>
@@ -615,6 +601,7 @@ function approval() {
       </div>
     </n-spin>
     <ConfrimModal ref="confrimModalRef" @commit="reject" />
+    <NotPassed ref="notPassModalRef" @success="reloadList" />
   </div>
 </template>
 
diff --git a/types/workorder.d.ts b/types/workorder.d.ts
index 36781d1..e0fd016 100644
--- a/types/workorder.d.ts
+++ b/types/workorder.d.ts
@@ -16,6 +16,7 @@ export interface OrderState {
   activeId: string
   currentIndex: number
   packageList: PackageListItem[]
+  approvalList: any[]
   immersion: boolean
 }
 
-- 
2.39.3


From bdf4ac31c62814492193b36c3d7c1cba0f6d14d5 Mon Sep 17 00:00:00 2001
From: shuliYao <1397940314@qq.com>
Date: Fri, 29 Mar 2024 20:12:04 +0800
Subject: [PATCH 018/143] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E6=96=B0=E5=9B=BE=E7=89=87=EF=BC=8C=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?-1=E7=9B=B8=E4=BC=BC=E5=BA=A6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/content/Content.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index be25774..8ebdf46 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -480,7 +480,7 @@ function cancel(val) {
               <n-image class="img" :img-props="{ onClick: hideDownload }"
                 :class="{ 'img-fit': viewMode === 'horizontalVersion', 'img-full': viewMode === '3:4' || viewMode === 'verticalVersion' }"
                 :preview-src="item.imgUrl" :src="item.thumburl" ref="imageRef" />
-              <div class="percent" v-if="item.simila!=-1">
+              <div class="percent" v-if="item.similar!=-1">
                 <SvgIcon size="42" name="tag" />
                 <div class="val">
                   {{ `${item.similar}%` }}
-- 
2.39.3


From ed48e7d6f4b24967a353cf93f8249e354b48fd28 Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Sat, 30 Mar 2024 08:26:45 +0800
Subject: [PATCH 019/143] bug

---
 src/views/final/content/Content.vue | 652 ++++++++++++++--------------
 src/views/task/content/Content.vue  |   2 +-
 2 files changed, 336 insertions(+), 318 deletions(-)

diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index d0b8596..6da9fac 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
-import type { DataTableColumns, DataTableRowKey, PaginationProps } from "naive-ui";
-import { NButton, NDataTable, useDialog, useMessage } from "naive-ui";
+import type { DataTableColumns, DataTableRowKey, PaginationProps } from 'naive-ui'
+import { NButton, NDataTable, useDialog, useMessage } from 'naive-ui'
 import {
   computed,
   defineEmits,
@@ -13,9 +13,9 @@ import {
   ref,
   unref,
   watch,
-} from "vue";
-import { rowPropKeys } from "naive-ui/es/legacy-grid/src/Row";
-import { useRoute, useRouter } from "vue-router";
+} from 'vue'
+import { rowPropKeys } from 'naive-ui/es/legacy-grid/src/Row'
+import { useRoute, useRouter } from 'vue-router'
 import {
   Action,
   CustomTabelModal,
@@ -24,50 +24,50 @@ import {
   RepeatModal,
   RepeatTaskTableModal,
   StatusItem,
-} from "../comp";
-import { getFinalList } from "@/api/final";
-import { audit } from "@/api/task/task";
-import SvgIcon from "@/components/Icon/SvgIcon.vue";
-import type { RowData } from "@/config/final";
-import { findKey, headRules } from "@/config/final";
-import { useWindowSizeFn } from "@/hooks/event/useWindowSizeFn";
-import { useUser } from "@/store/modules/user";
-import { useFinal } from "@/store/modules/final";
-import { getViewportOffset } from "@/utils/domUtils";
-import { isBoolean } from "@/utils/is";
-import { useDictionary } from "@/store/modules/dictonary";
-import ConfrimModal from "@/views/task/modal/ConfrimModal.vue";
-import type { ApprovalParam } from "/#/api";
-import emitter from "@/utils/mitt";
-import { formatToDateHMS } from "@/utils/dateUtil";
-import { getAllfieldList, getfieldList, savefield } from "@/api/home/filter";
-
-const emit = defineEmits(["changeShow"]);
+} from '../comp'
+import { getFinalList } from '@/api/final'
+import { audit } from '@/api/task/task'
+import SvgIcon from '@/components/Icon/SvgIcon.vue'
+import type { RowData } from '@/config/final'
+import { findKey, headRules } from '@/config/final'
+import { useWindowSizeFn } from '@/hooks/event/useWindowSizeFn'
+import { useUser } from '@/store/modules/user'
+import { useFinal } from '@/store/modules/final'
+import { getViewportOffset } from '@/utils/domUtils'
+import { isBoolean } from '@/utils/is'
+import { useDictionary } from '@/store/modules/dictonary'
+import NotPassed from '@/components/Approval/NotPassed.vue'
+import type { ApprovalParam } from '/#/api'
+import emitter from '@/utils/mitt'
+import { formatToDateHMS } from '@/utils/dateUtil'
+import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter'
+
+const emit = defineEmits(['changeShow'])
 function changeContent() {
-  emit("changeShow");
+  emit('changeShow')
 }
 
-const dicStore = useDictionary();
-const izstatusList = ref([]);
-const router = useRouter();
-const route = useRoute();
-const reviewType = 0;
+const dicStore = useDictionary()
+const izstatusList = ref([])
+const router = useRouter()
+const route = useRoute()
+const reviewType = 0
 const actionsColumns = {
-  title: "操作",
-  key: "actions",
+  title: '操作',
+  key: 'actions',
   minWidth: 200,
-  fixed: "right",
+  fixed: 'right',
   render(row) {
     return h(ListAction, {
       id: row.id,
       status: row.states,
       trigger: (action) => {
-        actionHandler(action, row);
+        actionHandler(action, row)
       },
-    });
+    })
   },
-};
-const columnsRef = ref<DataTableColumns<RowData>>([]);
+}
+const columnsRef = ref<DataTableColumns<RowData>>([])
 // const columns: DataTableColumns<RowData> = [
 //   {
 //     type: "selection",
@@ -167,410 +167,428 @@ const columnsRef = ref<DataTableColumns<RowData>>([]);
 async function getColumns() {
   columnsRef.value = [
     {
-      type: "selection",
-      fixed: "left",
+      type: 'selection',
+      fixed: 'left',
       width: 50,
     },
-  ];
-
-  const userStore = useUser();
-  const userInfo = userStore.getUserInfo;
-  let res;
-  res = await getAllfieldList(reviewType); // 所有筛选项目
-  const allList = res.data;
-  res = await getfieldList(reviewType, userInfo.id); // 当前用户选择的项目
-  const useList = res.data;
-  const userFieldFixed = useList.userFieldFixed?.split(",");
-  const userFieldUnFixed = useList.userFieldUnFixed?.split(",");
-  console.log(userFieldFixed, userFieldUnFixed, "userFieldUnFixed");
-  console.log(allList, "allList");
+  ]
+
+  const userStore = useUser()
+  const userInfo = userStore.getUserInfo
+  let res
+  res = await getAllfieldList(reviewType) // 所有筛选项目
+  const allList = res.data
+  res = await getfieldList(reviewType, userInfo.id) // 当前用户选择的项目
+  const useList = res.data
+  const userFieldFixed = useList.userFieldFixed?.split(',')
+  const userFieldUnFixed = useList.userFieldUnFixed?.split(',')
+  console.log(userFieldFixed, userFieldUnFixed, 'userFieldUnFixed')
+  console.log(allList, 'allList')
   allList?.map((v) => {
     if (!userFieldFixed?.length && !userFieldUnFixed?.length) {
       if (v.isrequired == 2) {
         columnsRef.value.push({
           title: v.fieldDesc,
-          fixed: "left",
+          fixed: 'left',
           key: v.name,
           width: 120,
-        });
+        })
       }
     }
 
-    if (userFieldFixed?.find((v2) => v2 == v.name)) {
+    if (userFieldFixed?.find(v2 => v2 == v.name)) {
       columnsRef.value.push({
         title: v.fieldDesc,
         key: v.name,
-        fixed: "left",
+        fixed: 'left',
         width: 120,
-      });
+      })
     }
-    if (userFieldUnFixed?.find((v2) => v2 == v.name)) {
+    if (userFieldUnFixed?.find(v2 => v2 == v.name)) {
       columnsRef.value.push({
         title: v.fieldDesc,
         key: v.name,
         width: 120,
-      });
+      })
     }
-  });
-  columnsRef.value.push(actionsColumns as any);
-  formatColumns();
-  console.log(columnsRef.value, "columnsRef");
+  })
+  columnsRef.value.push(actionsColumns as any)
+  formatColumns()
+  console.log(columnsRef.value, 'columnsRef')
 }
 
 async function formatColumns() {
   // TODO处理特殊字段
 
-  let index;
-  index = columnsRef.value.findIndex((v) => v.title == "任务ID");
+  let index
+  index = columnsRef.value.findIndex(v => v.title == '任务ID')
   if (index > -1) {
     columnsRef.value[index] = {
-      title: "任务ID",
+      title: '任务ID',
       key: columnsRef.value[index].key, // "id"
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
       render(row) {
         const item: any = izstatusList.value.find(
-          (item: any) => item.value == row.states
-        );
+          (item: any) => item.value == row.states,
+        )
         return h(
           NButton,
           {
-            strong: true,
-            tertiary: true,
-            text: true,
-            size: "small",
-            "text-color": "#507AFD",
-            onClick: () => goDetail(row),
+            'strong': true,
+            'tertiary': true,
+            'text': true,
+            'size': 'small',
+            'text-color': '#507AFD',
+            'onClick': () => goDetail(row),
           },
-          { default: () => row.id }
-        );
+          { default: () => row.id },
+        )
       },
-    };
+    }
   }
 
-  index = columnsRef.value.findIndex((v) => v.title == "任务名称");
+  index = columnsRef.value.findIndex(v => v.title == '任务名称')
   if (index > -1) {
     columnsRef.value[index] = {
-      title: "任务名称",
+      title: '任务名称',
       key: columnsRef.value[index].key, // "fromtaskname"
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
       ellipsis: {
         tooltip: true,
       },
-    };
+    }
   }
-  index = columnsRef.value.findIndex((v) => v.title == "审批状态");
+  index = columnsRef.value.findIndex(v => v.title == '审批状态')
   if (index > -1) {
     columnsRef.value[index] = {
-      title: "审批状态",
+      title: '审批状态',
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 120,
-      sorter: "default",
+      sorter: 'default',
       renderSorterIcon: ({ order }) => {
-        if (order === false) return h(SvgIcon, { name: "sort-2" });
-        if (order === "ascend") return h(SvgIcon, { name: "sort-1" });
-        if (order === "descend") return h(SvgIcon, { name: "sort-3" });
+        if (order === false)
+          return h(SvgIcon, { name: 'sort-2' })
+        if (order === 'ascend')
+          return h(SvgIcon, { name: 'sort-1' })
+        if (order === 'descend')
+          return h(SvgIcon, { name: 'sort-3' })
       },
       render(row) {
         const item: any = izstatusList.value.find(
-          (item: any) => item.value == row.states
-        );
+          (item: any) => item.value == row.states,
+        )
         return h(StatusItem, {
           id: row.id,
           status: row.states,
-          label: item ? item.label : "",
-        });
+          label: item ? item.label : '',
+        })
       },
-    };
+    }
   }
-  index = columnsRef.value.findIndex((v) => v.title == "图片相似度");
+  index = columnsRef.value.findIndex(v => v.title == '图片相似度')
   if (index > -1) {
     columnsRef.value[index] = {
-      title: "图片相似度",
+      title: '图片相似度',
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 150,
-      sorter: "default",
+      sorter: 'default',
       renderSorterIcon: ({ order }) => {
-        if (order === false) return h(SvgIcon, { name: "sort-2" });
-        if (order === "ascend") return h(SvgIcon, { name: "sort-1" });
-        if (order === "descend") return h(SvgIcon, { name: "sort-3" });
+        if (order === false)
+          return h(SvgIcon, { name: 'sort-2' })
+        if (order === 'ascend')
+          return h(SvgIcon, { name: 'sort-1' })
+        if (order === 'descend')
+          return h(SvgIcon, { name: 'sort-3' })
       },
       render(row: any) {
-        return row.similarityscore ? `${row.similarityscore}%` : "";
+        return h('div', {
+          id: row.id,
+          style: { color: row.similarityscore === 100 ? '#FF4E4F' : '' },
+        }, { default: () => row.similarityscore ? `${row.similarityscore}%` : '' })
       },
-    };
+
+    }
   }
-  index = columnsRef.value.findIndex((v) => v.title == "提报时间");
+  index = columnsRef.value.findIndex(v => v.title == '提报时间')
   if (index > -1) {
     columnsRef.value[index] = {
-      title: "提报时间",
+      title: '提报时间',
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
-      sorter: "default",
+      sorter: 'default',
       renderSorterIcon: ({ order }) => {
-        if (order === false) return h(SvgIcon, { name: "sort-2" });
-        if (order === "ascend") return h(SvgIcon, { name: "sort-1" });
-        if (order === "descend") return h(SvgIcon, { name: "sort-3" });
+        if (order === false)
+          return h(SvgIcon, { name: 'sort-2' })
+        if (order === 'ascend')
+          return h(SvgIcon, { name: 'sort-1' })
+        if (order === 'descend')
+          return h(SvgIcon, { name: 'sort-3' })
       },
       render(row: any) {
-        return formatToDateHMS(row.createdate || 0);
+        return formatToDateHMS(row.createdate || 0)
       },
-    };
+    }
   }
 
-  index = columnsRef.value.findIndex((v) => v.title == "更新时间");
+  index = columnsRef.value.findIndex(v => v.title == '更新时间')
   if (index > -1) {
     columnsRef.value[index] = {
-      title: "更新时间",
+      title: '更新时间',
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
       render(row: any) {
-        return row.updatetime ? formatToDateHMS(row.updatetime) : "";
+        return row.updatetime ? formatToDateHMS(row.updatetime) : ''
       },
-    };
+    }
   }
 }
 
-const deviceHeight = ref(600);
+const deviceHeight = ref(600)
 
 onMounted(() => {
-  emitter.on("filter-final", refreshHandler);
-  getColumns();
+  emitter.on('filter-final', refreshHandler)
+  getColumns()
 
   nextTick(() => {
-    computeListHeight();
-  });
-});
+    computeListHeight()
+  })
+})
 
 onBeforeMount(() => {
-  dicStore.fetchizstatusListt();
-});
+  dicStore.fetchizstatusListt()
+})
 
 watch(
   () => dicStore.izstatusList,
   (newval) => {
-    izstatusList.value = newval;
-  }
-);
+    izstatusList.value = newval
+  },
+)
 
 onUnmounted(() => {
-  emitter.off("filter-final", refreshHandler);
-});
+  emitter.off('filter-final', refreshHandler)
+})
 
-const tableRef = ref<InstanceType<typeof NDataTable>>();
-const rowKey = (row: RowData) => row.id;
-const loading = ref(true);
-const total = ref(0);
+const tableRef = ref<InstanceType<typeof NDataTable>>()
+const rowKey = (row: RowData) => row.id
+const loading = ref(true)
+const total = ref(0)
 const pagination = reactive({
   page: 1,
-  pageCount: 1,
+  pageCount: 10,
   pageSize: 10,
   showSizePicker: true,
   pageSizes: [
     {
-      label: "10 每页",
+      label: '10 每页',
       value: 10,
     },
     {
-      label: "15 每页",
+      label: '15 每页',
       value: 15,
     },
     {
-      label: "30 每页",
+      label: '30 每页',
       value: 30,
     },
     {
-      label: "50 每页",
+      label: '50 每页',
       value: 50,
     },
   ],
   showQuickJumper: true,
   prefix: () => `共 ${total.value} 条数据`,
-});
-const tableData = ref<Array<RowData>>([]);
-const selectionIds = ref<DataTableRowKey[]>([]);
-const dialog = useDialog();
-const message = useMessage();
-const finalStore = useFinal();
+})
+const tableData = ref<Array<RowData>>([])
+const selectionIds = ref<DataTableRowKey[]>([])
+const dialog = useDialog()
+const message = useMessage()
+const finalStore = useFinal()
 
 async function query(page: number, pageSize: number, filterId?: any) {
-  const asideParmas = unref(finalStore.getAsideValue);
+  const asideParmas = unref(finalStore.getAsideValue)
   // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
-  const params = filterId ? { userSearchId: filterId } : asideParmas;
+  const params = filterId ? { userSearchId: filterId } : asideParmas
   const result = await getFinalList({
-    sortorder: "asc",
+    sortorder: 'asc',
     pageSize,
     currPage: page,
-    sortname: "",
+    sortname: '',
     ...params,
-  });
-  const { data, pageCount, totalCount } = result;
-  tableData.value = data;
-  total.value = totalCount;
-  pagination.page = page;
-  pagination.pageCount = pageCount;
-  loading.value = false;
+  })
+  const { data, pageCount, totalCount } = result
+  tableData.value = data
+  total.value = totalCount
+  pagination.page = page
+  pagination.pageCount = pageCount
+  loading.value = false
 }
 
 async function handlePageChange(currentPage) {
-  if (loading.value) return;
-  const { pageSize } = pagination;
-  pagination.page = currentPage;
-  await query(currentPage, pageSize);
+  if (loading.value)
+    return
+  const { pageSize } = pagination
+  pagination.page = currentPage
+  await query(currentPage, pageSize)
 }
 async function handlePageSizeChange(currentPageSize) {
-  if (loading.value) return;
+  if (loading.value)
+    return
 
-  const { page } = pagination;
-  pagination.pageSize = currentPageSize;
+  const { page } = pagination
+  pagination.pageSize = currentPageSize
 
-  await query(page, currentPageSize);
+  await query(page, currentPageSize)
 }
 
 function handleCheck(rowKeys: DataTableRowKey[]) {
-  selectionIds.value = rowKeys;
+  selectionIds.value = rowKeys
 }
 
 async function computeListHeight() {
-  const table = unref(tableRef);
-  if (!table) return;
-  const tableEl: any = table?.$el;
-  const headEl = tableEl.querySelector(".n-data-table-thead ");
-  const { bottomIncludeBody } = getViewportOffset(headEl);
-  const headerH = 64;
-  let paginationH = 2;
-  const marginH = 60;
+  const table = unref(tableRef)
+  if (!table)
+    return
+  const tableEl: any = table?.$el
+  const headEl = tableEl.querySelector('.n-data-table-thead ')
+  const { bottomIncludeBody } = getViewportOffset(headEl)
+  const headerH = 64
+  let paginationH = 2
+  const marginH = 60
   if (!isBoolean(unref(pagination))) {
     const paginationEl = tableEl.querySelector(
-      ".n-data-table__pagination"
-    ) as HTMLElement;
+      '.n-data-table__pagination',
+    ) as HTMLElement
     if (paginationEl) {
-      const offsetHeight = paginationEl.offsetHeight;
-      paginationH += offsetHeight || 0;
-    } else {
-      paginationH += 28;
+      const offsetHeight = paginationEl.offsetHeight
+      paginationH += offsetHeight || 0
+    }
+    else {
+      paginationH += 28
     }
   }
-  let height = bottomIncludeBody - (headerH + paginationH + marginH);
-  const maxHeight = 800;
-  height = maxHeight && maxHeight < height ? maxHeight : height;
-  deviceHeight.value = height;
+  let height = bottomIncludeBody - (headerH + paginationH + marginH)
+  const maxHeight = 800
+  height = maxHeight && maxHeight < height ? maxHeight : height
+  deviceHeight.value = height
 }
 
-useWindowSizeFn(computeListHeight);
+useWindowSizeFn(computeListHeight)
 
 const maxHeight = computed(() => {
-  return tableData.value.length ? `${unref(deviceHeight)}px` : "auto";
-});
+  return tableData.value.length ? `${unref(deviceHeight)}px` : 'auto'
+})
 
-query(pagination.page, pagination.pageSize);
+query(pagination.page, pagination.pageSize)
 
-const customTabelRef = ref(null);
-const importExcelRef = ref(null);
-const rejectModalRef = ref(null);
-const repeatModalRef = ref(null);
-const repeatTaskTableModalRef = ref(null);
+const customTabelRef = ref(null)
+const importExcelRef = ref(null)
+const notPassModalRef = ref(null) // 不通过
+const repeatModalRef = ref(null)
+const repeatTaskTableModalRef = ref(null)
 
 function showModal(modalRef: any) {
-  const modal = unref(modalRef)! as any;
-  modal.showModal();
+  const modal = unref(modalRef)! as any
+  modal.showModal()
 }
 
-const popover = ref<ComponentRef | null>(null);
+const popover = ref<ComponentRef | null>(null)
 
 function importHandler() {
-  (popover.value as any).setShow(false);
-  showModal(importExcelRef);
+  (popover.value as any).setShow(false)
+  showModal(importExcelRef)
 }
 
 function exportHandler() {
-  loading.value = true;
-  import("@/utils/exportExcel").then((excel) => {
+  loading.value = true
+  import('@/utils/exportExcel').then((excel) => {
     const tHeader = [
-      "任务Id",
-      "任务名称",
-      "审批节点",
-      "审批状态",
-      "图片相似度",
-      "提报时间",
-      "更新时间",
-    ];
+      '任务Id',
+      '任务名称',
+      '审批节点',
+      '审批状态',
+      '图片相似度',
+      '提报时间',
+      '更新时间',
+    ]
     const filterVal = [
-      "id",
-      "name",
-      "approvalnode",
-      "approvalstatus",
-      "similarity",
-      "uptime",
-      "updatetime",
-    ];
-    const list = tableData.value;
-    const data = formatJson(filterVal, list);
+      'id',
+      'name',
+      'approvalnode',
+      'approvalstatus',
+      'similarity',
+      'uptime',
+      'updatetime',
+    ]
+    const list = tableData.value
+    const data = formatJson(filterVal, list)
     excel.export_json_to_excel({
       header: tHeader,
       data,
-      filename: "data",
+      filename: 'data',
       autoWidth: true,
-      bookType: "xlsx",
-    });
-    loading.value = false;
-  });
+      bookType: 'xlsx',
+    })
+    loading.value = false
+  })
 }
 
 function formatJson(filterVal, jsonDataList) {
-  return jsonDataList.map((v) =>
+  return jsonDataList.map(v =>
     filterVal.map((j) => {
-      return v[j];
-    })
-  );
+      return v[j]
+    }),
+  )
 }
 
 function sucessHandler(excelData) {
   const data = excelData.content.map((item) => {
-    const obj = {};
+    const obj = {}
     Object.keys(item).forEach((key) => {
-      const k = findKey(columns, key);
-      obj[k] = item[key];
-    });
-    return obj;
-  });
+      const k = findKey(columns, key)
+      obj[k] = item[key]
+    })
+    return obj
+  })
 
-  tableData.value = data;
+  tableData.value = data
 }
 
 function commitHandler(columns) {
-  columnsRef.value = [...columns, actionsColumns];
-  formatColumns();
+  columnsRef.value = [...columns, actionsColumns]
+  formatColumns()
 }
 
 function actionHandler(action: any, row: any) {
-  const { key } = action;
+  const { key } = action
   switch (key) {
-    case "view":
-      goDetail(row);
-      break;
-    case "reset":
-      resetHandler();
-      break;
-    case "approval":
-      approvalHandler(row);
-      break;
-    case "reject":
-      rejectHandler(row);
-      break;
+    case 'view':
+      goDetail(row)
+      break
+    case 'reset':
+      resetHandler()
+      break
+    case 'approval':
+      approvalHandler(row)
+      break
+    case 'reject':
+      rejectHandler(row)
+      break
     default:
-      break;
+      break
   }
 }
 
 // states:1未提交，2待审批，3通过，4不通过
 function validate(items: any[]) {
-  if (items.length === 0) return "至少选中一个任务";
+  if (items.length === 0)
+    return '至少选中一个任务'
 
   // const useInfo = userStore.getUserInfo
   // const username = useInfo.loginname
@@ -587,151 +605,151 @@ function validate(items: any[]) {
   //     return '审批人不一致'
   // }
 
-  return null;
+  return null
 }
 
 function goDetail(row) {
-  router.push({ name: "final-detail", query: { id: row.id, packageid: row.packageid } });
+  router.push({ name: 'final-detail', query: { id: row.id, packageid: row.packageid } })
 }
 
 function resetHandler() {
   dialog.info({
-    title: "确认提示",
-    content: "确认重置当前选中的任务的审批吗?",
-    positiveText: "确定",
-    negativeText: "取消",
+    title: '确认提示',
+    content: '确认重置当前选中的任务的审批吗?',
+    positiveText: '确定',
+    negativeText: '取消',
     onPositiveClick: async () => {
       // TODO：需要支持重置
       // const result = await resetApproval()
     },
     onNegativeClick: () => {},
-  });
+  })
 }
 
 function getSelectItems() {
-  return tableData.value.filter((item) => selectionIds.value.includes(item.id));
+  return tableData.value.filter(item => selectionIds.value.includes(item.id))
 }
 
 function approvalHandler(row) {
   // const items = getSelectItems()
-  const items = [row];
-  const msg = validate(items);
+  const items = [row]
+  const msg = validate(items)
 
   if (msg !== null) {
-    message.error(msg);
-    return;
+    message.error(msg)
+    return
   }
 
   dialog.info({
-    title: "确认提示",
-    content: "确认给该任务审批为【通过】吗?",
-    positiveText: "确定",
-    negativeText: "取消",
+    title: '确认提示',
+    content: '确认给该任务审批为【通过】吗?',
+    positiveText: '确定',
+    negativeText: '取消',
     onPositiveClick: () => {
-      approval(items);
+      approval(items)
     },
     onNegativeClick: () => {},
-  });
+  })
 }
 
 function batchApproval() {
-  const items = getSelectItems();
-  const msg = validate(items);
+  const items = getSelectItems()
+  const msg = validate(items)
 
   if (msg !== null) {
-    message.error(msg);
-    return;
+    message.error(msg)
+    return
   }
 
   dialog.info({
-    title: "确认提示",
-    content: "确认给该任务审批为【通过】吗?",
-    positiveText: "确定",
-    negativeText: "取消",
+    title: '确认提示',
+    content: '确认给该任务审批为【通过】吗?',
+    positiveText: '确定',
+    negativeText: '取消',
     onPositiveClick: () => {
-      approval(items);
+      approval(items)
     },
     onNegativeClick: () => {},
-  });
+  })
 }
 
 function approval(items) {
-  const formIds: string[] = items.map((item) => item.id);
-  const taskIds: string[] = items.map((item) => item.taskId);
-  const tasknames: string[] = items.map((item) => item.taskname);
+  const formIds: string[] = items.map(item => item.id)
+  const taskIds: string[] = items.map(item => item.taskId)
+  const tasknames: string[] = items.map(item => item.taskname)
 
   const param: ApprovalParam = {
     formid: formIds,
     taskId: taskIds,
     approvd: true,
-    taskComment: "approval",
+    taskComment: 'approval',
     taskname: tasknames,
-  };
+  }
 
-  doAudit(param);
+  doAudit(param)
 }
 
 function rejectHandler(row) {
   // const items = getSelectItems()
-  const items = [row];
-  const msg = validate(items);
+  const items = [row]
+  const msg = validate(items)
 
   if (msg !== null) {
-    message.error(msg);
-    return;
+    message.error(msg)
+    return
   }
 
-  const modal = unref(rejectModalRef)! as any;
-  modal.showModal();
+  const modal = unref(notPassModalRef)! as any
+  modal.showModal()
 }
 
 function reject(idOrDesc: string, backId: string, isOther: boolean) {
-  const items = getSelectItems();
-  const formIds: string[] = items.map((item) => item.id);
-  const taskIds: string[] = items.map((item) => item.fromtaskid);
-  const tasknames: string[] = items.map((item) => item.fromtaskname);
+  const items = getSelectItems()
+  const formIds: string[] = items.map(item => item.id)
+  const taskIds: string[] = items.map(item => item.fromtaskid)
+  const tasknames: string[] = items.map(item => item.fromtaskname)
 
   const param: ApprovalParam = {
     formid: formIds,
     taskId: taskIds,
     approvd: false,
     taskComment: idOrDesc,
-    taskname: isOther ? tasknames : ["其他"],
-  };
+    taskname: isOther ? tasknames : ['其他'],
+  }
 
-  doAudit(param);
+  doAudit(param)
 }
 
 function doAudit(param: any) {
   audit(param).then((res) => {
-    const { code } = res;
-    if (code === "OK") reload();
-    else message.error(res.message);
-  });
+    const { code } = res
+    if (code === 'OK')
+      reload()
+    else message.error(res.message)
+  })
 }
 
 function reload() {
-  const { page, pageSize } = unref(tableRef.value?.pagination) as PaginationProps;
-  query(page!, pageSize!);
+  const { page, pageSize } = unref(tableRef.value?.pagination) as PaginationProps
+  query(page!, pageSize!)
 }
 
 watch(
   () => finalStore.asideValue,
   (newVal, oldVal) => {
-    refreshHandler();
+    refreshHandler()
   },
-  { deep: true }
-);
+  { deep: true },
+)
 
 function reset() {
-  pagination.page = 1;
-  pagination.pageCount = 1;
-  pagination.pageSize = 1;
+  pagination.page = 1
+  pagination.pageCount = 1
 }
 
 async function refreshHandler(searchId?: any) {
-  reset();
-  query(pagination.page, pagination.pageSize, searchId);
+  reset()
+  query(pagination.page, pagination.pageSize, searchId)
 }
 </script>
 
@@ -743,7 +761,9 @@ async function refreshHandler(searchId?: any) {
         <SvgIcon size="32" name="magnifying" @click="changeContent" />
       </div>
       <div>
-        <NButton class="xjcc" text @click="showModal(repeatModalRef)"> 小结查重 </NButton>
+        <NButton class="xjcc" text @click="showModal(repeatModalRef)">
+          小结查重
+        </NButton>
         <div class="btn" @click="batchApproval">
           <SvgIcon style="margin-right: 6px" size="14" name="tf" />
           批量审批
@@ -761,19 +781,13 @@ async function refreshHandler(searchId?: any) {
           </template>
           <ul class="wrapper-header-action">
             <li @click="importHandler">
-              <SvgIcon size="20" name="download" /><span style="margin-left: 5px"
-                >批量导入数据</span
-              >
+              <SvgIcon size="20" name="download" /><span style="margin-left: 5px">批量导入数据</span>
             </li>
             <li @click="exportHandler">
-              <SvgIcon size="20" name="download" /><span style="margin-left: 5px"
-                >导出待审数据</span
-              >
+              <SvgIcon size="20" name="download" /><span style="margin-left: 5px">导出待审数据</span>
             </li>
             <li>
-              <SvgIcon size="20" name="download" /><span style="margin-left: 5px"
-                >导出全部数据</span
-              >
+              <SvgIcon size="20" name="download" /><span style="margin-left: 5px">导出全部数据</span>
             </li>
           </ul>
         </n-popover>
@@ -823,10 +837,11 @@ async function refreshHandler(searchId?: any) {
       :on-success="sucessHandler"
       :header-config="headRules"
     />
-    <ConfrimModal ref="rejectModalRef" @commit="reject" />
+    <NotPassed ref="notPassModalRef" @success="reloadList" />
+
     <RepeatModal
       ref="repeatModalRef"
-      @reject="showModal(rejectModalRef)"
+      @reject="showModal(notPassModalRef)"
       @viewrepeat="showModal(repeatTaskTableModalRef)"
     />
     <RepeatTaskTableModal ref="repeatTaskTableModalRef" />
@@ -834,6 +849,9 @@ async function refreshHandler(searchId?: any) {
 </template>
 
 <style lang="less" scoped>
+.color-red{
+  color: #FF4E4F!important;
+}
 .wrapper {
   display: flex;
   flex: 1;
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index 73016c1..697b41a 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -342,7 +342,7 @@ function reloadList() {
   <div class="wrapper">
     <div class="wrapper-header">
       <div class="left">
-        <span class="font">任务ID：{{ currentTaskId }}</span>
+        <span class="font">任务ID：{{ taskDetailInfo.fromtaskname }}</span>
         <SvgIcon
           size="22"
           class="forward"
-- 
2.39.3


From 26481b68e855acf23151dccbc6e87ce75572a971 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sat, 30 Mar 2024 09:05:01 +0800
Subject: [PATCH 020/143] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/content/Content.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 14cae00..7cfe6f4 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -428,8 +428,8 @@ function reloadList() {
               </div>
             </div>
             <div class="status">
-              <img v-show="taskDetailInfo?.states === 3" class="img-status" src="@/assets/images/task/pass.png" alt="">
-              <img v-show="taskDetailInfo?.states === 5" class="img-status" src="@/assets/images/task/not_pass.png"
+              <img v-show="taskDetailInfo?.states === 2" class="img-status" src="@/assets/images/task/pass.png" alt="">
+              <img v-show="taskDetailInfo?.states === 3" class="img-status" src="@/assets/images/task/not_pass.png"
                 alt="">
             </div>
             <!-- 右下信息 -->
-- 
2.39.3


From de6505bfb9dc826bdc8abe50767666639f2eb74f Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sat, 30 Mar 2024 09:07:53 +0800
Subject: [PATCH 021/143] =?UTF-8?q?feat:=20=E4=B8=BB=E5=9B=BE=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=B8=BA=E9=80=9A=E8=BF=87=E6=88=96=E4=B8=8D=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E5=90=8E=EF=BC=8C=E7=A6=81=E6=AD=A2=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/content/Content.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 7cfe6f4..e6b6f41 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -269,7 +269,10 @@ function immersionHandler() {
 }
 
 function showAction() {
-  const item = taskDetailInfo.value;
+  const item = taskDetailInfo.value;  
+  if (item.states === 2 || item.states === 3) {
+    return
+  }
   if (batch.value === false) overTask.value = item;
 }
 
-- 
2.39.3


From 55533ff3f98c5c2754d57a71889dadf757dad35d Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sat, 30 Mar 2024 12:34:53 +0800
Subject: [PATCH 022/143] =?UTF-8?q?feat:=20=E7=94=9F=E6=88=90=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E7=A9=BA=E5=80=BC=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/aside/ListItem.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/worksheet/aside/ListItem.vue b/src/views/worksheet/aside/ListItem.vue
index 10dac90..aec4360 100644
--- a/src/views/worksheet/aside/ListItem.vue
+++ b/src/views/worksheet/aside/ListItem.vue
@@ -63,7 +63,7 @@ onMounted(async () => {
           提交时间：{{ format(listItem.createdate, "yyyy-MM-dd HH:mm:ss") }}
         </li>
         <li v-else-if="item.id === 'createTime'">
-          生成时间：{{ format(listItem.createTime, "yyyy-MM-dd HH:mm:ss") }}
+          生成时间：{{ listItem.createTime && format(listItem.createTime, "yyyy-MM-dd HH:mm:ss") }}
         </li>
         <li v-else class="ellipsis" v-if="listItem[item.id]">
           <span class="label">{{ item.name }}：</span>{{ listItem[item.id] }}
-- 
2.39.3


From 2fcde4358f400cf7ea9b4f5d4ba9b1634e9c1bc4 Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Sat, 30 Mar 2024 12:59:11 +0800
Subject: [PATCH 023/143] bug

---
 src/views/final/content/Content.vue | 120 ++++++++++++++++------------
 src/views/task/aside/ListItem.vue   |   5 +-
 src/views/task/aside/TaskList.vue   | 112 +++++++++++++-------------
 src/views/task/content/Content.vue  |  16 ++--
 4 files changed, 140 insertions(+), 113 deletions(-)

diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index 6da9fac..126413c 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -248,6 +248,19 @@ async function formatColumns() {
     }
   }
 
+  index = columnsRef.value.findIndex(v => v.title == '所属项目')
+  if (index > -1) {
+    columnsRef.value[index] = {
+      title: '所属项目',
+      key: columnsRef.value[index].key, // "fromtaskname"
+      fixed: columnsRef.value[index].fixed || undefined,
+      width: 200,
+      ellipsis: {
+        tooltip: true,
+      },
+    }
+  }
+
   index = columnsRef.value.findIndex(v => v.title == '任务名称')
   if (index > -1) {
     columnsRef.value[index] = {
@@ -575,10 +588,10 @@ function actionHandler(action: any, row: any) {
       resetHandler()
       break
     case 'approval':
-      approvalHandler(row)
+      singleApproval(row)
       break
     case 'reject':
-      rejectHandler(row)
+      rejectHandler([row])
       break
     default:
       break
@@ -630,26 +643,24 @@ function getSelectItems() {
   return tableData.value.filter(item => selectionIds.value.includes(item.id))
 }
 
-function approvalHandler(row) {
-  // const items = getSelectItems()
-  const items = [row]
-  const msg = validate(items)
-
-  if (msg !== null) {
-    message.error(msg)
-    return
+// 单个审批通过
+function singleApproval(row) {
+  const param = {
+    result: true,
+    comment: '',
+    disposeType: '',
+    disposeTypeId: '',
+    failCauseId: '',
+    failCauseName: '',
+    flowTaskInfoList: [
+      {
+        formId: row.id,
+        taskId: row.taskId,
+        taskName: row.fromTaskName,
+      },
+    ],
   }
-
-  dialog.info({
-    title: '确认提示',
-    content: '确认给该任务审批为【通过】吗?',
-    positiveText: '确定',
-    negativeText: '取消',
-    onPositiveClick: () => {
-      approval(items)
-    },
-    onNegativeClick: () => {},
-  })
+  doAudit(param)
 }
 
 function batchApproval() {
@@ -673,26 +684,25 @@ function batchApproval() {
   })
 }
 
-function approval(items) {
-  const formIds: string[] = items.map(item => item.id)
-  const taskIds: string[] = items.map(item => item.taskId)
-  const tasknames: string[] = items.map(item => item.taskname)
+// function approval(items) {
+//   const formIds: string[] = items.map(item => item.id)
+//   const taskIds: string[] = items.map(item => item.taskId)
+//   const tasknames: string[] = items.map(item => item.taskname)
 
-  const param: ApprovalParam = {
-    formid: formIds,
-    taskId: taskIds,
-    approvd: true,
-    taskComment: 'approval',
-    taskname: tasknames,
-  }
+//   const param: ApprovalParam = {
+//     formid: formIds,
+//     taskId: taskIds,
+//     approvd: true,
+//     taskComment: 'approval',
+//     taskname: tasknames,
+//   }
 
-  doAudit(param)
-}
+//   doAudit(param)
+// }
 
-function rejectHandler(row) {
-  // const items = getSelectItems()
-  const items = [row]
-  const msg = validate(items)
+// 审核不通过
+function rejectHandler(list) {
+  const msg = validate(list)
 
   if (msg !== null) {
     message.error(msg)
@@ -700,7 +710,7 @@ function rejectHandler(row) {
   }
 
   const modal = unref(notPassModalRef)! as any
-  modal.showModal()
+  modal.showModal(list)
 }
 
 function reject(idOrDesc: string, backId: string, isOther: boolean) {
@@ -720,15 +730,6 @@ function reject(idOrDesc: string, backId: string, isOther: boolean) {
   doAudit(param)
 }
 
-function doAudit(param: any) {
-  audit(param).then((res) => {
-    const { code } = res
-    if (code === 'OK')
-      reload()
-    else message.error(res.message)
-  })
-}
-
 function reload() {
   const { page, pageSize } = unref(tableRef.value?.pagination) as PaginationProps
   query(page!, pageSize!)
@@ -751,6 +752,27 @@ async function refreshHandler(searchId?: any) {
   reset()
   query(pagination.page, pagination.pageSize, searchId)
 }
+
+// 审核通过
+function doAudit(param: any) {
+  dialog.info({
+    title: '确认提示',
+    content: '确认给该任务审批为【通过】吗?',
+    positiveText: '确定',
+    negativeText: '取消',
+    onPositiveClick: () => {
+      audit(param).then((res) => {
+        const { code } = res
+        if (code === 'OK') {
+          message.success('审核成功')
+          reload()
+        }
+        else { message.error(res.message) }
+      })
+    },
+    onNegativeClick: () => {},
+  })
+}
 </script>
 
 <template>
@@ -837,7 +859,7 @@ async function refreshHandler(searchId?: any) {
       :on-success="sucessHandler"
       :header-config="headRules"
     />
-    <NotPassed ref="notPassModalRef" @success="reloadList" />
+    <NotPassed ref="notPassModalRef" @success="reload" />
 
     <RepeatModal
       ref="repeatModalRef"
diff --git a/src/views/task/aside/ListItem.vue b/src/views/task/aside/ListItem.vue
index 473aec1..d2ac772 100644
--- a/src/views/task/aside/ListItem.vue
+++ b/src/views/task/aside/ListItem.vue
@@ -53,7 +53,10 @@ const svgName = computed(() => {
             "
           >{{ listItem.statshisText }}</span>
         </li>
-        <li v-else-if="item.id === 'createdate'">
+        <li v-else-if="item.id === 'finishTime'">
+          提报时间：{{ format(listItem.finishTime, "yyyy-MM-dd HH:mm:ss") }}
+        </li>
+        <li v-else-if="item.id === '提报时间'">
           提交时间：{{ format(listItem.createdate, "yyyy-MM-dd HH:mm:ss") }}
         </li>
         <li v-else class="ellipsis">
diff --git a/src/views/task/aside/TaskList.vue b/src/views/task/aside/TaskList.vue
index 2f94104..a53597e 100644
--- a/src/views/task/aside/TaskList.vue
+++ b/src/views/task/aside/TaskList.vue
@@ -1,119 +1,121 @@
 <script lang="ts" setup>
-import { useInfiniteScroll } from "@vueuse/core";
-import { onMounted, onUnmounted, reactive, ref, watch, defineProps } from "vue";
-import ListItem from "./ListItem.vue";
-import emitter from "@/utils/mitt";
-import { useTaskStore } from "@/store/modules/task";
-
-const taskStore = useTaskStore();
-const data = ref<any[]>([]);
-const activeId = ref("");
-const el = ref<HTMLDivElement | null>(null);
-const keyword = ref("");
-const canloadMore = ref(true);
-const isLoading = ref(false);
+import { useInfiniteScroll } from '@vueuse/core'
+import { defineProps, onMounted, onUnmounted, reactive, ref, watch } from 'vue'
+import ListItem from './ListItem.vue'
+import emitter from '@/utils/mitt'
+import { useTaskStore } from '@/store/modules/task'
 
 defineProps({
   showFieldList: {
     type: Array,
     default: () => [],
   },
-});
-
+})
+const taskStore = useTaskStore()
+const data = ref<any[]>([])
+const activeId = ref('')
+const el = ref<HTMLDivElement | null>(null)
+const keyword = ref('')
+const canloadMore = ref(true)
+const isLoading = ref(false)
 
 const pagination = reactive({
   pageNo: 0,
-  pageSize: 100,
-});
+  pageSize: 30,
+})
 
 function selectHandler(id: string, index: number) {
-  taskStore.setActive(index);
+  taskStore.setActive(index)
 }
 
 useInfiniteScroll(
   el as any,
   () => {
-    loadMore();
+    loadMore()
   },
-  { distance: 10, interval: 1500, canLoadMore: () => canloadMore.value }
-);
+  { distance: 10, interval: 1500, canLoadMore: () => canloadMore.value },
+)
 
 async function loadMore() {
-  if (isLoading.value || el.value == null) return;
-    isLoading.value = true;
+  if (isLoading.value || el.value == null)
+    return
+  isLoading.value = true
   try {
-    const more = await fetchList();
-    data.value.push(...more);
-  } finally {
-    isLoading.value = false;
+    const more = await fetchList()
+    data.value.push(...more)
+  }
+  finally {
+    isLoading.value = false
   }
 }
 
+// 获取左侧列表
 async function fetchList() {
   try {
-    pagination.pageNo += 1;
-    const result = await taskStore.fetchApprovalList(pagination);
-    const { data, pageCount } = result;
-    canloadMore.value = pageCount >= pagination.pageNo;
-    return data || [];
-  } catch (error) {
-    canloadMore.value = false;
-    return [];
+    pagination.pageNo += 1
+    const result = await taskStore.fetchApprovalList(pagination)
+    const { data, pageCount } = result
+    canloadMore.value = pageCount >= pagination.pageNo
+    return data || []
+  }
+  catch (error) {
+    canloadMore.value = false
+    return []
   }
 }
 
 watch(
   () => taskStore.activeId,
   (newVal) => {
-    activeId.value = newVal;
-  }
-);
+    activeId.value = newVal
+  },
+)
 
 function reset() {
-  pagination.pageNo = 0;
-  pagination.pageSize = 100;
-  canloadMore.value = true;
-  data.value.length = 0;
+  pagination.pageNo = 0
+  pagination.pageSize = 100
+  canloadMore.value = true
+  data.value.length = 0
 
-  taskStore.reset();
+  taskStore.reset()
 }
 
 async function search(word: string) {
-  keyword.value = word;
-  reset();
+  keyword.value = word
+  reset()
   useInfiniteScroll(
     el as any,
     () => {
-      loadMore();
+      loadMore()
     },
-    { distance: 10, canLoadMore: () => canloadMore.value }
-  );
+    { distance: 10, canLoadMore: () => canloadMore.value },
+  )
 }
 
 onMounted(() => {
-  emitter.on("refresh", refreshHandler);
-});
+  emitter.on('refresh', refreshHandler)
+})
 
 onUnmounted(() => {
-  emitter.off("refresh", refreshHandler);
-});
+  emitter.off('refresh', refreshHandler)
+})
 
 async function refreshHandler() {
-  search("");
+  search('')
 }
 
 defineExpose({
   search,
-});
+})
 </script>
 
 <template>
   <n-spin :show="isLoading">
     <div ref="el" class="list">
       <ListItem
-        :showFieldList="showFieldList"
         v-for="(item, index) in data"
         :key="item.id"
+        :show-field-list="showFieldList"
         :selected="activeId === item.id"
         :list-item="item"
         @click="selectHandler(item.id, index)"
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index 697b41a..af5d094 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -490,13 +490,13 @@ function reloadList() {
           </n-grid>
         </div>
         <div class="time">
-          <div v-if="taskDetailInfo?.ocrPicture?.photoDateTimestamp" class="time-item">
+          <div class="time-item">
             <SvgIcon class="svg-time" color="#FFF" size="16" name="camera-time" />
-            <span>{{ formatToDateHMS(Number(taskDetailInfo.ocrPicture.photoDateTimestamp) || 0) }}</span>
+            <span>{{ taskDetailInfo?.ocrPicture?.photoDateTimestamp ? formatToDateHMS(Number(taskDetailInfo.ocrPicture.photoDateTimestamp)) : '-' }}</span>
           </div>
-          <div v-if="taskDetailInfo?.ocrPicture?.submitDateTimestamp" class="time-item time-item2">
+          <div class="time-item time-item2">
             <SvgIcon class="svg-time" color="#FFF" size="16" name="submit-time" />
-            <span>{{ formatToDateHMS(Number(taskDetailInfo.ocrPicture.submitDateTimestamp) || 0) }}</span>
+            <span>{{ taskDetailInfo?.ocrPicture?.submitDateTimestamp ? formatToDateHMS(Number(taskDetailInfo.ocrPicture.submitDateTimestamp)) : '-' }}</span>
           </div>
         </div>
         <div style="display: none">
@@ -544,13 +544,13 @@ function reloadList() {
                 <img v-if="item.historyStates === 2" class="tag-status" src="@/assets/images/task/tag-pass.png" alt="">
                 <img v-if="item.historyStates === 3" class="tag-status" src="@/assets/images/task/tag-not-pass.png" alt="">
                 <div class="time">
-                  <div v-if="item.photoDateTimestamp" class="time-item">
+                  <div class="time-item">
                     <SvgIcon class="svg-time" color="#FFF" size="8" name="camera-time" />
-                    <span>{{ formatToDateHMS(Number(item.photoDateTimestamp) || 0) }}</span>
+                    <span>{{ item.photoDateTimestamp ? formatToDateHMS(Number(item.photoDateTimestamp)) : '-' }}</span>
                   </div>
-                  <div v-if="item.submitDateTimestamp" class="time-item time-item2">
+                  <div class="time-item time-item2">
                     <SvgIcon class="svg-time" color="#FFF" size="8" name="submit-time" />
-                    <span>{{ formatToDateHMS(Number(item.submitDateTimestamp) || 0) }}</span>
+                    <span>{{ item.submitDateTimestamp ? formatToDateHMS(Number(item.submitDateTimestamp)) : '-' }}</span>
                   </div>
                 </div>
                 <div :class="{ 'percent-red': item.similarityScore === 100 }" class="percent">
-- 
2.39.3


From de6e957668dda1fce0fc0f05bd11e0cd940a3e54 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sat, 30 Mar 2024 13:45:45 +0800
Subject: [PATCH 024/143] =?UTF-8?q?feat:=20=E5=AE=A1=E6=89=B9=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/content/Content.vue | 39 +++++++++++++------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index e6b6f41..f506e49 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -312,12 +312,7 @@ function approvalHandler(items?: any) {
     processItems = selectItems.value
   }
   else if (overTask.value) {
-    //  主图点击 => 点击 => 通过/不通过按钮
     cloneItem = clone(overTask.value)
-    // 接口问题，暂时先这样处理
-    // if (!cloneItem.taskId) {
-    //   cloneItem.taskId = "taskIdtaskIdtaskIdtaskIdtaskId"
-    // }
     processItems = [cloneItem]
   }
   //  任务包图片 => 点击 => 通过/不通过按钮
@@ -331,31 +326,37 @@ function approvalHandler(items?: any) {
     return
   }
 
+  const list: any = []
+  processItems.forEach((item) => {
+    list.push({
+      formId: item.id,
+      taskId: item.taskId,
+      taskName: item.fromTaskName,
+    })
+  })
+
+  const param = {
+    result: true,
+    comment: '',
+    disposeType: '',
+    disposeTypeId: '',
+    failCauseId: '',
+    failCauseName: '',
+    flowTaskInfoList: list,
+  }
+
   dialog.info({
     title: '确认提示',
     content: '确认给该任务审批为【通过】吗?',
     positiveText: '确定',
     negativeText: '取消',
     onPositiveClick: () => {
-      approval()
+      doAudit(param)
     },
     onNegativeClick: () => { },
   })
 }
-function approval() {
-  const formIds: string[] = processItems.map(item => item.id)
-  const taskIds: string[] = processItems.map(item => item.taskId)
-  const tasknames: string[] = processItems.map(item => item.taskname)
-  const param: ApprovalParam = {
-    formid: formIds,
-    taskId: taskIds,
-    approvd: true,
-    taskComment: 'approval',
-    taskname: tasknames,
-  }
 
-  doAudit(param)
-}
 function doAudit(param: any) {
   audit(param).then((res) => {
     const { code } = res
-- 
2.39.3


From cd26cebeb6d59b6779cd023d6fa2f90f6f41b6c8 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sat, 30 Mar 2024 14:11:02 +0800
Subject: [PATCH 025/143] =?UTF-8?q?feat:=20=E6=B2=89=E6=B5=B8=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icons/power-off.svg          | 17 +++++++++++++++++
 src/views/worksheet/content/Content.vue |  3 ++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 src/assets/icons/power-off.svg

diff --git a/src/assets/icons/power-off.svg b/src/assets/icons/power-off.svg
new file mode 100644
index 0000000..9ec7596
--- /dev/null
+++ b/src/assets/icons/power-off.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>沉浸模式-开启</title>
+    <g id="图审审批" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="沉浸模式1.1" transform="translate(-1375.000000, -32.000000)" fill-rule="nonzero">
+            <g id="更多操作" transform="translate(1370.000000, 27.000000)">
+                <g id="沉浸模式-开启" transform="translate(5.000000, 5.000000)">
+                    <polygon id="路径" fill-opacity="0" fill="#FFFFFF" points="0 0 20 0 20 20 0 20"></polygon>
+                    <g id="编组" transform="translate(2.000000, 2.000000)" fill="#507AFD">
+                        <path d="M8,16 C3.59999999,16 0,12.4444444 0,8.09876544 C0,6.22222223 0.700000007,4.34567902 2,2.86419753 C2.40000001,2.4691358 3,2.37037037 3.4,2.76543209 C3.8,3.16049383 3.89999999,3.75308642 3.5,4.14814814 C2.5,5.23456791 2,6.61728395 2,8.09876544 C2,11.3580247 4.70000001,14.0246914 8,14.0246914 C11.3,14.0246914 14,11.3580247 14,8.09876544 C14,6.61728395 13.5,5.23456791 12.5,4.14814816 C12.1,3.75308642 12.2,3.16049383 12.6,2.76543211 C13,2.37037037 13.6,2.46913581 14,2.86419755 C15.3,4.34567903 16,6.12345681 16,8.09876545 C16,12.4444444 12.4,16 8,16 Z" id="路径"></path>
+                        <path d="M8.99999999,5.92592592 C8.99999999,6.41975308 8.6,6.91358025 7.99999999,6.91358025 L7.99999999,6.91358025 C7.4,6.91358025 6.99999999,6.51851852 6.99999999,5.92592592 L6.99999999,0.987654328 C6.99999999,0.493827172 7.4,0 7.99999999,0 L7.99999999,0 C8.49999999,0 8.99999999,0.395061734 8.99999999,0.987654328 L8.99999999,5.92592592 Z" id="路径"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index f506e49..43d6ec2 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -389,7 +389,8 @@ function reloadList() {
             批量审批
           </div>
           <div class="icon-wrap">
-            <SvgIcon size="20" name="immersion-model" @click="immersionHandler" />
+            <SvgIcon size="20" v-if="isFullScreen" name="power-off" @click="immersionHandler" style="cursor: pointer;"/>
+            <SvgIcon size="20" v-else name="immersion-model" @click="immersionHandler" style="cursor: pointer;"/>
           </div>
         </div>
 
-- 
2.39.3


From 8370576e217b3fbf099f90e9750e619fa04fbb5d Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sat, 30 Mar 2024 15:12:40 +0800
Subject: [PATCH 026/143] =?UTF-8?q?feat:=20=E9=AB=98=E7=BA=A7=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=A0=B7=E5=BC=8F=E5=8F=8A=E4=BA=A4=E4=BA=92=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=8C=E6=90=9C=E7=B4=A2=E9=99=90=E5=88=B6=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/layout/components/Header/index.vue        | 185 ++++++++++--------
 src/views/final/comp/FilterModal.vue          |  50 ++---
 src/views/home/aside/comp/Action.vue          |  19 +-
 src/views/home/aside/comp/AdvanceFilter.vue   | 120 ++++++++----
 .../home/aside/comp/modals/FilterModal.vue    |  32 ++-
 5 files changed, 230 insertions(+), 176 deletions(-)

diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue
index a6f42c2..71b411d 100644
--- a/src/layout/components/Header/index.vue
+++ b/src/layout/components/Header/index.vue
@@ -1,20 +1,29 @@
 <script lang="ts">
-import { useDialog, useMessage } from 'naive-ui'
-import { defineComponent, inject, onMounted, reactive, ref, toRefs, unref, watch } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
-import QuillModal from './QuillModal.vue'
-import RecycleModal from './RecycleModal.vue'
-import SearchModal from './SearchModal.vue'
-import ShortcutModal from './ShortcutModal.vue'
-import UserSettings from './UserSettings.vue'
-import { msgPolling } from '@/api/message/message'
-import { getImgUrl } from '@/utils/urlUtils'
-import { useUser } from '@/store/modules/user'
-import { useTaskStore } from '@/store/modules/task'
-
-const taskStore = useTaskStore()
+import { useDialog, useMessage } from "naive-ui";
+import {
+  defineComponent,
+  inject,
+  onMounted,
+  reactive,
+  ref,
+  toRefs,
+  unref,
+  watch,
+} from "vue";
+import { useRoute, useRouter } from "vue-router";
+import QuillModal from "./QuillModal.vue";
+import RecycleModal from "./RecycleModal.vue";
+import SearchModal from "./SearchModal.vue";
+import ShortcutModal from "./ShortcutModal.vue";
+import UserSettings from "./UserSettings.vue";
+import { msgPolling } from "@/api/message/message";
+import { getImgUrl } from "@/utils/urlUtils";
+import { useUser } from "@/store/modules/user";
+import { useTaskStore } from "@/store/modules/task";
+
+const taskStore = useTaskStore();
 export default defineComponent({
-  name: 'PageHeader',
+  name: "PageHeader",
   components: {
     UserSettings,
     QuillModal,
@@ -30,139 +39,137 @@ export default defineComponent({
       type: Boolean,
     },
   },
-  emits: ['update:collapsed'],
+  emits: ["update:collapsed"],
   setup() {
-    const message = useMessage()
-    const dialog = useDialog()
+    const message = useMessage();
+    const dialog = useDialog();
 
-    const userStore = useUser()
-    const useInfo = userStore.getUserInfo
+    const userStore = useUser();
+    const useInfo = userStore.getUserInfo;
 
-    const name = ''
+    const name = "";
 
     const state = reactive({
-      username: name ?? '',
-      fullscreenIcon: 'FullscreenOutlined',
-    })
+      username: name ?? "",
+      fullscreenIcon: "FullscreenOutlined",
+    });
 
-    const router = useRouter()
-    const route = useRoute()
-    const routename = ref(route.meta.title)
+    const router = useRouter();
+    const route = useRoute();
+    const routename = ref(route.meta.title);
     // 图标列表mm
     const iconList = ref([
       {
-        icon: 'magnifying-1',
+        icon: "magnifying-1",
         handle: searchHandler,
       },
       {
-        icon: 'shortcut-keys',
+        icon: "shortcut-keys",
         handle: shortcutHandler,
       },
       {
-        icon: 'suspicious-folder',
+        icon: "suspicious-folder",
         handle: recycleHandler,
       },
       {
-        icon: 'memo',
+        icon: "memo",
         handle: quillHandler,
       },
       {
-        icon: 'nomessage',
+        icon: "nomessage",
         handle: goMessage,
       },
-    ])
+    ]);
 
     watch(
       () => route.fullPath,
       () => {
-        routename.value = route.meta.title
-      },
-    )
+        routename.value = route.meta.title;
+      }
+    );
 
     const handleDragOver = (event, item) => {
-      taskStore.setInFile(true)
-    }
+      taskStore.setInFile(true);
+    };
 
     const handleDragLeave = (event, item) => {
-      taskStore.setInFile(false)
-    }
+      taskStore.setInFile(false);
+    };
 
     const dropdownSelect = (key) => {
-      router.push({ name: key })
-    }
+      router.push({ name: key });
+    };
 
     // 退出登录
     const doLogout = () => {
       dialog.info({
-        title: '提示',
-        content: '您确定要退出登录吗',
-        positiveText: '确定',
-        negativeText: '取消',
+        title: "提示",
+        content: "您确定要退出登录吗",
+        positiveText: "确定",
+        negativeText: "取消",
         onPositiveClick: () => {
           userStore.logout().then(() => {
-            message.success('成功退出登录')
+            message.success("成功退出登录");
             router
               .replace({
-                name: 'Login',
+                name: "Login",
                 query: {
                   // redirect: route.fullPath,
                 },
               })
-              .finally(() => location.reload())
-          })
+              .finally(() => location.reload());
+          });
         },
         onNegativeClick: () => {},
-      })
-    }
+      });
+    };
 
-    const quillModalRef = ref(null)
-    const shortcutModal = ref(null)
-    const recycleModalRef = ref(null)
-    const SearchModalRef = ref(null)
+    const quillModalRef = ref(null);
+    const shortcutModal = ref(null);
+    const recycleModalRef = ref(null);
+    const SearchModalRef = ref(null);
 
     function quillHandler() {
-      const modal = unref(quillModalRef)! as any
-      modal.showModal()
+      const modal = unref(quillModalRef)! as any;
+      modal.showModal();
     }
 
     function shortcutHandler() {
-      const modal = unref(shortcutModal)! as any
-      modal.showModal()
+      const modal = unref(shortcutModal)! as any;
+      modal.showModal();
     }
 
     function recycleHandler() {
-      const modal = unref(recycleModalRef)! as any
-      modal.showModal()
+      const modal = unref(recycleModalRef)! as any;
+      modal.showModal();
     }
 
     function searchHandler() {
-      const modal = unref(SearchModalRef)! as any
-      modal.showModal()
+      const modal = unref(SearchModalRef)! as any;
+      modal.showModal();
     }
 
     function goMessage() {
-      router.push({ name: 'message-main' })
+      router.push({ name: "message-main" });
     }
 
     async function getMessage() {
-      const res = await msgPolling()
-      if (res.data)
-        iconList.value[4].icon = 'hasmessage'
-      else
-        iconList.value[4].icon = 'nomessage'
+      const res = await msgPolling();
+      if (res.data) iconList.value[4].icon = "hasmessage";
+      else iconList.value[4].icon = "nomessage";
     }
-
     setInterval(() => {
-      getMessage()
-    }, 5000)
+      getMessage();
+    }, 5000);
 
-    const mousetrap = inject('mousetrap') as any
+    const mousetrap = inject("mousetrap") as any;
     onMounted(() => {
-      mousetrap.bind('n r', quillHandler)
-      mousetrap.bind('n t', quillHandler)
-      mousetrap.bind('n n', recycleHandler)
-      mousetrap.bind('m m', searchHandler)
-    })
+      getMessage();
+      mousetrap.bind("n r", quillHandler);
+      mousetrap.bind("n t", quillHandler);
+      mousetrap.bind("n n", recycleHandler);
+      mousetrap.bind("m m", searchHandler);
+    });
 
     return {
       ...toRefs(state),
@@ -183,9 +190,9 @@ export default defineComponent({
       getMessage,
       handleDragOver,
       handleDragLeave,
-    }
+    };
   },
-})
+});
 </script>
 
 <template>
@@ -207,8 +214,16 @@ export default defineComponent({
         v-for="item in iconList"
         :key="item.icon"
         class="layout-header-trigger layout-header-trigger-min"
-        @dragover.prevent="(e) => { handleDragOver(e, item) }"
-        @dragleave.prevent="(e) => { handleDragLeave(e, item) }"
+        @dragover.prevent="
+          (e) => {
+            handleDragOver(e, item);
+          }
+        "
+        @dragleave.prevent="
+          (e) => {
+            handleDragLeave(e, item);
+          }
+        "
       >
         <div class="back" @click="item.handle">
           <SvgIcon :name="item.icon" size="18" />
@@ -326,9 +341,7 @@ export default defineComponent({
   }
 
   .layout-header-left {
-    ::v-deep(
-        .n-breadcrumb .n-breadcrumb-item:last-child .n-breadcrumb-item__link
-      ) {
+    ::v-deep(.n-breadcrumb .n-breadcrumb-item:last-child .n-breadcrumb-item__link) {
       color: #515a6e;
     }
   }
diff --git a/src/views/final/comp/FilterModal.vue b/src/views/final/comp/FilterModal.vue
index 9ac92c5..8ed15f8 100644
--- a/src/views/final/comp/FilterModal.vue
+++ b/src/views/final/comp/FilterModal.vue
@@ -146,32 +146,32 @@ function rowProps(row: RowData) {
 }
 
 function handleCheck(rowKeys: DataTableRowKey[]) {
+  console.log(rowKeys, selectionIds.value, "handleCheck");
   selectionIds.value = rowKeys;
 }
 
-function select(key: number) {
+function select(key: number, id: string) {
   switch (key) {
     case 1:
-      editSelection();
+      editSelection(id);
       break;
     case 2:
-      deleteSelection();
+      deleteSelection(id);
       break;
     default:
       break;
   }
 }
 
-function editSelection() {
+function editSelection(id = "") {
   // eslint-disable-next-line dot-notation
-  const $message = window["$message"];
+  // const $message = window["$message"];
+  // if (selectionIds.value.length === 0 || selectionIds.value.length > 1) {
+  //   $message.error("请选中一条过滤");
+  //   return;
+  // }
 
-  if (selectionIds.value.length === 0 || selectionIds.value.length > 1) {
-    $message.error("请选中一条过滤");
-    return;
-  }
-
-  const selectedId = selectionIds.value[0];
+  const selectedId = id;
   const selectedFilter = tableData.value.find((item: any) => {
     return item.id === selectedId;
   });
@@ -180,12 +180,12 @@ function editSelection() {
   closeModal();
 }
 
-function deleteSelection() {
+function deleteSelection(id = "") {
   // eslint-disable-next-line dot-notation
-  const $message = window["$message"];
-
   if (selectionIds.value.length === 0) {
-    $message.error("至少选中一条过滤");
+    deleteCondition({ ids: id }).then(() => {
+      query(pagination.page, pagination.pageSize);
+    });
     return;
   }
 
@@ -335,12 +335,19 @@ const showSearch = computed(() => {
             <div class="del_btn">
               <n-button icon-placement="left" size="medium">
                 <template #icon>
-                  <SvgIcon  name="delete-history" size="16" />
+                  <SvgIcon name="delete-history" size="16" />
                 </template>
-                删除</n-button>
+                删除</n-button
+              >
             </div>
             <div class="msg">
-              <span>已选中 <span style="color:#507afd;font-size:16px">{{ selectionIds.length }}</span> 项</span>
+              <span
+                >已选中
+                <span style="color: #507afd; font-size: 16px">{{
+                  selectionIds.length
+                }}</span>
+                项</span
+              >
               <a @click="selectionIds = []">清空</a>
             </div>
           </div>
@@ -400,11 +407,10 @@ const showSearch = computed(() => {
       width: 300px;
       border: 1px solid gray;
     }
-    .del_btn{
-
+    .del_btn {
     }
-    .msg{
-      a{
+    .msg {
+      a {
         margin-left: 30px;
         cursor: pointer;
         color: #507afd;
diff --git a/src/views/home/aside/comp/Action.vue b/src/views/home/aside/comp/Action.vue
index a0e1560..af0ad94 100644
--- a/src/views/home/aside/comp/Action.vue
+++ b/src/views/home/aside/comp/Action.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup>
-import type { DropdownMixedOption } from 'naive-ui/es/dropdown/src/interface'
-import type { PropType } from 'vue'
+import type { DropdownMixedOption } from "naive-ui/es/dropdown/src/interface";
+import type { PropType } from "vue";
 
-defineOptions({ name: 'Action' })
+defineOptions({ name: "Action" });
 
-defineProps({
+const props = defineProps({
   options: {
     type: Array as PropType<DropdownMixedOption[]>,
     default: null,
@@ -12,18 +12,21 @@ defineProps({
   },
   select: {
     type: Function as PropType<Function>,
-    default: () => { },
+    default: () => {},
   },
   id: {
     type: String,
-    default: '',
+    default: "",
   },
-})
+});
+const fun = (key) => {
+  props.select(key, props.id);
+};
 </script>
 
 <template>
   <div :data-id="id">
-    <n-dropdown trigger="hover" :options="options" @select="(select as any)">
+    <n-dropdown trigger="hover" :options="options" @select="fun">
       <SvgIcon name="more-hor" size="20" />
     </n-dropdown>
   </div>
diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue
index 5308db4..95a4234 100644
--- a/src/views/home/aside/comp/AdvanceFilter.vue
+++ b/src/views/home/aside/comp/AdvanceFilter.vue
@@ -17,7 +17,10 @@ const props = defineProps({
     required: true,
   },
 });
-
+const ruleForm = reactive({
+  keyword: "",
+});
+const ruleformRef = ref();
 const emit = defineEmits<{
   (e: "show-filter"): void;
   (e: "show-custom"): void;
@@ -27,7 +30,7 @@ const emit = defineEmits<{
 
 const data = ref<FilterEntity[]>([]);
 const unData = ref<FilterEntity[]>([]);
-const loading =  ref(false);
+const loading = ref(false);
 const canloadMore = true;
 const el = ref<HTMLDivElement | null>(null);
 const popover = ref<ComponentRef | null>(null);
@@ -74,8 +77,8 @@ useInfiniteScroll(
   },
   { distance: 10, interval: 300, canLoadMore: () => false }
 );
-const showClick =async () => {
-  getSearchedList('')
+const showClick = async () => {
+  getSearchedList("");
 };
 
 async function loadMore() {
@@ -92,7 +95,7 @@ async function featchList() {
   loading.value = true;
   try {
     const searchParam: FilterSearchParam = {
-      search_searchname: { value: keyword.value, op: "like", type: "string" },
+      search_searchname: { value: ruleForm.keyword, op: "like", type: "string" },
     };
     const result = await getConditionList(pagination, searchParam, props.type);
     const { data } = result;
@@ -121,11 +124,8 @@ function generateFilterEntityList(data) {
       };
     });
 
-    const reg = new RegExp(keyword.value, "gi");
-    const hilightText = searchname.replace(
-      reg,
-      `<span>${keyword.value}</span>`
-    );
+    const reg = new RegExp(ruleForm.keyword, "gi");
+    const hilightText = searchname.replace(reg, `<span>${ruleForm.keyword}</span>`);
 
     return {
       id,
@@ -134,7 +134,7 @@ function generateFilterEntityList(data) {
       isDefaultFilter: false,
       filterList: list,
       reorder,
-      searchname
+      searchname,
     };
   });
 
@@ -143,12 +143,17 @@ function generateFilterEntityList(data) {
 
 function selectHandler(item: FilterEntity) {
   (popover.value as any).setShow(false);
-  currentlySelectedAdvanced.value = item.searchname
+  currentlySelectedAdvanced.value = item.searchname;
   emit("select", item.id);
 }
 
 const inputHandler = debounce((word) => {
-  getSearchedList(word)
+  ruleForm.keyword = word;
+  ruleformRef.value.validate();
+  if (word.length < 2 && word) {
+    return;
+  }
+  getSearchedList(word);
 }, 300);
 
 function getSearchedList(word) {
@@ -157,7 +162,7 @@ function getSearchedList(word) {
   } else {
     pagination.pageSize = 10;
   }
-  keyword.value = word;
+  ruleForm.keyword = word;
   featchList().then((list) => {
     let dataArr: FilterEntity[] = [];
     let unDataArr: FilterEntity[] = [];
@@ -195,10 +200,26 @@ function favoriteHandler(event: MouseEvent, item: any) {
       }
     });
 
-    inputHandler(keyword.value);
+    inputHandler(ruleForm.keyword);
   }
 }
 
+const rules = {
+  keyword: [
+    {
+      trigger: ["blur", "input", "change"],
+      level: "error",
+      validator(_rule, value) {
+        if (value.length >= 2) {
+          return true;
+        } else {
+          return new Error("搜索关键字最少为两个");
+        }
+      },
+    },
+  ],
+};
+
 function unFavoriteHandler(event: MouseEvent, item) {
   event.stopImmediatePropagation();
   event.stopPropagation();
@@ -208,7 +229,7 @@ function unFavoriteHandler(event: MouseEvent, item) {
   if (!isDefaultFilter) {
     item.favorite = false;
     unfavorite(id);
-    inputHandler(keyword.value);
+    inputHandler(ruleForm.keyword);
   }
 }
 
@@ -233,29 +254,37 @@ const moveEnd = () => {
       >
         <template #trigger>
           <div class="wrapper-left-dropdown" @click="showClick">
-            <span style="font-size: 20px;color: #333333;font-weight: Medium;">{{currentlySelectedAdvanced}}</span>
-            <SvgIcon :style="{ marginLeft: '5px' }" name="down" size="14" />
+            <span style="font-size: 20px; color: #333333; font-weight: Medium">{{
+              currentlySelectedAdvanced
+            }}</span>
+            <SvgIcon :style="{ marginLeft: '5px' }" name="down" size="14" color="#999999"/>
           </div>
         </template>
         <n-spin :show="loading">
           <div class="wrapper-left-popover">
-            <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')"
-                />
-              </template>
-            </n-input>
+            <n-form :rules="rules" ref="ruleformRef" :model="ruleForm">
+              <n-form-item path="keyword">
+                <n-input
+                  :style="{ '--n-border': '0px' }"
+                  placeholder="请输入关键字"
+                  @input="inputHandler"
+                  :value="ruleForm.keyword"
+                  :minlength="2"
+                >
+                  <template #prefix>
+                    <SvgIcon size="14px" name="magnifying-1" />
+                  </template>
+                  <template #suffix>
+                    <SvgIcon
+                      size="14px"
+                      style="cursor: pointer"
+                      name="setting"
+                      @click="emit('show-filter')"
+                    />
+                  </template>
+                </n-input>
+              </n-form-item>
+            </n-form>
 
             <ul ref="el" class="wrapper-left-list">
               <li
@@ -264,23 +293,28 @@ const moveEnd = () => {
                 style="display: flex; align-items: center"
                 @click="selectHandler(item)"
               >
-                <SvgIcon  name="drag" size="18" color="#333333" style="margin-right:3px"/>
+                <SvgIcon
+                  name="drag"
+                  size="18"
+                  color="#333333"
+                  style="margin-right: 3px"
+                />
                 <SvgIcon
                   v-if="item.favorite && !item.isDefaultFilter"
                   name="favorite-fill"
                   color="#fd9b0a"
                   size="18"
-                  style="margin-right:3px"
+                  style="margin-right: 3px"
                   @click="unFavoriteHandler($event, item)"
                 />
                 <SvgIcon
                   v-else-if="!item.favorite && !item.isDefaultFilter"
                   name="favorite-unfill"
                   size="18"
-                  style="margin-right:3px"
+                  style="margin-right: 3px"
                   @click="favoriteHandler($event, item)"
                 />
-                <div v-html="item.name" style="color: #333333;"/>
+                <div v-html="item.name" style="color: #333333" />
               </li>
               <!-- filter=".draggable-li[draggable='false']" -->
               <VueDraggable
@@ -298,14 +332,14 @@ const moveEnd = () => {
                   class="cursor-move draggable-li fix"
                   :draggable="true"
                 >
-                  <SvgIcon  name="drag" size="18" style="margin-right:3px"/>
+                  <SvgIcon name="drag" size="18" style="margin-right: 3px" />
                   <SvgIcon
                     v-if="item.favorite && !item.isDefaultFilter"
                     name="favorite-fill"
                     color="#fd9b0a"
                     size="18"
                     fill="#666666"
-                    style="cursor: pointer!important;margin-right:3px;"
+                    style="cursor: pointer !important; margin-right: 3px"
                     @click="unFavoriteHandler($event, item)"
                   />
                   <SvgIcon
@@ -313,10 +347,10 @@ const moveEnd = () => {
                     name="favorite-unfill"
                     size="18"
                     fill="#666666"
-                    style="cursor: pointer!important;margin-right:3px;"
+                    style="cursor: pointer !important; margin-right: 3px"
                     @click="favoriteHandler($event, item)"
                   />
-                  <div v-html="item.name" style="color: #333333;"/>
+                  <div v-html="item.name" style="color: #333333" />
                 </li>
               </VueDraggable>
             </ul>
diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue
index 597e2cc..397fc78 100644
--- a/src/views/home/aside/comp/modals/FilterModal.vue
+++ b/src/views/home/aside/comp/modals/FilterModal.vue
@@ -148,43 +148,41 @@ function handleCheck(rowKeys: DataTableRowKey[]) {
   selectionIds.value = rowKeys;
 }
 
-function select(key: number) {
+function select(key: number, id: string) {
   switch (key) {
     case 1:
-      editSelection();
+      editSelection(id);
       break;
     case 2:
-      deleteSelection();
+      deleteSelection(id);
       break;
     default:
       break;
   }
 }
 
-function editSelection() {
+function editSelection(id) {
   // eslint-disable-next-line dot-notation
-  const $message = window["$message"];
-
-  if (selectionIds.value.length === 0 || selectionIds.value.length > 1) {
-    $message.error("请选中一条过滤");
-    return;
-  }
-
-  const selectedId = selectionIds.value[0];
+  // const $message = window["$message"];
+  // if (selectionIds.value.length === 0 || selectionIds.value.length > 1) {
+  //   $message.error("请选中一条过滤");
+  //   return;
+  // }
+  const selectedId = id;
   const selectedFilter = tableData.value.find((item: any) => {
     return item.id === selectedId;
   });
 
   emit("editFilter", selectedFilter);
-  closeModal();
+  // closeModal();
 }
 
-function deleteSelection() {
+function deleteSelection(id = '') {
   // eslint-disable-next-line dot-notation
-  const $message = window["$message"];
-
   if (selectionIds.value.length === 0) {
-    $message.error("至少选中一条过滤");
+    deleteCondition({ ids: id }).then(() => {
+      query(pagination.page, pagination.pageSize);
+    });
     return;
   }
 
-- 
2.39.3


From 161be236bcb6ffd373a03881478aa8f40db11fd8 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sat, 30 Mar 2024 15:47:44 +0800
Subject: [PATCH 027/143] =?UTF-8?q?feat:=20=E6=89=B9=E9=87=8F=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E5=88=A0=E9=99=A4=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/aside/ListItem.vue  | 16 +++++++++++-----
 src/views/worksheet/content/Content.vue |  9 +++++----
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/views/worksheet/aside/ListItem.vue b/src/views/worksheet/aside/ListItem.vue
index aec4360..bf855f4 100644
--- a/src/views/worksheet/aside/ListItem.vue
+++ b/src/views/worksheet/aside/ListItem.vue
@@ -45,7 +45,7 @@ onMounted(async () => {
         <div class="id-wrap">
           <SvgIcon :name="svgName" size="28" />
           <span class="list-item-header-name" :class="{ 'list-item-header-selected': selected }">
-            {{ listItem.name }}
+            <span class="list-item-title" :title="listItem.name">{{ listItem.name }} </span>
             <span class="list-item-header-selected">({{ listItem.pictureCount }})</span>
           </span>
         </div>
@@ -104,15 +104,21 @@ onMounted(async () => {
     }
 
     .list-item-header-name {
-      width: 226px;
+      width: 250px;
       font-size: 16px;
       font-family: PingFang SC, PingFang SC-Medium;
       font-weight: 700;
       color: #333333;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
       margin-bottom: 0 0 8px 8px;
+      display: flex;
+      justify-content: space-between;
+      .list-item-title{
+        width: 200px;
+        display: inline-block;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
     }
 
     &-name {
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 43d6ec2..8cdbce5 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -21,7 +21,7 @@ import { computed, onUnmounted, onUpdated, reactive, ref, unref, watch } from "v
 import ConfrimModal from "../modal/ConfrimModal.vue";
 import type { ApprovalParam, SimilarityPictureSortParam } from "/#/api";
 
-const batch = ref(false);
+const batch = ref(false); // 批量审批状态
 const selectItems = ref<any[]>([]);
 const message = useMessage();
 const dialog = useDialog();
@@ -370,7 +370,8 @@ function doAudit(param: any) {
 }
 
 function reloadList() {
-  loadMore()
+  setBatch(false)
+  refreshHandler()
 }
 </script>
 
@@ -479,7 +480,7 @@ function reloadList() {
           <!-- 右侧任务 标题信息 -->
           <div class="right">
             <n-scrollbar style="max-height: 100%">
-              <span class="task-name">任务ID：{{ taskDetailInfo.taskname }}</span>
+              <span class="task-name" :title="taskDetailInfo.taskname">任务ID：{{ taskDetailInfo.taskname }}</span>
               <div class="tags">
                 <div class="tag tag-submiting" v-if="taskDetailInfo.states == 1">{{ TASK_STATUS_OBJ[taskDetailInfo.states]
                 }}</div>
@@ -576,7 +577,7 @@ function reloadList() {
               </div>
             </div>
             <div class="check">
-              <n-checkbox v-show="batch" v-model:checked="item.checked" @click.stop
+              <n-checkbox v-show="batch && item.historyStates !== 2 && item.historyStates !== 3" v-model:checked="item.checked" @click.stop
                 @update:checked="onCheckChange($event, item)" />
             </div>
             <div class="percent">
-- 
2.39.3


From 05c518ec67767b961a2a61ea1b2f7b9e130a613d Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sat, 30 Mar 2024 15:50:51 +0800
Subject: [PATCH 028/143] =?UTF-8?q?feat:=20=E7=AD=9B=E9=80=89=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F=E5=8F=8A=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=B4=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/comp/FilterModal.vue          |  1 +
 .../home/aside/comp/modals/FilterModal.vue    | 31 +++++++++++++++++--
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/views/final/comp/FilterModal.vue b/src/views/final/comp/FilterModal.vue
index 8ed15f8..4c13bf5 100644
--- a/src/views/final/comp/FilterModal.vue
+++ b/src/views/final/comp/FilterModal.vue
@@ -74,6 +74,7 @@ const columns: DataTableColumns<RowData> = [
   {
     title: "创建时间",
     key: "createtime",
+    sorter: (row1, row2) => new Date(row1?.createtime).getTime() - new Date(row2?.createtime).getTime()
   },
   {
     title: "更新者",
diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue
index 397fc78..f119d1f 100644
--- a/src/views/home/aside/comp/modals/FilterModal.vue
+++ b/src/views/home/aside/comp/modals/FilterModal.vue
@@ -43,6 +43,23 @@ interface RowData {
   updatetime: string;
 }
 
+const sortData = (row) => {
+  console.log("sortData", row);
+  if (row.order == "descend") {
+    tableData.value.sort(
+      (a, b) =>
+        new Date(a[row.columnKey]).getTime() - new Date(b[row.columnKey]).getTime()
+    );
+  } else if (row.order == "ascend") {
+    tableData.value.sort(
+      (a, b) =>
+        new Date(b[row.columnKey]).getTime() - new Date(a[row.columnKey]).getTime()
+    );
+  } else {
+    tableData.value.sort((a, b) => Number((a as any).reorder) - Number((b as any).reorder));
+  }
+};
+
 const columns: DataTableColumns<RowData> = [
   {
     type: "selection",
@@ -73,6 +90,12 @@ const columns: DataTableColumns<RowData> = [
     title: "创建时间",
     key: "createtime",
     width: 180,
+    sorter: (row1, row2) => {
+      // tableData.value.sort(
+      //   (a, b) => new Date(a?.createtime).getTime() - new Date(b?.createtime).getTime()
+      // );
+      return new Date(row1?.createtime).getTime() - new Date(row2?.createtime).getTime();
+    },
   },
   {
     title: "更新者",
@@ -177,7 +200,7 @@ function editSelection(id) {
   // closeModal();
 }
 
-function deleteSelection(id = '') {
+function deleteSelection(id = "") {
   // eslint-disable-next-line dot-notation
   if (selectionIds.value.length === 0) {
     deleteCondition({ ids: id }).then(() => {
@@ -272,7 +295,6 @@ defineExpose({
   showModal,
 });
 
-
 const inputHandler = debounce((word) => {
   keyword.value = word;
   query(1, 5);
@@ -340,7 +362,7 @@ const inputHandler = debounce((word) => {
               @update:page="handlePageChange"
               @update-page-size="handlePageSizeChange"
               @update:checked-row-keys="handleCheck"
-
+              @update:sorter="sortData"
             />
           </div>
         </div>
@@ -418,4 +440,7 @@ const inputHandler = debounce((word) => {
     }
   }
 }
+::v-deep(.n-data-table .n-data-table-th){
+  font-weight: bold !important;
+}
 </style>
-- 
2.39.3


From a45916ebd0d64089e14912eaf0a6d444fe54136c Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sat, 30 Mar 2024 16:00:37 +0800
Subject: [PATCH 029/143] =?UTF-8?q?fix:=20=E6=8E=A5=E5=8F=A3=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E8=B0=83=E6=95=B4=EF=BC=8C=E5=89=8D=E7=AB=AF=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=A0=BC=E5=BC=8F=E5=8C=96=E9=94=99=E8=AF=AF=EF=BC=8C?=
 =?UTF-8?q?=E9=98=BB=E5=A1=9E=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/content/Content.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 8cdbce5..4d2d7f0 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -496,7 +496,7 @@ function reloadList() {
               <div class="property">
                 <span class="property-name top" style=" color: #666666">图片大小
                 </span>
-                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo &&
+                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo && taskDetailInfo?.pictureInfo?.imgSize&&
                   (taskDetailInfo?.pictureInfo?.imgSize / 1000).toFixed(2) }}KB</span>
               </div>
               <div class="property">
@@ -522,8 +522,7 @@ function reloadList() {
               <div class="property">
                 <span class="property-name top" style=" color: #666666">创建时间
                 </span>
-                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo &&
-                  format(taskDetailInfo?.pictureInfo?.createTime, 'yyyy-MM-dd HH:mm:ss') }}</span>
+                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo && taskDetailInfo?.pictureInfo.createTime }}</span>
               </div>
               <div class="property">
                 <span class="property-name top" style=" color: #666666">提报时间
-- 
2.39.3


From 8f499e6343070539fc9115d9c8ebe53cee643e30 Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Sat, 30 Mar 2024 16:01:48 +0800
Subject: [PATCH 030/143] bug

---
 src/components/Approval/NotPassed.vue |  6 +--
 src/views/task/aside/Aside.vue        | 10 ++++-
 src/views/task/aside/ListItem.vue     |  3 --
 src/views/task/aside/TaskList.vue     |  6 +++
 src/views/task/content/Content.vue    | 61 ++++++++++++---------------
 src/views/task/index.vue              | 11 ++++-
 6 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/src/components/Approval/NotPassed.vue b/src/components/Approval/NotPassed.vue
index e2d4031..04bad76 100644
--- a/src/components/Approval/NotPassed.vue
+++ b/src/components/Approval/NotPassed.vue
@@ -4,9 +4,7 @@ import { useMessage } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
 import { audit } from '@/api/task/task'
 
-const emit = defineEmits<{
-  (e: 'success')
-}>()
+const emit = defineEmits(['success'])
 const message = useMessage()
 const loading = ref(false)
 
@@ -104,7 +102,7 @@ async function handleSumbit(e: MouseEvent) {
           const { code } = res
           if (code === 'OK') {
             message.success('审核成功')
-            emit('success')
+            emit('success', param)
             closeModal()
           }
           else { message.error(res.message) }
diff --git a/src/views/task/aside/Aside.vue b/src/views/task/aside/Aside.vue
index c8a8ab4..17d1790 100644
--- a/src/views/task/aside/Aside.vue
+++ b/src/views/task/aside/Aside.vue
@@ -20,7 +20,7 @@ import emitter from '@/utils/mitt'
 const CustomFieldModalRef = ref(null)
 const collapse = ref(false)
 const taskStore = useTaskStore()
-const taskListRef = ref<HTMLDivElement | null>(null)
+const taskListRef: any = ref(null)
 // 展示字段
 const showFieldList = ref<any[]>([])
 
@@ -144,6 +144,14 @@ function editFilter(filter: any) {
   modal.showModal()
   modal.edit(filter)
 }
+
+function setAsideItemName(text) {
+  taskListRef.value.setStatusName(text)
+}
+
+defineExpose({
+  setAsideItemName,
+})
 </script>
 
 <template>
diff --git a/src/views/task/aside/ListItem.vue b/src/views/task/aside/ListItem.vue
index d2ac772..f81bf6e 100644
--- a/src/views/task/aside/ListItem.vue
+++ b/src/views/task/aside/ListItem.vue
@@ -53,9 +53,6 @@ const svgName = computed(() => {
             "
           >{{ listItem.statshisText }}</span>
         </li>
-        <li v-else-if="item.id === 'finishTime'">
-          提报时间：{{ format(listItem.finishTime, "yyyy-MM-dd HH:mm:ss") }}
-        </li>
         <li v-else-if="item.id === '提报时间'">
           提交时间：{{ format(listItem.createdate, "yyyy-MM-dd HH:mm:ss") }}
         </li>
diff --git a/src/views/task/aside/TaskList.vue b/src/views/task/aside/TaskList.vue
index a53597e..eb88cf6 100644
--- a/src/views/task/aside/TaskList.vue
+++ b/src/views/task/aside/TaskList.vue
@@ -104,8 +104,14 @@ async function refreshHandler() {
   search('')
 }
 
+function setStatusName(text) {
+  const index = taskStore.getCurrentIndex
+  data.value[index].statshisText = text
+}
+
 defineExpose({
   search,
+  setStatusName,
 })
 </script>
 
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index af5d094..af253a2 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -19,6 +19,7 @@ import { isEmpty } from '@/utils'
 import { formatToDateHMS } from '@/utils/dateUtil'
 import { hideDownload } from '@/utils/image'
 
+const emit = defineEmits(['setAsideItemName'])
 const batch = ref(false)
 const selectItems = ref<any[]>([])
 const message = useMessage()
@@ -43,11 +44,8 @@ function setBatch(value: boolean) {
 
   batch.value = value
 
-  if (value === false) {
-    selectItems.value.forEach(item => (item.checked = false))
-    selectItems.value.length = 0
-    selectItems.value.length = 0
-  }
+  if (value === false)
+    selectItems.value = []
 }
 
 function onCheckChange(checked: any, item: any) {
@@ -94,6 +92,12 @@ function handleKeydown(event) {
   // 在这里执行右箭头的逻辑
 }
 
+// 从store里面获取任务id
+function currentTaskId() {
+  const index = taskStore.getCurrentIndex
+  return taskStore.getApprovalList[index]?.id || ''
+}
+
 // states:1未提交，2待审批，3通过，4不通过
 function validate(items: any[]) {
   if (items.length === 0)
@@ -169,36 +173,22 @@ function approvalHandler(items?: any) {
 }
 
 function rejectHandler(items?: any) {
-  // let cloneItem: any
-  // if (batch.value) {
-  //   processItems = selectItems.value
-  // }
-  // else if (overTask.value) {
-  //   cloneItem = clone(overTask.value)
-  //   processItems = [cloneItem]
-  // }
-
-  // if (items !== undefined && !(items instanceof PointerEvent))
-  //   processItems = items
-
-  // const msg = validate(processItems)
-
-  // if (msg !== null) {
-  //   message.error(msg)
-  //   return
-  // }
-
   const modal = unref(notPassModalRef)! as any
   modal.showModal(selectItems.value)
 }
 
+function singleRejectHandler() {
+  const modal = unref(notPassModalRef)! as any
+  modal.showModal([taskDetailInfo.value])
+}
+
 function doAudit(param: any) {
   audit(param).then((res) => {
     const { code } = res
-    setBatch(false)
     if (code === 'OK') {
       message.success('审核成功')
-      reloadList()
+      setBatch(false)
+      reloadList(param, '通过')
     }
 
     else { message.error(res.message) }
@@ -273,12 +263,6 @@ async function getImgList() {
   }
 }
 
-// 从store里面获取任务id
-const currentTaskId = computed(() => {
-  const index = taskStore.getCurrentIndex
-  return taskStore.getApprovalList[index]?.id || ''
-})
-
 function overTaskHandle() {
   const item = taskDetailInfo.value
   if (item?.userapprove?.statshis === 2 || item?.userapprove?.statshis == 3) {
@@ -333,7 +317,14 @@ async function getDetail() {
   getImgList()
 }
 
-function reloadList() {
+function reloadList(param, text) {
+  // 修改左侧状态
+  const id = currentTaskId()
+  const hasCurrentId = param.flowTaskInfoList.find(item => item.formId === id)
+
+  if (hasCurrentId)
+    emit('setAsideItemName', text)
+
   getDetail()
 }
 </script>
@@ -434,7 +425,7 @@ function reloadList() {
             width="168"
             height="48"
             name="r7"
-            @click.stop="rejectHandler"
+            @click.stop="singleRejectHandler"
           />
         </div>
         <div class="check">
@@ -575,7 +566,7 @@ function reloadList() {
         <History :data="taskDetailInfo" />
       </n-tab-pane>
     </n-tabs>
-    <NotPassed ref="notPassModalRef" @success="reloadList" />
+    <NotPassed ref="notPassModalRef" @success="(param) => reloadList(param, '不通过')" />
     <BatchModal
       ref="batchModalRef"
       @reject="rejectHandler"
diff --git a/src/views/task/index.vue b/src/views/task/index.vue
index 25c07dd..46dd531 100644
--- a/src/views/task/index.vue
+++ b/src/views/task/index.vue
@@ -1,15 +1,22 @@
 <script lang="ts" setup>
+import { ref } from 'vue'
 import Aside from './aside/Aside.vue'
 import Content from './content/Content.vue'
+
+const asideRef: any = ref(null)
+
+function setAsideItemName(text) {
+  asideRef.value.setAsideItemName(text)
+}
 </script>
 
 <template>
   <div class="main">
     <!-- 侧边 -->
-    <Aside />
+    <Aside ref="asideRef" />
 
     <!-- 内容 -->
-    <Content />
+    <Content @set-aside-item-name="setAsideItemName" />
   </div>
 </template>
 
-- 
2.39.3


From ff11552fc67086b1f3ff97fe1599a30a0ecb6976 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sat, 30 Mar 2024 16:06:56 +0800
Subject: [PATCH 031/143] =?UTF-8?q?fix:=202819=20=E3=80=90AI=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86=E3=80=91=E5=90=8D=E5=AD=97=E6=94=B9?=
 =?UTF-8?q?=E5=8F=98=EF=BC=8C=E5=8F=98=E6=88=90=E5=9B=BE=E5=AE=A1=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mock/user/user.ts               | 2 +-
 src/router/modules/worksheet.ts | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mock/user/user.ts b/mock/user/user.ts
index 22854ed..ff5816e 100644
--- a/mock/user/user.ts
+++ b/mock/user/user.ts
@@ -23,7 +23,7 @@ const adminInfo = {
       value: 'task-main',
     },
     {
-      label: 'AI工单',
+      label: '图审审批管理',
       value: 'worksheet-main',
     },
   ],
diff --git a/src/router/modules/worksheet.ts b/src/router/modules/worksheet.ts
index 8a46a38..d80eb8d 100644
--- a/src/router/modules/worksheet.ts
+++ b/src/router/modules/worksheet.ts
@@ -1,5 +1,5 @@
-import type { RouteRecordRaw } from 'vue-router'
 import { Layout } from '@/router/constant'
+import type { RouteRecordRaw } from 'vue-router'
 
 /**
  * @param name 路由名称, 必须设置,且不能重名
@@ -19,7 +19,7 @@ const routes: Array<RouteRecordRaw> = [
     redirect: '/worksheet',
     component: Layout,
     meta: {
-      title: 'AI工单',
+      title: '图审审批管理',
       permissions: ['worksheet-main'],
       svgname: 'worksheet',
       svgsize: 22,
@@ -30,7 +30,7 @@ const routes: Array<RouteRecordRaw> = [
         path: 'worksheet',
         name: 'worksheet-main',
         meta: {
-          title: 'AI工单',
+          title: '图审审批管理',
         },
         component: () => import('@/views/worksheet/index.vue'),
       },
-- 
2.39.3


From ac5aeb5c0511f1b861911dc66dbf54fd455dd1f5 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sat, 30 Mar 2024 18:28:04 +0800
Subject: [PATCH 032/143] =?UTF-8?q?feat:=20bug=E4=BF=AE=E5=A4=8D=EF=BC=8C?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=8F=B3=E4=BE=A7=E8=A1=A8=E6=A0=BC=E9=AB=98?=
 =?UTF-8?q?=E4=BA=AE=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/content/Content.vue        | 563 ++++++++++++----------
 src/views/task/content/TaskTable.vue      |  20 +-
 src/views/task/modal/CustomFieldModal.vue |   5 +-
 3 files changed, 314 insertions(+), 274 deletions(-)

diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index 697b41a..357c89d 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -1,103 +1,103 @@
 <script lang="ts" setup>
-import { computed, onMounted, onUnmounted, reactive, ref, unref, watch } from 'vue'
-import { chunk, clone } from 'lodash-es'
-import { useDialog, useMessage } from 'naive-ui'
-import { useRoute } from 'vue-router'
-import BatchModal from '../modal/BatchModal.vue'
-import CustomSettingModal from '../modal/CustomSettingModal.vue'
-import PictureTable from './PictureTable.vue'
-import TaskTable from './TaskTable.vue'
-import History from './History.vue'
-import NotPassed from '@/components/Approval/NotPassed.vue'
-import { getAllfieldList, getfieldList } from '@/api/home/filter'
-import { TASK_STATUS_OBJ } from '@/enums/index'
-
-import { audit, dubiousfileyd, getSimilarityList, getTaskDetailInfo } from '@/api/task/task'
-import { useTask } from '@/store/modules/task'
-import { useUser } from '@/store/modules/user'
-import { isEmpty } from '@/utils'
-import { formatToDateHMS } from '@/utils/dateUtil'
-import { hideDownload } from '@/utils/image'
-
-const batch = ref(false)
-const selectItems = ref<any[]>([])
-const message = useMessage()
-const dialog = useDialog()
-const notPassModalRef = ref(null)
-const batchModalRef = ref(null)
-const totalCount = ref(0)
-const taskId: any = ref('') // 任务id
-const packageId: any = ref('') // 包id
-const CustomSettingModalRef = ref(null)
-const taskTableData = ref<any[]>([])
-const route = useRoute()
+import { computed, onMounted, onUnmounted, reactive, ref, unref, watch } from "vue";
+import { chunk, clone } from "lodash-es";
+import { useDialog, useMessage } from "naive-ui";
+import { useRoute } from "vue-router";
+import BatchModal from "../modal/BatchModal.vue";
+import CustomSettingModal from "../modal/CustomSettingModal.vue";
+import PictureTable from "./PictureTable.vue";
+import TaskTable from "./TaskTable.vue";
+import History from "./History.vue";
+import NotPassed from "@/components/Approval/NotPassed.vue";
+import { getAllfieldList, getfieldList } from "@/api/home/filter";
+import { TASK_STATUS_OBJ } from "@/enums/index";
+
+import {
+  audit,
+  dubiousfileyd,
+  getSimilarityList,
+  getTaskDetailInfo,
+} from "@/api/task/task";
+import { useTask } from "@/store/modules/task";
+import { useUser } from "@/store/modules/user";
+import { isEmpty } from "@/utils";
+import { formatToDateHMS } from "@/utils/dateUtil";
+import { hideDownload } from "@/utils/image";
+
+const batch = ref(false);
+const selectItems = ref<any[]>([]);
+const message = useMessage();
+const dialog = useDialog();
+const notPassModalRef = ref(null);
+const batchModalRef = ref(null);
+const totalCount = ref(0);
+const taskId: any = ref(""); // 任务id
+const packageId: any = ref(""); // 包id
+const CustomSettingModalRef = ref(null);
+const taskTableData = ref<any[]>([]);
+const route = useRoute();
 
 const sortBy: any = {
-  orderType: 'desc',
-  orderName: 'similarityScore',
-}
+  orderType: "desc",
+  orderName: "similarityScore",
+};
 
 function setBatch(value: boolean) {
-  if (totalCount.value === 0)
-    return
+  if (totalCount.value === 0) return;
 
-  batch.value = value
+  batch.value = value;
 
   if (value === false) {
-    selectItems.value.forEach(item => (item.checked = false))
-    selectItems.value.length = 0
-    selectItems.value.length = 0
+    selectItems.value.forEach((item) => (item.checked = false));
+    selectItems.value.length = 0;
+    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 taskpagination = reactive({
   pageNo: 1,
   pageSize: 10,
-})
-const taskStore = useTask()
-const overTask = ref<any>(null)
-const taskDetailInfo = ref<any>({})
-const taskDetailPictureList = ref<any[]>([])
-const userStore = useUser()
-const imageRef = ref<ComponentElRef | null>()
-let processItems: any[] = []
+});
+const taskStore = useTask();
+const overTask = ref<any>(null);
+const taskDetailInfo = ref<any>({});
+const taskDetailPictureList = ref<any[]>([]);
+const userStore = useUser();
+const imageRef = ref<ComponentElRef | null>();
+let processItems: any[] = [];
 
 onMounted(() => {
-  window.addEventListener('keydown', handleKeydown)
+  window.addEventListener("keydown", handleKeydown);
   if (route.query.id) {
-    taskId.value = route.query.id
-    packageId.value = route.query.packageid
-    getDetail()
+    taskId.value = route.query.id;
+    packageId.value = route.query.packageid;
+    getDetail();
   }
-})
+});
 
 // 键盘左右箭头快捷切换
 function handleKeydown(event) {
-  if (event.key === 'ArrowLeft')
-    backHandler()
+  if (event.key === "ArrowLeft") backHandler();
   // 在这里执行左箭头的逻辑
-  else if (event.key === 'ArrowRight')
-    forwardHandler()
+  else if (event.key === "ArrowRight") forwardHandler();
   // 在这里执行右箭头的逻辑
 }
 
 // states:1未提交，2待审批，3通过，4不通过
 function validate(items: any[]) {
-  if (items.length === 0)
-    return '至少选中一个任务'
+  if (items.length === 0) return "至少选中一个任务";
 
   // const useInfo = userStore.getUserInfo
   // const username = useInfo.loginname
@@ -114,58 +114,56 @@ function validate(items: any[]) {
   //     return '审批人不一致'
   // }
 
-  return null
+  return null;
 }
 
 function approvalHandler(items?: any) {
-  let cloneItem: any
+  let cloneItem: any;
   if (batch.value) {
-    processItems = selectItems.value
-  }
-  else if (overTask.value) {
-    cloneItem = clone(overTask.value)
-    processItems = [cloneItem]
+    processItems = selectItems.value;
+  } else if (overTask.value) {
+    cloneItem = clone(overTask.value);
+    processItems = [cloneItem];
   }
 
-  if (items !== undefined && !(items instanceof PointerEvent))
-    processItems = items
+  if (items !== undefined && !(items instanceof PointerEvent)) processItems = items;
 
-  const msg = validate(processItems)
+  const msg = validate(processItems);
 
   if (msg !== null) {
-    message.error(msg)
-    return
+    message.error(msg);
+    return;
   }
 
-  const list: any = []
+  const list: any = [];
   processItems.forEach((item) => {
     list.push({
       formId: item.id,
       taskId: item.taskId,
       taskName: item.fromTaskName,
-    })
-  })
+    });
+  });
 
   const param = {
     result: true,
-    comment: '',
-    disposeType: '',
-    disposeTypeId: '',
-    failCauseId: '',
-    failCauseName: '',
+    comment: "",
+    disposeType: "",
+    disposeTypeId: "",
+    failCauseId: "",
+    failCauseName: "",
     flowTaskInfoList: list,
-  }
+  };
 
   dialog.info({
-    title: '确认提示',
-    content: '确认给该任务审批为【通过】吗?',
-    positiveText: '确定',
-    negativeText: '取消',
+    title: "确认提示",
+    content: "确认给该任务审批为【通过】吗?",
+    positiveText: "确定",
+    negativeText: "取消",
     onPositiveClick: () => {
-      doAudit(param)
+      doAudit(param);
     },
     onNegativeClick: () => {},
-  })
+  });
 }
 
 function rejectHandler(items?: any) {
@@ -188,153 +186,157 @@ function rejectHandler(items?: any) {
   //   return
   // }
 
-  const modal = unref(notPassModalRef)! as any
-  modal.showModal(selectItems.value)
+  const modal = unref(notPassModalRef)! as any;
+  modal.showModal(selectItems.value);
 }
 
 function doAudit(param: any) {
   audit(param).then((res) => {
-    const { code } = res
-    setBatch(false)
-    if (code === 'OK') {
-      message.success('审核成功')
-      reloadList()
+    const { code } = res;
+    setBatch(false);
+    if (code === "OK") {
+      message.success("审核成功");
+      reloadList();
+    } else {
+      message.error(res.message);
     }
-
-    else { message.error(res.message) }
-  })
+  });
 }
 
 function showModal(modalRef: any) {
-  const modal = unref(modalRef)! as any
-  modal.showModal()
+  const modal = unref(modalRef)! as any;
+  modal.showModal();
 }
 
 function forwardHandler() {
-  taskStore.forward()
+  taskStore.forward();
 }
 
 function backHandler() {
-  taskStore.back()
+  taskStore.back();
 }
 
 async function handleDragEnd(event, item) {
   // 可以在这里添加拖拽结束后的逻辑
-  const flag = taskStore.getInFile
+  const flag = taskStore.getInFile;
   if (flag) {
-    const res = await dubiousfileyd({ pictureid: item.pictureid })
-    if (res.code === 'OK') {
-      message.success('加入成功')
-      getTableData()
+    const res = await dubiousfileyd({ pictureid: item.pictureid });
+    if (res.code === "OK") {
+      message.success("加入成功");
+      getTableData();
+    } else {
+      message.error(res.message);
     }
-    else {
-      message.error(res.message)
-    }
-    taskStore.setInFile(false)
+    taskStore.setInFile(false);
   }
 }
 
 async function getTableData() {
-  const useInfo = userStore.getUserInfo
-  const listData = []
-  const reviewType = 3 // 类型
-  let res = await getAllfieldList(reviewType)
-  const fieldList = (res as any)?.data
-  res = await getfieldList(reviewType, useInfo.id)
-  const userFieldList = (res as any)?.data.userFieldFixed
+  const useInfo = userStore.getUserInfo;
+  const listData = [];
+  const reviewType = 3; // 类型
+  let res = await getAllfieldList(reviewType);
+  const fieldList = (res as any)?.data;
+  res = await getfieldList(reviewType, useInfo.id);
+  const userFieldList = (res as any)?.data.userFieldFixed;
+  const blueList = [
+    "拜访终端名称",
+    "定位信息",
+    "拜访日期",
+    "定位距离",
+    "拜访小结",
+    "拜访项目类别",
+  ];
   fieldList.map((v) => {
     if (userFieldList.includes(v.name)) {
       const item = {
         label: v.fieldDesc,
         value: taskDetailInfo.value.ocrPicture[v.name],
         key: v.name,
-      }
-      listData.push(item)
+        blue: blueList.includes(v.fieldDesc),
+      };
+      listData.push(item);
     }
-  })
-  taskTableData.value = chunk(listData, 2)
+  });
+  taskTableData.value = chunk(listData, 2);
 }
 
 async function getImgList() {
   if (!isEmpty(taskDetailInfo.value.ocrPicture.id)) {
-    const { data, total } = await getSimilarityList(
-      {
-        ...taskpagination,
-        ...sortBy,
-        pictureId: taskDetailInfo.value.ocrPicture.id,
-      },
-    )
-    taskDetailPictureList.value = data
-    totalCount.value = total
-  }
-  else {
-    taskDetailPictureList.value.length = 0
-    totalCount.value = 0
+    const { data, total } = await getSimilarityList({
+      ...taskpagination,
+      ...sortBy,
+      pictureId: taskDetailInfo.value.ocrPicture.id,
+    });
+    taskDetailPictureList.value = data;
+    totalCount.value = total;
+  } else {
+    taskDetailPictureList.value.length = 0;
+    totalCount.value = 0;
   }
 }
 
 // 从store里面获取任务id
 const currentTaskId = computed(() => {
-  const index = taskStore.getCurrentIndex
-  return taskStore.getApprovalList[index]?.id || ''
-})
+  const index = taskStore.getCurrentIndex;
+  return taskStore.getApprovalList[index]?.id || "";
+});
 
 function overTaskHandle() {
-  const item = taskDetailInfo.value
+  const item = taskDetailInfo.value;
   if (item?.userapprove?.statshis === 2 || item?.userapprove?.statshis == 3) {
-    overTask.value = null
-    return
+    overTask.value = null;
+    return;
   }
 
-  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;
 }
 
 function showActionsModal() {
-  const modal = unref(CustomSettingModalRef)! as any
-  modal.showModal()
+  const modal = unref(CustomSettingModalRef)! as any;
+  modal.showModal();
 }
 
 onUnmounted(() => {
-  taskStore.reset()
-  window.removeEventListener('keydown', handleKeydown)
-})
+  taskStore.reset();
+  window.removeEventListener("keydown", handleKeydown);
+});
 
 function immersionHandler() {
-  taskStore.updateImmersion()
+  taskStore.updateImmersion();
 }
 
 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();
 }
 
 watch(
   () => [taskStore.activeId],
   () => {
-    packageId.value = taskStore.getPackageid
-    taskId.value = taskStore.getActiveId
-    getDetail()
-  },
-)
+    packageId.value = taskStore.getPackageid;
+    taskId.value = taskStore.getActiveId;
+    getDetail();
+  }
+);
 
 // 获取数据
 async function getDetail() {
-  taskDetailInfo.value = await getTaskDetailInfo(taskId.value, packageId.value)
-  setBatch(false)
-  getTableData()
-  getImgList()
+  taskDetailInfo.value = await getTaskDetailInfo(taskId.value, packageId.value);
+  setBatch(false);
+  getTableData();
+  getImgList();
 }
 
 function reloadList() {
-  getDetail()
+  getDetail();
 }
 </script>
 
@@ -343,24 +345,11 @@ function reloadList() {
     <div class="wrapper-header">
       <div class="left">
         <span class="font">任务ID：{{ taskDetailInfo.fromtaskname }}</span>
-        <SvgIcon
-          size="22"
-          class="forward"
-          name="arrow-left"
-          @click="backHandler"
-        />
-        <SvgIcon
-          size="22"
-          class="back"
-          name="arrow-right"
-          @click="forwardHandler"
-        />
+        <SvgIcon size="22" class="forward" name="arrow-left" @click="backHandler" />
+        <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">
           <div class="btn" @click="setBatch(true)">
             <SvgIcon style="margin-right: 6px" size="22" name="batch" />
             批量审批
@@ -391,11 +380,7 @@ function reloadList() {
             </ul>
           </n-popover> -->
           <div class="icon-wrap">
-            <SvgIcon
-              size="20"
-              name="immersion-model"
-              @click="immersionHandler"
-            />
+            <SvgIcon size="20" name="immersion-model" @click="immersionHandler" />
           </div>
         </div>
         <div v-show="showActions" class="batch">
@@ -405,9 +390,19 @@ function reloadList() {
             </template>
             返回
           </n-button>
-          <img class="btn-approval btn-left" src="@/assets/images/task/btn-not-pass.png" alt="" @click.stop="rejectHandler">
+          <img
+            class="btn-approval btn-left"
+            src="@/assets/images/task/btn-not-pass.png"
+            alt=""
+            @click.stop="rejectHandler"
+          />
           <SvgIcon size="24" name="vs" />
-          <img class="btn-approval" src="@/assets/images/task/btn-pass.png" alt="" @click.stop="approvalHandler">
+          <img
+            class="btn-approval"
+            src="@/assets/images/task/btn-pass.png"
+            alt=""
+            @click.stop="approvalHandler"
+          />
         </div>
       </div>
     </div>
@@ -447,44 +442,50 @@ function reloadList() {
         </div>
 
         <div class="status">
-          <img v-show="taskDetailInfo?.userapprove?.statshis === 2" class="img-status" src="@/assets/images/task/pass.png" alt="">
-          <img v-show="taskDetailInfo?.userapprove?.statshis === 3" class="img-status" src="@/assets/images/task/not_pass.png" alt="">
+          <img
+            v-show="taskDetailInfo?.userapprove?.statshis === 2"
+            class="img-status"
+            src="@/assets/images/task/pass.png"
+            alt=""
+          />
+          <img
+            v-show="taskDetailInfo?.userapprove?.statshis === 3"
+            class="img-status"
+            src="@/assets/images/task/not_pass.png"
+            alt=""
+          />
         </div>
         <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="big-mark" />
         <div class="info img-info">
           <n-grid x-gap="12" y-gap="10" :cols="12">
             <n-gi span="4" class="gi1">
               <span>
-                <img class="icon-status" src="@/assets/images/task/status.png" alt="">
+                <img class="icon-status" src="@/assets/images/task/status.png" alt="" />
               </span>
             </n-gi>
             <n-gi span="8" class="gi2">
-              <span class="value">{{ TASK_STATUS_OBJ[taskDetailInfo?.userapprove?.statshis] }}</span>
+              <span class="value">{{
+                TASK_STATUS_OBJ[taskDetailInfo?.userapprove?.statshis]
+              }}</span>
               <span class="label">审批状态</span>
             </n-gi>
             <n-gi span="4" class="gi1">
               <span>
-                <img class="icon-status" src="@/assets/images/task/similarity.png" alt="">
+                <img
+                  class="icon-status"
+                  src="@/assets/images/task/similarity.png"
+                  alt=""
+                />
               </span>
             </n-gi>
             <n-gi span="8" class="gi2">
-              <span class="value num">{{
-                totalCount
-              }}<span class="unit">张</span> </span>
+              <span class="value num">{{ totalCount }}<span class="unit">张</span> </span>
               <span class="label">相似匹配</span>
             </n-gi>
           </n-grid>
@@ -492,11 +493,18 @@ function reloadList() {
         <div class="time">
           <div v-if="taskDetailInfo?.ocrPicture?.photoDateTimestamp" class="time-item">
             <SvgIcon class="svg-time" color="#FFF" size="16" name="camera-time" />
-            <span>{{ formatToDateHMS(Number(taskDetailInfo.ocrPicture.photoDateTimestamp) || 0) }}</span>
+            <span>{{
+              formatToDateHMS(Number(taskDetailInfo.ocrPicture.photoDateTimestamp) || 0)
+            }}</span>
           </div>
-          <div v-if="taskDetailInfo?.ocrPicture?.submitDateTimestamp" class="time-item time-item2">
+          <div
+            v-if="taskDetailInfo?.ocrPicture?.submitDateTimestamp"
+            class="time-item time-item2"
+          >
             <SvgIcon class="svg-time" color="#FFF" size="16" name="submit-time" />
-            <span>{{ formatToDateHMS(Number(taskDetailInfo.ocrPicture.submitDateTimestamp) || 0) }}</span>
+            <span>{{
+              formatToDateHMS(Number(taskDetailInfo.ocrPicture.submitDateTimestamp) || 0)
+            }}</span>
           </div>
         </div>
         <div style="display: none">
@@ -520,16 +528,16 @@ function reloadList() {
               />
             </div>
             <div class="list">
-              <div
-                v-for="(item) in taskDetailPictureList"
-                :key="item.id"
-                class="item"
-              >
+              <div v-for="item in taskDetailPictureList" :key="item.id" class="item">
                 <div
                   draggable="true"
                   class="img-wrapper"
                   :style="{ 'background-image': `url(${item.imgUrl})` }"
-                  @dragend="(event) => { handleDragEnd(event, item) }"
+                  @dragend="
+                    (event) => {
+                      handleDragEnd(event, item);
+                    }
+                  "
                 />
                 <div class="small-mark" />
                 <div class="check">
@@ -541,19 +549,36 @@ function reloadList() {
                   />
                 </div>
 
-                <img v-if="item.historyStates === 2" class="tag-status" src="@/assets/images/task/tag-pass.png" alt="">
-                <img v-if="item.historyStates === 3" class="tag-status" src="@/assets/images/task/tag-not-pass.png" alt="">
+                <img
+                  v-if="item.historyStates === 2"
+                  class="tag-status"
+                  src="@/assets/images/task/tag-pass.png"
+                  alt=""
+                />
+                <img
+                  v-if="item.historyStates === 3"
+                  class="tag-status"
+                  src="@/assets/images/task/tag-not-pass.png"
+                  alt=""
+                />
                 <div class="time">
                   <div v-if="item.photoDateTimestamp" class="time-item">
                     <SvgIcon class="svg-time" color="#FFF" size="8" name="camera-time" />
-                    <span>{{ formatToDateHMS(Number(item.photoDateTimestamp) || 0) }}</span>
+                    <span>{{
+                      formatToDateHMS(Number(item.photoDateTimestamp) || 0)
+                    }}</span>
                   </div>
                   <div v-if="item.submitDateTimestamp" class="time-item time-item2">
                     <SvgIcon class="svg-time" color="#FFF" size="8" name="submit-time" />
-                    <span>{{ formatToDateHMS(Number(item.submitDateTimestamp) || 0) }}</span>
+                    <span>{{
+                      formatToDateHMS(Number(item.submitDateTimestamp) || 0)
+                    }}</span>
                   </div>
                 </div>
-                <div :class="{ 'percent-red': item.similarityScore === 100 }" class="percent">
+                <div
+                  :class="{ 'percent-red': item.similarityScore === 100 }"
+                  class="percent"
+                >
                   {{ item.similarityScore }}<span class="percent-unit">%</span>
                 </div>
               </div>
@@ -566,7 +591,11 @@ function reloadList() {
 
     <n-tabs type="line" animated>
       <n-tab-pane name="task-info" tab="任务信息">
-        <TaskTable :data="taskDetailInfo" :task-table-data="taskTableData" @show-modal="showActionsModal" />
+        <TaskTable
+          :data="taskDetailInfo"
+          :task-table-data="taskTableData"
+          @show-modal="showActionsModal"
+        />
       </n-tab-pane>
       <n-tab-pane name="picture-info" tab="图片信息">
         <PictureTable :data="taskDetailInfo" />
@@ -576,12 +605,12 @@ function reloadList() {
       </n-tab-pane>
     </n-tabs>
     <NotPassed ref="notPassModalRef" @success="reloadList" />
-    <BatchModal
-      ref="batchModalRef"
-      @reject="rejectHandler"
-      @approval="approvalHandler"
+    <BatchModal ref="batchModalRef" @reject="rejectHandler" @approval="approvalHandler" />
+    <CustomSettingModal
+      ref="CustomSettingModalRef"
+      :review-type="3"
+      @on-ok="getTableData"
     />
-    <CustomSettingModal ref="CustomSettingModalRef" :review-type="3" @on-ok="getTableData" />
   </div>
 </template>
 
@@ -593,7 +622,7 @@ function reloadList() {
   color: #666666;
 }
 ::v-deep(.n-tabs-tab--active .n-tabs-tab__label) {
-  color: #507AFD;
+  color: #507afd;
   font-size: 16px;
   font-weight: 500;
 }
@@ -612,49 +641,48 @@ function reloadList() {
   }
 }
 
-.icon-wrap{
+.icon-wrap {
   display: flex;
   align-items: center;
   justify-content: center;
   width: 30px;
   height: 30px;
-  background: rgba(80,122,253,.1);
+  background: rgba(80, 122, 253, 0.1);
   border-radius: 8px;
   margin-left: 10px;
   cursor: pointer;
 }
 
-.img-info{
-  .icon-status{
+.img-info {
+  .icon-status {
     width: 32px;
     height: 32px;
   }
 
-  .label{
+  .label {
     font-size: 11px;
     font-family: PingFang SC, PingFang SC-Medium;
     font-weight: 500;
     color: #ffffff;
   }
 
-  .value{
+  .value {
     font-size: 15px;
     font-family: PingFang SC, PingFang SC-Semibold;
     font-weight: 600;
     color: #ffffff;
   }
 
-  .num{
+  .num {
     font-size: 18px;
     font-family: PingFang SC, PingFang SC-Semibold;
     font-weight: 600;
     color: #ffffff;
   }
 
-  .unit{
+  .unit {
     font-size: 11px;
   }
-
 }
 .wrapper {
   display: flex;
@@ -717,13 +745,13 @@ function reloadList() {
         display: flex;
         align-items: center;
 
-        .btn-approval{
+        .btn-approval {
           width: 68px;
           height: 28px;
           cursor: pointer;
         }
 
-        .btn-left{
+        .btn-left {
           margin-left: 16px;
         }
       }
@@ -749,10 +777,15 @@ function reloadList() {
       border-radius: 8px;
       position: relative;
 
-      .big-mark{
+      .big-mark {
         width: 100%;
         height: 151px;
-        background: linear-gradient(180deg,rgba(0,0,0,0.00) 0%, rgba(0,0,0,0.00) 29%, rgba(3,0,0,0.73));
+        background: linear-gradient(
+          180deg,
+          rgba(0, 0, 0, 0) 0%,
+          rgba(0, 0, 0, 0) 29%,
+          rgba(3, 0, 0, 0.73)
+        );
         position: absolute;
         left: 0;
         bottom: 0;
@@ -806,7 +839,7 @@ function reloadList() {
         left: 16px;
         bottom: 16px;
 
-        .time-item{
+        .time-item {
           display: flex;
           align-items: center;
           font-size: 14px;
@@ -816,12 +849,12 @@ function reloadList() {
           margin-bottom: 4px;
         }
 
-        .time-item2{
+        .time-item2 {
           margin-bottom: 0;
         }
 
-        .svg-time{
-          margin-right: 5px
+        .svg-time {
+          margin-right: 5px;
         }
       }
 
@@ -837,20 +870,20 @@ function reloadList() {
         justify-content: center;
       }
 
-      .check{
+      .check {
         position: absolute;
         z-index: 3;
         left: 2%;
         top: 2%;
       }
 
-      .status{
+      .status {
         position: absolute;
         z-index: 3;
         left: 0;
         top: 0;
 
-        .img-status{
+        .img-status {
           width: 133px;
           height: 129px;
         }
@@ -859,12 +892,12 @@ function reloadList() {
 
     .right {
       flex: 0.5;
-      background: #F6F9FD;
+      background: #f6f9fd;
       border-radius: 8px;
       margin-left: 20px;
       padding: 24px;
 
-      .right-card{
+      .right-card {
         padding: 3px;
       }
 
@@ -893,10 +926,14 @@ function reloadList() {
         // overflow: hidden;
         margin: 0px 16px 27px 0px;
 
-        .small-mark{
+        .small-mark {
           width: 100%;
           height: 36px;
-          background: linear-gradient(180deg,rgba(0,0,0,0.01), rgba(0,0,0,0.44) 88%);
+          background: linear-gradient(
+            180deg,
+            rgba(0, 0, 0, 0.01),
+            rgba(0, 0, 0, 0.44) 88%
+          );
           border-radius: 0px 8px 8px 8px;
           position: absolute;
           left: 0;
@@ -904,7 +941,7 @@ function reloadList() {
           z-index: 0;
         }
 
-        .tag-status{
+        .tag-status {
           width: 46px;
           height: 22px;
           position: absolute;
@@ -917,7 +954,7 @@ function reloadList() {
           z-index: 3;
           left: 3px;
           bottom: 3px;
-          .time-item{
+          .time-item {
             display: flex;
             align-items: center;
             font-size: 10px;
@@ -928,12 +965,12 @@ function reloadList() {
             line-height: 12px;
           }
 
-          .time-item2{
+          .time-item2 {
             margin-bottom: 0;
           }
 
-          .svg-time{
-            margin-right: 5px
+          .svg-time {
+            margin-right: 5px;
           }
         }
 
@@ -973,12 +1010,12 @@ function reloadList() {
         font-size: 14px;
       }
 
-      .percent-unit{
+      .percent-unit {
         font-size: 8px;
-        margin-top: 4px
+        margin-top: 4px;
       }
 
-      .percent-red{
+      .percent-red {
         background: #ff4e4f;
       }
     }
diff --git a/src/views/task/content/TaskTable.vue b/src/views/task/content/TaskTable.vue
index a0d4a18..cda8791 100644
--- a/src/views/task/content/TaskTable.vue
+++ b/src/views/task/content/TaskTable.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import { ref, watch } from "vue";
+
 defineProps({
   data: {
     type: Object as PropType<any>,
@@ -8,19 +10,17 @@ defineProps({
     type: Array as any,
     default: () => [[]],
   },
-})
-const emit = defineEmits(['showModal'])
+});
+const emit = defineEmits(["showModal"]);
 function showActionsModal() {
-  emit('showModal')
+  emit("showModal");
 }
 </script>
 
 <template>
   <div class="info-header">
     <div class="left_box">
-      <div class="title">
-        填报信息
-      </div>
+      <div class="title">填报信息</div>
     </div>
     <div class="right_box" @click="showActionsModal">
       自定义设置
@@ -32,13 +32,13 @@ function showActionsModal() {
       <th v-if="item && item[0]">
         {{ item[0].label }}
       </th>
-      <td v-if="item && item[0]" :class="item.blue ? 'blue' : ''">
+      <td v-if="item && item[0]" :class="item[0].blue ? 'blue' : ''">
         {{ item[0].value }}
       </td>
       <th v-if="item && item.length > 1">
         {{ item[1].label }}
       </th>
-      <td v-if="item && item.length > 1" :class="item.blue ? 'blue' : ''">
+      <td v-if="item && item.length > 1" :class="item[1].blue ? 'blue' : ''">
         {{ item[1].value }}
       </td>
     </tr>
@@ -81,8 +81,8 @@ function showActionsModal() {
     font-family: PingFang SC, PingFang SC-Regular;
     color: #666666;
 
-    .icon{
-      margin-left: 7px
+    .icon {
+      margin-left: 7px;
     }
   }
 }
diff --git a/src/views/task/modal/CustomFieldModal.vue b/src/views/task/modal/CustomFieldModal.vue
index a0d9228..e92f8a0 100644
--- a/src/views/task/modal/CustomFieldModal.vue
+++ b/src/views/task/modal/CustomFieldModal.vue
@@ -251,7 +251,10 @@ function removeHandler(id: string) {
   let index = onList.value.findIndex((item) => {
     return item.id === id;
   });
-  if (index !== -1) onList.value.splice(index, 1);
+  if (index !== -1) {
+    onList.value.splice(index, 1);
+    onShowList.value.splice(index, 1);
+  }
 
   index = offList.value.findIndex((v) => v.id == id);
   offList.value[index].checked = false;
-- 
2.39.3


From 0837afc5453e47bcb15d4e4bc6cfbfc93770fee2 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sat, 30 Mar 2024 19:28:27 +0800
Subject: [PATCH 033/143] =?UTF-8?q?feat:=20=E4=BB=BB=E5=8A=A1=E7=BB=88?=
 =?UTF-8?q?=E5=AE=A1=E7=95=8C=E9=9D=A2=E5=92=8C=E4=B8=80=E9=94=AE=E6=9F=A5?=
 =?UTF-8?q?=E9=87=8D=E7=95=8C=E9=9D=A2=E7=9A=84=E6=96=B0=E5=BB=BA=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E6=9D=A1=E4=BB=B6=E6=96=B0=E5=A2=9E=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=EF=BC=8C=E5=BC=B9=E7=AA=9724=E5=B0=8F=E6=97=B6=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/comp/NewFilterModal.vue       |   6 +-
 .../home/aside/comp/modals/NewFilterModal.vue |   6 +-
 src/views/worksheet/modal/ApprovalModal.vue   | 116 +++++++++---------
 3 files changed, 63 insertions(+), 65 deletions(-)

diff --git a/src/views/final/comp/NewFilterModal.vue b/src/views/final/comp/NewFilterModal.vue
index ae1e823..3b9a219 100644
--- a/src/views/final/comp/NewFilterModal.vue
+++ b/src/views/final/comp/NewFilterModal.vue
@@ -150,7 +150,7 @@ function unformatValue(searchfield: string, searchvalue: any) {
 function createCondition() {
   formValue.conditions.push({
     type: null,
-    operator: null,
+    operator: 'eq',
     result: null,
   })
 }
@@ -227,7 +227,7 @@ function leaveHandler() {
   formValue.conditions = [
     {
       type: null,
-      operator: null,
+      operator: 'eq',
       result: null,
     },
   ]
@@ -269,7 +269,7 @@ defineExpose({
             <n-form-item path="name" label="标题">
               <n-input v-model:value="formValue.name" :style="{ width: '780px' }" @keydown.enter.prevent />
             </n-form-item>
-            <n-form-item path="logic" label="逻辑关系">
+            <n-form-item path="logic" label="逻辑关系" v-show="false">
               <n-select filterable v-model:value="formValue.logic" placeholder="请选择逻辑关系" :options="logicOptions" />
             </n-form-item>
             <n-form-item
diff --git a/src/views/home/aside/comp/modals/NewFilterModal.vue b/src/views/home/aside/comp/modals/NewFilterModal.vue
index 8dc60d6..1c4dda4 100644
--- a/src/views/home/aside/comp/modals/NewFilterModal.vue
+++ b/src/views/home/aside/comp/modals/NewFilterModal.vue
@@ -158,7 +158,7 @@ function unformatValue(searchfield: string, searchvalue: any) {
 function createCondition() {
   formValue.conditions.push({
     type: null,
-    operator: null,
+    operator: 'eq',
     result: null,
   })
 }
@@ -260,7 +260,7 @@ function leaveHandler() {
   formValue.conditions = [
     {
       type: null,
-      operator: null,
+      operator: 'eq',
       result: null,
     },
   ]
@@ -302,7 +302,7 @@ defineExpose({
             <n-form-item path="name" label="标题">
               <n-input v-model:value="formValue.name" :style="{ width: '780px' }" @keydown.enter.prevent />
             </n-form-item>
-            <n-form-item path="logic" label="逻辑关系">
+            <n-form-item path="logic" label="逻辑关系" v-show="false">
               <n-select filterable v-model:value="formValue.logic" placeholder="请选择逻辑关系" :options="logicOptions" />
             </n-form-item>
             <n-form-item
diff --git a/src/views/worksheet/modal/ApprovalModal.vue b/src/views/worksheet/modal/ApprovalModal.vue
index 5f60991..55f0fa9 100644
--- a/src/views/worksheet/modal/ApprovalModal.vue
+++ b/src/views/worksheet/modal/ApprovalModal.vue
@@ -1,101 +1,104 @@
 <script lang="ts" setup>
-import { reactive, ref, toRefs } from 'vue'
-import { format } from 'date-fns'
-import { NButton, NDataTable, useDialog, useMessage } from 'naive-ui'
-import { aiApprovaltools, aiApprovaltoolsClearmark } from '@/api/work/work'
+import { onMounted, reactive, ref, toRefs } from "vue";
+import { format } from "date-fns";
+import { NButton, NDataTable, useDialog, useMessage } from "naive-ui";
+import { aiApprovaltools, aiApprovaltoolsClearmark } from "@/api/work/work";
+import { getToolsCount } from "@/api/home/main";
 
 const emit = defineEmits<{
-  (e: 'reject', params: any)
-  (e: 'notPass', params: any)
-}>()
+  (e: "reject", params: any);
+  (e: "notPass", params: any);
+}>();
 
-const dialog = useDialog()
+const dialog = useDialog();
 
 const state: any = reactive({
   detail: {},
-  taskId: '',
-})
-const { detail } = toRefs(state)
+  taskId: "",
+});
+const { detail } = toRefs(state);
 const cardStyle = {
-  'width': '450px',
-  '--n-padding-bottom': '10px',
-  '--n-padding-left': '0px',
-}
+  width: "450px",
+  "--n-padding-bottom": "10px",
+  "--n-padding-left": "0px",
+};
 
-const show = ref(false)
+const show = ref(false);
 
 function showModal(id) {
-  console.log(id)
-  state.taskId = id
-  getDetail(id)
+  console.log(id);
+  state.taskId = id;
+  getDetail(id);
 }
 
 async function getDetail(id) {
-  const res = await aiApprovaltools({ taskid: id })
-  if (res.code === 'OK') {
-    state.detail = res.data
-    show.value = true
+  const res = await aiApprovaltools({ taskid: id });
+  if (res.code === "OK") {
+    state.detail = res.data;
+    show.value = true;
   }
 
-  console.log(res)
+  console.log(res);
 }
 
 async function clearMark() {
-  const res = await aiApprovaltoolsClearmark({ taskid: state.taskId })
-  if (res.code === 'OK')
-    closeModal()
+  const res = await aiApprovaltoolsClearmark({ taskid: state.taskId });
+  if (res.code === "OK") closeModal();
 }
 
 function closeModal() {
-  show.value = false
+  show.value = false;
 }
 
 async function reject() {
   // emit('reject', { a: 'todo' })
   // closeModal()
   dialog.info({
-    title: '确认提示',
-    content: '确认设置成假吗?',
-    positiveText: '确定',
-    negativeText: '取消',
+    title: "确认提示",
+    content: "确认设置成假吗?",
+    positiveText: "确定",
+    negativeText: "取消",
     onPositiveClick: async () => {
       // TODO：需要支持重置
       // const result = await resetApproval()
-      clearMark()
+      clearMark();
     },
     onNegativeClick: () => {},
-  })
+  });
 }
 
 async function viewRepeat(e: MouseEvent) {
-  emit('notPass', {
+  emit("notPass", {
     id: state.taskId,
     detail: state.detail,
-  })
-  e.preventDefault()
-  closeModal()
+  });
+  e.preventDefault();
+  closeModal();
+}
+
+async function getShowStatus() {
+  const res = await getToolsCount();
+  if (!JSON.parse(res.message)) {
+    show.value = true;
+  }
 }
+onMounted(() => {
+  getShowStatus();
+});
 
 defineExpose({
   showModal,
-})
+});
 </script>
 
 <template>
   <n-modal v-model:show="show" transform-origin="center" class="modal_wrap">
     <div class="wrapper">
       <div class="closed">
-        <SvgIcon
-          style="cursor: pointer"
-          name="cut-down"
-          width="32"
-          @click="closeModal"
-        />
+        <SvgIcon style="cursor: pointer" name="cut-down" width="32" @click="closeModal" />
       </div>
       <div class="wrapper-hearder">
-        <div class="wrapper-title">
-          智能AI审批工具
-        </div>
+        <div class="wrapper-title">智能AI审批工具</div>
         <div class="wrapper-mark">
           {{ detail.tenantusername }}
         </div>
@@ -105,25 +108,20 @@ defineExpose({
           <div v-for="i in 1" :key="i" class="item">
             <div class="imgwrapper" />
             <div class="content">
-              <div class="task_id">
-                任务ID：{{ detail.taskid }}
-              </div>
+              <div class="task_id">任务ID：{{ detail.taskid }}</div>
               <div class="tag_box">
-                <div class="tag_item">
-                  基线任务
-                </div>
-                <div class="tag_item error">
-                  相似图片({{ detail.similarcount }})
-                </div>
+                <div class="tag_item">基线任务</div>
+                <div class="tag_item error">相似图片({{ detail.similarcount }})</div>
               </div>
               <div class="time_box">
-                {{ format(detail.createtime, 'yyyy-MM-dd HH:mm:ss') }}
+                {{ format(detail.createtime, "yyyy-MM-dd HH:mm:ss") }}
               </div>
             </div>
           </div>
         </n-scrollbar>
         <div class="mark_text">
-          智能识别：{{ detail.similarComplete }}张图片来源于网络，建议将图片标记为假，或 快速审批不通过！
+          智能识别：{{ detail.similarComplete }}张图片来源于网络，建议将图片标记为假，或
+          快速审批不通过！
         </div>
         <div class="footer">
           <SvgIcon
-- 
2.39.3


From 1b61fcabb92afdd2e4d985a6d078c39f2a04d012 Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Sat, 30 Mar 2024 19:34:49 +0800
Subject: [PATCH 034/143] bug

---
 src/api/task/task.ts                    |  8 ++++++--
 src/views/task/aside/TaskList.vue       |  8 ++++++--
 src/views/task/content/Content.vue      | 27 ++++++++++++++++++++++---
 src/views/task/content/PictureTable.vue | 27 ++++++++++++++++---------
 4 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/src/api/task/task.ts b/src/api/task/task.ts
index 5dc1654..572e5f7 100644
--- a/src/api/task/task.ts
+++ b/src/api/task/task.ts
@@ -7,11 +7,15 @@ import { ContentTypeEnum } from '@/enums/httpEnum'
  * 获取审核列表
  * @returns
  */
-export async function getApprovalList(page: PageParam) {
+export async function getApprovalList(page: any) {
   const res = await http.request({
     url: `/flow/task/listalldata`,
     method: 'get',
-    params: { pageSize: page.pageSize, currPage: page.pageNo },
+    params: {
+      pageSize: page.pageSize,
+      currPage: page.pageNo,
+      keyword: page.keyword,
+    },
   })
 
   const { data: { list, totalCount } } = res
diff --git a/src/views/task/aside/TaskList.vue b/src/views/task/aside/TaskList.vue
index eb88cf6..5044a60 100644
--- a/src/views/task/aside/TaskList.vue
+++ b/src/views/task/aside/TaskList.vue
@@ -37,6 +37,7 @@ useInfiniteScroll(
 )
 
 async function loadMore() {
+  console.log(77888)
   if (isLoading.value || el.value == null)
     return
   isLoading.value = true
@@ -53,7 +54,10 @@ async function loadMore() {
 async function fetchList() {
   try {
     pagination.pageNo += 1
-    const result = await taskStore.fetchApprovalList(pagination)
+    const result = await taskStore.fetchApprovalList({
+      ...pagination,
+      keyword: keyword.value,
+    })
     const { data, pageCount } = result
     canloadMore.value = pageCount >= pagination.pageNo
     return data || []
@@ -73,7 +77,7 @@ watch(
 
 function reset() {
   pagination.pageNo = 0
-  pagination.pageSize = 100
+  pagination.pageSize = 30
   canloadMore.value = true
   data.value.length = 0
 
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index af253a2..52766bf 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -303,9 +303,11 @@ function previewHandler(event: MouseEvent) {
 watch(
   () => [taskStore.activeId],
   () => {
-    packageId.value = taskStore.getPackageid
-    taskId.value = taskStore.getActiveId
-    getDetail()
+    if (!isEmpty(taskStore.getActiveId)) {
+      packageId.value = taskStore.getPackageid
+      taskId.value = taskStore.getActiveId
+      getDetail()
+    }
   },
 )
 
@@ -456,6 +458,9 @@ function reloadList(param, text) {
           />
         </div>
         <div class="big-mark" />
+        <div class="preview" @click="previewHandler">
+          <SvgIcon size="16" name="zoom-out" />
+        </div>
         <div class="info img-info">
           <n-grid x-gap="12" y-gap="10" :cols="12">
             <n-gi span="4" class="gi1">
@@ -740,6 +745,22 @@ function reloadList(param, text) {
       border-radius: 8px;
       position: relative;
 
+      .preview {
+        position: absolute;
+        right: 10px;
+        top: 10px;
+        z-index: 3;
+        width: 30px;
+        height: 30px;
+        background: rgba(255, 255, 255, 0.20);
+        border-radius: 6px;
+        backdrop-filter: blur(10px);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        cursor: pointer;
+      }
+
       .big-mark{
         width: 100%;
         height: 151px;
diff --git a/src/views/task/content/PictureTable.vue b/src/views/task/content/PictureTable.vue
index d2fa022..68d0512 100644
--- a/src/views/task/content/PictureTable.vue
+++ b/src/views/task/content/PictureTable.vue
@@ -19,35 +19,42 @@ defineProps({
     <tr>
       <th>图片名称</th>
       <td class="blue">
-        {{ data?.ocrPicture?.imgname }}
+        {{ data?.pictureInfo?.imgname }}
       </td>
       <th>图片格式</th>
-      <td class="blue" />
+      <td class="blue">
+        {{ data?.pictureInfo?.imgFormat }}
+      </td>
     </tr>
     <tr>
       <th>图片大小</th>
-      <td />
+      <td class="blue">
+        {{ (data?.pictureInfo?.imgSize / 1024).toFixed(2) }}kb
+      </td>
       <th>图片尺寸</th>
-      <td />
+      <td class="blue">
+        {{ data?.pictureInfo?.imgMeasure }}
+      </td>
     </tr>
     <tr>
       <th>上传时间</th>
-      <td> {{ data?.ocrPicture?.uptime }}</td>
+      <td> {{ data?.pictureInfo?.uploadTime }}</td>
       <th>生成时间</th>
-      <td> {{ data?.ocrPicture?.gentime }}</td>
+      <td> {{ data?.pictureInfo?.createTime }}</td>
     </tr>
     <tr>
       <th>标记时间</th>
-      <td />
+      <td> {{ data?.pictureInfo?.tagTime }}</td>
+
       <th>色彩空间</th>
-      <td>{{ data?.ocrPicture?.space }}</td>
+      <td>{{ data?.pictureInfo?.imgSpace }}</td>
     </tr>
     <tr>
       <th>
         来源
       </th>
       <td colspan="3">
-        {{ data?.ocrPicture?.source }}
+        {{ data?.pictureInfo?.source }}
       </td>
     </tr>
   </table>
@@ -125,7 +132,7 @@ td {
 }
 
 .blue {
-  color: #507afd;
+  // color: #507afd;
 }
 
 .black {
-- 
2.39.3


From cc544282be1b8816e40ef2de44c5452b01e8a123 Mon Sep 17 00:00:00 2001
From: raofuzi <2641346316@qq.com>
Date: Sat, 30 Mar 2024 21:17:34 +0800
Subject: [PATCH 035/143] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               |   2 +-
 package.json                                  |   3 +
 pnpm-lock.yaml                                | 182 ++++++++++++++++--
 src/api/home/main.ts                          |  14 ++
 src/assets/icons/down-line.svg                |  32 +++
 src/assets/icons/top-line.svg                 |  32 +++
 src/layout/components/Header/index.vue        |   7 +-
 src/store/modules/asideConfig.ts              |  28 +++
 src/views/home/aside/Aside.vue                |  48 ++++-
 src/views/home/aside/comp/Search.vue          |   8 +-
 src/views/home/aside/comp/Upload.vue          |   7 +-
 .../home/aside/comp/items/PictureDownload.vue |   4 +
 .../home/aside/comp/items/Similarity.vue      |   5 +-
 .../aside/comp/modals/CustomFilterModal.vue   |  16 +-
 src/views/home/content/Content.vue            | 165 ++++++++++++++--
 .../home/content/modal/CheckingTaskModal.vue  |  12 +-
 .../home/content/modal/FinishPackageModal.vue | 102 +++++++++-
 .../content/modal/FinishPackageModalTwo.vue   |  82 ++++++++
 .../content/modal/PackageSettingsModal.vue    |  22 ++-
 .../content/modal/QueryRepeatedTasksModal.vue |  16 +-
 src/views/worksheet/aside/Aside.vue           |   2 +
 21 files changed, 718 insertions(+), 71 deletions(-)
 create mode 100644 src/assets/icons/down-line.svg
 create mode 100644 src/assets/icons/top-line.svg
 create mode 100644 src/views/home/content/modal/FinishPackageModalTwo.vue

diff --git a/components.d.ts b/components.d.ts
index 2e87e2e..e07d992 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -28,7 +28,6 @@ declare module 'vue' {
     NGi: typeof import('naive-ui')['NGi']
     NGrid: typeof import('naive-ui')['NGrid']
     NGridItem: typeof import('naive-ui')['NGridItem']
-    NIcon: typeof import('naive-ui')['NIcon']
     NImage: typeof import('naive-ui')['NImage']
     NInput: typeof import('naive-ui')['NInput']
     NMessageProvider: typeof import('naive-ui')['NMessageProvider']
@@ -37,6 +36,7 @@ declare module 'vue' {
     NotPassed: typeof import('./src/components/NotPassed.vue')['default']
     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']
diff --git a/package.json b/package.json
index 36a4b15..6ed43e6 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,9 @@
     "postinstall": "patch-package"
   },
   "dependencies": {
+    "@vicons/ionicons5": "^0.12.0",
+    "@vicons/tabler": "^0.12.0",
+    "@vicons/utils": "^0.1.4",
     "@vueup/vue-quill": "^1.2.0",
     "@vueuse/core": "10.9.0",
     "axios": "^1.4.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d92ef5c..3dde4d4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,6 +5,15 @@ settings:
   excludeLinksFromLockfile: false
 
 dependencies:
+  '@vicons/ionicons5':
+    specifier: ^0.12.0
+    version: 0.12.0
+  '@vicons/tabler':
+    specifier: ^0.12.0
+    version: 0.12.0
+  '@vicons/utils':
+    specifier: ^0.1.4
+    version: 0.1.4(vue@3.3.10)
   '@vueup/vue-quill':
     specifier: ^1.2.0
     version: 1.2.0(vue@3.3.10)
@@ -17,6 +26,9 @@ dependencies:
   date-fns:
     specifier: ^2.30.0
     version: 2.30.0
+  dayjs:
+    specifier: ^1.11.10
+    version: 1.11.10
   esno:
     specifier: ^0.16.3
     version: 0.16.3
@@ -41,6 +53,9 @@ dependencies:
   naive-ui:
     specifier: ^2.38.1
     version: 2.38.1(vue@3.3.10)
+  patch-package:
+    specifier: ^8.0.0
+    version: 8.0.0
   pinia:
     specifier: ^2.0.33
     version: 2.1.7(typescript@4.9.5)(vue@3.3.10)
@@ -1333,6 +1348,10 @@ packages:
     resolution: {integrity: sha512-SXgrhajHG7boLv6oU93CcmdDm0HYRiceuz6b+7z+/2lCJPTWDv0V5YiwFHT2ejE4bQqgSXQiVPQYPWv7LGsK1g==}
     dev: true
 
+  /@types/node@14.14.45:
+    resolution: {integrity: sha512-DssMqTV9UnnoxDWu959sDLZzfvqCF0qDNRjaWeYSui9xkFe61kKo4l1TWNTQONpuXEm+gLMRvdlzvNHBamzmEw==}
+    dev: false
+
   /@types/node@18.19.2:
     resolution: {integrity: sha512-6wzfBdbWpe8QykUkXBjtmO3zITA0A3FIjoy+in0Y2K4KrCiRhNYJIdwAPDffZ3G6GnaKaSLSEa9ZuORLfEoiwg==}
     dependencies:
@@ -1503,6 +1522,23 @@ packages:
     resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
     dev: true
 
+  /@vicons/ionicons5@0.12.0:
+    resolution: {integrity: sha512-Iy1EUVRpX0WWxeu1VIReR1zsZLMc4fqpt223czR+Rpnrwu7pt46nbnC2ycO7ItI/uqDLJxnbcMC7FujKs9IfFA==}
+    dev: false
+
+  /@vicons/tabler@0.12.0:
+    resolution: {integrity: sha512-3+wUFuxb7e8OzZ8Wryct1pzfA2vyoF4lwW98O9s27ZrfCGaJGNmqG+q8A7vQ92Mf+COCgxpK+rhNPTtTvaU6qw==}
+    dev: false
+
+  /@vicons/utils@0.1.4(vue@3.3.10):
+    resolution: {integrity: sha512-OHI19qVNN6i+uPQ+Y3f2s0dUxwsYnOCcKBW7XOU4yXXO1aU3ZoKpblCc3+4N0qmgoJs5rWKRAaMisipqEXJwAg==}
+    peerDependencies:
+      vue: ^3.0.6
+    dependencies:
+      '@xicons/utils': 0.1.4
+      vue: 3.3.10(typescript@4.9.5)
+    dev: false
+
   /@vitejs/plugin-vue@4.5.1(vite@5.0.5)(vue@3.3.10):
     resolution: {integrity: sha512-DaUzYFr+2UGDG7VSSdShKa9sIWYBa1LL8KC0MNOf2H5LjcTPjob0x8LbkqXWmAtbANJCkpiQTj66UVcQkN2s3g==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1771,6 +1807,12 @@ packages:
       '@xtuc/long': 4.2.2
     dev: true
 
+  /@xicons/utils@0.1.4:
+    resolution: {integrity: sha512-uXxKDLz9abr80yJC05XSTq6wlyFcdW+N/1IYJkeHjzzXVc4VQ0sEYMoMMTjAH7HQBOyOkzOB4pf5NGF72lwa8Q==}
+    dependencies:
+      css-render: 0.13.9
+    dev: false
+
   /@xtuc/ieee754@1.2.0:
     resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==}
     dev: true
@@ -1779,6 +1821,10 @@ packages:
     resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==}
     dev: true
 
+  /@yarnpkg/lockfile@1.1.0:
+    resolution: {integrity: sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==}
+    dev: false
+
   /JSONStream@1.3.5:
     resolution: {integrity: sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==}
     hasBin: true
@@ -1987,6 +2033,11 @@ packages:
     resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
     dev: false
 
+  /at-least-node@1.0.0:
+    resolution: {integrity: sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==}
+    engines: {node: '>= 4.0.0'}
+    dev: false
+
   /atob@2.1.2:
     resolution: {integrity: sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==}
     engines: {node: '>= 4.5.0'}
@@ -2087,7 +2138,6 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       fill-range: 7.0.1
-    dev: true
 
   /browserslist@4.22.2:
     resolution: {integrity: sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==}
@@ -2270,7 +2320,6 @@ packages:
   /ci-info@3.9.0:
     resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==}
     engines: {node: '>=8'}
-    dev: true
 
   /class-utils@0.3.6:
     resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
@@ -2537,6 +2586,14 @@ packages:
       shebang-command: 2.0.0
       which: 2.0.2
 
+  /css-render@0.13.9:
+    resolution: {integrity: sha512-n3C4ZH59rveBrUlAD7n0Ze9/gUMKa4dlH1C9CWKpGcIHR/xRcIVXzBGy1iw8WWq2ySmn2/ZqOpySQNAK5Pb6sw==}
+    dependencies:
+      '@emotion/hash': 0.8.0
+      '@types/node': 14.14.45
+      csstype: 3.0.11
+    dev: false
+
   /css-render@0.15.12:
     resolution: {integrity: sha512-eWzS66patiGkTTik+ipO9qNGZ+uNuGyTmnz6/+EJIiFg8+3yZRpnMwgFo8YdXhQRsiePzehnusrxVvugNjXzbw==}
     dependencies:
@@ -2611,6 +2668,10 @@ packages:
       '@babel/runtime': 7.23.5
     dev: false
 
+  /dayjs@1.11.10:
+    resolution: {integrity: sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==}
+    dev: false
+
   /de-indent@1.0.2:
     resolution: {integrity: sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==}
     dev: true
@@ -3887,7 +3948,6 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       to-regex-range: 5.0.1
-    dev: true
 
   /finalhandler@1.1.2:
     resolution: {integrity: sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==}
@@ -3920,6 +3980,12 @@ packages:
       path-exists: 4.0.0
     dev: true
 
+  /find-yarn-workspace-root@2.0.0:
+    resolution: {integrity: sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==}
+    dependencies:
+      micromatch: 4.0.5
+    dev: false
+
   /fizzy-ui-utils@2.0.7:
     resolution: {integrity: sha512-CZXDVXQ1If3/r8s0T+v+qVeMshhfcuq0rqIFgJnrtd+Bu8GmDmqMjntjUePypVtjHXKJ6V4sw9zeyox34n9aCg==}
     dependencies:
@@ -3995,6 +4061,16 @@ packages:
       universalify: 2.0.1
     dev: true
 
+  /fs-extra@9.1.0:
+    resolution: {integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      at-least-node: 1.0.0
+      graceful-fs: 4.2.11
+      jsonfile: 6.1.0
+      universalify: 2.0.1
+    dev: false
+
   /fs.realpath@1.0.0:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
 
@@ -4147,7 +4223,6 @@ packages:
 
   /graceful-fs@4.2.11:
     resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
-    dev: true
 
   /graphemer@1.4.0:
     resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
@@ -4465,6 +4540,12 @@ packages:
       is-data-descriptor: 1.0.1
     dev: true
 
+  /is-docker@2.2.1:
+    resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==}
+    engines: {node: '>=8'}
+    hasBin: true
+    dev: false
+
   /is-extendable@0.1.1:
     resolution: {integrity: sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==}
     engines: {node: '>=0.10.0'}
@@ -4510,7 +4591,6 @@ packages:
   /is-number@7.0.0:
     resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
     engines: {node: '>=0.12.0'}
-    dev: true
 
   /is-obj@2.0.0:
     resolution: {integrity: sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==}
@@ -4573,10 +4653,21 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /is-wsl@2.2.0:
+    resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==}
+    engines: {node: '>=8'}
+    dependencies:
+      is-docker: 2.2.1
+    dev: false
+
   /isarray@1.0.0:
     resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
     dev: true
 
+  /isarray@2.0.5:
+    resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
+    dev: false
+
   /isexe@2.0.0:
     resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
 
@@ -4671,6 +4762,16 @@ packages:
   /json-stable-stringify-without-jsonify@1.0.1:
     resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
 
+  /json-stable-stringify@1.1.1:
+    resolution: {integrity: sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.5
+      isarray: 2.0.5
+      jsonify: 0.0.1
+      object-keys: 1.1.1
+    dev: false
+
   /json5@1.0.2:
     resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}
     hasBin: true
@@ -4698,7 +4799,10 @@ packages:
       universalify: 2.0.1
     optionalDependencies:
       graceful-fs: 4.2.11
-    dev: true
+
+  /jsonify@0.0.1:
+    resolution: {integrity: sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==}
+    dev: false
 
   /jsonparse@1.3.1:
     resolution: {integrity: sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==}
@@ -4734,6 +4838,12 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /klaw-sync@6.0.0:
+    resolution: {integrity: sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==}
+    dependencies:
+      graceful-fs: 4.2.11
+    dev: false
+
   /kleur@3.0.3:
     resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
     engines: {node: '>=6'}
@@ -5100,7 +5210,6 @@ packages:
     dependencies:
       braces: 3.0.2
       picomatch: 2.3.1
-    dev: true
 
   /mime-db@1.52.0:
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
@@ -5172,7 +5281,6 @@ packages:
 
   /minimist@1.2.8:
     resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
-    dev: true
 
   /minipass@4.2.8:
     resolution: {integrity: sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==}
@@ -5453,6 +5561,14 @@ packages:
       mimic-fn: 4.0.0
     dev: true
 
+  /open@7.4.2:
+    resolution: {integrity: sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==}
+    engines: {node: '>=8'}
+    dependencies:
+      is-docker: 2.2.1
+      is-wsl: 2.2.0
+    dev: false
+
   /optionator@0.9.3:
     resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==}
     engines: {node: '>= 0.8.0'}
@@ -5464,6 +5580,11 @@ packages:
       prelude-ls: 1.2.1
       type-check: 0.4.0
 
+  /os-tmpdir@1.0.2:
+    resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==}
+    engines: {node: '>=0.10.0'}
+    dev: false
+
   /outlayer@2.1.1:
     resolution: {integrity: sha512-+GplXsCQ3VrbGujAeHEzP9SXsBmJxzn/YdDSQZL0xqBmAWBmortu2Y9Gwdp9J0bgDQ8/YNIPMoBM13nTwZfAhw==}
     dependencies:
@@ -5570,6 +5691,28 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /patch-package@8.0.0:
+    resolution: {integrity: sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA==}
+    engines: {node: '>=14', npm: '>5'}
+    hasBin: true
+    dependencies:
+      '@yarnpkg/lockfile': 1.1.0
+      chalk: 4.1.2
+      ci-info: 3.9.0
+      cross-spawn: 7.0.3
+      find-yarn-workspace-root: 2.0.0
+      fs-extra: 9.1.0
+      json-stable-stringify: 1.1.1
+      klaw-sync: 6.0.0
+      minimist: 1.2.8
+      open: 7.4.2
+      rimraf: 2.7.1
+      semver: 7.5.4
+      slash: 2.0.0
+      tmp: 0.0.33
+      yaml: 2.3.4
+    dev: false
+
   /path-browserify@1.0.1:
     resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}
     dev: true
@@ -5634,7 +5777,6 @@ packages:
   /picomatch@2.3.1:
     resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
     engines: {node: '>=8.6'}
-    dev: true
 
   /pidtree@0.6.0:
     resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==}
@@ -6072,6 +6214,13 @@ packages:
     resolution: {integrity: sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==}
     dev: true
 
+  /rimraf@2.7.1:
+    resolution: {integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==}
+    hasBin: true
+    dependencies:
+      glob: 7.2.3
+    dev: false
+
   /rimraf@3.0.2:
     resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
     hasBin: true
@@ -6243,6 +6392,11 @@ packages:
     resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
     dev: true
 
+  /slash@2.0.0:
+    resolution: {integrity: sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==}
+    engines: {node: '>=6'}
+    dev: false
+
   /slash@3.0.0:
     resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
     engines: {node: '>=8'}
@@ -6688,6 +6842,13 @@ packages:
     resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
     dev: true
 
+  /tmp@0.0.33:
+    resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==}
+    engines: {node: '>=0.6.0'}
+    dependencies:
+      os-tmpdir: 1.0.2
+    dev: false
+
   /to-fast-properties@2.0.0:
     resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
     engines: {node: '>=4'}
@@ -6712,7 +6873,6 @@ packages:
     engines: {node: '>=8.0'}
     dependencies:
       is-number: 7.0.0
-    dev: true
 
   /to-regex@3.0.2:
     resolution: {integrity: sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==}
@@ -6827,7 +6987,6 @@ packages:
   /universalify@2.0.1:
     resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==}
     engines: {node: '>= 10.0.0'}
-    dev: true
 
   /unpipe@1.0.0:
     resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
@@ -7377,7 +7536,6 @@ packages:
   /yaml@2.3.4:
     resolution: {integrity: sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==}
     engines: {node: '>= 14'}
-    dev: true
 
   /yargs-parser@20.2.9:
     resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==}
diff --git a/src/api/home/main.ts b/src/api/home/main.ts
index bd661e2..7028557 100644
--- a/src/api/home/main.ts
+++ b/src/api/home/main.ts
@@ -250,3 +250,17 @@ export async function getPictureList(params: any): Promise<any> {
     total,
   }
 }
+
+/**
+ * 获取需要过滤的搜索条件框列表
+ * @param 
+ * @returns
+ */
+export async function getFilterList(params) {
+
+  return http.request({
+    url: `/ocr/ocrUsersearch/querySearchCondition`,
+    method: 'get',
+    params
+  })
+}
\ No newline at end of file
diff --git a/src/assets/icons/down-line.svg b/src/assets/icons/down-line.svg
new file mode 100644
index 0000000..7a1b4e2
--- /dev/null
+++ b/src/assets/icons/down-line.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 13</title>
+    <defs>
+        <rect id="path-1" x="0" y="0" width="15.7538462" height="15.7538462"></rect>
+    </defs>
+    <g id="index" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="异步查重" transform="translate(-1352.000000, -938.000000)">
+            <g id="编组-25" transform="translate(1064.000000, 919.000000)">
+                <g id="编组-14" transform="translate(256.000000, 19.000000)">
+                    <g id="收起" transform="translate(40.000000, 8.000000) scale(-1, 1) rotate(-90.000000) translate(-40.000000, -8.000000) translate(32.000000, 0.000000)">
+                        <g id="编组-13" transform="translate(0.123077, 0.123077)">
+                            <mask id="mask-2" fill="white">
+                                <use xlink:href="#path-1"></use>
+                            </mask>
+                            <g id="蒙版"></g>
+                            <g id="编组-11" mask="url(#mask-2)">
+                                <g transform="translate(1.741980, 1.461539)">
+                                    <rect id="矩形" fill="#666666" transform="translate(0.729021, 6.415385) rotate(-270.000000) translate(-0.729021, -6.415385) " x="-5.68636353" y="5.68636353" width="12.830769" height="1.45804193" rx="0.291608386"></rect>
+                                    <g id="编组" stroke-width="1" fill="none" transform="translate(8.478978, 6.415385) scale(-1, 1) translate(-8.478978, -6.415385) translate(4.688069, 0.000000)">
+                                        <rect id="矩形" transform="translate(3.790909, 6.415384) scale(-1, -1) rotate(-180.000000) translate(-3.790909, -6.415384) " x="0" y="0" width="7.58181805" height="12.830769"></rect>
+                                        <path d="M0.201793759,6.3610837 C0.213041182,6.22879799 0.269278297,6.09961817 0.370505105,5.99839136 L0.370505105,5.99839136 L0.563544402,5.80535207 C0.57979068,5.78910579 0.596756979,5.77401837 0.61434058,5.7600898 L6.09088579,0.287203877 C6.20476595,0.173323719 6.38940217,0.173323719 6.50328233,0.287203877 L7.10871816,0.89263971 C7.22259832,1.00651987 7.22259832,1.19115609 7.10871816,1.30503624 L1.99779376,6.41479376 L7.10871816,11.5257328 C7.20632972,11.6233443 7.22027423,11.7729399 7.15055169,11.8854041 L7.10871816,11.9381293 L6.50328233,12.5435651 C6.38940217,12.6574453 6.20476595,12.6574453 6.09088579,12.5435651 L6.09088579,12.5435651 L0.618409245,7.07387291 C0.599371439,7.05906492 0.581040393,7.04291292 0.563544402,7.02541693 L0.370505105,6.83237764 C0.269278297,6.73115083 0.213041182,6.60197101 0.201793759,6.4696853 Z" id="形状结合" fill="#666666" transform="translate(3.697961, 6.415384) scale(1, -1) rotate(-180.000000) translate(-3.697961, -6.415384) "></path>
+                                    </g>
+                                </g>
+                            </g>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/icons/top-line.svg b/src/assets/icons/top-line.svg
new file mode 100644
index 0000000..aa3653a
--- /dev/null
+++ b/src/assets/icons/top-line.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 13</title>
+    <defs>
+        <rect id="path-1" x="0" y="3.06460325e-13" width="15.7538462" height="15.7538462"></rect>
+    </defs>
+    <g id="index" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="异步查重-折叠" transform="translate(-1352.000000, -1041.000000)">
+            <g id="编组-36" transform="translate(1064.000000, 1022.000000)">
+                <g id="编组-19" transform="translate(256.000000, 19.000000)">
+                    <g id="展开" transform="translate(40.000000, 8.000000) scale(1, -1) rotate(-90.000000) translate(-40.000000, -8.000000) translate(32.000000, 0.000000)">
+                        <g id="编组-13" transform="translate(0.123077, 0.123077)">
+                            <mask id="mask-2" fill="white">
+                                <use xlink:href="#path-1"></use>
+                            </mask>
+                            <g id="蒙版"></g>
+                            <g id="编组-11" mask="url(#mask-2)">
+                                <g transform="translate(1.741980, 1.461539)">
+                                    <rect id="矩形" fill="#666666" transform="translate(0.729021, 6.415385) rotate(-270.000000) translate(-0.729021, -6.415385) " x="-5.68636353" y="5.68636353" width="12.830769" height="1.45804193" rx="0.291608386"></rect>
+                                    <g id="编组" stroke-width="1" fill="none" transform="translate(8.478978, 6.415385) scale(-1, 1) translate(-8.478978, -6.415385) translate(4.688069, 0.000000)">
+                                        <rect id="矩形" transform="translate(3.790909, 6.415385) scale(-1, -1) rotate(-180.000000) translate(-3.790909, -6.415385) " x="0" y="3.05602346e-13" width="7.58181805" height="12.830769"></rect>
+                                        <path d="M0.201793759,6.3610837 C0.213041182,6.22879799 0.269278297,6.09961817 0.370505105,5.99839136 L0.370505105,5.99839136 L0.563544402,5.80535207 C0.57979068,5.78910579 0.596756979,5.77401837 0.61434058,5.7600898 L6.09088579,0.287203877 C6.20476595,0.173323719 6.38940217,0.173323719 6.50328233,0.287203877 L7.10871816,0.89263971 C7.22259832,1.00651987 7.22259832,1.19115609 7.10871816,1.30503624 L1.99779376,6.41479376 L7.10871816,11.5257328 C7.20632972,11.6233443 7.22027423,11.7729399 7.15055169,11.8854041 L7.10871816,11.9381293 L6.50328233,12.5435651 C6.38940217,12.6574453 6.20476595,12.6574453 6.09088579,12.5435651 L6.09088579,12.5435651 L0.618409245,7.07387291 C0.599371439,7.05906492 0.581040393,7.04291292 0.563544402,7.02541693 L0.370505105,6.83237764 C0.269278297,6.73115083 0.213041182,6.60197101 0.201793759,6.4696853 Z" id="形状结合" fill="#666666" transform="translate(3.697961, 6.415385) scale(1, -1) rotate(-180.000000) translate(-3.697961, -6.415385) "></path>
+                                    </g>
+                                </g>
+                            </g>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue
index a6f42c2..947969d 100644
--- a/src/layout/components/Header/index.vue
+++ b/src/layout/components/Header/index.vue
@@ -11,6 +11,7 @@ import { msgPolling } from '@/api/message/message'
 import { getImgUrl } from '@/utils/urlUtils'
 import { useUser } from '@/store/modules/user'
 import { useTaskStore } from '@/store/modules/task'
+import defaultAvatar from '@/assets/icons/avatar.svg';
 
 const taskStore = useTaskStore()
 export default defineComponent({
@@ -164,6 +165,8 @@ export default defineComponent({
       mousetrap.bind('m m', searchHandler)
     })
 
+    const defaultAvatarSrc = ref(defaultAvatar);
+
     return {
       ...toRefs(state),
       iconList,
@@ -183,6 +186,7 @@ export default defineComponent({
       getMessage,
       handleDragOver,
       handleDragLeave,
+      defaultAvatarSrc,
     }
   },
 })
@@ -216,7 +220,8 @@ export default defineComponent({
       </div>
       <!-- 个人中心 -->
       <div class="layout-header-trigger layout-header-trigger-min">
-        <n-avatar :src="getImgUrl(useInfo.usericon)" round />
+        <!-- <n-avatar :src="getImgUrl(useInfo.usericon)" round /> -->
+        <n-avatar :src="getImgUrl(useInfo.usericon) || defaultAvatarSrc" round/>
       </div>
       <!-- 设置 -->
       <UserSettings @logout="doLogout" />
diff --git a/src/store/modules/asideConfig.ts b/src/store/modules/asideConfig.ts
index 721eb2a..e91108a 100644
--- a/src/store/modules/asideConfig.ts
+++ b/src/store/modules/asideConfig.ts
@@ -9,6 +9,9 @@ export interface ConfigState {
   systemConfig: AsideConfig | null
   customConfig: string[] | null
   asideValue: any
+  searchValue: string
+  isAllowDownload: boolean
+  timeNum: number
 }
 
 export const useAsideConfigStore = defineStore({
@@ -17,6 +20,9 @@ export const useAsideConfigStore = defineStore({
     systemConfig: null,
     customConfig: null,
     asideValue: null,
+    searchValue: "",
+    isAllowDownload: true,
+    timeNum: 0,
   }),
   getters: {
     getConfig(): AsideConfig | null {
@@ -28,6 +34,15 @@ export const useAsideConfigStore = defineStore({
     getAsideValue(): any {
       return this.asideValue
     },
+    getSearchValue(): any {
+      return this.searchValue
+    },
+    getIsAllowDownload(): any {
+      return this.isAllowDownload
+    },
+    getTimeNum(): any {
+      return this.timeNum
+    },
   },
   actions: {
     setConfig(config: AsideConfig) {
@@ -36,6 +51,19 @@ export const useAsideConfigStore = defineStore({
     setAsideValue(value) {
       this.asideValue = value
     },
+    setSearchValue(value) {
+      this.searchValue = value
+    },
+    setIsAllowDownload(value) {
+      this.isAllowDownload = value
+    },
+    setTimeNum(value) {
+      this.timeNum = value
+    },
+    // 设置个性化配置
+    setCustomConfig(value) {
+      this.customConfig = value
+    },
     // 获取系统配置信息
     async fetchConfig() {
       const response = await getConfig()
diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue
index fa2c43c..b5e764e 100644
--- a/src/views/home/aside/Aside.vue
+++ b/src/views/home/aside/Aside.vue
@@ -11,6 +11,7 @@ import type { AsideEntity } from '@/config/aside'
 import { asideMap } from '@/config/aside'
 import type { AsideConfig } from '/#/api'
 import emitter from '@/utils/mitt'
+import { getFilterList } from '@/api/home/main'
 
 const configStore = useConfig()
 
@@ -30,6 +31,7 @@ Object.keys(asideMap).forEach((key) => {
 const filterModalRef = ref(null)
 const newFilterModalRef = ref(null)
 const customModalRef = ref(null)
+const customObjRef = ref<any>(null) // 获取高级筛选获取的值
 
 function showModal(modalRef: any) {
   const modal = unref(modalRef)! as any
@@ -86,16 +88,32 @@ configStore.$subscribe(() => {
 
   if (config == null || customConfig == null)
     return
-
-  const showKeys = [...customConfig].filter(key => !asideMap[key].isDefaultFilter)
-  const defaultKeys = Object.keys(asideMap).filter(key => asideMap[key].isDefaultFilter)
+  // console.log("config", config, "customConfig", customConfig);
+  /* rao
+  const showKeys = [...customConfig].filter(key => !asideMap[key].isDefaultFilter)// 获取customConfig 非isDefaultFilter的选项
+  const defaultKeys = Object.keys(asideMap).filter(key => asideMap[key].isDefaultFilter)// 获取asideMap isDefaultFilter的选项
   showKeys.unshift(...defaultKeys)
+  */
+  
+  const showKeys = [...customConfig];
 
   Object.keys(config).forEach((key) => {
     if (key.startsWith('iz') && asideMap[key] !== undefined)
       asideVisible[key] = (showKeys.includes(key) || asideMap[key].isDefaultFilter) && config[key] === 'Y'
   })
-
+  if(customObjRef.value) {// 赋值
+    Object.keys(customObjRef.value).map(key => {
+      if(asideMap.hasOwnProperty(key)) {
+        const str = key.toLowerCase()
+        if(str == "izsimilarity" && typeof customObjRef.value[str] == "string") {
+          customObjRef.value[str] = customObjRef.value[str].split(',');
+        }
+        // asideMap[str].defaultValue = customObjRef.value[str];// 赋值
+        asideValue[key] = customObjRef.value[str];// 赋值
+      }
+    });
+  }
+  // console.log("showKeys", showKeys);
   const items = showKeys.reduce((acc, key) => {
     const { render } = asideMap[key]
 
@@ -112,7 +130,7 @@ configStore.$subscribe(() => {
       return acc
     }
   }, [])
-
+  // console.log("items", items);
   showItems.value = items
 })
 
@@ -134,9 +152,23 @@ function scrollHandler(key: string) {
   element?.scrollIntoView(true)
 }
 
-// 选择某个过滤配置，刷新图片墙
-function filterHandler(searchId: string) {
-  emitter.emit('filter', searchId)
+// 选择某个过滤配置，刷新图片墙 -> 筛选搜索条件
+async function filterHandler(searchId: string) {
+  // emitter.emit('filter', searchId)
+  const res = await getFilterList({userSearchId: searchId});
+  // console.log("顾虑结果", res);
+  if(res.code == "OK") {
+    let obj = res.data;
+    customObjRef.value = res.data;
+    let showKeys: any[] = [];
+    Object.keys(obj).map(key => {
+      if(asideMap.hasOwnProperty(key)) {
+        showKeys.push(key);
+      }
+    });
+    // console.log(showKeys);
+    configStore.setCustomConfig(showKeys);
+  }
 }
 
 function editFilter(filter: any) {
diff --git a/src/views/home/aside/comp/Search.vue b/src/views/home/aside/comp/Search.vue
index 97d2472..ba057e6 100644
--- a/src/views/home/aside/comp/Search.vue
+++ b/src/views/home/aside/comp/Search.vue
@@ -48,6 +48,12 @@ function selectHandler(item: SearchEntity) {
   (popover.value as any).setShow(false)
   emit('select', item.key)
 }
+
+// 模糊搜索
+const searchName = () => {
+  configStore.setSearchValue(searchKeyword.value);
+}
+
 </script>
 
 <template>
@@ -59,7 +65,7 @@ function selectHandler(item: SearchEntity) {
       <template #trigger>
         <n-input style="width: 260px;height: 32px;" placeholder="请输入你需要搜索的内容" @input="inputHandler">
           <template #suffix>
-            <SvgIcon size="14px" name="magnifying-1" />
+            <SvgIcon size="14px" name="magnifying-1" @click="searchName" style="cursor: pointer;" />
           </template>
         </n-input>
       </template>
diff --git a/src/views/home/aside/comp/Upload.vue b/src/views/home/aside/comp/Upload.vue
index 8499257..d4ec7a4 100644
--- a/src/views/home/aside/comp/Upload.vue
+++ b/src/views/home/aside/comp/Upload.vue
@@ -16,7 +16,11 @@ const emit = defineEmits<{
 }>()
 
 
-const figureUrl = ref(props.value)
+let figureUrl = ref(props.value)
+if(figureUrl.value && figureUrl.value.indexOf('http') == -1) {
+  figureUrl.value = getImgUrl(figureUrl.value);
+}
+
 const uploadRef = ref(null);
 
 async function customRequest(data: UploadCustomRequestOptions) {
@@ -83,6 +87,7 @@ const handleDrop = async (e) => {
     emit('update:value', result.data)
   }
 };
+
 </script>
 
 <template>
diff --git a/src/views/home/aside/comp/items/PictureDownload.vue b/src/views/home/aside/comp/items/PictureDownload.vue
index a6be27b..afbdd32 100644
--- a/src/views/home/aside/comp/items/PictureDownload.vue
+++ b/src/views/home/aside/comp/items/PictureDownload.vue
@@ -1,5 +1,8 @@
 <script lang="ts" setup>
 import { ref } from 'vue'
+import { useConfig } from '@/store/modules/asideConfig'
+
+const configStore = useConfig()
 
 const props = defineProps({
   value: {
@@ -20,6 +23,7 @@ const download = ref(props.value)
 
 function onChange(value: boolean) {
   emit('update:value', value)
+  configStore.setIsAllowDownload(value);
 }
 </script>
 
diff --git a/src/views/home/aside/comp/items/Similarity.vue b/src/views/home/aside/comp/items/Similarity.vue
index b37f3f7..d94c5ae 100644
--- a/src/views/home/aside/comp/items/Similarity.vue
+++ b/src/views/home/aside/comp/items/Similarity.vue
@@ -7,7 +7,7 @@ const props = defineProps<{
 }>()
 
 const emit = defineEmits<{
-  (e: 'update:value', value: number[]): void
+  (e: 'update:value', value: string): void
 }>()
 
 const range = ref<[number, number]>(props.value)
@@ -19,7 +19,8 @@ const marks = {
 }
 
 function onChange(value: number & number[]) {
-  emit('update:value', value)
+  let valueStr = value.join('-');
+  emit('update:value', valueStr)
 }
 </script>
 
diff --git a/src/views/home/aside/comp/modals/CustomFilterModal.vue b/src/views/home/aside/comp/modals/CustomFilterModal.vue
index 3adc9d6..211e841 100644
--- a/src/views/home/aside/comp/modals/CustomFilterModal.vue
+++ b/src/views/home/aside/comp/modals/CustomFilterModal.vue
@@ -305,7 +305,7 @@ onMounted(() => {
               :bordered="false"
             >
               <div class="input_wrap">
-                <n-input placeholder="关键词搜索" @input="leftInputHandler">
+                <n-input placeholder="搜索关键词" @input="leftInputHandler">
                   <template #suffix>
                     <SvgIcon size="14px" name="magnifying-1-color999" />
                   </template>
@@ -313,7 +313,7 @@ onMounted(() => {
                 <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="全部" @update:checked="onCheckAllChange" />
+                      <n-checkbox v-model:checked="checkAll" label="全部" @update:checked="onCheckAllChange" :indeterminate="!checkAll"/>
                     </div>
                     <div
                       v-for="item in offList" v-show="item.name.includes(offKeyword)" :key="item.id" :class="{ 'disable-check': item.fix }"
@@ -341,7 +341,7 @@ onMounted(() => {
                 <span class="textbtnStyle" @click="clearDragSource">清空</span>
               </template>
               <div class="input_wrap">
-                <n-input placeholder="关键词搜索" @input="rightInputHandler">
+                <n-input placeholder="搜索关键词" @input="rightInputHandler">
                   <template #suffix>
                     <SvgIcon size="14px" name="magnifying-1-color999" />
                   </template>
@@ -351,7 +351,7 @@ onMounted(() => {
                     <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  size="16px" style="display:block;margin-left: auto;cursor: pointer;"
+                      <SvgIcon v-if="!item.fix"  size="16px" style="display:block;margin-left: auto;cursor: pointer;"
                         name="clear" @click="removeHandler(item.id)" />
                     </div>
                   </VueDraggable>
@@ -386,7 +386,7 @@ onMounted(() => {
   }
 
   &-bar {
-    background-color: #f8f8f8;
+    background-color: #f8f8f8 !important;
     width: calc(100% + 12px);
     margin-top: 20px;
     color: #333333;
@@ -424,6 +424,10 @@ onMounted(() => {
 .dragcardStyle {
   --n-padding-bottom: 0px !important;
   --n-padding-left: 0px !important;
+  ::v-deep(.n-card__content) {
+    padding-left: 0 !important;
+    padding-right: 0 !important;
+  }
 }
 
 .cardstyle {
@@ -431,6 +435,7 @@ onMounted(() => {
   height: 800px;
   --n-padding-bottom: 20px;
   --n-padding-left: 24px;
+  // background-color: #f8f8f8 !important;
 }
 
 .textbtnStyle {
@@ -471,6 +476,7 @@ onMounted(() => {
 ::v-deep(.n-card > .n-card-header .n-card-header__main){
   font-weight: lighter !important;
   font-size: 14px;
+  color: #333333;
 }
 ::v-deep(.n-scrollbar){
   border-left: 1px solid #cad2dd !important;
diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 8ebdf46..45b036f 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -13,8 +13,8 @@ import dayjs from 'dayjs'
 import imagesloaded from 'imagesloaded'
 import { cloneDeep, debounce } from 'lodash-es'
 import Masonry from 'masonry-layout'
-import { useMessage } from 'naive-ui'
-import { computed, nextTick, onMounted, onUnmounted, onUpdated, reactive, ref, unref, watch } from 'vue'
+import { useMessage, NIcon } from 'naive-ui'
+import { computed, nextTick, onMounted, onUnmounted, onUpdated, reactive, ref, unref, watch, h, } from 'vue'
 import CheckingTaskModal from './modal/CheckingTaskModal.vue'
 import FinishPackageModal from './modal/FinishPackageModal.vue'
 import GeneratePackageModal from './modal/GeneratePackageModal.vue'
@@ -22,6 +22,16 @@ import LoginSuccessModal from './modal/LoginSuccessModal.vue'
 import PackageSettingsModal from './modal/PackageSettingsModal.vue'
 import QueryRepeatedTasksModal from './modal/QueryRepeatedTasksModal.vue'
 import type { PictureSortParam } from "/#/api"
+import type { Component } from 'vue'
+import {
+  Upload as UploadIcon,
+  Download as DownloadIcon,
+} from '@vicons/tabler'
+import {
+  EyeOutline as EyeOutlineIcon,
+  EllipsisHorizontal,
+} from '@vicons/ionicons5'
+import { Icon } from '@vicons/utils'
 
 const deviceHeight = ref(600)
 let _masonry: null | Masonry = null
@@ -129,6 +139,26 @@ const viewLabel = computed(() => {
   return item?.label
 })
 
+let isAllowDownload = ref(true)
+let calNum = ref(0);
+const searchValue = ref('');
+
+configStore.$subscribe(() => {
+  isAllowDownload.value = configStore.isAllowDownload;
+  calNum.value = configStore.getTimeNum;
+  // console.log("calNum.value----------", calNum.value);
+  searchValue.value = configStore.getSearchValue;
+})
+
+
+watch(() => searchValue.value,
+  (newVal, oldVal) => {
+    if(newVal) {
+      featchList()
+    }
+  },
+);
+
 const listData = ref<any[]>([])
 
 async function featchList() {
@@ -140,7 +170,7 @@ async function featchList() {
     }
 
     pagination.pageNo += 1
-
+    const searchValue = configStore.getSearchValue // rao
     const asideParams = unref(configStore.getAsideValue)
     const params = filterId ? { userSearchId: filterId } : asideParams
     let result = {
@@ -148,10 +178,17 @@ async function featchList() {
       data: [],
       total: 0,
     }
+    let sortObj: any = {} // rao start
+    if(sortBy.orderbyvalue == "pictureResult") {
+      sortObj.ordertype = sortBy.orderbyname
+    }else if(sortBy.orderbyvalue == "fromuptime") {
+      sortObj.orderByTime = sortBy.orderbyname
+    }// rao end
+  
     if (checkTaskStatus.value === 2 && isRefresh) {
-      result = await queryPageListByCheckNo({ ...pagination, ...contentParams, ...params, ...sortBy, checkDuplicateNo: checkDuplicateNo.value })
+      result = await queryPageListByCheckNo({ ...pagination, ...contentParams, ...params, ...sortObj, checkDuplicateNo: checkDuplicateNo.value, upUserName: searchValue })
     } else {
-      result = await getPictureList({ ...pagination, ...contentParams, ...params, ...sortBy })
+      result = await getPictureList({ ...pagination, ...contentParams, ...params, ...sortObj, upUserName: searchValue })
     }
     const { data, pageCount, total } = result
     totalCount.value = total
@@ -215,7 +252,7 @@ async function oneCheck() {
     if (res.code === "OK") {
       checkDuplicateNo.value = res.data.checkDuplicateNo
   	  checkTaskStatus.value = res.data.status
-  	  tasksLoadingModal.showModal()
+  	  tasksLoadingModal.closeModal()
     } else {
       message.error(res.message || '查重失败')
     }
@@ -233,7 +270,10 @@ async function showAddPackage() {
 //查重任务加载提示框,关闭回调
 async function tasksLoadingCloseCallback() {
 	const checkingTaskModal = checkingTaskModalRef.value as any
-	checkingTaskModal.showModal()
+	checkingTaskModal.closeModal()
+  if(isRefresh.value) {
+    refresh(true);
+  }
 }
 
 async function showLoginSuccessModal() {
@@ -241,6 +281,9 @@ async function showLoginSuccessModal() {
   // modal.showModal()
 }
 
+// 包id
+const packageIdRef = ref('');
+
 async function commitHandler(settingParam) {
   const params = {
     name: settingParam.packagename,
@@ -252,6 +295,7 @@ async function commitHandler(settingParam) {
   createPackage(params).then((res) => {
     if (res.code === "OK") {
       message.success(res.data);
+      packageIdRef.value = res.data.checkDuplicateId;
       modal.closeModal()
       finishModal.showModal()
 	  //清空查重任务状态和编号
@@ -330,6 +374,7 @@ function getAvatar(url: string): string {
 function sortHandler(orderby: "pictureResult" | "fromuptime") {
   sortBy.orderbyvalue = orderby;
   sortBy.orderbyname = sortBy.orderbyname === "asc" ? "desc" : "asc";
+
   refreshHandler()
 }
 async function downloadImage(item) {
@@ -379,10 +424,12 @@ function previewHandler(index: number, event: MouseEvent) {
     (imageRef.value?.[index] as any).mergedOnClick();
 }
 
+const timer = ref();
+
 /**
  * 检查查重状态
  */
-function refresh(val) {
+function refresh(val?: any) {
   // delete asideVal.izsimilarity
   const checkingTaskModal = checkingTaskModalRef.value as any
   if (checkDuplicateNo.value) {
@@ -394,16 +441,40 @@ function refresh(val) {
         //   modal.showModal()
         //   return
         // }
-  
-        if (checkTaskStatus.value === 2 && isRefresh) {
+        
+        if (checkTaskStatus.value === 2 && isRefresh.value) {
+          configStore.setTimeNum(100);
+          const tasksLoadingModal = queryRepeatedTasksModalRef.value as any
+          tasksLoadingModal.closeModal();
           checkingTaskModal.closeModal()
           isRefresh.value = false
           message.success('任务执行完毕，正在刷新数据...');
+          if(timer.value) {
+            clearInterval(timer.value);
+          }
           reset()
           loadMore()
+          // configStore.setTimeNum(0);
         } else if (checkTaskStatus.value === 1) {
-          // checkingTaskModal.showModal()
-          return
+          const tasksLoadingModal = queryRepeatedTasksModalRef.value as any
+          tasksLoadingModal.showModal();
+          if(calNum.value < 90) {
+            calNum.value = calNum.value + 10;
+            // console.log("calNum.value计算后的值",calNum.value);
+          }
+          configStore.setTimeNum(calNum.value);
+          // console.log("calNum.value timer.value外面------", timer.value, calNum.value, isRefresh.value);
+          if(calNum.value == 10 && isRefresh.value) {
+            if(timer.value) {
+              clearInterval(timer.value);
+            }
+            timer.value = setInterval(() => {
+              // console.log("calNum.value timer.value里面------", timer.value, calNum.value);
+              refresh();
+            }, 200);
+          }
+          checkingTaskModal.showModal()
+          // return
         }
       }
     })
@@ -425,6 +496,32 @@ function cancel(val) {
   }
 }
 
+const renderIcon = (icon: Component) => {
+  return () => {
+    return h(NIcon, null, {
+      default: () => h(icon)
+    })
+  }
+}
+
+const dropdownOptions = ref([
+  {
+    label: '导入任务数据',
+    key: 'profile',
+    icon: renderIcon(UploadIcon)
+  },
+  {
+    label: '导出任务数据',
+    key: 'editProfile',
+    icon: renderIcon(DownloadIcon)
+  },
+  {
+    label: '查看导入记录',
+    key: 'logout',
+    icon: renderIcon(EyeOutlineIcon)
+  }
+]);
+
 </script>
 
 <template>
@@ -434,10 +531,23 @@ function cancel(val) {
         <SvgIcon size="32" name="magnifying" />
         <span class="font">AI一键查重</span>
       </div>
-      <SvgIcon v-show="checkTaskStatus !== 2" style="cursor: pointer;" size="105" name="yijianchachong"
-        @click="oneCheck" />
-      <SvgIcon v-show="checkTaskStatus === 2" style="cursor: pointer;" size="105" name="shengchengrenwubao"
-        @click="showAddPackage" />
+      <div class="flex-btn-icon">
+        <SvgIcon v-show="checkTaskStatus !== 2" style="cursor: pointer;" size="105" name="yijianchachong"
+          @click="oneCheck" />
+        <SvgIcon v-show="checkTaskStatus === 2" style="cursor: pointer;" size="105" name="shengchengrenwubao"
+          @click="showAddPackage" />
+        <n-dropdown
+          trigger="hover"
+          placement="bottom-start"
+          :options="dropdownOptions"
+        >
+          <n-button style="margin-left: 10px;">
+            <Icon>
+              <EllipsisHorizontal />
+            </Icon>
+          </n-button>
+        </n-dropdown>
+      </div>
     </div>
     <div class="wrapper-content">
       <div style="display: flex;justify-content: space-between;">
@@ -464,7 +574,7 @@ function cancel(val) {
             <SvgIcon style="margin-left: 8px;" name="sort" size="12" />
           </div>
         </div>
-        <span style="font-size: 16px;color:#494949">共 <span style="color:#7899fd;font-weight: 500;">{{ totalCount
+        <span style="font-size: 16px;color: #333">共 <span style="color: #507AFD;font-weight: 500;">{{ totalCount
         }}</span> 项</span>
       </div>
       <n-spin :show="loading">
@@ -486,16 +596,23 @@ function cancel(val) {
                   {{ `${item.similar}%` }}
                 </div>
               </div>
-              <div class="glass">
+              <div class="glass" v-if="isAllowDownload">
                 <SvgIcon size="16" name="download" style="margin-top: -6px;cursor: pointer;"
                   @click="downloadImage(item)" />
               </div>
 
               <div class="info">
                 <div class="footer">
-                  <div class="img-name">{{ item.imgName }}</div>
+                  <div class="img-name">
+                    <n-tooltip trigger="hover">
+                      <template #trigger>
+                        <span>{{ item.imgName }}</span>
+                      </template>
+                      {{ item.imgName }}
+                    </n-tooltip>
+                  </div>
                   <div class="icon-wrap" @click="previewHandler(index, $event)">
-                    <SvgIcon size="13" name="magnifying-2" style="cursor: pointer;margin-left: 3px;color:#898481" />
+                    <SvgIcon size="13" name="magnifying-2" style="cursor: pointer;color:#898481" />
                   </div>
                 </div>
                 <div class="left">
@@ -517,7 +634,7 @@ function cancel(val) {
     <GeneratePackageModal ref="generateModalRef" />
     <QueryRepeatedTasksModal ref="queryRepeatedTasksModalRef" @closeCallback="tasksLoadingCloseCallback"/>
     <LoginSuccessModal ref="LoginSuccessModalRef" />
-    <FinishPackageModal ref="finishPackageModal" />
+    <FinishPackageModal ref="finishPackageModal" :id="packageIdRef"/>
     <CheckingTaskModal ref="checkingTaskModalRef" @refresh="refresh" @cancel="cancel" />
   </div>
 </template>
@@ -677,6 +794,8 @@ function cancel(val) {
         .icon-wrap {
           width: 22px;
           height: 22px;
+          line-height: 22px;
+          text-align: center;
           background-color: #FFF;
           border-radius: 6px;
         }
@@ -729,5 +848,9 @@ function cancel(val) {
       overflow-y: scroll;
     }
   }
+  .flex-btn-icon {
+    display: flex;
+    align-items: center;
+  }
 }
 </style>
diff --git a/src/views/home/content/modal/CheckingTaskModal.vue b/src/views/home/content/modal/CheckingTaskModal.vue
index 6eef24b..88b432b 100644
--- a/src/views/home/content/modal/CheckingTaskModal.vue
+++ b/src/views/home/content/modal/CheckingTaskModal.vue
@@ -44,14 +44,15 @@ defineExpose({
 </script>
 
 <template>
-  <div>
-    <n-modal v-model:show="show" :mask-closable="false" transform-origin="center" style="position: fixed;right: 0;bottom: 0;">
+  <div class="removeMask">
+    <n-modal v-model:show="show" :show-mask="false" :mask-closable="false" transform-origin="center" style="position: fixed;right: 0;bottom: 0;">
       <n-card :style="cardStyle" :bordered="false" size="huge" role="dialog" aria-modal="true" style="padding: 8px 8px 0 8px;">
         <div class="wrapper">
           <div class="title">查重进度</div>
           <div class="icon-list">
             <svg-icon size="20" name="refresh" @click="refresh" style="margin-right: 16px;cursor: pointer;" />
-            <svg-icon size="20" name="fold" style="margin-right: 16px;cursor: pointer;" @click="toggle"/>
+            <svg-icon v-show="!isFold" size="20" name="down-line" style="margin-right: 16px;cursor: pointer;" @click="toggle"/>
+            <svg-icon v-show="isFold" size="20" name="top-line" style="margin-right: 16px;cursor: pointer;" @click="toggle"/>
             <svg-icon size="20" name="close-none-border" @click="cancel" style="margin-right: 16px;cursor: pointer;"/>
           </div>
         </div>
@@ -89,4 +90,9 @@ defineExpose({
   font-size: 14px;
   line-height: 54px;
 }
+.removeMask {
+  ::v-deep(.n-modal-mask) {
+    display: none !important;
+  }
+}
 </style>
diff --git a/src/views/home/content/modal/FinishPackageModal.vue b/src/views/home/content/modal/FinishPackageModal.vue
index 828b564..a187b55 100644
--- a/src/views/home/content/modal/FinishPackageModal.vue
+++ b/src/views/home/content/modal/FinishPackageModal.vue
@@ -4,6 +4,13 @@ import { useRouter } from 'vue-router';
 
 defineOptions({ name: 'ShortcutModal' })
 
+const props = defineProps({
+  id: {
+    type: String,
+    default: '',
+  },
+});
+
 const show = ref(false)
 const router = useRouter()
 
@@ -19,7 +26,15 @@ function showModal() {
 
 function closeModal(path) {
   show.value = false
-  router.push(path)
+  if(props.id) {
+    router.push(path + '?id=' + props.id)
+  }else {
+    router.push(path)
+  }
+}
+
+function closeIconModal() {
+  show.value = false
 }
 
 defineExpose({
@@ -28,8 +43,8 @@ defineExpose({
 </script>
 
 <template>
-  <div>
-    <n-modal v-model:show="show" :mask-closable="false" transform-origin="center" style="padding: 8px;">
+  <div class="finish-package-modal" v-if="show">
+    <!-- <n-modal v-model:show="show" :mask-closable="false" transform-origin="center" style="padding: 8px;">
       <n-card :style="cardStyle" :bordered="false" size="huge" role="dialog" aria-modal="true">
         <div style="display: flex;">
           <div><svg-icon size="80" name="robot2" /></div>
@@ -50,14 +65,56 @@ defineExpose({
           </div>
         </template>
       </n-card>
-    </n-modal>
+    </n-modal> -->
+    <div class="header-box">
+      <div class="robot-box"><svg-icon size="80" name="robot2" /></div>
+      <div class="text-box">
+        <div class="msg-title">生成成功提示</div>
+        <div class="msg-text">AI已根据您的配置要求生成任务包。</div>
+      </div>
+      <div class="close-box" @click="closeIconModal">
+        <svg-icon size="30" name="close-none-border" />
+      </div>
+    </div>
+    <div class="wrapper-footer">
+      <div @click="closeModal('/worksheet')">
+        <svg-icon size="80" name="copy-select" />
+        <div class="footer-text">
+          进入AI工单
+        </div>
+      </div>
+      <div @click="closeModal('/task')">
+        <svg-icon size="80" name="task-approval-select" />
+        <div class="footer-text">
+          进入任务审批
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 
 <style lang="less" scoped>
+.finish-package-modal {
+  position: fixed;
+  width: 400px;
+  height: 250px;
+  top: 50%;
+  left: 50%;
+  margin-left: -200px;
+  margin-top: -150px;
+  background: linear-gradient(to right, #fff, #f0f3ff, #e4e9ff);
+  opacity: 0.95;
+  border-radius: 5px;
+  z-index: 99999;
+}
+
 .wrapper-footer {
-  margin-top: -20px;
-  text-align: right;
+  margin-top: 10px;
+  display: flex;
+  justify-content: space-around;
+  >div {
+    cursor: pointer;
+  }
 }
 
 .msg-title {
@@ -79,4 +136,37 @@ defineExpose({
   line-height: 22px;
 }
 
+.header-box {
+  margin-top: 20px;
+  display: flex;
+  justify-content: space-between;
+}
+
+.robot-box {
+  margin-left: 10px;
+  margin-right: 20px;
+}
+
+.msg-title {
+  color: #333333;
+  font-weight: bold;
+}
+
+.msg-text {
+  color: #666666;
+}
+
+.close-box {
+  margin-right: 20px;
+  cursor: pointer;
+}
+
+.text-box {
+  margin-right: auto;
+}
+
+.footer-text {
+  font-size: 18px;
+  color: #507AFD;
+}
 </style>
diff --git a/src/views/home/content/modal/FinishPackageModalTwo.vue b/src/views/home/content/modal/FinishPackageModalTwo.vue
new file mode 100644
index 0000000..828b564
--- /dev/null
+++ b/src/views/home/content/modal/FinishPackageModalTwo.vue
@@ -0,0 +1,82 @@
+<script lang="ts" setup>
+import { defineOptions, ref } from 'vue';
+import { useRouter } from 'vue-router';
+
+defineOptions({ name: 'ShortcutModal' })
+
+const show = ref(false)
+const router = useRouter()
+
+const cardStyle = {
+  'width': '29vw',
+  '--n-padding-bottom': '10px',
+  '--n-padding-left': '10px',
+}
+
+function showModal() {
+  show.value = true
+}
+
+function closeModal(path) {
+  show.value = false
+  router.push(path)
+}
+
+defineExpose({
+  showModal,
+})
+</script>
+
+<template>
+  <div>
+    <n-modal v-model:show="show" :mask-closable="false" transform-origin="center" style="padding: 8px;">
+      <n-card :style="cardStyle" :bordered="false" size="huge" role="dialog" aria-modal="true">
+        <div style="display: flex;">
+          <div><svg-icon size="80" name="robot2" /></div>
+          <div style="height: 130px;text-align: center;margin-left: 20px;">
+            <div class="msg-title">生成任务提示</div>
+            <div class="msg-text">AI已根据您的配置要求生成任务包。</div>
+          </div>
+        </div>
+
+        <template #footer>
+          <div class="wrapper-footer">
+            <n-button type="info" @click="closeModal('/worksheet')">
+              进入AI工单
+            </n-button>
+            <n-button style="margin-left:10px;color: #666666;" @click="closeModal('/task')">
+              进入任务审批
+            </n-button>
+          </div>
+        </template>
+      </n-card>
+    </n-modal>
+  </div>
+</template>
+
+<style lang="less" scoped>
+.wrapper-footer {
+  margin-top: -20px;
+  text-align: right;
+}
+
+.msg-title {
+  font-size: 16px;
+  font-family: PingFang SC, PingFang SC-Medium;
+  font-weight: Medium;
+  text-align: left;
+  color: #333333;
+  line-height: 24px;
+  margin: 12px 0;
+}
+
+.msg-text {
+  font-size: 14px;
+  font-family: PingFang SC, PingFang SC-Regular;
+  font-weight: Regular;
+  text-align: left;
+  color: #666666;
+  line-height: 22px;
+}
+
+</style>
diff --git a/src/views/home/content/modal/PackageSettingsModal.vue b/src/views/home/content/modal/PackageSettingsModal.vue
index 75859a9..6efa521 100644
--- a/src/views/home/content/modal/PackageSettingsModal.vue
+++ b/src/views/home/content/modal/PackageSettingsModal.vue
@@ -80,23 +80,23 @@ function afterLeave() {
             <span :style="{ 'margin-left': '18px' }">基本信息</span>
           </div>
         </div>
-        <n-form ref="formRef" :model="model" style="margin-top: 8px;" :rules="rules">
-          <n-form-item path="packagename" label="任务包名称">
+        <n-form ref="formRef" :model="model" require-mark-placement="left" style="margin-top: 8px;" :rules="rules">
+          <n-form-item class="wrapper-task-package-name" path="packagename" label="任务包名称">
             <n-input v-model:value="model.packagename" max="12" @keydown.enter.prevent />
           </n-form-item>
           <n-form-item path="mark" :style="formItemStyle">
             <n-checkbox v-model:checked="model.mark">
-              是否给重复图片添加重复标识
+              是否给重复图片增加重复标识
             </n-checkbox>
           </n-form-item>
         </n-form>
       </div>
       <template #footer>
         <div class="wrapper-footer">
-          <n-button type="info" @click="handleSumbit">
+          <n-button style="background-color: #507AFD !important;" type="info" @click="handleSumbit">
             生成任务包
           </n-button>
-          <n-button secondary style="margin-left:15px" @click="closeModal">
+          <n-button secondary style="margin-left:15px;color: #333;background-color: #fff;border: 1px solid #CAD2DD;" @click="closeModal">
             取消
           </n-button>
         </div>
@@ -113,12 +113,16 @@ function afterLeave() {
   &-title {
     font-weight: bold;
     font-size: 16px;
+    color: #333;
   }
 
   &-bar {
-    background-color: #e8e8e8;
+    background-color: #f8f8f8;
     width: 100%;
     margin-top: 20px;
+    span {
+      color: #333;
+    }
   }
 
   &-form {
@@ -127,6 +131,12 @@ function afterLeave() {
     margin-top: 20px;
   }
 
+  &-task-package-name {
+    ::v-deep(.n-form-item-label) {
+      color: #666;
+    }
+  }
+
   &-new {
     display: flex;
     width: 110px;
diff --git a/src/views/home/content/modal/QueryRepeatedTasksModal.vue b/src/views/home/content/modal/QueryRepeatedTasksModal.vue
index 95febf3..81970a7 100644
--- a/src/views/home/content/modal/QueryRepeatedTasksModal.vue
+++ b/src/views/home/content/modal/QueryRepeatedTasksModal.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { ref } from 'vue';
-
+import { useConfig } from '@/store/modules/asideConfig'
 
 const emit = defineEmits<{
   (e: 'closeCallback', value: any),
@@ -11,8 +11,8 @@ const show = ref(false)
 
 const stys = {
   'width': '424px',
-  'height': '192px',
-  '--n-padding-bottom': '0px',
+  'height': '232px',
+  '--n-padding-bottom': '20px',
   '--n-padding-left': '0px',
   'background': 'linear-gradient(132deg, rgba(255, 255, 255, 0.32) 21%, rgba(152, 172, 255, 0.14) 100%)',
   'border-radius': '4px',
@@ -34,18 +34,26 @@ defineExpose({
   closeModal,
 })
 
+const configStore = useConfig()
+const percent = ref(0);
 
+configStore.$subscribe(() => {
+  percent.value = configStore.getTimeNum;
+});
 
 </script>
 
 <template>
-  <n-modal v-model:show="show" :mask-closable="false"  transform-origin="center">
+  <n-modal v-model:show="show" :mask-closable="false" :show-mask="false" transform-origin="center">
     <n-card :style="stys" :bordered="false" role="dialog" aria-modal="true">
       <svg-icon size="15" name="close" @click="closeModal" style="position:absolute; right:6px;top:6px;cursor: pointer;"/>
       <div class="wrapper">
         <svg-icon size="90" name="robot2" />
         <span style="margin-top: 24px;">正在查重中</span>
       </div>
+      <div style="padding: 0 20px;">
+        <n-progress type="line" :percentage="percent" :show-indicator="false"/>
+      </div>
     </n-card>
   </n-modal>
 </template>
diff --git a/src/views/worksheet/aside/Aside.vue b/src/views/worksheet/aside/Aside.vue
index b4d363b..92d8df7 100644
--- a/src/views/worksheet/aside/Aside.vue
+++ b/src/views/worksheet/aside/Aside.vue
@@ -13,10 +13,12 @@ nextTick,
 onMounted,
 ref,
 unref,
+toRaw,
 watch
 } from "vue";
 import CustomFieldModalVue from "../modal/CustomFieldModal.vue";
 import WorkSheetList from "./WorkSheetList.vue";
+
 defineOptions({ name: "AsideContent" });
 
 const collapse = ref(false);
-- 
2.39.3


From d4ee5d73b766af7b002ce75daa2f7fcec1f05de4 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sat, 30 Mar 2024 23:48:06 +0800
Subject: [PATCH 036/143] =?UTF-8?q?fix:=20=E6=96=87=E5=AD=97=E8=B6=85?=
 =?UTF-8?q?=E5=87=BA=E9=95=BF=E5=BA=A6=E5=A2=9E=E5=8A=A0popver?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/aside/ListItem.vue  | 10 +++++++---
 src/views/worksheet/content/Content.vue |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/worksheet/aside/ListItem.vue b/src/views/worksheet/aside/ListItem.vue
index bf855f4..00db5f3 100644
--- a/src/views/worksheet/aside/ListItem.vue
+++ b/src/views/worksheet/aside/ListItem.vue
@@ -45,7 +45,9 @@ onMounted(async () => {
         <div class="id-wrap">
           <SvgIcon :name="svgName" size="28" />
           <span class="list-item-header-name" :class="{ 'list-item-header-selected': selected }">
-            <span class="list-item-title" :title="listItem.name">{{ listItem.name }} </span>
+            <n-ellipsis style="max-width: 226px">
+             {{ listItem.name }}{{ listItem.name }}{{ listItem.name }}{{ listItem.name }}{{ listItem.name }}
+            </n-ellipsis>
             <span class="list-item-header-selected">({{ listItem.pictureCount }})</span>
           </span>
         </div>
@@ -111,8 +113,10 @@ onMounted(async () => {
       color: #333333;
       margin-bottom: 0 0 8px 8px;
       display: flex;
-      justify-content: space-between;
-      .list-item-title{
+      justify-content: flex-start;
+      align-items: center;
+
+      .list-item-title {
         width: 200px;
         display: inline-block;
         white-space: nowrap;
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 4d2d7f0..b26ca8a 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -480,7 +480,7 @@ function reloadList() {
           <!-- 右侧任务 标题信息 -->
           <div class="right">
             <n-scrollbar style="max-height: 100%">
-              <span class="task-name" :title="taskDetailInfo.taskname">任务ID：{{ taskDetailInfo.taskname }}</span>
+              <n-ellipsis style="max-width: 350px">任务ID：{{ taskDetailInfo.taskname }}</n-ellipsis>
               <div class="tags">
                 <div class="tag tag-submiting" v-if="taskDetailInfo.states == 1">{{ TASK_STATUS_OBJ[taskDetailInfo.states]
                 }}</div>
-- 
2.39.3


From f3e7bd4c4b442e20f8485956c546c659ca0856a1 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sat, 30 Mar 2024 23:51:47 +0800
Subject: [PATCH 037/143] =?UTF-8?q?feat:=20=E7=A7=BB=E9=99=A4=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E4=BB=BB=E5=8A=A1=E5=8C=85=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/aside/ListItem.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/worksheet/aside/ListItem.vue b/src/views/worksheet/aside/ListItem.vue
index 00db5f3..8a3c4f6 100644
--- a/src/views/worksheet/aside/ListItem.vue
+++ b/src/views/worksheet/aside/ListItem.vue
@@ -46,7 +46,7 @@ onMounted(async () => {
           <SvgIcon :name="svgName" size="28" />
           <span class="list-item-header-name" :class="{ 'list-item-header-selected': selected }">
             <n-ellipsis style="max-width: 226px">
-             {{ listItem.name }}{{ listItem.name }}{{ listItem.name }}{{ listItem.name }}{{ listItem.name }}
+             {{ listItem.name }}
             </n-ellipsis>
             <span class="list-item-header-selected">({{ listItem.pictureCount }})</span>
           </span>
-- 
2.39.3


From 1fa07621a5d16eb3111ff5f1db912dc81dabf1c0 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sun, 31 Mar 2024 00:07:45 +0800
Subject: [PATCH 038/143] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=8F=90?=
 =?UTF-8?q?=E6=8A=A5=E4=BA=BA=E6=8F=90=E6=8A=A5=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/aside/ListItem.vue  | 2 +-
 src/views/worksheet/content/Content.vue | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/worksheet/aside/ListItem.vue b/src/views/worksheet/aside/ListItem.vue
index 8a3c4f6..f80514d 100644
--- a/src/views/worksheet/aside/ListItem.vue
+++ b/src/views/worksheet/aside/ListItem.vue
@@ -45,7 +45,7 @@ onMounted(async () => {
         <div class="id-wrap">
           <SvgIcon :name="svgName" size="28" />
           <span class="list-item-header-name" :class="{ 'list-item-header-selected': selected }">
-            <n-ellipsis style="max-width: 226px">
+            <n-ellipsis style="max-width: 180px">
              {{ listItem.name }}
             </n-ellipsis>
             <span class="list-item-header-selected">({{ listItem.pictureCount }})</span>
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index b26ca8a..7bacc6a 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -517,7 +517,7 @@ function reloadList() {
               <div class="property">
                 <span class="property-name top" style=" color: #666666">提报人
                 </span>
-                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo?.source || "-" }}</span>
+                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.upname || "-" }}</span>
               </div>
               <div class="property">
                 <span class="property-name top" style=" color: #666666">创建时间
@@ -527,8 +527,8 @@ function reloadList() {
               <div class="property">
                 <span class="property-name top" style=" color: #666666">提报时间
                 </span>
-                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.uploadTime &&
-                  format(taskDetailInfo?.pictureInfo?.uploadTime, 'yyyy-MM-dd HH:mm:ss') || '-' }}</span>
+                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.submitDateTimestamp &&
+                  format(taskDetailInfo?.submitDateTimestamp, 'yyyy-MM-dd HH:mm:ss') || '-' }}</span>
               </div>
               <div v-for="key in Object.keys(propertys)" :key="key" class="property">
                 <span class="property-name">{{ fieldMap[key] }}</span>
-- 
2.39.3


From 331b75636b8f7b27ab226e5d43f81db4f4ab18f6 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sun, 31 Mar 2024 01:28:55 +0800
Subject: [PATCH 039/143] =?UTF-8?q?feat:=20=E8=A7=A3=E6=95=A3=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/home/main.ts                        | 13 ++++++++
 src/views/home/content/Content.vue          |  5 ---
 src/views/worksheet/aside/ListItem.vue      | 36 +++++++++++++++------
 src/views/worksheet/aside/WorkSheetList.vue | 30 +++++++++++++----
 4 files changed, 62 insertions(+), 22 deletions(-)

diff --git a/src/api/home/main.ts b/src/api/home/main.ts
index bd661e2..5f70458 100644
--- a/src/api/home/main.ts
+++ b/src/api/home/main.ts
@@ -180,6 +180,19 @@ export async function oneClickCheck(params: Partial<CheckParam> = { search_histo
     params
   })
 }
+/**
+ * 解散任务包
+ * @param 
+ * @returns
+ */
+ export async function deletePackage(params) {
+
+  return http.request({
+    url: `/ocr/ocrTaskPackage/deletePackage`,
+    method: 'get',
+    params
+  })
+}
 /**
  * 任务完成——创建任务包前——获取图片列表
  * @param 
diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 8ebdf46..52595ad 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -236,11 +236,6 @@ async function tasksLoadingCloseCallback() {
 	checkingTaskModal.showModal()
 }
 
-async function showLoginSuccessModal() {
-  const modal = LoginSuccessModalRef.value as any
-  // modal.showModal()
-}
-
 async function commitHandler(settingParam) {
   const params = {
     name: settingParam.packagename,
diff --git a/src/views/worksheet/aside/ListItem.vue b/src/views/worksheet/aside/ListItem.vue
index f80514d..cb9350c 100644
--- a/src/views/worksheet/aside/ListItem.vue
+++ b/src/views/worksheet/aside/ListItem.vue
@@ -1,8 +1,10 @@
 <script lang="ts" setup>
 import { format } from 'date-fns';
-import { computed, onMounted } from "vue";
+import { computed, onMounted, ref } from "vue";
 import type { PackageListItem } from "/#/workorder";
+
 defineOptions({ name: "ListItem" });
+const emit = defineEmits(['dismisClick'])
 
 const props = defineProps({
   selected: {
@@ -21,19 +23,22 @@ const props = defineProps({
     type: Array,
     default: () => [],
   },
+  mouseOverTask: {
+    type: Array,
+    default: () => [],
+  },
 });
-console.log(props.dicts, "dicts");
+const isDismissTask = ref(false)
 const svgName = computed(() => {
   return props.selected ? "taskpack-select" : "taskpack";
 });
-function getValueByLabel(label) {
-  const result = props.dicts.filter(item => item.name === label)
-  if (result.length === 0) {
-    return ""
-  } else {
-    return props.dicts.filter(item => item.name === label)[0].fieldDesc
-  }
+
+
+function handleDismissTask() {
+  isDismissTask.value = true
+  emit('dismisClick',  props.mouseOverTask.id)
 }
+
 onMounted(async () => {
 })
 </script>
@@ -46,9 +51,15 @@ onMounted(async () => {
           <SvgIcon :name="svgName" size="28" />
           <span class="list-item-header-name" :class="{ 'list-item-header-selected': selected }">
             <n-ellipsis style="max-width: 180px">
-             {{ listItem.name }}
+              {{ listItem.name }}
             </n-ellipsis>
             <span class="list-item-header-selected">({{ listItem.pictureCount }})</span>
+            <n-popover placement="bottom" trigger="hover" >
+              <template #trigger>
+                <span class="dismiss-task-pack"  v-show="mouseOverTask?.id" style="cursor: pointer;" @click.stop="handleDismissTask">...</span>
+              </template>
+              <span>解散任务包</span>
+            </n-popover>
           </span>
         </div>
       </div>
@@ -105,6 +116,11 @@ onMounted(async () => {
       margin-bottom: 6px
     }
 
+    .dismiss-task-pack {
+      position: absolute;
+      right: 15px;
+    }
+
     .list-item-header-name {
       width: 250px;
       font-size: 16px;
diff --git a/src/views/worksheet/aside/WorkSheetList.vue b/src/views/worksheet/aside/WorkSheetList.vue
index 39cb0b7..4292eb4 100644
--- a/src/views/worksheet/aside/WorkSheetList.vue
+++ b/src/views/worksheet/aside/WorkSheetList.vue
@@ -1,9 +1,11 @@
 <script lang="ts" setup>
+import { deletePackage } from '@/api/home/main'
 import NotPassed from '@/components/NotPassed.vue'
 import { useWorkOrder } from '@/store/modules/workOrder'
 import { isEmpty } from '@/utils'
 import { useInfiniteScroll } from '@vueuse/core'
-import { reactive, ref, unref, watch } from 'vue'
+import { useMessage } from 'naive-ui'
+import { reactive, ref, watch } from 'vue'
 import ApprovalModal from '../modal/ApprovalModal.vue'
 import ListItem from './ListItem.vue'
 import type { PackageListItem } from '/#/workorder'
@@ -33,11 +35,7 @@ const pagination = reactive({
 
 const approvalModalRef = ref(null)
 const notPassedRef: any = ref(null)
-
-function showModal(modalRef: any, id) {
-  const modal = unref(modalRef)! as any
-  modal.showModal(id)
-}
+const overTask = ref<any>(null);
 
 function selectHandler(id: string, index: number) {
   workStore.setActive(index)
@@ -125,7 +123,21 @@ async function search(word: string) {
     { distance: 10, canLoadMore: () => canloadMore.value },
   )
 }
-
+function overTaskHandelr(item: any) {
+  overTask.value = item
+}
+function leaveTaskHandler() {
+  overTask.value = null;
+}
+const message = useMessage()
+function dismisClick(packageId:string) {
+  deletePackage({packageId: packageId}).then((res) => {
+    if(res.code==="OK"){
+      message.success("解散任务包成功")
+      loadMore()
+    }
+  })
+}
 defineExpose({
   search,
 })
@@ -143,7 +155,11 @@ defineExpose({
         :list-item="item"
         :show-field-list="showFieldList"
         :dicts="dicts"
+        :mouse-over-task="overTask"
         @click="selectHandler(item.id, index)"
+        @mouseover="overTaskHandelr(item)"  
+        @mouseleave="leaveTaskHandler"
+        @dismisClick="dismisClick"
       />
     </div>
   </n-spin>
-- 
2.39.3


From 938e53ed44352c51dccfd67e0abd064c839dee8e Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Sun, 31 Mar 2024 01:42:12 +0800
Subject: [PATCH 040/143] =?UTF-8?q?=E6=9A=82=E5=AD=98=E7=BB=88=E5=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icons/column.svg         |  18 +++++
 src/views/final/content/Content.vue | 110 +++++++++++++++-------------
 src/views/task/content/Content.vue  |   2 +-
 3 files changed, 77 insertions(+), 53 deletions(-)
 create mode 100644 src/assets/icons/column.svg

diff --git a/src/assets/icons/column.svg b/src/assets/icons/column.svg
new file mode 100644
index 0000000..954e360
--- /dev/null
+++ b/src/assets/icons/column.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>自定义列</title>
+    <defs>
+        <rect id="path-1" x="0" y="0" width="64" height="64"></rect>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="PrevailCloud-Design-图标集" transform="translate(-1986.000000, -6758.000000)">
+            <g id="自定义列" transform="translate(1986.000000, 6758.000000)">
+                <mask id="mask-2" fill="white">
+                    <use xlink:href="#path-1"></use>
+                </mask>
+                <g id="蒙版"></g>
+                <path d="M36.9854854,42.6064492 C37.5377701,42.6064492 37.9854854,43.0541645 37.9854854,43.6064492 L37.9854854,56 C37.9854854,56.5522847 37.5377701,57 36.9854854,57 L33.9854854,57 C33.4332006,57 32.9854854,56.5522847 32.9854854,56 L32.985,52.303 L7,52.3032246 C6.44771525,52.3032246 6,51.8555094 6,51.3032246 L6,48.3032246 C6,47.7509399 6.44771525,47.3032246 7,47.3032246 L32.985,47.303 L32.9854854,43.6064492 C32.9854854,43.0541645 33.4332006,42.6064492 33.9854854,42.6064492 L36.9854854,42.6064492 Z M54.4637884,47.3032246 C55.0160731,47.3032246 55.4637884,47.7509399 55.4637884,48.3032246 L55.4637884,51.3032246 C55.4637884,51.8555094 55.0160731,52.3032246 54.4637884,52.3032246 L44.6371044,52.3032246 C44.0848196,52.3032246 43.6371044,51.8555094 43.6371044,51.3032246 L43.6371044,48.3032246 C43.6371044,47.7509399 44.0848196,47.3032246 44.6371044,47.3032246 L54.4637884,47.3032246 Z M29.8824782,24.8032246 C30.4347629,24.8032246 30.8824782,25.2509399 30.8824782,25.8032246 L30.882,29.5 L57,29.5 C57.5522847,29.5 58,29.9477153 58,30.5 L58,33.5 C58,34.0522847 57.5522847,34.5 57,34.5 L30.882,34.5 L30.8824782,38.1967754 C30.8824782,38.7490601 30.4347629,39.1967754 29.8824782,39.1967754 L26.8824782,39.1967754 C26.3301934,39.1967754 25.8824782,38.7490601 25.8824782,38.1967754 L25.8824782,25.8032246 C25.8824782,25.2509399 26.3301934,24.8032246 26.8824782,24.8032246 L29.8824782,24.8032246 Z M19.2308592,29.5 C19.7831439,29.5 20.2308592,29.9477153 20.2308592,30.5 L20.2308592,33.5 C20.2308592,34.0522847 19.7831439,34.5 19.2308592,34.5 L7,34.5 C6.44771525,34.5 6,34.0522847 6,33.5 L6,30.5 C6,29.9477153 6.44771525,29.5 7,29.5 L19.2308592,29.5 Z M36.9854854,7 C37.5377701,7 37.9854854,7.44771525 37.9854854,8 L37.9854854,20.3935508 C37.9854854,20.9458355 37.5377701,21.3935508 36.9854854,21.3935508 L33.9854854,21.3935508 C33.4332006,21.3935508 32.9854854,20.9458355 32.9854854,20.3935508 L32.985,16.696 L7,16.6967754 C6.44771525,16.6967754 6,16.2490601 6,15.6967754 L6,12.6967754 C6,12.1444906 6.44771525,11.6967754 7,11.6967754 L32.985,11.696 L32.9854854,8 C32.9854854,7.44771525 33.4332006,7 33.9854854,7 L36.9854854,7 Z M54.4637884,11.6967754 C55.0160731,11.6967754 55.4637884,12.1444906 55.4637884,12.6967754 L55.4637884,15.6967754 C55.4637884,16.2490601 55.0160731,16.6967754 54.4637884,16.6967754 L44.6371044,16.6967754 C44.0848196,16.6967754 43.6371044,16.2490601 43.6371044,15.6967754 L43.6371044,12.6967754 C43.6371044,12.1444906 44.0848196,11.6967754 44.6371044,11.6967754 L54.4637884,11.6967754 Z" id="形状结合" fill="#666666" fill-rule="nonzero" mask="url(#mask-2)"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index 126413c..73cd966 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -46,7 +46,7 @@ const emit = defineEmits(['changeShow'])
 function changeContent() {
   emit('changeShow')
 }
-
+const checkedRowKeys = ref([])
 const dicStore = useDictionary()
 const izstatusList = ref([])
 const router = useRouter()
@@ -170,6 +170,10 @@ async function getColumns() {
       type: 'selection',
       fixed: 'left',
       width: 50,
+      disabled(row: any) {
+        console.log(row)
+        return row.states !== 2
+      },
     },
   ]
 
@@ -663,43 +667,34 @@ function singleApproval(row) {
   doAudit(param)
 }
 
+// 批量通过
 function batchApproval() {
-  const items = getSelectItems()
-  const msg = validate(items)
+  const items: any = getSelectItems()
+  const list: any = []
+  items.forEach((item) => {
+    list.push({
+      formId: item.id,
+      taskId: item.taskId,
+      taskName: item.fromtaskname,
+    })
+  })
 
-  if (msg !== null) {
-    message.error(msg)
-    return
+  const param = {
+    result: true,
+    comment: '',
+    disposeType: '',
+    disposeTypeId: '',
+    failCauseId: '',
+    failCauseName: '',
+    flowTaskInfoList: list,
   }
-
-  dialog.info({
-    title: '确认提示',
-    content: '确认给该任务审批为【通过】吗?',
-    positiveText: '确定',
-    negativeText: '取消',
-    onPositiveClick: () => {
-      approval(items)
-    },
-    onNegativeClick: () => {},
-  })
+  console.log(param)
+  reload()
+  checkedRowKeys.value = []
+  console.log(selectionIds.value)
+  // doAudit(param)
 }
 
-// function approval(items) {
-//   const formIds: string[] = items.map(item => item.id)
-//   const taskIds: string[] = items.map(item => item.taskId)
-//   const tasknames: string[] = items.map(item => item.taskname)
-
-//   const param: ApprovalParam = {
-//     formid: formIds,
-//     taskId: taskIds,
-//     approvd: true,
-//     taskComment: 'approval',
-//     taskname: tasknames,
-//   }
-
-//   doAudit(param)
-// }
-
 // 审核不通过
 function rejectHandler(list) {
   const msg = validate(list)
@@ -713,24 +708,8 @@ function rejectHandler(list) {
   modal.showModal(list)
 }
 
-function reject(idOrDesc: string, backId: string, isOther: boolean) {
-  const items = getSelectItems()
-  const formIds: string[] = items.map(item => item.id)
-  const taskIds: string[] = items.map(item => item.fromtaskid)
-  const tasknames: string[] = items.map(item => item.fromtaskname)
-
-  const param: ApprovalParam = {
-    formid: formIds,
-    taskId: taskIds,
-    approvd: false,
-    taskComment: idOrDesc,
-    taskname: isOther ? tasknames : ['其他'],
-  }
-
-  doAudit(param)
-}
-
 function reload() {
+  selectionIds.value = []
   const { page, pageSize } = unref(tableRef.value?.pagination) as PaginationProps
   query(page!, pageSize!)
 }
@@ -786,10 +765,21 @@ function doAudit(param: any) {
         <NButton class="xjcc" text @click="showModal(repeatModalRef)">
           小结查重
         </NButton>
-        <div class="btn" @click="batchApproval">
+        <div class="batch">
+          <NButton text @click="setBatch(false)">
+            <template #icon>
+              <SvgIcon name="revoke" />
+            </template>
+            返回
+          </NButton>
+          <img class="btn-approval btn-left" src="@/assets/images/task/btn-not-pass.png" alt="" @click.stop="rejectHandler">
+          <SvgIcon size="24" name="vs" />
+          <img class="btn-approval" src="@/assets/images/task/btn-pass.png" alt="" @click.stop="batchApproval">
+        </div>
+        <!-- <div class="btn" @click="batchApproval">
           <SvgIcon style="margin-right: 6px" size="14" name="tf" />
           批量审批
-        </div>
+        </div> -->
         <n-popover
           ref="popover"
           :style="{ padding: '0px' }"
@@ -839,6 +829,7 @@ function doAudit(param: any) {
     <div class="wrapper-content">
       <NDataTable
         ref="tableRef"
+        v-model:checked-row-keys="checkedRowKeys"
         remote
         :columns="columnsRef"
         :scroll-x="1250"
@@ -874,6 +865,21 @@ function doAudit(param: any) {
 .color-red{
   color: #FF4E4F!important;
 }
+
+.batch {
+  display: flex;
+  align-items: center;
+
+  .btn-approval{
+    width: 68px;
+    height: 28px;
+    cursor: pointer;
+  }
+
+  .btn-left{
+    margin-left: 16px;
+  }
+}
 .wrapper {
   display: flex;
   flex: 1;
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index 52766bf..0dbd088 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -212,7 +212,7 @@ async function handleDragEnd(event, item) {
   // 可以在这里添加拖拽结束后的逻辑
   const flag = taskStore.getInFile
   if (flag) {
-    const res = await dubiousfileyd({ pictureid: item.pictureid })
+    const res = await dubiousfileyd({ pictureid: item.pictureId })
     if (res.code === 'OK') {
       message.success('加入成功')
       getTableData()
-- 
2.39.3


From 70e1ac6df09f5aa3b94eb3433ad157a2c075fc41 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sun, 31 Mar 2024 01:53:40 +0800
Subject: [PATCH 041/143] =?UTF-8?q?feat:=20=E4=B8=8D=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B8=BA=E7=BA=A2=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/content/Content.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 7bacc6a..92f7c19 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -914,8 +914,8 @@ function reloadList() {
       }
 
       .tag-passed {
-        color: #02C984;
-        border: 1px solid #02C984;
+        color: #ff7575;
+        border: 1px solid #ff7575;
       }
 
       .tag-approved {
-- 
2.39.3


From 53b98dc6a6340eb2c8b2b432c2a6fe55a5227d8c Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sun, 31 Mar 2024 01:55:33 +0800
Subject: [PATCH 042/143] =?UTF-8?q?feat:=20=E6=9B=B4=E6=94=B9=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=80=92=E5=BA=8F=E6=AD=A3=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/content/Content.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 92f7c19..dbee369 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -53,7 +53,7 @@ const taskpagination = reactive({
   pageSize: 10,
 });
 const sortBy: SimilarityPictureSortParam = {
-  orderType: "asc",
+  orderType: "desc",
   orderName: "similarityScore",
 };
 const workStore = useWorkOrder();
@@ -234,7 +234,7 @@ async function handleSelect(item: any) {
 async function sortHandler(orderby: "similarityScore" | "createdate") {
   selectedSortName.value = orderby;
   sortBy.orderName = orderby;
-  sortBy.orderType = sortBy.orderType === "asc" ? "desc" : "asc";
+  sortBy.orderType = sortBy.orderType === "desc" ? "desc" : "asc";
   refreshHandler();
 }
 
-- 
2.39.3


From 852b9aad2c6667948484434dc0fa8f4da7b114df Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Sun, 31 Mar 2024 02:29:41 +0800
Subject: [PATCH 043/143] bug

---
 src/components/Approval/NotPassed.vue   | 20 +++++++---
 src/views/final/content/Content.vue     | 50 ++++++++++---------------
 src/views/task/content/PictureTable.vue |  2 +-
 3 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/src/components/Approval/NotPassed.vue b/src/components/Approval/NotPassed.vue
index 04bad76..b2e53a5 100644
--- a/src/components/Approval/NotPassed.vue
+++ b/src/components/Approval/NotPassed.vue
@@ -30,8 +30,8 @@ const rules = {
 }
 
 const formData = reactive({
-  disposeTypeId: '',
-  failCauseId: '',
+  disposeTypeId: '262403670085013522',
+  failCauseId: '260402999231251188',
   comment: '',
 })
 
@@ -149,7 +149,7 @@ async function selectChange(id) {
               <n-select v-model:value="formData.failCauseId" filterable :options="failCauseOptions" @change="selectChange" />
             </n-form-item>
             <n-form-item v-show="showOther" class="form-item-area" label="" path="">
-              <n-input v-model:value="formData.comment" type="textarea" placeholder="备注内容" />
+              <n-input v-model:value="formData.comment" placeholder-class="pl" type="textarea" placeholder="备注内容" />
             </n-form-item>
           </div>
         </n-form>
@@ -157,9 +157,9 @@ async function selectChange(id) {
       <template #footer>
         <div class="wrapper-footer">
           <n-button type="info" @click="handleSumbit">
-            确认
+            确定
           </n-button>
-          <n-button secondary style="margin-left:15px" @click="closeModal">
+          <n-button secondary class="btn" style="margin-left:15px" @click="closeModal">
             取消
           </n-button>
         </div>
@@ -219,6 +219,7 @@ async function selectChange(id) {
   .form-item-area{
     margin-top: -30px;
   }
+
 }
 
 ::v-deep(.n-card__content) {
@@ -234,4 +235,13 @@ async function selectChange(id) {
   margin-top: 0px;
   margin-bottom: 0px;
 }
+
+::v-deep(.n-input__placeholder) {
+  color: #333333!important;
+}
+
+.btn{
+  border: 1px solid #cad2dd;
+  background-color: #fff;
+}
 </style>
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index 73cd966..c6a36dc 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -171,7 +171,6 @@ async function getColumns() {
       fixed: 'left',
       width: 50,
       disabled(row: any) {
-        console.log(row)
         return row.states !== 2
       },
     },
@@ -606,22 +605,6 @@ function actionHandler(action: any, row: any) {
 function validate(items: any[]) {
   if (items.length === 0)
     return '至少选中一个任务'
-
-  // const useInfo = userStore.getUserInfo
-  // const username = useInfo.loginname
-
-  // for (const item of items) {
-  //   const { iztrueorfalse, states, assignee } = item
-  //   if (iztrueorfalse === null)
-  //     return '未判别真假'
-
-  //   else if (states !== 2)
-  //     return '审批状态不合法'
-
-  //   else if (assignee !== username)
-  //     return '审批人不一致'
-  // }
-
   return null
 }
 
@@ -670,6 +653,13 @@ function singleApproval(row) {
 // 批量通过
 function batchApproval() {
   const items: any = getSelectItems()
+  const msg = validate(items)
+
+  if (msg !== null) {
+    message.error(msg)
+    return
+  }
+  console.log(items)
   const list: any = []
   items.forEach((item) => {
     list.push({
@@ -688,17 +678,19 @@ function batchApproval() {
     failCauseName: '',
     flowTaskInfoList: list,
   }
-  console.log(param)
-  reload()
-  checkedRowKeys.value = []
-  console.log(selectionIds.value)
-  // doAudit(param)
+
+  doAudit(param)
+}
+
+// 批量不通过
+function batchReject() {
+  const items: any = getSelectItems()
+  rejectHandler(items)
 }
 
 // 审核不通过
 function rejectHandler(list) {
   const msg = validate(list)
-
   if (msg !== null) {
     message.error(msg)
     return
@@ -710,6 +702,8 @@ function rejectHandler(list) {
 
 function reload() {
   selectionIds.value = []
+  checkedRowKeys.value = []
+
   const { page, pageSize } = unref(tableRef.value?.pagination) as PaginationProps
   query(page!, pageSize!)
 }
@@ -766,13 +760,7 @@ function doAudit(param: any) {
           小结查重
         </NButton>
         <div class="batch">
-          <NButton text @click="setBatch(false)">
-            <template #icon>
-              <SvgIcon name="revoke" />
-            </template>
-            返回
-          </NButton>
-          <img class="btn-approval btn-left" src="@/assets/images/task/btn-not-pass.png" alt="" @click.stop="rejectHandler">
+          <img 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">
         </div>
@@ -822,7 +810,7 @@ function doAudit(param: any) {
       <SvgIcon
         style="cursor: pointer"
         size="18"
-        name="setting"
+        name="column"
         @click="showModal(customTabelRef)"
       />
     </div>
diff --git a/src/views/task/content/PictureTable.vue b/src/views/task/content/PictureTable.vue
index 68d0512..36ce636 100644
--- a/src/views/task/content/PictureTable.vue
+++ b/src/views/task/content/PictureTable.vue
@@ -19,7 +19,7 @@ defineProps({
     <tr>
       <th>图片名称</th>
       <td class="blue">
-        {{ data?.pictureInfo?.imgname }}
+        {{ data?.pictureInfo?.imgName }}
       </td>
       <th>图片格式</th>
       <td class="blue">
-- 
2.39.3


From ef6acbbafc9ea1852f66f5eb35636da2cb048519 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sun, 31 Mar 2024 08:58:24 +0800
Subject: [PATCH 044/143] =?UTF-8?q?fix:=202613=20=E4=B8=BB=E9=A1=B5?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=A2=99=E5=B1=95=E7=A4=BA=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/content/Content.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 52595ad..b3064fa 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -450,14 +450,14 @@ function cancel(val) {
               <SvgIcon class="gap" name="arrow-botton" size="14" />
             </div>
           </n-popselect>
-          <div style="margin-left: 15px;cursor: pointer;color:#323233" @click="sortHandler('pictureResult')">
-            <span>相似度排序</span>
-            <SvgIcon style="margin-left: 8px;" name="sort" size="12" />
-          </div>
           <div style="margin-left: 15px;cursor: pointer;color:#323233" @click="sortHandler('fromuptime')">
             <span>时间排序</span>
             <SvgIcon style="margin-left: 8px;" name="sort" size="12" />
           </div>
+          <div style="margin-left: 15px;cursor: pointer;color:#323233" @click="sortHandler('pictureResult')">
+            <span>相似度排序</span>
+            <SvgIcon style="margin-left: 8px;" name="sort" size="12" />
+          </div>
         </div>
         <span style="font-size: 16px;color:#494949">共 <span style="color:#7899fd;font-weight: 500;">{{ totalCount
         }}</span> 项</span>
-- 
2.39.3


From b7284f3c6c70dcd82ae57a40ec2449ea1a4a8908 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sun, 31 Mar 2024 09:15:12 +0800
Subject: [PATCH 045/143] =?UTF-8?q?fix:=202798=20=E3=80=90=E5=9B=BE?=
 =?UTF-8?q?=E5=AE=A1=E5=AE=A1=E6=89=B9=E7=AE=A1=E7=90=86=E3=80=91=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E6=89=B9=E9=87=8F=E5=AE=A1=E6=89=B9=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E5=A4=8D=E9=80=89=E6=A1=86=E5=90=8E=E5=86=8D?=
 =?UTF-8?q?=E7=82=B9=E4=B8=80=E6=AC=A1=E5=BA=94=E8=AF=A5=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E5=A4=8D=E9=80=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/content/Content.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index dbee369..678d613 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -29,7 +29,11 @@ const totalCount = ref(0);
 let _imagesload: any;
 
 function setBatch(value: boolean) {
-  batch.value = value;
+  if (value && batch.value) {
+    batch.value = !value;
+  } else {
+    batch.value = value;
+  }
   if (value === false) {
     selectItems.value.forEach((item) => (item.checked = false));
     selectItems.value.length = 0;
-- 
2.39.3


From 35cb522488ec80c064ad4c5f78d65cf927255ba3 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sun, 31 Mar 2024 10:00:45 +0800
Subject: [PATCH 046/143] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E6=94=BE?=
 =?UTF-8?q?=E5=A4=A7=E9=95=9C=E5=9B=BE=E6=A0=87=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/content/Content.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index b3064fa..b11ec11 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -490,7 +490,7 @@ function cancel(val) {
                 <div class="footer">
                   <div class="img-name">{{ item.imgName }}</div>
                   <div class="icon-wrap" @click="previewHandler(index, $event)">
-                    <SvgIcon size="13" name="magnifying-2" style="cursor: pointer;margin-left: 3px;color:#898481" />
+                    <SvgIcon size="13" name="magnifying-2" style="cursor: pointer;color:#898481;" />
                   </div>
                 </div>
                 <div class="left">
@@ -674,6 +674,9 @@ function cancel(val) {
           height: 22px;
           background-color: #FFF;
           border-radius: 6px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
         }
       }
 
-- 
2.39.3


From 0412fb2fdd4b7aef923ebe417fb7756c10e36c59 Mon Sep 17 00:00:00 2001
From: raofuzi <2641346316@qq.com>
Date: Sun, 31 Mar 2024 10:21:27 +0800
Subject: [PATCH 047/143] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/content/Content.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 634974d..98c6632 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -295,7 +295,7 @@ async function commitHandler(settingParam) {
   createPackage(params).then((res) => {
     if (res.code === "OK") {
       message.success(res.data);
-      packageIdRef.value = res.data.checkDuplicateId;
+      packageIdRef.value = res.data.id;
       modal.closeModal()
       finishModal.showModal()
 	  //清空查重任务状态和编号
-- 
2.39.3


From 7f377fd9dfe0d8c7bc5c906c74c6113ca5229060 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sun, 31 Mar 2024 10:31:29 +0800
Subject: [PATCH 048/143] =?UTF-8?q?feat:=202851bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/modal/CustomSettingModal.vue | 154 ++++++++++----------
 1 file changed, 77 insertions(+), 77 deletions(-)

diff --git a/src/views/task/modal/CustomSettingModal.vue b/src/views/task/modal/CustomSettingModal.vue
index bcd1cb4..8fb0c1c 100644
--- a/src/views/task/modal/CustomSettingModal.vue
+++ b/src/views/task/modal/CustomSettingModal.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup>
-import { defineEmits, defineProps, onMounted, ref } from 'vue'
-import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter'
-import { ReportInfoConfig } from '@/config/workorder'
-import { useUser } from '@/store/modules/user'
+import { computed, defineEmits, defineProps, onMounted, ref } from "vue";
+import { getAllfieldList, getfieldList, savefield } from "@/api/home/filter";
+import { ReportInfoConfig } from "@/config/workorder";
+import { useUser } from "@/store/modules/user";
 
 const props = defineProps({
   reviewType: {
@@ -10,140 +10,143 @@ const props = defineProps({
     default: () => 3,
     require: true,
   },
-})
-const emit = defineEmits(['onOk'])
+});
+const emit = defineEmits(["onOk"]);
 
 onMounted(async () => {
-  const userStore = useUser()
-  const userInfo = userStore.getUserInfo
-  let res
-  res = await getAllfieldList(props.reviewType) // 所有筛选项目
-  const allList = res.data
-  res = await getfieldList(props.reviewType, userInfo.id) // 当前用户选择的项目
-  const useList = res.data
+  const userStore = useUser();
+  const userInfo = userStore.getUserInfo;
+  let res;
+  res = await getAllfieldList(props.reviewType); // 所有筛选项目
+  const allList = res.data;
+  res = await getfieldList(props.reviewType, userInfo.id); // 当前用户选择的项目
+  const useList = res.data;
   /**
    * name 标题
    * id 键值
    * fix 是否默认
    * checked 是否选中
    */
-  const userFieldFixed = useList.userFieldFixed?.split(',')
-  const userFieldUnFixed = useList.userFieldUnFixed?.split(',')
+  const userFieldFixed = useList.userFieldFixed?.split(",");
+  const userFieldUnFixed = useList.userFieldUnFixed?.split(",");
   allList.map((v) => {
     const item = {
       name: v.fieldDesc,
       id: v.name,
       fix: v.isrequired == 2,
       checked:
-        v.isrequired == 2
-        || Boolean(userFieldFixed?.find(v2 => v2 == v.name))
-        || Boolean(userFieldUnFixed?.find(v2 => v2 == v.name)),
-    }
-    offList.value.push(item)
-  })
-})
-
-const offList = ref<any[]>([])
+        v.isrequired == 2 ||
+        Boolean(userFieldFixed?.find((v2) => v2 == v.name)) ||
+        Boolean(userFieldUnFixed?.find((v2) => v2 == v.name)),
+    };
+    offList.value.push(item);
+  });
+});
+
+const offList = ref<any[]>([]);
 function generatList() {
-  const keys = Object.keys(ReportInfoConfig)
-  const hideList: object[] = []
+  const keys = Object.keys(ReportInfoConfig);
+  const hideList: object[] = [];
   for (const key of keys) {
-    const name = ReportInfoConfig[key]?.label
-    const isDefault = ReportInfoConfig[key]?.isDefault
+    const name = ReportInfoConfig[key]?.label;
+    const isDefault = ReportInfoConfig[key]?.isDefault;
 
     // 系统配置为Y且不是默认配置
     if (!isDefault) {
       hideList.push({
         id: key,
-        name: name || '未配置',
+        name: name || "未配置",
         fix: isDefault,
         checked: ReportInfoConfig[key].isDefault,
-      })
+      });
     }
   }
 
-  const fixedList = generateDefaultList()
+  const fixedList = generateDefaultList();
 
-  hideList.unshift(...fixedList)
+  hideList.unshift(...fixedList);
 
-  offList.value = hideList
-  return { hideList }
+  offList.value = hideList;
+  return { hideList };
 }
 
 function generateDefaultList() {
   return Object.keys(ReportInfoConfig).reduce((acc, key) => {
-    const { label, isDefault } = ReportInfoConfig[key]
+    const { label, isDefault } = ReportInfoConfig[key];
 
     if (isDefault) {
       const config = {
         id: key,
-        name: label || '未配置',
+        name: label || "未配置",
         fix: true,
         checked: true,
-      }
-      return [...acc, config]
-    }
-    else {
-      return acc
+      };
+      return [...acc, config];
+    } else {
+      return acc;
     }
-  }, [])
+  }, []);
 }
 
-const show = ref(false)
-const checkAll = ref(false)
+const show = ref(false);
+const checkAll = computed(() => {
+  return offList.value.length == selectIds.value.length;
+});
 
 function showModal() {
-  show.value = true
+  show.value = true;
 }
 
 function closeModal() {
-  show.value = false
+  show.value = false;
 }
 async function handleSumbit(e: MouseEvent) {
-  const userStore = useUser()
-  const userInfo = userStore.getUserInfo
-  let userField = ''
+  const userStore = useUser();
+  const userInfo = userStore.getUserInfo;
+  let userField = "";
   offList.value.map((v) => {
-    if (v.checked)
-      userField += `${v.id},`
-  })
-  userField = userField.slice(0, userField.length - 1)
-  savefield(props.reviewType, userInfo.id, userField)
-  e.preventDefault()
-  closeModal()
-  emit('onOk')
+    if (v.checked) userField += `${v.id},`;
+  });
+  userField = userField.slice(0, userField.length - 1);
+  savefield(props.reviewType, userInfo.id, userField);
+  e.preventDefault();
+  closeModal();
+  emit("onOk");
 }
 
 defineExpose({
   showModal,
-})
+});
 
 // generatList();
 
-const selectIds = ref<string[]>([])
+const selectIds = ref<string[]>([]);
 
 function onCheckAllChange(value) {
-  const ids: string[] = []
+  const ids: string[] = [];
 
   for (const item of offList.value) {
     if (!item.fix) {
-      item.checked = value
-      ids.push(item.id)
+      item.checked = value;
+      ids.push(item.id);
     }
   }
 
-  selectIds.value = value ? ids : []
+  selectIds.value = value ? ids : [];
 }
 
 function onCheckChange(checked: any, item: any) {
-  const index = selectIds.value.indexOf(item.id)
+  const index = selectIds.value.indexOf(item.id);
 
-  item.checked = checked
+  item.checked = checked;
 
-  if (index === -1 && checked)
-    selectIds.value.push(item.id)
-  else selectIds.value.splice(index, 1)
+  if (index === -1 && checked) selectIds.value.push(item.id);
+  else selectIds.value.splice(index, 1);
 }
+
+const indeterminate = computed(() => {
+  return offList.value.length > 0 && offList.value.length > selectIds.value.length;
+});
 </script>
 
 <template>
@@ -171,8 +174,10 @@ function onCheckChange(checked: any, item: any) {
                   <div class="draggable-li" style="background: #f8f8f8">
                     <n-checkbox
                       v-model:checked="checkAll"
-                      label="全部"
+                      label="全选"
                       @update:checked="onCheckAllChange"
+                      :class="{ checkAll: indeterminate }"
+                      :indeterminate="indeterminate"
                     />
                   </div>
                   <div class="content">
@@ -199,9 +204,7 @@ function onCheckChange(checked: any, item: any) {
       </div>
       <template #footer>
         <div class="wrapper-footer">
-          <n-button type="info" @click="handleSumbit">
-            确认
-          </n-button>
+          <n-button type="info" @click="handleSumbit"> 确定 </n-button>
           <n-button secondary style="margin-left: 15px" @click="closeModal">
             取消
           </n-button>
@@ -288,7 +291,7 @@ function onCheckChange(checked: any, item: any) {
     color: #333;
     display: flex;
     align-items: center;
-    border-bottom: 1px solid #E8E8E8;
+    border-bottom: 1px solid #e8e8e8;
   }
 
   .disable-check {
@@ -296,9 +299,7 @@ function onCheckChange(checked: any, item: any) {
   }
 }
 
-::v-deep(
-    .n-card.n-card--content-segmented > .n-card__content:not(:first-child)
-  ) {
+::v-deep(.n-card.n-card--content-segmented > .n-card__content:not(:first-child)) {
   border: 0px;
 }
 
@@ -306,5 +307,4 @@ function onCheckChange(checked: any, item: any) {
   --n-padding-top: 0px;
   --n-padding-bottom: 12px;
 }
-
 </style>
-- 
2.39.3


From 0023764a996fea25e606e02bfe14e9f31e5f591a Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sun, 31 Mar 2024 10:32:57 +0800
Subject: [PATCH 049/143] =?UTF-8?q?fix:=20=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/aside/Aside.vue | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/views/worksheet/aside/Aside.vue b/src/views/worksheet/aside/Aside.vue
index b4d363b..78d6e37 100644
--- a/src/views/worksheet/aside/Aside.vue
+++ b/src/views/worksheet/aside/Aside.vue
@@ -32,6 +32,9 @@ function collapseHandler() {
 }
 const mousetrap = inject('mousetrap') as any
 mousetrap.bind('[', collapseHandler)
+
+const searchKeyword = ref('')
+
 const asideWidth = computed(() => {
   return collapse.value ? 0 : 308;
 });
@@ -136,11 +139,15 @@ const showSearch = ref(false);
 
 function setShowSearch(value: boolean) {
   showSearch.value = value;
-
-  if (value === false) (packageListRef.value as any).search("");
+  if (value === false) {
+    (packageListRef.value as any).search("");
+    searchKeyword.value = ''
+  };
 }
 
 const inputHandler = debounce((word) => {
+  searchKeyword.value = word
+  console.log(22222)
   (packageListRef.value as any).search(word);
 }, 500);
 </script>
@@ -183,6 +190,7 @@ const inputHandler = debounce((word) => {
           style="flex: 1; height: 32px"
           placeholder="请输入你需要搜索的内容"
           @input="inputHandler"
+          v-model:value="searchKeyword"
         >
           <template #suffix>
             <SvgIcon size="14px" name="magnifying-1" />
-- 
2.39.3


From e2a94f5857358e96a3aa9c4e8b0f74eac0bf2572 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sun, 31 Mar 2024 10:50:11 +0800
Subject: [PATCH 050/143] =?UTF-8?q?feat:=20=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/aside/Aside.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/worksheet/aside/Aside.vue b/src/views/worksheet/aside/Aside.vue
index 78d6e37..73aed61 100644
--- a/src/views/worksheet/aside/Aside.vue
+++ b/src/views/worksheet/aside/Aside.vue
@@ -147,7 +147,7 @@ function setShowSearch(value: boolean) {
 
 const inputHandler = debounce((word) => {
   searchKeyword.value = word
-  console.log(22222)
+  console.log(22222);
   (packageListRef.value as any).search(word);
 }, 500);
 </script>
-- 
2.39.3


From 74f0fa26b30732f7c23ee68451bc9b51bd4ad896 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sun, 31 Mar 2024 11:03:30 +0800
Subject: [PATCH 051/143] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E5=B1=95=E7=A4=BA=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/content/modal/LoginSuccessModal.vue | 2 +-
 src/views/worksheet/modal/ApprovalModal.vue        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/home/content/modal/LoginSuccessModal.vue b/src/views/home/content/modal/LoginSuccessModal.vue
index 5aaeb5a..5d2f947 100644
--- a/src/views/home/content/modal/LoginSuccessModal.vue
+++ b/src/views/home/content/modal/LoginSuccessModal.vue
@@ -13,7 +13,7 @@ const toolsData = ref({} as any);
 async function getData(){
   const res=await getToolsCount();
   toolsData.value=res.data || {};
-  if(!JSON.parse(res.message)){
+  if(res.code == 'OK'){
     showModal();
   }
 }
diff --git a/src/views/worksheet/modal/ApprovalModal.vue b/src/views/worksheet/modal/ApprovalModal.vue
index 55f0fa9..eac9608 100644
--- a/src/views/worksheet/modal/ApprovalModal.vue
+++ b/src/views/worksheet/modal/ApprovalModal.vue
@@ -78,7 +78,7 @@ async function viewRepeat(e: MouseEvent) {
 
 async function getShowStatus() {
   const res = await getToolsCount();
-  if (!JSON.parse(res.message)) {
+  if (res.code == 'OK') {
     show.value = true;
   }
 }
-- 
2.39.3


From a5ab9710a9fc3a6739c9e42efdc814bde8d80252 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sun, 31 Mar 2024 11:09:16 +0800
Subject: [PATCH 052/143] =?UTF-8?q?fix:=202707=20=E3=80=90=E5=9B=BE?=
 =?UTF-8?q?=E5=AE=A1=E5=AE=A1=E6=89=B9=E7=AE=A1=E7=90=86=E3=80=91=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=95=B0=E6=8D=AE=EF=BC=8C=E7=82=B9=E5=87=BB=E5=8F=89?=
 =?UTF-8?q?=E5=8F=B7=E5=85=B3=E9=97=AD=E6=90=9C=E7=B4=A2=E6=A1=86=EF=BC=8C?=
 =?UTF-8?q?=E5=86=8D=E6=AC=A1=E6=89=93=E5=BC=80=E5=90=8E=E4=BE=9D=E7=84=B6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8A=E6=AC=A1=E8=BE=93=E5=85=A5=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E3=80=82=E9=A2=84=E6=9C=9F=EF=BC=9A=E5=86=8D=E6=AC=A1?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=E5=90=8E=E5=BA=94=E8=AF=A5=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/work/work.ts                | 4 ++--
 src/views/worksheet/aside/Aside.vue | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/api/work/work.ts b/src/api/work/work.ts
index 70e76c3..bbef956 100644
--- a/src/api/work/work.ts
+++ b/src/api/work/work.ts
@@ -7,11 +7,11 @@ import { ContentTypeEnum } from '@/enums/httpEnum'
  * 获取任务包列表
  * @returns
  */
-export async function getPackageList(params: PageParam, packagename: string) {
+export async function getPackageList(params: PageParam, packageName: string) {
   const res = await http.request({
     url: `/ocr/ocrTaskPackage/getPackageList`,
     method: 'get',
-    params: { ...params, packagename },
+    params: { ...params, packageName },
   })
 
   const { data: { records, pages } } = res
diff --git a/src/views/worksheet/aside/Aside.vue b/src/views/worksheet/aside/Aside.vue
index 73aed61..b3295fe 100644
--- a/src/views/worksheet/aside/Aside.vue
+++ b/src/views/worksheet/aside/Aside.vue
@@ -146,8 +146,7 @@ function setShowSearch(value: boolean) {
 }
 
 const inputHandler = debounce((word) => {
-  searchKeyword.value = word
-  console.log(22222);
+  searchKeyword.value = word;
   (packageListRef.value as any).search(word);
 }, 500);
 </script>
-- 
2.39.3


From 57a699f4223ca43c87fe6581f5156f94736beb33 Mon Sep 17 00:00:00 2001
From: raofuzi <2641346316@qq.com>
Date: Sun, 31 Mar 2024 11:57:21 +0800
Subject: [PATCH 053/143] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/content/Content.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 324b8ca..2a86020 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -440,19 +440,23 @@ function refresh(val?: any) {
         //   return
         // }
         
-        if (checkTaskStatus.value === 2 && isRefresh.value) {
+        if ((checkTaskStatus.value === 2 || checkTaskStatus.value === 3) && isRefresh.value) {
           configStore.setTimeNum(100);
           const tasksLoadingModal = queryRepeatedTasksModalRef.value as any
           tasksLoadingModal.closeModal();
           checkingTaskModal.closeModal()
           isRefresh.value = false
-          message.success('任务执行完毕，正在刷新数据...');
+          if(checkTaskStatus.value === 2) {
+            message.success('任务执行完毕，正在刷新数据...');
+          }else {
+            message.error('查询异常');
+          }
           if(timer.value) {
             clearInterval(timer.value);
           }
           reset()
           loadMore()
-          // configStore.setTimeNum(0);
+          configStore.setTimeNum(0);
         } else if (checkTaskStatus.value === 1) {
           const tasksLoadingModal = queryRepeatedTasksModalRef.value as any
           tasksLoadingModal.showModal();
-- 
2.39.3


From bc51e033eea60feb4ffc0a3c65c99c83c61e4459 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sun, 31 Mar 2024 12:26:09 +0800
Subject: [PATCH 054/143] =?UTF-8?q?fix:=20=E9=AB=98=E7=BA=A7=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=B7=BB=E5=8A=A0=E6=9D=A1=E4=BB=B6=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/comp/NewFilterModal.vue             | 4 ++--
 src/views/home/aside/comp/modals/NewFilterModal.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/final/comp/NewFilterModal.vue b/src/views/final/comp/NewFilterModal.vue
index 3b9a219..0bf6c22 100644
--- a/src/views/final/comp/NewFilterModal.vue
+++ b/src/views/final/comp/NewFilterModal.vue
@@ -84,10 +84,10 @@ const formRef = ref<FormInst | null>(null)
 
 const formValue = reactive<FormType>({
   name: null,
-  logic: null,
+  logic: 'where',
   conditions: [{
     type: null,
-    operator: null,
+    operator: 'eq',
     result: null,
   }],
 })
diff --git a/src/views/home/aside/comp/modals/NewFilterModal.vue b/src/views/home/aside/comp/modals/NewFilterModal.vue
index 1c4dda4..4793d0d 100644
--- a/src/views/home/aside/comp/modals/NewFilterModal.vue
+++ b/src/views/home/aside/comp/modals/NewFilterModal.vue
@@ -84,10 +84,10 @@ const formRef = ref<FormInst | null>(null)
 
 const formValue = reactive<FormType>({
   name: null,
-  logic: null,
+  logic: 'where',
   conditions: [{
     type: null,
-    operator: null,
+    operator: 'eq',
     result: null,
   }],
 })
-- 
2.39.3


From 8238d4258ef20093112d0e713ffeab44962cc600 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sun, 31 Mar 2024 13:33:16 +0800
Subject: [PATCH 055/143] =?UTF-8?q?fix:=202857=20=E3=80=90=E5=9B=BE?=
 =?UTF-8?q?=E5=AE=A1=E5=AE=A1=E6=89=B9=E7=AE=A1=E7=90=86--=E8=A7=A3?=
 =?UTF-8?q?=E6=95=A3=E4=BB=BB=E5=8A=A1=E5=8C=85=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                             |  1 +
 src/views/worksheet/aside/ListItem.vue      | 18 +++++++++++-------
 src/views/worksheet/aside/WorkSheetList.vue |  7 +++++--
 src/views/worksheet/content/Content.vue     |  1 +
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index e07d992..d6fb45b 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -34,6 +34,7 @@ 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']
diff --git a/src/views/worksheet/aside/ListItem.vue b/src/views/worksheet/aside/ListItem.vue
index cb9350c..acb324e 100644
--- a/src/views/worksheet/aside/ListItem.vue
+++ b/src/views/worksheet/aside/ListItem.vue
@@ -28,15 +28,16 @@ const props = defineProps({
     default: () => [],
   },
 });
-const isDismissTask = ref(false)
 const svgName = computed(() => {
   return props.selected ? "taskpack-select" : "taskpack";
 });
 
+const popconfirmTarget: any = ref(null)
+const popconfirmRef: any = ref(null)
 
 function handleDismissTask() {
-  isDismissTask.value = true
   emit('dismisClick',  props.mouseOverTask.id)
+  popconfirmRef.value[0]?.setShow(false); // 关闭 popconfirm
 }
 
 onMounted(async () => {
@@ -44,7 +45,7 @@ onMounted(async () => {
 </script>
 
 <template>
-  <div class="list-item" :class="{ 'list-item-selected': selected }">
+  <div class="list-item" :class="{ 'list-item-selected': selected }" ref="popconfirmTarget">
     <div v-for="(item, index) in showFieldList" :key="index">
       <div v-if="item.id === 'name'" class="list-item-header">
         <div class="id-wrap">
@@ -54,12 +55,15 @@ onMounted(async () => {
               {{ listItem.name }}
             </n-ellipsis>
             <span class="list-item-header-selected">({{ listItem.pictureCount }})</span>
-            <n-popover placement="bottom" trigger="hover" >
+            <n-popconfirm id="taskPopconfirmRef" ref="popconfirmRef" :show-icon="false" :show-arrow="false"
+              placement="bottom" trigger="click">
               <template #trigger>
-                <span class="dismiss-task-pack"  v-show="mouseOverTask?.id" style="cursor: pointer;" @click.stop="handleDismissTask">...</span>
+                <span class="dismiss-task-pack" v-show="mouseOverTask?.id" style="cursor: pointer;">...</span>
               </template>
-              <span>解散任务包</span>
-            </n-popover>
+              <template #action>
+                <span @click="handleDismissTask" style="cursor: pointer;">解散任务包</span>
+              </template>
+            </n-popconfirm>
           </span>
         </div>
       </div>
diff --git a/src/views/worksheet/aside/WorkSheetList.vue b/src/views/worksheet/aside/WorkSheetList.vue
index 4292eb4..f797a21 100644
--- a/src/views/worksheet/aside/WorkSheetList.vue
+++ b/src/views/worksheet/aside/WorkSheetList.vue
@@ -126,14 +126,17 @@ async function search(word: string) {
 function overTaskHandelr(item: any) {
   overTask.value = item
 }
-function leaveTaskHandler() {
-  overTask.value = null;
+function leaveTaskHandler(event) {
+  if(event?.relatedTarget?.id !=="taskPopconfirmRef"){
+    overTask.value = null;
+  }
 }
 const message = useMessage()
 function dismisClick(packageId:string) {
   deletePackage({packageId: packageId}).then((res) => {
     if(res.code==="OK"){
       message.success("解散任务包成功")
+      reset()
       loadMore()
     }
   })
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 678d613..1f614c0 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -194,6 +194,7 @@ watch(
     if (isEmpty(packageid)) {
       listData.value.length = 0;
       totalCount.value = 0;
+      taskDetailInfo.value = {}
       return;
     }
     queryDetail(packageid)
-- 
2.39.3


From 487e83a19980760623d599aafd0e55047dbdf899 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sun, 31 Mar 2024 13:55:09 +0800
Subject: [PATCH 056/143] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9AI=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E5=89=8D=E7=AB=AF=E6=98=BE=E7=A4=BA=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/user.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index fb93e9a..d52817a 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -124,6 +124,11 @@ export const useUserStore = defineStore({
         // 默认设置为第一个租户
         const firstTenant = data.tenantList.length > 0 ? data.tenantList[0] : null
         const tenantId = firstTenant ? firstTenant.id : ''
+        data.frontmenuTList.forEach(ele=>{
+          if(ele.description === 'AI工单'){
+            ele.description = '图审审批管理'
+          }
+        })
         storage.set(CURRENT_USER, data, ex)
         storage.set(TENANT_ID, tenantId)
         this.setUserInfo(data)
-- 
2.39.3


From 84349062d42c6bb33354bdd19cad743d3faeb450 Mon Sep 17 00:00:00 2001
From: raofuzi <2641346316@qq.com>
Date: Sun, 31 Mar 2024 17:35:40 +0800
Subject: [PATCH 057/143] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Header/index.vue        |  2 +-
 src/views/home/aside/Aside.vue                |  2 +-
 src/views/home/aside/comp/Search.vue          | 13 ++--
 .../aside/comp/modals/CustomFilterModal.vue   | 21 ++++--
 src/views/home/content/Content.vue            | 64 +++++++++++++------
 5 files changed, 70 insertions(+), 32 deletions(-)

diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue
index 2fa42b6..0dd4002 100644
--- a/src/layout/components/Header/index.vue
+++ b/src/layout/components/Header/index.vue
@@ -227,7 +227,7 @@ export default defineComponent({
       <!-- 个人中心 -->
       <div class="layout-header-trigger layout-header-trigger-min">
         <!-- <n-avatar :src="getImgUrl(useInfo.usericon)" round /> -->
-        <n-avatar :src="getImgUrl(useInfo.usericon) || defaultAvatarSrc" round/>
+        <n-avatar :src="(useInfo.usericon && getImgUrl(useInfo.usericon)) || defaultAvatarSrc" round/>
       </div>
       <!-- 设置 -->
       <UserSettings @logout="doLogout" />
diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue
index b5e764e..f6c6efe 100644
--- a/src/views/home/aside/Aside.vue
+++ b/src/views/home/aside/Aside.vue
@@ -130,7 +130,7 @@ configStore.$subscribe(() => {
       return acc
     }
   }, [])
-  // console.log("items", items);
+  console.log("items", items);
   showItems.value = items
 })
 
diff --git a/src/views/home/aside/comp/Search.vue b/src/views/home/aside/comp/Search.vue
index ba057e6..2f6cea7 100644
--- a/src/views/home/aside/comp/Search.vue
+++ b/src/views/home/aside/comp/Search.vue
@@ -54,6 +54,11 @@ const searchName = () => {
   configStore.setSearchValue(searchKeyword.value);
 }
 
+const close = () => {
+  searchKeyword.value = "";
+  emit('close');
+}
+
 </script>
 
 <template>
@@ -63,22 +68,22 @@ const searchName = () => {
       trigger="focus"
     >
       <template #trigger>
-        <n-input style="width: 260px;height: 32px;" placeholder="请输入你需要搜索的内容" @input="inputHandler">
+        <n-input v-model:value="searchKeyword" style="width: 260px;height: 32px;" placeholder="请输入你需要搜索的内容" @input="inputHandler">
           <template #suffix>
             <SvgIcon size="14px" name="magnifying-1" @click="searchName" style="cursor: pointer;" />
           </template>
         </n-input>
       </template>
-      <div class="wrapper-popover">
+      <!-- <div class="wrapper-popover">
         <ul class="wrapper-list">
           <li v-for="(item, index) in data" v-show="item.label.includes(searchKeyword)" :key="index" @click="selectHandler(item)">
             {{ item.label }}
           </li>
         </ul>
-      </div>
+      </div> -->
     </n-popover>
 
-    <SvgIcon size="16px" style="margin-left: 6px;cursor: pointer;" name="clear" @click="$emit('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 211e841..f5131be 100644
--- a/src/views/home/aside/comp/modals/CustomFilterModal.vue
+++ b/src/views/home/aside/comp/modals/CustomFilterModal.vue
@@ -3,7 +3,7 @@ import { getAllfieldList, getfieldList, setFilter } from '@/api/home/filter'
 import { asideMap } from '@/config/aside'
 import { useConfig } from '@/store/modules/asideConfig'
 import { useUser } from "@/store/modules/user"
-import { debounce, difference } from 'lodash-es'
+import { debounce, difference, cloneDeep } from 'lodash-es'
 import { computed, defineOptions, onMounted, ref, watch } from 'vue'
 import { VueDraggable } from 'vue-draggable-plus'
 
@@ -25,6 +25,7 @@ function showModal() {
   if (config == null || customConfig == null)
     return
   const { showList, hideList } = generatList(config, customConfig)
+  console.log("showList", showList);
   onList.value = showList
   offList.value = hideList
   // 重置全选状态
@@ -124,7 +125,15 @@ function generatList(config, customConfig) {
   const fixedList = generateDefaultList(config)
   offList.unshift(...fixedList)
   onList.unshift(...fixedList)
-  return { showList: onList, hideList: offList }
+  // onList按照customConfig排序
+  let tempOnList = cloneDeep(onList);
+  let sortList: any = [];
+  customConfig.map(key => {
+    let tempItem = tempOnList.find(item => item.id == key);
+    sortList.push(tempItem);
+  });
+  // return { showList: onList, hideList: offList }
+  return { showList: sortList, hideList: offList }
 }
 
 configStore.$subscribe(() => {
@@ -313,7 +322,7 @@ onMounted(() => {
                 <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="全部" @update:checked="onCheckAllChange" :indeterminate="!checkAll"/>
+                      <n-checkbox v-model:checked="checkAll" label="全选" @update:checked="onCheckAllChange" :indeterminate="!checkAll"/>
                     </div>
                     <div
                       v-for="item in offList" v-show="item.name.includes(offKeyword)" :key="item.id" :class="{ 'disable-check': item.fix }"
@@ -364,9 +373,9 @@ onMounted(() => {
       <template #footer>
         <div class="wrapper-footer">
           <n-button type="info" @click="handleSumbit">
-            确认
+            确定
           </n-button>
-          <n-button secondary style="margin-left:15px" @click="closeModal">
+          <n-button secondary style="margin-left:15px; border: 1px solid #CAD2DD;" @click="closeModal">
             取消
           </n-button>
         </div>
@@ -476,7 +485,7 @@ onMounted(() => {
 ::v-deep(.n-card > .n-card-header .n-card-header__main){
   font-weight: lighter !important;
   font-size: 14px;
-  color: #333333;
+  color: #666;
 }
 ::v-deep(.n-scrollbar){
   border-left: 1px solid #cad2dd !important;
diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 2a86020..1290e6f 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -30,6 +30,7 @@ import LoginSuccessModal from './modal/LoginSuccessModal.vue'
 import PackageSettingsModal from './modal/PackageSettingsModal.vue'
 import QueryRepeatedTasksModal from './modal/QueryRepeatedTasksModal.vue'
 import type { PictureSortParam } from "/#/api"
+import defaultAvatar from '@/assets/icons/avatar.svg'
 
 const deviceHeight = ref(600)
 let _masonry: null | Masonry = null
@@ -140,6 +141,7 @@ const viewLabel = computed(() => {
 let isAllowDownload = ref(true)
 let calNum = ref(0);
 const searchValue = ref('');
+const isInitSeaerch = ref(false);// 是否初始化搜索
 
 configStore.$subscribe(() => {
   isAllowDownload.value = configStore.isAllowDownload;
@@ -150,9 +152,13 @@ configStore.$subscribe(() => {
 
 
 watch(() => searchValue.value,
-  (newVal, oldVal) => {
+  async (newVal, oldVal) => {
     if(newVal) {
-      featchList()
+      isInitSeaerch.value = true;
+      const more = await featchList()
+      listData.value = more;
+      isInitSeaerch.value = false;
+      // configStore.setSearchValue("");
     }
   },
 );
@@ -181,8 +187,12 @@ async function featchList() {
       sortObj.ordertype = sortBy.orderbyname
     }else if(sortBy.orderbyvalue == "fromuptime") {
       sortObj.orderByTime = sortBy.orderbyname
-    }// rao end
-  
+    }
+    if(params['izsimilarity'] && typeof params['izsimilarity'] != "string") {
+      params['izsimilarity'] = params['izsimilarity'].join('-');
+    }
+    // rao end
+    
     if (checkTaskStatus.value === 2 && isRefresh) {
       result = await queryPageListByCheckNo({ ...pagination, ...contentParams, ...params, ...sortObj, checkDuplicateNo: checkDuplicateNo.value, upUserName: searchValue })
     } else {
@@ -217,6 +227,10 @@ async function loadMore() {
     return
 
   const more = await featchList()
+  // if(isInitSeaerch.value) {
+  //   listData.value = [];
+  //   isInitSeaerch.value = false;
+  // }
   listData.value.push(...more)
 }
 
@@ -238,19 +252,18 @@ async function oneCheck() {
   const asideVal = cloneDeep(configStore.getAsideValue)
   asideVal.izyear = dayjs(asideVal.izyear[0]).format("YYYY/MM/DD") + '-' + dayjs(asideVal.izyear[1]).format("YYYY/MM/DD")
   const tasksLoadingModal = queryRepeatedTasksModalRef.value as any
-
   // 查重任务编号,状态不为空,或者状态执行中..
-  if(checkDuplicateNo.value && checkTaskStatus.value && checkTaskStatus.value===1){
-	 tasksLoadingModal.showModal()
+  tasksLoadingModal.showModal()
+  if(checkDuplicateNo.value && checkTaskStatus.value && checkTaskStatus.value===1){// 暂时rao
 	 return;
   }
-  
+  debugger
   //调用查重任务开启流程
   oneClickCheckTaskPackage(asideVal).then((res) => {
     if (res.code === "OK") {
       checkDuplicateNo.value = res.data.checkDuplicateNo
   	  checkTaskStatus.value = res.data.status
-  	  tasksLoadingModal.closeModal()
+  	  tasksLoadingModal.showModal() // 暂时rao
     } else {
       message.error(res.message || '查重失败')
     }
@@ -268,7 +281,7 @@ async function showAddPackage() {
 //查重任务加载提示框,关闭回调
 async function tasksLoadingCloseCallback() {
 	const checkingTaskModal = checkingTaskModalRef.value as any
-	checkingTaskModal.closeModal()
+	checkingTaskModal.showModal()
   if(isRefresh.value) {
     refresh(true);
   }
@@ -442,8 +455,8 @@ function refresh(val?: any) {
         
         if ((checkTaskStatus.value === 2 || checkTaskStatus.value === 3) && isRefresh.value) {
           configStore.setTimeNum(100);
-          const tasksLoadingModal = queryRepeatedTasksModalRef.value as any
-          tasksLoadingModal.closeModal();
+          // const tasksLoadingModal = queryRepeatedTasksModalRef.value as any
+          // tasksLoadingModal.closeModal();
           checkingTaskModal.closeModal()
           isRefresh.value = false
           if(checkTaskStatus.value === 2) {
@@ -458,8 +471,8 @@ function refresh(val?: any) {
           loadMore()
           configStore.setTimeNum(0);
         } else if (checkTaskStatus.value === 1) {
-          const tasksLoadingModal = queryRepeatedTasksModalRef.value as any
-          tasksLoadingModal.showModal();
+          // const tasksLoadingModal = queryRepeatedTasksModalRef.value as any
+          // tasksLoadingModal.showModal();
           if(calNum.value < 90) {
             calNum.value = calNum.value + 10;
             // console.log("calNum.value计算后的值",calNum.value);
@@ -475,7 +488,7 @@ function refresh(val?: any) {
               refresh();
             }, 200);
           }
-          checkingTaskModal.showModal()
+          // checkingTaskModal.showModal()
           // return
         }
       }
@@ -543,11 +556,11 @@ const dropdownOptions = ref([
           placement="bottom-start"
           :options="dropdownOptions"
         >
-          <n-button style="margin-left: 10px;">
-            <Icon>
-              <EllipsisHorizontal />
+          <span class="expand-icon">
+            <Icon style="position: relative; top: 2px;">
+              <EllipsisHorizontal style="color: #507afd;"/>
             </Icon>
-          </n-button>
+          </span>
         </n-dropdown>
       </div>
     </div>
@@ -618,7 +631,7 @@ const dropdownOptions = ref([
                   </div>
                 </div>
                 <div class="left">
-                  <n-avatar :src="getAvatar(item.uphead)" class="avatar" round />
+                  <n-avatar :src="(item.uphead && getAvatar(item.uphead)) || defaultAvatar" class="avatar" round />
                   <span>{{ item.upname }}</span>
                 </div>
                 <!-- <div class="right">
@@ -854,5 +867,16 @@ const dropdownOptions = ref([
     display: flex;
     align-items: center;
   }
+
+  .expand-icon {
+    display: block;
+    margin-left: 10px;
+    width: 30px;
+    height: 30px;
+    line-height: 30px;
+    background: linear-gradient(144deg, rgba(115, 167, 249, 0.1) 0%, rgba(62, 110, 241, 0.1) 96%); 
+    border-radius: 8px;
+    text-align: center;
+  }
 }
 </style>
\ No newline at end of file
-- 
2.39.3


From db4104bfc0f1e4e8a8c264dadcf298b6ad5d9009 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sun, 31 Mar 2024 17:56:02 +0800
Subject: [PATCH 058/143] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=ADhistoryStates?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/content/Content.vue | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 1f614c0..fd77b4f 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -275,7 +275,7 @@ function immersionHandler() {
 
 function showAction() {
   const item = taskDetailInfo.value;  
-  if (item.states === 2 || item.states === 3) {
+  if (item.historyStates === 2 || item.historyStates === 3) {
     return
   }
   if (batch.value === false) overTask.value = item;
@@ -367,6 +367,7 @@ function doAudit(param: any) {
     const { code } = res
     setBatch(false)
     if (code === 'OK') {
+      message.info(res.message)
       emitter.emit('refresh')
       refreshHandler()
     }
@@ -439,8 +440,8 @@ function reloadList() {
               </div>
             </div>
             <div class="status">
-              <img v-show="taskDetailInfo?.states === 2" class="img-status" src="@/assets/images/task/pass.png" alt="">
-              <img v-show="taskDetailInfo?.states === 3" class="img-status" src="@/assets/images/task/not_pass.png"
+              <img v-show="taskDetailInfo?.historyStates === 2" class="img-status" src="@/assets/images/task/pass.png" alt="">
+              <img v-show="taskDetailInfo?.historyStates === 3" class="img-status" src="@/assets/images/task/not_pass.png"
                 alt="">
             </div>
             <!-- 右下信息 -->
@@ -452,7 +453,7 @@ function reloadList() {
                   </span>
                 </n-gi>
                 <n-gi span="8" class="gi2">
-                  <span class="value">{{ TASK_STATUS_OBJ[taskDetailInfo.states] }}</span>
+                  <span class="value">{{ TASK_STATUS_OBJ[taskDetailInfo.historyStates] }}</span>
                   <span class="label">审批状态</span>
                 </n-gi>
                 <n-gi span="4" class="gi1">
@@ -487,15 +488,15 @@ function reloadList() {
             <n-scrollbar style="max-height: 100%">
               <n-ellipsis style="max-width: 350px">任务ID：{{ taskDetailInfo.taskname }}</n-ellipsis>
               <div class="tags">
-                <div class="tag tag-submiting" v-if="taskDetailInfo.states == 1">{{ TASK_STATUS_OBJ[taskDetailInfo.states]
+                <div class="tag tag-submiting" v-if="taskDetailInfo.historyStates == 1">{{ TASK_STATUS_OBJ[taskDetailInfo.historyStates]
                 }}</div>
-                <div class="tag tag-approve" v-else-if="taskDetailInfo.states == 2">{{
-                  TASK_STATUS_OBJ[taskDetailInfo.states] }}</div>
-                <div class="tag tag-passed" v-else-if="taskDetailInfo.states == 3">{{
-                  TASK_STATUS_OBJ[taskDetailInfo.states]
+                <div class="tag tag-approve" v-else-if="taskDetailInfo.historyStates == 2">{{
+                  TASK_STATUS_OBJ[taskDetailInfo.historyStates] }}</div>
+                <div class="tag tag-passed" v-else-if="taskDetailInfo.historyStates == 3">{{
+                  TASK_STATUS_OBJ[taskDetailInfo.historyStates]
                 }}</div>
-                <div class="tag tag-approved" v-else-if="taskDetailInfo.states == 4">{{
-                  TASK_STATUS_OBJ[taskDetailInfo.states] }}</div>
+                <div class="tag tag-approved" v-else-if="taskDetailInfo.historyStates == 4">{{
+                  TASK_STATUS_OBJ[taskDetailInfo.historyStates] }}</div>
               </div>
               <n-divider class="divider-line" />
               <div class="property">
-- 
2.39.3


From 6c729a6aab34678e461d89442e4b5a01b297d6c8 Mon Sep 17 00:00:00 2001
From: raofuzi <2641346316@qq.com>
Date: Sun, 31 Mar 2024 18:05:58 +0800
Subject: [PATCH 059/143] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               |  8 ---
 src/views/home/content/Content.vue            | 62 ++++++++++++-------
 .../content/modal/QueryRepeatedTasksModal.vue |  5 ++
 3 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index d6fb45b..94c93f7 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -21,11 +21,8 @@ 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']
     NGrid: typeof import('naive-ui')['NGrid']
     NGridItem: typeof import('naive-ui')['NGridItem']
     NImage: typeof import('naive-ui')['NImage']
@@ -34,7 +31,6 @@ 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']
@@ -44,11 +40,7 @@ declare module 'vue' {
     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/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 1290e6f..40e599f 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -252,12 +252,46 @@ async function oneCheck() {
   const asideVal = cloneDeep(configStore.getAsideValue)
   asideVal.izyear = dayjs(asideVal.izyear[0]).format("YYYY/MM/DD") + '-' + dayjs(asideVal.izyear[1]).format("YYYY/MM/DD")
   const tasksLoadingModal = queryRepeatedTasksModalRef.value as any
+  
+  console.log('calNum.value111111111111111', calNum.value, checkTaskStatus.value);
+  if(calNum.value == 0 && isRefresh.value) {
+    if(timer.value) {
+      clearInterval(timer.value);
+    }
+    timer.value = setInterval(() => {
+      console.log('calNum.value2222222222222', calNum.value,checkTaskStatus.value);
+      if (checkDuplicateNo.value) {
+        getCheckDuplicateStatus(checkDuplicateNo.value).then((res) => {
+          if (res.code === "OK") {
+            checkTaskStatus.value = res.data.status;
+            if(calNum.value < 90) {
+              calNum.value = calNum.value + 10;
+            }
+            configStore.setTimeNum(calNum.value);
+            if(checkTaskStatus.value === 2 || checkTaskStatus.value === 3) {
+              if(checkTaskStatus.value === 2) {
+                message.success('任务执行完毕，正在刷新数据...');
+              }else {
+                message.error('查询异常');
+              }
+              tasksLoadingModal.closeOnlyModal();
+              configStore.setTimeNum(100);
+              if(timer.value) {
+                clearInterval(timer.value);
+              }
+              setTimeout(() => {
+                configStore.setTimeNum(0);
+              }, 1000);
+            }
+          }})
+      }
+    }, 1000);
+  }
   // 查重任务编号,状态不为空,或者状态执行中..
-  tasksLoadingModal.showModal()
   if(checkDuplicateNo.value && checkTaskStatus.value && checkTaskStatus.value===1){// 暂时rao
-	 return;
+    tasksLoadingModal.showModal()
+	  return;
   }
-  debugger
   //调用查重任务开启流程
   oneClickCheckTaskPackage(asideVal).then((res) => {
     if (res.code === "OK") {
@@ -455,8 +489,6 @@ function refresh(val?: any) {
         
         if ((checkTaskStatus.value === 2 || checkTaskStatus.value === 3) && isRefresh.value) {
           configStore.setTimeNum(100);
-          // const tasksLoadingModal = queryRepeatedTasksModalRef.value as any
-          // tasksLoadingModal.closeModal();
           checkingTaskModal.closeModal()
           isRefresh.value = false
           if(checkTaskStatus.value === 2) {
@@ -471,25 +503,7 @@ function refresh(val?: any) {
           loadMore()
           configStore.setTimeNum(0);
         } else if (checkTaskStatus.value === 1) {
-          // const tasksLoadingModal = queryRepeatedTasksModalRef.value as any
-          // tasksLoadingModal.showModal();
-          if(calNum.value < 90) {
-            calNum.value = calNum.value + 10;
-            // console.log("calNum.value计算后的值",calNum.value);
-          }
-          configStore.setTimeNum(calNum.value);
-          // console.log("calNum.value timer.value外面------", timer.value, calNum.value, isRefresh.value);
-          if(calNum.value == 10 && isRefresh.value) {
-            if(timer.value) {
-              clearInterval(timer.value);
-            }
-            timer.value = setInterval(() => {
-              // console.log("calNum.value timer.value里面------", timer.value, calNum.value);
-              refresh();
-            }, 200);
-          }
-          // checkingTaskModal.showModal()
-          // return
+          return
         }
       }
     })
diff --git a/src/views/home/content/modal/QueryRepeatedTasksModal.vue b/src/views/home/content/modal/QueryRepeatedTasksModal.vue
index 81970a7..19f520a 100644
--- a/src/views/home/content/modal/QueryRepeatedTasksModal.vue
+++ b/src/views/home/content/modal/QueryRepeatedTasksModal.vue
@@ -29,9 +29,14 @@ function closeModal() {
   emit('closeCallback', true)
 }
 
+function closeOnlyModal() {
+  show.value = false
+}
+
 defineExpose({
   showModal,
   closeModal,
+  closeOnlyModal,
 })
 
 const configStore = useConfig()
-- 
2.39.3


From e1ce077f55f966f4731d8f30f0c6380e90cecc7d Mon Sep 17 00:00:00 2001
From: raofuzi <2641346316@qq.com>
Date: Sun, 31 Mar 2024 18:08:02 +0800
Subject: [PATCH 060/143] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/content/Content.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 40e599f..3163054 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -282,6 +282,8 @@ async function oneCheck() {
               setTimeout(() => {
                 configStore.setTimeNum(0);
               }, 1000);
+              reset()
+              loadMore()
             }
           }})
       }
-- 
2.39.3


From 6af37bf71df3e38abd8d72b7fd7f86a0a8285e24 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sun, 31 Mar 2024 18:22:03 +0800
Subject: [PATCH 061/143] =?UTF-8?q?fix:=20=E6=96=87=E5=AD=97=E5=A4=AA?=
 =?UTF-8?q?=E9=95=BF=E6=98=BE=E7=A4=BA=E5=A2=9E=E5=8A=A0popver?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/worksheet/aside/ListItem.vue b/src/views/worksheet/aside/ListItem.vue
index acb324e..39d46f5 100644
--- a/src/views/worksheet/aside/ListItem.vue
+++ b/src/views/worksheet/aside/ListItem.vue
@@ -36,7 +36,7 @@ const popconfirmTarget: any = ref(null)
 const popconfirmRef: any = ref(null)
 
 function handleDismissTask() {
-  emit('dismisClick',  props.mouseOverTask.id)
+  emit('dismisClick', props.mouseOverTask.id)
   popconfirmRef.value[0]?.setShow(false); // 关闭 popconfirm
 }
 
@@ -69,21 +69,21 @@ onMounted(async () => {
       </div>
       <ul v-else class="list-item-detail">
         <li v-if="item.id === 'statshisText'">
-          审批状态：<span class="list-item-status" :class="listItem.statshisText === '通过'
+          审批状态：<n-ellipsis style="max-width: 170px"><span class="list-item-status" :class="listItem.statshisText === '通过'
             ? 'list-item-success'
             : listItem.statshisText === '不通过'
               ? 'list-item-error'
               : 'list-item-watting'
             ">{{ listItem.statshisText }}</span>
-        </li>
+          </n-ellipsis></li>
         <li v-else-if="item.id === 'createdate'">
-          提交时间：{{ format(listItem.createdate, "yyyy-MM-dd HH:mm:ss") }}
+          提交时间：<n-ellipsis style="max-width: 170px">{{ listItem.createdate && format(listItem.createdate, "yyyy-MM-dd HH:mm:ss") }}</n-ellipsis>
         </li>
         <li v-else-if="item.id === 'createTime'">
-          生成时间：{{ listItem.createTime && format(listItem.createTime, "yyyy-MM-dd HH:mm:ss") }}
+          生成时间：<n-ellipsis style="max-width: 170px">{{ listItem.createTime && format(listItem.createTime, "yyyy-MM-dd HH:mm:ss") }}</n-ellipsis>
         </li>
         <li v-else class="ellipsis" v-if="listItem[item.id]">
-          <span class="label">{{ item.name }}：</span>{{ listItem[item.id] }}
+          <span class="label">{{ item.name }}：</span><n-ellipsis style="max-width: 170px">{{ listItem[item.id] }}</n-ellipsis>
         </li>
       </ul>
     </div>
@@ -185,6 +185,5 @@ onMounted(async () => {
     position: absolute;
     bottom: 0px;
   }
-}
-</style>
+}</style>
 ../types
-- 
2.39.3


From afc7b81d9925a952c1f41567bd8123dc34678396 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sun, 31 Mar 2024 18:30:30 +0800
Subject: [PATCH 062/143] =?UTF-8?q?fix:=202872=20=E3=80=90=E5=9B=BE?=
 =?UTF-8?q?=E5=AE=A1=E5=AE=A1=E6=89=B9=E7=AE=A1=E7=90=86=E3=80=91=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E4=BB=BB=E5=8A=A1=E5=8C=85=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8E=EF=BC=8C=E5=B7=A6=E4=BE=A7=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9C=AA=E5=B1=95=E7=A4=BA=E5=AF=B9=E5=BA=94=E7=9A=84?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/aside/ListItem.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/worksheet/aside/ListItem.vue b/src/views/worksheet/aside/ListItem.vue
index 39d46f5..c6febe5 100644
--- a/src/views/worksheet/aside/ListItem.vue
+++ b/src/views/worksheet/aside/ListItem.vue
@@ -82,7 +82,7 @@ onMounted(async () => {
         <li v-else-if="item.id === 'createTime'">
           生成时间：<n-ellipsis style="max-width: 170px">{{ listItem.createTime && format(listItem.createTime, "yyyy-MM-dd HH:mm:ss") }}</n-ellipsis>
         </li>
-        <li v-else class="ellipsis" v-if="listItem[item.id]">
+        <li v-else class="ellipsis">
           <span class="label">{{ item.name }}：</span><n-ellipsis style="max-width: 170px">{{ listItem[item.id] }}</n-ellipsis>
         </li>
       </ul>
-- 
2.39.3


From 8507763b45720397e960923959cae6d72b87ebd9 Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Sun, 31 Mar 2024 18:32:58 +0800
Subject: [PATCH 063/143] =?UTF-8?q?=E5=B0=8F=E7=BB=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/final/index.ts                        |  38 +-
 src/views/final/comp/RepeatModal.vue          |  11 +-
 src/views/final/comp/RepeatTaskTableModal.vue | 416 ++++++++++++------
 src/views/final/content/Content.vue           |  52 ++-
 4 files changed, 357 insertions(+), 160 deletions(-)

diff --git a/src/api/final/index.ts b/src/api/final/index.ts
index e7249f8..10d4f30 100644
--- a/src/api/final/index.ts
+++ b/src/api/final/index.ts
@@ -30,11 +30,11 @@ export async function getFinalList(params: FinalParam) {
     params: notEmptyParams,
   })
 
-  const { data: { list, totalPage,totalCount } } = res
+  const { data: { list, totalPage, totalCount } } = res
   return {
     pageCount: totalPage,
     data: list,
-    totalCount
+    totalCount,
   }
 }
 
@@ -62,3 +62,37 @@ export async function repetitionTask() {
     method: 'get',
   })
 }
+
+/**
+ * 获取审核列表
+ * @returns
+ */
+export async function getRepeatList(params: FinalParam) {
+  const notEmptyParams = pickBy(params, notEmpty)
+
+  Object.keys(notEmptyParams).forEach((key) => {
+    const val = notEmptyParams[key]
+
+    if (key === 'izuptime') {
+      const start = formatToDate2(val[0])
+      const end = formatToDate2(val[1])
+      notEmptyParams[key] = `${start}-${end}`
+    }
+
+    if (Array.isArray(notEmptyParams[key]))
+      notEmptyParams[key] = val.join(',')
+  })
+
+  const res = await http.request({
+    url: `/flow/task/repetitionTaskList`,
+    method: 'get',
+    params: notEmptyParams,
+  })
+
+  const { data: { list, totalPage, totalCount } } = res
+  return {
+    pageCount: totalPage,
+    data: list,
+    totalCount,
+  }
+}
diff --git a/src/views/final/comp/RepeatModal.vue b/src/views/final/comp/RepeatModal.vue
index 8ae0db5..d0ed920 100644
--- a/src/views/final/comp/RepeatModal.vue
+++ b/src/views/final/comp/RepeatModal.vue
@@ -22,6 +22,7 @@ const { detail, total } = toRefs(state)
 const show = ref(false)
 
 function showModal(id) {
+  state.total = 0
   getDetail(id)
 }
 
@@ -45,7 +46,13 @@ function closeModal() {
 }
 
 async function reject() {
-  emit('reject', { a: 'todo' })
+  const list = []
+  state.detail.forEach((items) => {
+    items.repeatedTaskList.forEach((item) => {
+      list.push(item)
+    })
+  })
+  emit('reject', list)
   closeModal()
 }
 
@@ -157,7 +164,7 @@ defineExpose({
     border-radius: 8px;
     padding: 16px;
     padding-top: 0;
-    margin: 45px 12px 35px 38px;
+    margin: 25px 12px 35px 38px;
 
     .imgwrapper {
       width: 160px;
diff --git a/src/views/final/comp/RepeatTaskTableModal.vue b/src/views/final/comp/RepeatTaskTableModal.vue
index d0f6d99..0b62d37 100644
--- a/src/views/final/comp/RepeatTaskTableModal.vue
+++ b/src/views/final/comp/RepeatTaskTableModal.vue
@@ -1,101 +1,156 @@
 <script lang="ts" setup>
-import { computed, h, reactive, ref, unref } from "vue";
-import { NDataTable, useDialog } from "naive-ui";
-import type { DataTableColumns, DataTableRowKey } from "naive-ui";
-import Action from "../comp/Action.vue";
-import { RejectModal } from "./index";
-import type { RowData } from "@/config/final";
-import { getFinalList } from "@/api/final";
-import type { ApprovalParam } from "/#/api";
-import { audit } from "@/api/task/task";
+import {
+  computed,
+  defineEmits,
+  h,
+  nextTick,
+  onBeforeMount,
+  onMounted,
+  onUnmounted,
+  reactive,
+  ref,
+  unref,
+  watch,
+} from 'vue'
+import { NDataTable, useDialog, useMessage } from 'naive-ui'
+import type { DataTableColumns, DataTableRowKey } from 'naive-ui'
+import {
+  ListAction,
+  StatusItem,
+} from '../comp'
+import { RejectModal } from './index'
+import { useDictionary } from '@/store/modules/dictonary'
+import type { RowData } from '@/config/final'
+import { getFinalList, getRepeatList } from '@/api/final'
+import { formatToDateHMS } from '@/utils/dateUtil'
+import { audit } from '@/api/task/task'
+import NotPassed from '@/components/Approval/NotPassed.vue'
 
 const emit = defineEmits<{
-  (e: "commit", columns: any[]);
-}>();
-
-const show = ref(false);
+  (e: 'commit', columns: any[])
+}>()
+const dicStore = useDictionary()
+const message = useMessage()
+const show = ref(false)
+const izstatusList = ref([])
+const dialog = useDialog()
+const checkedRowKeys = ref([])
+
+onBeforeMount(() => {
+  dicStore.fetchizstatusListt()
+})
 
 function showModal() {
-  show.value = true;
+  show.value = true
 }
 
 function closeModal() {
-  show.value = false;
+  show.value = false
 }
 
 async function handleSumbit(e: MouseEvent) {
-  e.preventDefault();
-  closeModal();
+  e.preventDefault()
+  closeModal()
 }
 
 defineExpose({
   showModal,
-});
+})
 
 const columns: DataTableColumns<RowData> = [
   {
-    type: "selection",
-    fixed: "left",
+    type: 'selection',
+    fixed: 'left',
     width: 50,
+    disabled(row: any) {
+      return row.states !== 2
+    },
   },
   {
-    title: "任务Id",
-    key: "id",
-    fixed: "left",
-    width: 100,
+    title: '任务Id',
+    key: 'id',
+    fixed: 'left',
+    width: 180,
+    ellipsis: {
+      tooltip: true,
+    },
   },
   {
-    title: "任务名称",
-    key: "fromtaskname",
-    fixed: "left",
-    width: 200,
+    title: '任务名称',
+    key: 'fromtaskname',
+    fixed: 'left',
+    width: 150,
+    ellipsis: {
+      tooltip: true,
+    },
   },
   {
-    title: "审批节点",
-    key: "approvalnode",
+    title: '审批节点',
+    key: 'approvalnode',
     width: 100,
   },
   {
-    title: "审批状态",
-    key: "states",
-    width: 100,
+    title: '审批状态',
+    key: 'states',
+    width: 120,
+    render(row) {
+      const item: any = izstatusList.value.find(
+        (item: any) => item.value == row.states,
+      )
+      return h(StatusItem, {
+        id: row.id,
+        status: row.states,
+        label: item ? item.label : '',
+      })
+    },
   },
   {
-    title: "图片相似度",
-    key: "similarity",
+    title: '图片相似度',
+    key: 'similarityscore',
     width: 100,
+    render(row: any) {
+      return h('div', {
+        id: row.id,
+        style: { color: row.similarityscore === 100 ? '#FF4E4F' : '' },
+      }, { default: () => row.similarityscore ? `${row.similarityscore}%` : '' })
+    },
   },
   {
-    title: "提报时间",
-    key: "fromuptime",
+    title: '提报时间',
+    key: 'fromuptime',
     width: 200,
+    render(row: any) {
+      return formatToDateHMS(row.createdate || 0)
+    },
   },
   {
-    title: "更新时间",
-    key: "updatetime",
+    title: '更新时间',
+    key: 'updatetime',
     width: 200,
   },
   {
-    title: "操作",
-    key: "actions",
+    title: '操作',
+    key: 'actions',
     width: 200,
-    fixed: "right",
+    fixed: 'right',
     render(row) {
-      return h(Action, {
+      return h(ListAction, {
         id: row.id,
         status: row.states,
-        trigger: actionHandler,
-      });
+        trigger: (action) => {
+          actionHandler(action, row)
+        },
+      })
     },
   },
-];
-
-const rejectModalRef = ref(null);
-const columnsRef = ref(columns);
-const tableRef = ref<InstanceType<typeof NDataTable>>();
-const rowKey = (row: RowData) => row.id;
-const loading = ref(true);
-const total = ref(0);
+]
+const notPassModalRef = ref(null) // 不通过弹窗
+const rejectModalRef = ref(null)
+const columnsRef = ref(columns)
+const tableRef = ref<InstanceType<typeof NDataTable>>()
+const rowKey = (row: RowData) => row.id
+const loading = ref(true)
+const total = ref(0)
 const pagination = reactive({
   page: 1,
   pageCount: 1,
@@ -103,136 +158,211 @@ const pagination = reactive({
   showSizePicker: true,
   pageSizes: [
     {
-      label: "10 每页",
+      label: '10 每页',
       value: 10,
     },
     {
-      label: "15 每页",
+      label: '15 每页',
       value: 15,
     },
     {
-      label: "30 每页",
+      label: '30 每页',
       value: 30,
     },
     {
-      label: "50 每页",
+      label: '50 每页',
       value: 50,
     },
   ],
   showQuickJumper: true,
-  prefix:()=>`共 ${total.value} 条数据`
-});
-const tableData = ref<Array<RowData>>([]);
-const selectionIds = ref<DataTableRowKey[]>([]);
+  prefix: () => `共 ${total.value} 条数据`,
+})
+const tableData = ref<Array<RowData>>([])
+const selectionIds = ref<DataTableRowKey[]>([])
 
-const deviceHeight = ref(600);
+const deviceHeight = ref(500)
 
 const maxHeight = computed(() => {
-  return tableData.value.length ? `${unref(deviceHeight)}px` : "auto";
-});
+  return tableData.value.length ? `${unref(deviceHeight)}px` : 'auto'
+})
 
 async function query(page: number, pageSize: number) {
-  const result = await getFinalList({
-    sortorder: "asc",
-    pageSize: 10,
+  const result = await getRepeatList({
+    sortorder: 'asc',
+    pageSize: pagination.pageSize,
     currPage: 1,
-    sortname: "",
-  });
-  const { data, pageCount,totalCount } = result;
-  total.value = totalCount;
-  tableData.value = data;
-  pagination.page = page;
-  pagination.pageCount = pageCount;
-  loading.value = false;
+    sortname: '',
+  })
+  console.log(666666)
+  console.log(result)
+
+  const { data, pageCount, totalCount } = result
+  total.value = totalCount
+  tableData.value = data
+  pagination.page = page
+  pagination.pageCount = pageCount
+  loading.value = false
 }
 
+watch(
+  () => dicStore.izstatusList,
+  (newval) => {
+    izstatusList.value = newval
+  },
+)
+
 async function handlePageChange(currentPage) {
-  if (loading.value) return;
-  pagination.page = currentPage;
-  const { pageSize } = pagination;
-  await query(currentPage, pageSize);
+  if (loading.value)
+    return
+  pagination.page = currentPage
+  const { pageSize } = pagination
+  await query(currentPage, pageSize)
 }
 async function handlePageSizeChange(currentPageSize) {
-  if (loading.value) return;
+  if (loading.value)
+    return
 
-  const { page } = pagination;
-  pagination.pageSize = currentPageSize;
+  const { page } = pagination
+  pagination.pageSize = currentPageSize
 
-  await query(page, currentPageSize);
+  await query(page, currentPageSize)
 }
 
 function handleCheck(rowKeys: DataTableRowKey[]) {
-  selectionIds.value = rowKeys;
+  selectionIds.value = rowKeys
 }
 
-function actionHandler(action: any) {
-  const { key } = action;
+function validate(items: any[]) {
+  if (items.length === 0)
+    return '至少选中一个任务'
+  return null
+}
+
+function actionHandler(action: any, row: any) {
+  const { key } = action
   switch (key) {
-    case "view":
-      break;
-    case "reset":
-      resetHandler();
-      break;
-    case "approval":
-      approvalHandler();
-      break;
-    case "reject":
-      (rejectModalRef.value as any).showModal();
-      break;
+    case 'view':
+      break
+    case 'reset':
+      // resetHandler()
+      break
+    case 'approval':
+      singleApproval(row)
+      break
+    case 'reject':
+      rejectHandler([row])
+      break
     default:
-      break;
+      break
   }
 }
 
-const dialog = useDialog();
+function getSelectItems() {
+  return tableData.value.filter(item => selectionIds.value.includes(item.id))
+}
 
-function resetHandler() {
-  dialog.info({
-    title: "确认提示",
-    content: "确认重置当前选中的任务的审批吗?",
-    positiveText: "确定",
-    negativeText: "取消",
-    onPositiveClick: async () => {
-      // TODO：需要支持重置
-      // const result = await resetApproval()
-    },
-    onNegativeClick: () => {},
-  });
+// 单个审批通过
+function singleApproval(row) {
+  const param = {
+    result: true,
+    comment: '',
+    disposeType: '',
+    disposeTypeId: '',
+    failCauseId: '',
+    failCauseName: '',
+    flowTaskInfoList: [
+      {
+        formId: row.id,
+        taskId: row.taskId,
+        taskName: row.fromTaskName,
+      },
+    ],
+  }
+  doAudit(param)
 }
 
-function approvalHandler() {
+// 批量通过
+function batchApproval() {
+  const items: any = getSelectItems()
+  const msg = validate(items)
+
+  if (msg !== null) {
+    message.error(msg)
+    return
+  }
+  console.log(items)
+  const list: any = []
+  items.forEach((item) => {
+    list.push({
+      formId: item.id,
+      taskId: item.taskId,
+      taskName: item.fromtaskname,
+    })
+  })
+
+  const param = {
+    result: true,
+    comment: '',
+    disposeType: '',
+    disposeTypeId: '',
+    failCauseId: '',
+    failCauseName: '',
+    flowTaskInfoList: list,
+  }
+
+  doAudit(param)
+}
+
+// 批量不通过
+function batchReject() {
+  const items: any = getSelectItems()
+  rejectHandler(items)
+}
+
+// 审核通过
+function doAudit(param: any) {
   dialog.info({
-    title: "确认提示",
-    content: "确认给该任务审批为【通过】吗?",
-    positiveText: "确定",
-    negativeText: "取消",
+    title: '确认提示',
+    content: '确认给该任务审批为【通过】吗?',
+    positiveText: '确定',
+    negativeText: '取消',
     onPositiveClick: () => {
-      // TODO：调用批量审批接口
+      audit(param).then((res) => {
+        const { code } = res
+        if (code === 'OK') {
+          message.success('审核成功')
+          reload()
+        }
+        else { message.error(res.message) }
+      })
     },
     onNegativeClick: () => {},
-  });
+  })
 }
 
-function rejectHandler(idOrDesc: string, isOther: boolean) {
-  // TODO:实现批量拒绝
-  // const param: ApprovalParam = {
-  //   formid: '',
-  //   taskId: '',
-  //   approvd: false,
-  //   taskComment: '',
-  // }
-  // if (isOther)
-  //   param.taskComment = idOrDesc
-  // else
-  //   param.taskComment = idOrDesc
-  // audit(param)
+// 审核不通过
+function rejectHandler(list) {
+  const msg = validate(list)
+  if (msg !== null) {
+    message.error(msg)
+    return
+  }
+
+  const modal = unref(notPassModalRef)! as any
+  modal.showModal(list)
 }
+query(pagination.page, pagination.pageSize)
 
-query(pagination.page, pagination.pageSize);
+function reload() {
+  selectionIds.value = []
+  checkedRowKeys.value = []
+}
 </script>
 
 <template>
   <div>
+    <NotPassed ref="notPassModalRef" @success="reload" />
+
     <n-modal v-model:show="show" transform-origin="center">
       <n-card
         class="cardstyle"
@@ -248,9 +378,15 @@ query(pagination.page, pagination.pageSize);
               <span :style="{ 'margin-left': '18px' }">任务信息</span>
             </div>
           </div>
+          <div class="batch">
+            <img 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">
+          </div>
           <div class="wrapper-content">
             <NDataTable
               ref="tableRef"
+              v-model:checked-row-keys="checkedRowKeys"
               remote
               :columns="columnsRef"
               :scroll-x="1250"
@@ -267,7 +403,9 @@ query(pagination.page, pagination.pageSize);
         </div>
         <template #footer>
           <div class="wrapper-footer">
-            <n-button type="info" @click="handleSumbit"> 确认 </n-button>
+            <n-button type="info" @click="handleSumbit">
+              确认
+            </n-button>
             <n-button secondary style="margin-left: 15px" @click="closeModal">
               取消
             </n-button>
@@ -280,6 +418,18 @@ query(pagination.page, pagination.pageSize);
 </template>
 
 <style lang="less" scoped>
+.batch {
+  display: flex;
+  align-items: center;
+  margin-top: 27px;
+
+  .btn-approval{
+    width: 68px;
+    height: 28px;
+    cursor: pointer;
+  }
+
+}
 .wrapper {
   display: flex;
   flex-direction: column;
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index c6a36dc..cd56c0c 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -505,7 +505,7 @@ query(pagination.page, pagination.pageSize)
 
 const customTabelRef = ref(null)
 const importExcelRef = ref(null)
-const notPassModalRef = ref(null) // 不通过
+const notPassModalRef = ref(null) // 不通过弹窗
 const repeatModalRef = ref(null)
 const repeatTaskTableModalRef = ref(null)
 
@@ -682,6 +682,12 @@ function batchApproval() {
   doAudit(param)
 }
 
+// 小结批量不通过
+function repeatBatchReject(items) {
+  console.log(items)
+  rejectHandler(items)
+}
+
 // 批量不通过
 function batchReject() {
   const items: any = getSelectItems()
@@ -700,6 +706,27 @@ function rejectHandler(list) {
   modal.showModal(list)
 }
 
+// 审核通过
+function doAudit(param: any) {
+  dialog.info({
+    title: '确认提示',
+    content: '确认给该任务审批为【通过】吗?',
+    positiveText: '确定',
+    negativeText: '取消',
+    onPositiveClick: () => {
+      audit(param).then((res) => {
+        const { code } = res
+        if (code === 'OK') {
+          message.success('审核成功')
+          reload()
+        }
+        else { message.error(res.message) }
+      })
+    },
+    onNegativeClick: () => {},
+  })
+}
+
 function reload() {
   selectionIds.value = []
   checkedRowKeys.value = []
@@ -725,27 +752,6 @@ async function refreshHandler(searchId?: any) {
   reset()
   query(pagination.page, pagination.pageSize, searchId)
 }
-
-// 审核通过
-function doAudit(param: any) {
-  dialog.info({
-    title: '确认提示',
-    content: '确认给该任务审批为【通过】吗?',
-    positiveText: '确定',
-    negativeText: '取消',
-    onPositiveClick: () => {
-      audit(param).then((res) => {
-        const { code } = res
-        if (code === 'OK') {
-          message.success('审核成功')
-          reload()
-        }
-        else { message.error(res.message) }
-      })
-    },
-    onNegativeClick: () => {},
-  })
-}
 </script>
 
 <template>
@@ -842,7 +848,7 @@ function doAudit(param: any) {
 
     <RepeatModal
       ref="repeatModalRef"
-      @reject="showModal(notPassModalRef)"
+      @reject="repeatBatchReject"
       @viewrepeat="showModal(repeatTaskTableModalRef)"
     />
     <RepeatTaskTableModal ref="repeatTaskTableModalRef" />
-- 
2.39.3


From 712580631a48c93b931aede47198573757ecad15 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sun, 31 Mar 2024 18:54:27 +0800
Subject: [PATCH 064/143] =?UTF-8?q?feat:=20=E4=BB=BB=E5=8A=A1=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E5=A2=9E=E5=8A=A0=E6=B2=89=E6=B5=B8=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/content/Content.vue | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index 7b4e457..e0c9fe3 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -77,6 +77,17 @@ const taskDetailPictureList = ref<any[]>([])
 const userStore = useUser()
 const imageRef = ref<ComponentElRef | null>()
 let processItems: any[] = []
+const isFullScreen = ref(false);
+
+const fullscreenStyles = computed<any>(() => ({
+  'width': isFullScreen.value ? '100vw' : '',
+  'height': isFullScreen.value ? '100vh' : '',
+  'position': isFullScreen.value ? 'fixed' : '',
+  'top': isFullScreen.value ? '0' : '',
+  'left': isFullScreen.value ? '0' : '',
+  'zIndex': isFullScreen.value ? '9999' : '',
+}));
+
 
 onMounted(() => {
   window.addEventListener('keydown', handleKeydown)
@@ -299,9 +310,13 @@ onUnmounted(() => {
 })
 
 function immersionHandler() {
-  taskStore.updateImmersion()
+  // taskStore.updateImmersion()
+  toggleFullScreen();
 }
-
+// 切换全屏状态
+const toggleFullScreen = () => {
+  isFullScreen.value = !isFullScreen.value;
+};
 function previewHandler(event: MouseEvent) {
   event.stopImmediatePropagation()
   event.stopPropagation()
@@ -342,7 +357,7 @@ function reloadList(param, text) {
 </script>
 
 <template>
-  <div class="wrapper">
+  <div class="wrapper fullscreen-container" :style="fullscreenStyles">
     <div class="wrapper-header">
       <div class="left">
         <span class="font">任务ID：{{ taskDetailInfo.fromtaskname }}</span>
@@ -381,7 +396,8 @@ function reloadList(param, text) {
             </ul>
           </n-popover> -->
           <div class="icon-wrap">
-            <SvgIcon size="20" name="immersion-model" @click="immersionHandler" />
+            <SvgIcon size="20" v-if="isFullScreen" name="power-off" @click="immersionHandler" style="cursor: pointer;"/>
+            <SvgIcon size="20" v-else name="immersion-model" @click="immersionHandler" style="cursor: pointer;"/>
           </div>
         </div>
         <div v-show="showActions" class="batch">
@@ -607,6 +623,12 @@ function reloadList(param, text) {
 </template>
 
 <style lang="less" scoped>
+.fullscreen-container {
+  /* 可添加其他样式 */
+  width: 100vw;
+  height: 100vh;
+  margin: 0px !important;
+}
 ::v-deep(.n-tabs-tab__label) {
   font-size: 14px;
   font-family: PingFang SC, PingFang SC-Regular;
-- 
2.39.3


From 8281a4719d70ad591c9220a02860a71252238033 Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Sun, 31 Mar 2024 22:42:23 +0800
Subject: [PATCH 065/143] =?UTF-8?q?=E7=BB=88=E5=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               |  8 +++++++
 src/api/final/index.ts                        | 21 +++----------------
 src/views/final/comp/RepeatTaskTableModal.vue | 21 ++++++++++---------
 3 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index 94c93f7..d6fb45b 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -21,8 +21,11 @@ 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']
     NGrid: typeof import('naive-ui')['NGrid']
     NGridItem: typeof import('naive-ui')['NGridItem']
     NImage: typeof import('naive-ui')['NImage']
@@ -31,6 +34,7 @@ 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']
@@ -40,7 +44,11 @@ declare module 'vue' {
     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/api/final/index.ts b/src/api/final/index.ts
index 10d4f30..fab2e62 100644
--- a/src/api/final/index.ts
+++ b/src/api/final/index.ts
@@ -68,31 +68,16 @@ export async function repetitionTask() {
  * @returns
  */
 export async function getRepeatList(params: FinalParam) {
-  const notEmptyParams = pickBy(params, notEmpty)
-
-  Object.keys(notEmptyParams).forEach((key) => {
-    const val = notEmptyParams[key]
-
-    if (key === 'izuptime') {
-      const start = formatToDate2(val[0])
-      const end = formatToDate2(val[1])
-      notEmptyParams[key] = `${start}-${end}`
-    }
-
-    if (Array.isArray(notEmptyParams[key]))
-      notEmptyParams[key] = val.join(',')
-  })
-
   const res = await http.request({
     url: `/flow/task/repetitionTaskList`,
     method: 'get',
-    params: notEmptyParams,
+    params,
   })
 
-  const { data: { list, totalPage, totalCount } } = res
+  const { data: { records, totalPage, totalCount } } = res
   return {
     pageCount: totalPage,
-    data: list,
+    data: records,
     totalCount,
   }
 }
diff --git a/src/views/final/comp/RepeatTaskTableModal.vue b/src/views/final/comp/RepeatTaskTableModal.vue
index 0b62d37..00947ed 100644
--- a/src/views/final/comp/RepeatTaskTableModal.vue
+++ b/src/views/final/comp/RepeatTaskTableModal.vue
@@ -40,10 +40,6 @@ onBeforeMount(() => {
   dicStore.fetchizstatusListt()
 })
 
-function showModal() {
-  show.value = true
-}
-
 function closeModal() {
   show.value = false
 }
@@ -53,10 +49,6 @@ async function handleSumbit(e: MouseEvent) {
   closeModal()
 }
 
-defineExpose({
-  showModal,
-})
-
 const columns: DataTableColumns<RowData> = [
   {
     type: 'selection',
@@ -190,7 +182,7 @@ async function query(page: number, pageSize: number) {
   const result = await getRepeatList({
     sortorder: 'asc',
     pageSize: pagination.pageSize,
-    currPage: 1,
+    pageNo: 1,
     sortname: '',
   })
   console.log(666666)
@@ -351,12 +343,21 @@ function rejectHandler(list) {
   const modal = unref(notPassModalRef)! as any
   modal.showModal(list)
 }
-query(pagination.page, pagination.pageSize)
+// query(pagination.page, pagination.pageSize)
+function showModal() {
+  query(pagination.page, pagination.pageSize)
+
+  show.value = true
+}
 
 function reload() {
   selectionIds.value = []
   checkedRowKeys.value = []
 }
+
+defineExpose({
+  showModal,
+})
 </script>
 
 <template>
-- 
2.39.3


From ceb024784be107bd51cff0332862805085b224af Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sun, 31 Mar 2024 23:12:11 +0800
Subject: [PATCH 066/143] =?UTF-8?q?feat:=20=E9=AB=98=E7=BA=A7=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E7=BB=84=E4=BB=B6props=E8=B0=83=E6=95=B4=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=AE=A1=E6=89=B9=E9=AB=98=E7=BA=A7=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E7=AD=9B=E9=80=89=E5=80=BC=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/aside.ts                           |   2 +-
 src/config/final.ts                           |  89 ++++
 .../home/aside/comp/modals/FilterModal.vue    |  15 +-
 .../home/aside/comp/modals/NewFilterModal.vue |   2 +
 src/views/task/aside/Aside.vue                |  21 +-
 src/views/task/modal/CustomFieldModal.vue     |  19 +-
 src/views/task/modal/NewFilterModal.vue       | 380 ++++++++++++++++++
 7 files changed, 507 insertions(+), 21 deletions(-)
 create mode 100644 src/views/task/modal/NewFilterModal.vue

diff --git a/src/config/aside.ts b/src/config/aside.ts
index 5ba3b4d..7b6b5b7 100644
--- a/src/config/aside.ts
+++ b/src/config/aside.ts
@@ -8,7 +8,7 @@ export interface AsideEntity {
   inFilterList?: boolean// 是否出现在过滤配置选项中(这个名字不好，为false代表只用于客户端的显示配置，不作为参数传递给服务器端)
   render?: boolean// 是否作为单独组件渲染
   key: string
-  component: Component
+  component?: Component
 }
 
 // 客户端配置
diff --git a/src/config/final.ts b/src/config/final.ts
index 17fe255..d9b2970 100644
--- a/src/config/final.ts
+++ b/src/config/final.ts
@@ -129,3 +129,92 @@ export const asideMap: Recordable<AsideEntity> = {
     inFilterList: false,
   },
 }
+
+
+// 审批添加筛选配置 (左侧)
+export const asideTaskMap: Recordable<AsideEntity> = {
+  izstatus: {
+    label: '审批状态',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izstatus'
+  },
+  izuptime: {
+    label: '提报时间',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izuptime'
+  },
+  izupuser: {
+    label: '提报人',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izupuser'
+  },
+  izprojecttype: {
+    label: '任务类型',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izprojecttype'
+  },
+  iztaskrrom: {
+    label: '任务来源',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'iztaskrrom'
+  },
+  izcustomname: {
+    label: '拜访客户',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izcustomname'
+  },
+  izcustomtype: {
+    label: '客户类型',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izcustomtype'
+  },
+  izproject: {
+    label: '所属项目',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izproject'
+  },
+  izvisitpro: {
+    label: '拜访省份/直辖市',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izvisitpro'
+  },
+  izcustomlevel: {
+    label: '客户级别',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izcustomlevel'
+  },
+  izprojecttype: {
+    label: '项目类别',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izprojecttype'
+  },
+  izproductname: {
+    label: '产品名称',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izproductname'
+  },
+  izvisitcity: {
+    label: '拜访城市',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izvisitcity'
+  },
+  izfirm: {
+    label: '厂商',
+    defaultValue: null,
+    isDefaultFilter: true,
+    key: 'izfirm'
+  }
+}
\ No newline at end of file
diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue
index f119d1f..d12ad9a 100644
--- a/src/views/home/aside/comp/modals/FilterModal.vue
+++ b/src/views/home/aside/comp/modals/FilterModal.vue
@@ -20,6 +20,13 @@ import type { FilterSearchParam } from "/#/api";
 
 defineOptions({ name: "FilterModal" });
 
+const props = defineProps({
+  type: {
+    type: Number,
+    default: () => 0,
+  },
+});
+
 const emit = defineEmits<{
   (e: "showNewFilter"): void;
   (e: "editFilter", filter: any): void;
@@ -56,7 +63,9 @@ const sortData = (row) => {
         new Date(b[row.columnKey]).getTime() - new Date(a[row.columnKey]).getTime()
     );
   } else {
-    tableData.value.sort((a, b) => Number((a as any).reorder) - Number((b as any).reorder));
+    tableData.value.sort(
+      (a, b) => Number((a as any).reorder) - Number((b as any).reorder)
+    );
   }
 };
 
@@ -142,7 +151,7 @@ async function query(page: number, pageSize: number) {
   const searchParam: FilterSearchParam = {
     search_searchname: { value: keyword.value, op: "like", type: "string" },
   };
-  const result = await getConditionList({ pageNo: page, pageSize }, searchParam, 0);
+  const result = await getConditionList({ pageNo: page, pageSize }, searchParam, props.type);
   const { data, pageCount, total: totalCount } = result;
   tableData.value = data;
   pagination.page = page;
@@ -440,7 +449,7 @@ const inputHandler = debounce((word) => {
     }
   }
 }
-::v-deep(.n-data-table .n-data-table-th){
+::v-deep(.n-data-table .n-data-table-th) {
   font-weight: bold !important;
 }
 </style>
diff --git a/src/views/home/aside/comp/modals/NewFilterModal.vue b/src/views/home/aside/comp/modals/NewFilterModal.vue
index 4793d0d..7b1212e 100644
--- a/src/views/home/aside/comp/modals/NewFilterModal.vue
+++ b/src/views/home/aside/comp/modals/NewFilterModal.vue
@@ -210,6 +210,8 @@ watch(() => dicStore.relationTypeList, (newval) => {
 })
 
 function showModal() {
+  const list = generateAllData(configStore.systemConfig)
+  typeOptions.value = list
   show.value = true
 }
 
diff --git a/src/views/task/aside/Aside.vue b/src/views/task/aside/Aside.vue
index 17d1790..8212a5a 100644
--- a/src/views/task/aside/Aside.vue
+++ b/src/views/task/aside/Aside.vue
@@ -1,21 +1,19 @@
 <script lang="ts" setup>
 import { debounce } from 'lodash-es'
-import { computed, inject, onMounted, ref, shallowRef, unref, watch } from 'vue'
+import { computed, inject, onBeforeMount, onMounted, ref, shallowRef, unref, watch } from 'vue'
 import CustomFieldModal from '../modal/CustomFieldModal.vue'
 import AdvanceFilter from '../../home/aside/comp/AdvanceFilter.vue'
 import {
   FilterModalVue,
-  NewFilterModalVue,
 } from '../../home/aside/comp/modals'
+import NewFilterModalVue from '../modal/NewFilterModal.vue'
 import TaskList from './TaskList.vue'
 import type { AsideEntity } from '@/config/aside'
-
 import { useUser } from '@/store/modules/user'
 import { getAllfieldList, getfieldList } from '@/api/home/filter'
-
 import { useTaskStore } from '@/store/modules/task'
-
 import emitter from '@/utils/mitt'
+import { useConfig } from '@/store/modules/asideConfig'
 
 const CustomFieldModalRef = ref(null)
 const collapse = ref(false)
@@ -87,8 +85,8 @@ async function getshowFieldList() {
    * fix 是否默认
    * checked 是否选中
    */
-  if (useList.userFieldFixed) {
-    useList.userFieldFixed?.split(',').map((v) => {
+  if (useList?.userFieldFixed) {
+    useList?.userFieldFixed?.split(',').map((v) => {
       let item = allList.find(v2 => v2.name == v)
       if (item) {
         item = {
@@ -103,7 +101,7 @@ async function getshowFieldList() {
   }
   else {
     // 若为首次获取 则赋默认值
-    allList.map((v) => {
+    allList?.map((v) => {
       if (v.isrequired == 2) {
         const item = {
           name: v.fieldDesc,
@@ -144,7 +142,11 @@ function editFilter(filter: any) {
   modal.showModal()
   modal.edit(filter)
 }
-
+const configStore = useConfig()
+onBeforeMount(async () => {
+  configStore.fetchConfig()
+  configStore.fetchCustomConfig()
+})
 function setAsideItemName(text) {
   taskListRef.value.setStatusName(text)
 }
@@ -231,6 +233,7 @@ defineExpose({
       ref="filterModalRef"
       @edit-filter="editFilter"
       @show-new-filter="showModal(newFilterModalRef)"
+      :type="2"
     />
     <!-- 新增过滤 -->
     <NewFilterModalVue ref="newFilterModalRef" />
diff --git a/src/views/task/modal/CustomFieldModal.vue b/src/views/task/modal/CustomFieldModal.vue
index e92f8a0..3bb4fd0 100644
--- a/src/views/task/modal/CustomFieldModal.vue
+++ b/src/views/task/modal/CustomFieldModal.vue
@@ -94,14 +94,14 @@ function generateDefaultList() {
 }
 
 const show = ref(false);
-const checkAll = computed(()=>{
+const checkAll = computed(() => {
   let baseNum = 0;
   offList.value.map((v) => {
     if (v.fix) {
       baseNum += 1;
     }
   });
-  return onList.value.length == offList.value.length-baseNum
+  return onList.value.length == offList.value.length - baseNum;
 });
 
 function showModal() {
@@ -274,11 +274,11 @@ const getData = async (type = "") => {
    * fix 是否默认
    * checked 是否选中
    */
-  const userFieldFixed = useList.userFieldFixed?.split(",");
-  const userFieldUnFixed = useList.userFieldUnFixed?.split(",");
+  const userFieldFixed = useList?.userFieldFixed?.split(",");
+  const userFieldUnFixed = useList?.userFieldUnFixed?.split(",");
   if (!type || type == "off") {
     offList.value = [];
-    allList.map((v) => {
+    allList?.map((v) => {
       let item = {
         name: v.fieldDesc,
         id: v.name,
@@ -297,7 +297,7 @@ const getData = async (type = "") => {
     offList.value.unshift(...fixList.value);
   }
   if (!type || type == "on") {
-    useList.userFieldFixed?.split(",").map((v) => {
+    useList?.userFieldFixed?.split(",").map((v) => {
       let item = allList.find((v2) => v2.name == v);
       if (item) {
         item = {
@@ -327,7 +327,10 @@ const indeterminate = computed(() => {
       baseNum += 1;
     }
   });
-  return onShowList.value.length > 0 && offShowList.value.length - baseNum > onShowList.value.length;
+  return (
+    onShowList.value.length > 0 &&
+    offShowList.value.length - baseNum > onShowList.value.length
+  );
 });
 const queryData = (value, type) => {
   if (value) {
@@ -433,7 +436,7 @@ const queryData = (value, type) => {
                   </template>
                 </n-input>
                 <div class="draggable-title">系统默认</div>
-                <div class="draggable-ul" style="border-bottom:none">
+                <div class="draggable-ul" style="border-bottom: none">
                   <div
                     v-for="item in fixShowList"
                     :key="item.id"
diff --git a/src/views/task/modal/NewFilterModal.vue b/src/views/task/modal/NewFilterModal.vue
new file mode 100644
index 0000000..d6e8cf2
--- /dev/null
+++ b/src/views/task/modal/NewFilterModal.vue
@@ -0,0 +1,380 @@
+<script lang="ts" setup>
+import type { FormInst, FormItemRule, FormRules } from 'naive-ui'
+import { computed, onBeforeMount, reactive, ref, unref, watch } from 'vue'
+import { asideTaskMap as asideMap } from '@/config/final'
+import { useDictionary } from '@/store/modules/dictonary'
+import { useConfig } from '@/store/modules/asideConfig'
+import type { FilterCondition } from '/#/api'
+import { addCondition, updateCondition } from '@/api/home/filter'
+import { formatToDate2, formatToDate3 } from '@/utils/dateUtil'
+
+type Status = 'edit' | 'new'
+
+const show = ref(false)
+const configStore = useConfig()
+const dicStore = useDictionary()
+const currentStatus = ref<Status>('new')
+let currentEditId: string | null = null
+
+const modalTitle = computed(() => {
+  return currentStatus.value === 'new' ? '新建过滤条件' : '编辑过滤条件'
+})
+
+const cardStyle = {
+  'width': '800px',
+  '--n-padding-bottom': '10px',
+  '--n-padding-left': '10px',
+}
+
+const noBorderInput = {
+  '--n-border': '0px',
+  '--n-border-hover': '0px',
+  '--n-border-pressed': '0px',
+}
+
+const formItemStyle = {
+  '--n-label-height': '0px',
+  '--n-feedback-height': '8px',
+}
+
+interface FormType {
+  name: string | null
+  logic: string | null
+  conditions: Condition[]
+}
+
+interface Condition {
+  type: string | null
+  operator: string | null
+  result: any
+}
+
+interface Option {
+  label: string
+  value: string
+}
+
+const rules: FormRules = {
+  name: {
+    required: true,
+    message: '请输入过滤条件名称',
+    trigger: 'blur',
+  },
+  logic: {
+    required: true,
+    message: '请选择逻辑关系',
+    trigger: 'blur',
+  },
+  conditions: {
+    required: true,
+    validator(rule: FormItemRule, value: Condition[]) {
+      for (const item of value) {
+        const { type, operator, result } = item
+
+        if (type === null || operator === null || result === null)
+          return new Error('请选择过滤条件')
+      }
+      return true
+    },
+    trigger: ['input', 'blur'],
+  },
+}
+
+const formRef = ref<FormInst | null>(null)
+
+const formValue = reactive<FormType>({
+  name: null,
+  logic: 'where',
+  conditions: [{
+    type: null,
+    operator: 'eq',
+    result: null,
+  }],
+})
+
+function handleSumbit(e: MouseEvent) {
+  e.preventDefault()
+  formRef.value?.validate((errors) => {
+    if (errors)
+      return
+
+    const list = formValue.conditions.map((item, index) => {
+      const { type, operator, result } = item
+
+      return {
+        searchfield: type!,
+        searchtype: operator!,
+        searchvalue: formatValue(type!, result),
+        searchRelationType: formValue.logic!,
+        orderNum: index + 1,
+      }
+    })
+
+    const param: FilterCondition = {
+      searchname: formValue.name!,
+      type: 1,
+      ocrUsersearchchildList: list,
+    }
+
+    if (currentStatus.value === 'new')
+      addCondition(param)
+    else
+      updateCondition({ id: currentEditId!, ...param })
+    closeModal()
+  })
+}
+
+function formatValue(searchfield: string, searchvalue: any) {
+  if (searchfield === 'izuptime') {
+    const start = formatToDate2(searchvalue[0])
+    const end = formatToDate2(searchvalue[1])
+    return `${start}-${end}`
+  }
+
+  return searchvalue
+}
+
+// 编辑前前转换为服务端格式
+function unformatValue(searchfield: string, searchvalue: any) {
+  // 2022/01/03-2023/02/04
+  if (searchfield === 'izuptime') {
+    const dataStrs = searchvalue.split('-')
+    const start = formatToDate3(dataStrs[0])
+    const end = formatToDate3(dataStrs[1])
+    return [start, end]
+  }
+
+  return searchvalue
+}
+
+function createCondition() {
+  formValue.conditions.push({
+    type: null,
+    operator: 'eq',
+    result: null,
+  })
+}
+
+function removeCondition(index: number) {
+  formValue.conditions.splice(index, 1)
+}
+
+function formLabel(index: number) {
+  return index === 0 ? '筛选条件' : ''
+}
+
+const typeOptions = ref<Option[]>([])
+
+const operatorOptions = [
+  {
+    label: '等于',
+    value: 'eq',
+  },
+  {
+    label: '不等于',
+    value: 'notEq',
+  },
+]
+
+const logicOptions = ref([])
+
+onBeforeMount(() => {
+  dicStore.fetchRelationTypeList()
+})
+
+watch(() => dicStore.relationTypeList, (newval) => {
+  logicOptions.value = newval
+})
+
+function showModal() {
+  show.value = true
+}
+
+function closeModal() {
+  show.value = false
+}
+
+function generateAllData(): Option[] {
+  const initVal: Option[] = []
+  const list = Object.keys(asideMap).reduce((acc, value) => {
+    if (value.startsWith('iz') && asideMap[value]?.inFilterList !== false) {
+      const name = asideMap[value]?.label
+
+      name && acc.push({
+        value,
+        label: name || '未配置',
+      })
+    }
+    return acc
+  }, initVal)
+
+  return list
+}
+
+typeOptions.value = generateAllData()
+
+function getOptions(key: string) {
+  const getterName = `get${key}`
+  const options = unref(dicStore[getterName])
+  return options || []
+}
+
+function leaveHandler() {
+  currentStatus.value = 'new'
+  currentEditId = null
+
+  formValue.name = null
+  formValue.conditions = [
+    {
+      type: null,
+      operator: 'eq',
+      result: null,
+    },
+  ]
+}
+
+function edit(editFilter: any) {
+  currentStatus.value = 'edit'
+
+  const { searchname, ocrUsersearchchildList, id } = editFilter
+  currentEditId = id
+  formValue.name = searchname
+  formValue.conditions = ocrUsersearchchildList.map((item) => {
+    return {
+      type: item.searchfield,
+      operator: item.searchtype,
+      result: unformatValue(item.searchfield, item.searchvalue),
+    }
+  })
+}
+
+defineExpose({
+  showModal,
+  edit,
+})
+</script>
+
+<template>
+  <n-modal v-model:show="show" transform-origin="center" @after-leave="leaveHandler">
+    <n-card :style="cardStyle" :bordered="false" size="huge" role="dialog" aria-modal="true">
+      <div class="wrapper">
+        <span class="wrapper-title">{{ modalTitle }}</span>
+        <div class="wrapper-bar">
+          <div class="wrapper-info">
+            <span :style="{ 'margin-left': '18px' }">基本信息</span>
+          </div>
+        </div>
+        <div class="wrapper-form">
+          <n-form ref="formRef" :model="formValue" :rules="rules">
+            <n-form-item path="name" label="标题">
+              <n-input v-model:value="formValue.name" :style="{ width: '780px' }" @keydown.enter.prevent />
+            </n-form-item>
+            <n-form-item path="logic" label="逻辑关系" v-show="false">
+              <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 filterable
+                v-model:value="item.type" placeholder="请选择筛选项名称" :options="typeOptions"
+              />
+              <n-select filterable
+                v-model:value="item.operator" style="margin-left: 8px;" placeholder="请选择"
+                :options="operatorOptions"
+              />
+              <n-space v-if="item.type === 'izuptime'">
+                <n-date-picker
+                  v-model:value="item.result" style="margin-left: 8px;width: 240px;" type="daterange"
+                  clearable
+                />
+              </n-space>
+              <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)">
+                <template #icon>
+                  <SvgIcon size="24" name="close" />
+                </template>
+              </n-button>
+            </n-form-item>
+          </n-form>
+        </div>
+        <div class="wrapper-new" @click="createCondition">
+          <span>+</span>
+          <span style="margin-left:8px">添加筛选条件</span>
+        </div>
+      </div>
+      <template #footer>
+        <div class="wrapper-footer">
+          <n-button type="info" @click="handleSumbit">
+            保存
+          </n-button>
+          <n-button secondary style="margin-left:15px" @click="closeModal">
+            取消
+          </n-button>
+        </div>
+      </template>
+    </n-card>
+  </n-modal>
+</template>
+
+<style lang="less" scoped>
+.wrapper {
+  display: flex;
+  flex-direction: column;
+
+  &-title {
+    font-weight: bold;
+    font-size: 16px;
+  }
+
+  &-bar {
+    background-color: #e8e8e8;
+    width: 100%;
+    margin-top: 20px;
+  }
+
+  &-form {
+    display: flex;
+    justify-content: space-between;
+    margin-top: 20px;
+  }
+
+  &-new {
+    display: flex;
+    width: 110px;
+    color: #507afd;
+    line-height: 22px;
+    cursor: pointer;
+
+    &:hover {
+      color: #507aac;
+    }
+  }
+
+  &-table {
+    margin-top: 20px;
+  }
+
+  &-footer {
+    display: flex;
+    justify-content: flex-end;
+  }
+
+  &-info {
+    font-weight: bold;
+    position: relative;
+
+    &:before {
+      background-color: #1980FF;
+      content: "";
+      width: 5px;
+      border-radius: 2px;
+      top: 0;
+      bottom: 0;
+      position: absolute;
+    }
+  }
+}
+</style>
-- 
2.39.3


From 3135b2c4e5ed41271cf51315ced2ac60da29392c Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sun, 31 Mar 2024 23:16:50 +0800
Subject: [PATCH 067/143] =?UTF-8?q?fix:=20=E4=BB=BB=E5=8A=A1=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=B8=8E=E9=A1=B9=E7=9B=AE=E7=B1=BB=E5=88=AB=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts     | 7 +++++++
 src/config/final.ts | 6 ------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index 94c93f7..e07d992 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -21,8 +21,11 @@ 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']
     NGrid: typeof import('naive-ui')['NGrid']
     NGridItem: typeof import('naive-ui')['NGridItem']
     NImage: typeof import('naive-ui')['NImage']
@@ -40,7 +43,11 @@ declare module 'vue' {
     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/config/final.ts b/src/config/final.ts
index d9b2970..a0d4947 100644
--- a/src/config/final.ts
+++ b/src/config/final.ts
@@ -151,12 +151,6 @@ export const asideTaskMap: Recordable<AsideEntity> = {
     isDefaultFilter: true,
     key: 'izupuser'
   },
-  izprojecttype: {
-    label: '任务类型',
-    defaultValue: null,
-    isDefaultFilter: true,
-    key: 'izprojecttype'
-  },
   iztaskrrom: {
     label: '任务来源',
     defaultValue: null,
-- 
2.39.3


From 1e8fc844038e3cb604390ebcb47d1228440f02e8 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sun, 31 Mar 2024 23:19:57 +0800
Subject: [PATCH 068/143] =?UTF-8?q?fix:=20=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=8C=89=E9=92=AE=E6=97=A0=E6=B3=95=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=EF=BC=8C=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/content/Content.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index e0c9fe3..7857120 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -619,6 +619,7 @@ function reloadList(param, text) {
       @reject="rejectHandler"
       @approval="approvalHandler"
     />
+    <CustomSettingModal ref="CustomSettingModalRef" />
   </div>
 </template>
 
-- 
2.39.3


From b2975583294f5673287be256625f7f1560a1ece4 Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Sun, 31 Mar 2024 23:29:09 +0800
Subject: [PATCH 069/143] bug

---
 src/assets/icons/summary.svg                  | 26 ++++++
 src/components/Approval/NotPassed.vue         |  8 +-
 src/views/final/comp/RepeatTaskTableModal.vue |  2 +-
 src/views/final/content/Content.vue           |  3 +-
 src/views/task/content/Content.vue            | 92 ++++++++++++-------
 5 files changed, 95 insertions(+), 36 deletions(-)
 create mode 100644 src/assets/icons/summary.svg

diff --git a/src/assets/icons/summary.svg b/src/assets/icons/summary.svg
new file mode 100644
index 0000000..075c554
--- /dev/null
+++ b/src/assets/icons/summary.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>chazhongjiansuo</title>
+    <defs>
+        <rect id="path-1" x="0" y="0" width="64" height="64"></rect>
+        <linearGradient x1="12.4444444%" y1="0%" x2="87.5555556%" y2="100%" id="linearGradient-3">
+            <stop stop-color="#5B85F8" offset="0%"></stop>
+            <stop stop-color="#3C6CF0" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="PrevailCloud-Design-图标集" transform="translate(-2250.000000, -6758.000000)">
+            <g id="chazhongjiansuo" transform="translate(2250.000000, 6758.000000)">
+                <mask id="mask-2" fill="white">
+                    <use xlink:href="#path-1"></use>
+                </mask>
+                <g id="蒙版"></g>
+                <g mask="url(#mask-2)" fill="url(#linearGradient-3)" fill-rule="nonzero" id="形状结合">
+                    <g transform="translate(6.000000, 2.000000)">
+                        <path d="M31.4511232,24.8747904 L31.7607141,24.8786253 L32.4504148,24.8786253 C39.5888163,25.0499657 45.2098765,30.9440752 45.0374513,38.0375676 C44.9632519,41.0900989 43.8225861,43.8634128 41.9782017,46.0188901 L51.6240923,56.6794025 C52.1413678,57.2619598 52.1413678,57.8102491 51.5206372,58.3585383 L50.106751,59.6264573 C49.5205054,60.1404784 48.9687449,60.1404784 48.4169844,59.523653 L38.6877524,48.7707922 C36.6723213,49.9523783 34.3085739,50.605744 31.7951992,50.5454164 L31.7951992,50.5454164 L31.1054985,50.5454164 C23.967097,50.374076 18.3460368,44.4799664 18.518462,37.3864741 C18.6908871,30.2929817 24.6223126,24.7072849 31.7607141,24.8786253 Z M23.6222467,0.61682542 C24.5188575,-0.205608473 25.8982588,-0.205608473 26.7948696,0.61682542 C29.3467619,2.94705478 35.2781874,6.95642001 46.3478825,7.77885391 C48.6928647,7.9501943 50.4516013,9.9034748 50.4176147,12.1994361 L50.4176147,12.1994361 L50.4176147,38.1061037 L48.5894096,38.1061037 C49.106685,28.682382 41.8303434,20.6293835 32.3469597,20.1153623 C22.8290909,19.6013411 14.6906235,26.7976377 14.173348,36.2556275 C13.6560725,45.7136172 20.9324142,53.8008838 30.4157979,54.314905 C31.5538039,54.3834412 32.69181,54.314905 33.795331,54.1435646 L33.795331,54.1435646 L34.5540017,55.2744112 C32.5193848,56.5423302 30.553738,57.775981 28.6915463,58.8382914 C26.5534744,60.1747465 23.8291569,60.1747465 21.6910849,58.8382914 C14.7595935,54.4177093 0,44.1715537 0,37.5235464 L0,37.5235464 L0,12.1994361 C0,9.9034748 1.75873661,8.01873046 4.06923373,7.81312199 C15.0009888,6.99068809 21.0013843,2.94705478 23.6222467,0.61682542 Z M31.7951992,30.2244456 C27.6225103,30.1216413 24.1395221,33.3771088 24.0705521,37.5235464 C23.967097,41.6699839 27.243175,45.0967918 31.4158638,45.199596 L31.4158638,45.199596 L31.8296842,45.199596 C36.002373,45.3024003 39.4508762,42.0469328 39.5543313,37.9004952 C39.6577864,33.7540577 36.3817084,30.3272498 32.2090195,30.2244456 L32.2090195,30.2244456 Z"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/components/Approval/NotPassed.vue b/src/components/Approval/NotPassed.vue
index b2e53a5..7d3ea14 100644
--- a/src/components/Approval/NotPassed.vue
+++ b/src/components/Approval/NotPassed.vue
@@ -101,7 +101,7 @@ async function handleSumbit(e: MouseEvent) {
         audit(param).then((res) => {
           const { code } = res
           if (code === 'OK') {
-            message.success('审核成功')
+            message.success(res.message)
             emit('success', param)
             closeModal()
           }
@@ -199,6 +199,8 @@ async function selectChange(id) {
     justify-content: flex-end;
     padding-right: 24px;
     padding-bottom: 10px;
+    border-top: 0.5px solid #d9d9d9;
+    padding-top: 15px;
   }
 
   &-info {
@@ -236,6 +238,10 @@ async function selectChange(id) {
   margin-bottom: 0px;
 }
 
+::v-deep(.n-form-item-label__text) {
+  color: #666666;
+}
+
 ::v-deep(.n-input__placeholder) {
   color: #333333!important;
 }
diff --git a/src/views/final/comp/RepeatTaskTableModal.vue b/src/views/final/comp/RepeatTaskTableModal.vue
index 00947ed..0d1c1ae 100644
--- a/src/views/final/comp/RepeatTaskTableModal.vue
+++ b/src/views/final/comp/RepeatTaskTableModal.vue
@@ -322,7 +322,7 @@ function doAudit(param: any) {
       audit(param).then((res) => {
         const { code } = res
         if (code === 'OK') {
-          message.success('审核成功')
+          message.success(res.message)
           reload()
         }
         else { message.error(res.message) }
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index cd56c0c..71285a0 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -717,7 +717,7 @@ function doAudit(param: any) {
       audit(param).then((res) => {
         const { code } = res
         if (code === 'OK') {
-          message.success('审核成功')
+          message.success(res.message)
           reload()
         }
         else { message.error(res.message) }
@@ -762,6 +762,7 @@ async function refreshHandler(searchId?: any) {
         <SvgIcon size="32" name="magnifying" @click="changeContent" />
       </div>
       <div>
+        <SvgIcon style="margin-right: 6px;" size="13" name="summary" @click="showModal(repeatModalRef)" />
         <NButton class="xjcc" text @click="showModal(repeatModalRef)">
           小结查重
         </NButton>
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index e0c9fe3..488edf8 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -2,7 +2,7 @@
 import { computed, onMounted, onUnmounted, reactive, ref, unref, watch } from 'vue'
 import { chunk, clone } from 'lodash-es'
 import { useDialog, useMessage } from 'naive-ui'
-import { useRoute } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import BatchModal from '../modal/BatchModal.vue'
 import CustomSettingModal from '../modal/CustomSettingModal.vue'
 import PictureTable from './PictureTable.vue'
@@ -25,6 +25,9 @@ import { formatToDateHMS } from '@/utils/dateUtil'
 import { hideDownload } from '@/utils/image'
 
 const emit = defineEmits(['setAsideItemName'])
+
+const router = useRouter()
+
 const batch = ref(false)
 const selectItems = ref<any[]>([])
 const message = useMessage()
@@ -37,22 +40,12 @@ const packageId: any = ref('') // 包id
 const CustomSettingModalRef = ref(null)
 const taskTableData = ref<any[]>([])
 const route = useRoute()
-
+const isDetail = ref(false) // 是否是详情
 const sortBy: any = {
   orderType: 'desc',
   orderName: 'similarityScore',
 }
 
-function setBatch(value: boolean) {
-  if (totalCount.value === 0)
-    return
-
-  batch.value = value
-
-  if (value === false)
-    selectItems.value = []
-}
-
 function onCheckChange(checked: any, item: any) {
   const index = selectItems.value.indexOf(item)
   item.checked = checked
@@ -77,23 +70,23 @@ const taskDetailPictureList = ref<any[]>([])
 const userStore = useUser()
 const imageRef = ref<ComponentElRef | null>()
 let processItems: any[] = []
-const isFullScreen = ref(false);
+const isFullScreen = ref(false)
 
 const fullscreenStyles = computed<any>(() => ({
-  'width': isFullScreen.value ? '100vw' : '',
-  'height': isFullScreen.value ? '100vh' : '',
-  'position': isFullScreen.value ? 'fixed' : '',
-  'top': isFullScreen.value ? '0' : '',
-  'left': isFullScreen.value ? '0' : '',
-  'zIndex': isFullScreen.value ? '9999' : '',
-}));
-
+  width: isFullScreen.value ? '100vw' : '',
+  height: isFullScreen.value ? '100vh' : '',
+  position: isFullScreen.value ? 'fixed' : '',
+  top: isFullScreen.value ? '0' : '',
+  left: isFullScreen.value ? '0' : '',
+  zIndex: isFullScreen.value ? '9999' : '',
+}))
 
 onMounted(() => {
   window.addEventListener('keydown', handleKeydown)
   if (route.query.id) {
     taskId.value = route.query.id
     packageId.value = route.query.packageid
+    isDetail.value = true
     getDetail()
   }
 })
@@ -108,6 +101,21 @@ function handleKeydown(event) {
   // 在这里执行右箭头的逻辑
 }
 
+function setBatch(value: boolean) {
+  // if (totalCount.value === 0)
+  //   return
+
+  batch.value = value
+
+  if (value === false) {
+    taskDetailInfo.value.checked = false
+    selectItems.value = []
+    taskDetailPictureList.value.forEach((item) => {
+      item.checked = false
+    })
+  }
+}
+
 // 从store里面获取任务id
 function currentTaskId() {
   const index = taskStore.getCurrentIndex
@@ -202,7 +210,7 @@ function doAudit(param: any) {
   audit(param).then((res) => {
     const { code } = res
     if (code === 'OK') {
-      message.success('审核成功')
+      message.success(res.message)
       setBatch(false)
       reloadList(param, '通过')
     }
@@ -311,12 +319,12 @@ onUnmounted(() => {
 
 function immersionHandler() {
   // taskStore.updateImmersion()
-  toggleFullScreen();
+  toggleFullScreen()
 }
 // 切换全屏状态
-const toggleFullScreen = () => {
-  isFullScreen.value = !isFullScreen.value;
-};
+function toggleFullScreen() {
+  isFullScreen.value = !isFullScreen.value
+}
 function previewHandler(event: MouseEvent) {
   event.stopImmediatePropagation()
   event.stopPropagation()
@@ -354,6 +362,14 @@ function reloadList(param, text) {
 
   getDetail()
 }
+
+function goBack() {
+  router.back()
+}
+
+function switchBatch() {
+  setBatch(!batch.value)
+}
 </script>
 
 <template>
@@ -361,12 +377,14 @@ function reloadList(param, text) {
     <div class="wrapper-header">
       <div class="left">
         <span class="font">任务ID：{{ taskDetailInfo.fromtaskname }}</span>
-        <SvgIcon size="22" class="forward" name="arrow-left" @click="backHandler" />
-        <SvgIcon size="22" class="back" name="arrow-right" @click="forwardHandler" />
+        <template v-if="!isDetail">
+          <SvgIcon size="22" class="forward" name="arrow-left" @click="backHandler" />
+          <SvgIcon size="22" class="back" name="arrow-right" @click="forwardHandler" />
+        </template>
       </div>
-      <div class="right">
+      <div v-if="!isDetail" class="right">
         <div v-show="!showActions" style="display: flex; align-items: center">
-          <div class="btn" @click="setBatch(true)">
+          <div class="btn" @click="switchBatch()">
             <SvgIcon style="margin-right: 6px" size="22" name="batch" />
             批量审批
           </div>
@@ -396,12 +414,12 @@ function reloadList(param, text) {
             </ul>
           </n-popover> -->
           <div class="icon-wrap">
-            <SvgIcon size="20" v-if="isFullScreen" name="power-off" @click="immersionHandler" style="cursor: pointer;"/>
-            <SvgIcon size="20" v-else name="immersion-model" @click="immersionHandler" style="cursor: pointer;"/>
+            <SvgIcon v-if="isFullScreen" size="20" name="power-off" style="cursor: pointer;" @click="immersionHandler" />
+            <SvgIcon v-else size="20" name="immersion-model" style="cursor: pointer;" @click="immersionHandler" />
           </div>
         </div>
         <div v-show="showActions" class="batch">
-          <n-button text @click="setBatch(false)">
+          <n-button text @click="switchBatch()">
             <template #icon>
               <SvgIcon name="revoke" />
             </template>
@@ -422,6 +440,14 @@ function reloadList(param, text) {
           >
         </div>
       </div>
+      <div v-else class="right">
+        <n-button text @click="goBack">
+          <template #icon>
+            <SvgIcon name="revoke" />
+          </template>
+          返回
+        </n-button>
+      </div>
     </div>
     <div class="wrapper-detail">
       <div
-- 
2.39.3


From cb4b00b1987a24981cfe3865aaef8015a1562801 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sun, 31 Mar 2024 23:29:31 +0800
Subject: [PATCH 070/143] =?UTF-8?q?feat:=20=E5=90=8C=E4=B8=80=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E6=AF=8F=E5=A4=A9=E6=9C=80=E5=A4=9A=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=9610=E6=AC=A1=E9=AA=8C=E8=AF=81=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E8=B6=85=E5=87=BA=E5=8D=81=E6=AC=A1=E5=90=8E=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=EF=BC=9A=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E6=AC=A1=E6=95=B0=E8=B6=85=E9=99=90?=
 =?UTF-8?q?=EF=BC=8C=E8=AF=B7=E6=98=8E=E5=A4=A9=E5=86=8D=E8=AF=95!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/components/Login.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue
index 2e4d5a9..4b50660 100644
--- a/src/views/login/components/Login.vue
+++ b/src/views/login/components/Login.vue
@@ -300,7 +300,11 @@ async function sendCode(value) {
     phone: formSms.phone,
     agentcode: formSms.agentcode,
   });
-  startCount();
+  if(res.code == 'OK'){
+    startCount();
+  }else{
+    message.error(res.message)
+  }
 }
 
 function startCount() {
-- 
2.39.3


From 93972ea9a5794252af627ba75f1a2a9e663f544c Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sun, 31 Mar 2024 23:49:37 +0800
Subject: [PATCH 071/143] =?UTF-8?q?feat:=20=E4=BB=BB=E5=8A=A1=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89=E8=A1=A5=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts     |  1 +
 src/config/final.ts | 41 +++++++++++++++++++++++++++--------------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index e07d992..d6fb45b 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -34,6 +34,7 @@ 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']
diff --git a/src/config/final.ts b/src/config/final.ts
index a0d4947..fcc931d 100644
--- a/src/config/final.ts
+++ b/src/config/final.ts
@@ -1,5 +1,5 @@
 import type { AsideEntity } from './aside'
-import { IzProjectVue, IzStatus, IztaskrromVue, PictureDownloadVue, PlanVue, ReportUserVue, TimeVue } from '@/views/home/aside/comp/items'
+import { IzProjectVue, IzStatus, IztaskrromVue, PictureDownloadVue, PlanVue, ReportUserVue, TimeVue, IzCustomname, IzCustomtype, IzVisitcity, IzCustomlevel, IzProjecttype, IzProductVue, IzvisitproVue, IzfirmVue } from '@/views/home/aside/comp/items'
 
 export interface RowData {
   id: string
@@ -137,78 +137,91 @@ export const asideTaskMap: Recordable<AsideEntity> = {
     label: '审批状态',
     defaultValue: null,
     isDefaultFilter: true,
-    key: 'izstatus'
+    key: 'izstatus',
+    component: IzStatus, // todo
   },
   izuptime: {
     label: '提报时间',
     defaultValue: null,
     isDefaultFilter: true,
-    key: 'izuptime'
+    key: 'izuptime',
+    component: TimeVue,
   },
   izupuser: {
     label: '提报人',
     defaultValue: null,
     isDefaultFilter: true,
-    key: 'izupuser'
+    key: 'izupuser',
+    component: ReportUserVue,
   },
   iztaskrrom: {
     label: '任务来源',
     defaultValue: null,
     isDefaultFilter: true,
-    key: 'iztaskrrom'
+    key: 'iztaskrrom',
+    component: IztaskrromVue,
   },
   izcustomname: {
     label: '拜访客户',
     defaultValue: null,
     isDefaultFilter: true,
-    key: 'izcustomname'
+    key: 'izcustomname',
+    component: IzCustomname,
   },
   izcustomtype: {
     label: '客户类型',
     defaultValue: null,
     isDefaultFilter: true,
-    key: 'izcustomtype'
+    key: 'izcustomtype',
+    component: IzCustomtype,
   },
   izproject: {
     label: '所属项目',
     defaultValue: null,
     isDefaultFilter: true,
-    key: 'izproject'
+    key: 'izproject',
+    component: IzProjectVue,
   },
   izvisitpro: {
     label: '拜访省份/直辖市',
     defaultValue: null,
     isDefaultFilter: true,
-    key: 'izvisitpro'
+    key: 'izvisitpro',
+    component: IzVisitcity,
   },
   izcustomlevel: {
     label: '客户级别',
     defaultValue: null,
     isDefaultFilter: true,
-    key: 'izcustomlevel'
+    key: 'izcustomlevel',
+    component: IzCustomlevel
   },
   izprojecttype: {
     label: '项目类别',
     defaultValue: null,
     isDefaultFilter: true,
-    key: 'izprojecttype'
+    key: 'izprojecttype',
+    component: IzProjecttype,
   },
   izproductname: {
     label: '产品名称',
     defaultValue: null,
     isDefaultFilter: true,
-    key: 'izproductname'
+    key: 'izproductname',
+    component: IzProductVue,
   },
   izvisitcity: {
     label: '拜访城市',
     defaultValue: null,
     isDefaultFilter: true,
-    key: 'izvisitcity'
+    key: 'izvisitcity',
+    component: IzvisitproVue,
   },
   izfirm: {
     label: '厂商',
     defaultValue: null,
     isDefaultFilter: true,
-    key: 'izfirm'
+    key: 'izfirm',
+    component: IzfirmVue,
   }
 }
\ No newline at end of file
-- 
2.39.3


From a2d3a3acef272574671a53aa00e804460a347fd5 Mon Sep 17 00:00:00 2001
From: raofuzi <2641346316@qq.com>
Date: Sun, 31 Mar 2024 23:58:50 +0800
Subject: [PATCH 072/143] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               |  3 ++
 src/assets/icons/ai-approve.svg               | 19 +++++++++++
 src/assets/icons/ai-order.svg                 | 20 +++++++++++
 src/assets/icons/robot-two.svg                | 13 ++++++++
 src/layout/components/Header/UserSettings.vue |  3 +-
 src/views/home/aside/Aside.vue                | 20 ++++++++++-
 .../home/aside/comp/items/IzCustomlevel.vue   |  9 +++--
 .../home/aside/comp/items/IzCustomname.vue    |  9 +++--
 .../home/aside/comp/items/IzCustomtype.vue    |  9 +++--
 .../home/aside/comp/items/IzCustomtypes.vue   |  9 +++--
 src/views/home/aside/comp/items/IzProduct.vue |  9 +++--
 src/views/home/aside/comp/items/IzProject.vue |  9 +++--
 .../home/aside/comp/items/IzProjecttype.vue   | 11 +++++--
 src/views/home/aside/comp/items/IzSearch.vue  |  9 +++--
 .../home/aside/comp/items/IzSearchManager.vue |  9 +++--
 src/views/home/aside/comp/items/IzShow.vue    |  9 +++--
 src/views/home/aside/comp/items/IzStatus.vue  |  9 +++--
 .../home/aside/comp/items/IzVisitcity.vue     |  9 +++--
 src/views/home/aside/comp/items/Izfiled17.vue |  9 +++--
 src/views/home/aside/comp/items/Izfiled2.vue  |  9 +++--
 src/views/home/aside/comp/items/Izfiled3.vue  |  9 +++--
 src/views/home/aside/comp/items/Izfiled6.vue  |  9 +++--
 src/views/home/aside/comp/items/Izfirm.vue    |  9 +++--
 .../home/aside/comp/items/Iztaskrrom.vue      |  9 +++--
 .../home/aside/comp/items/Iztaskstatus.vue    |  9 +++--
 .../home/aside/comp/items/Izvisitpro.vue      |  9 +++--
 src/views/home/aside/comp/items/Plan.vue      |  9 +++--
 .../home/aside/comp/items/ReportUser.vue      | 25 ++++++++++++--
 src/views/home/aside/comp/items/Time.vue      | 33 +++++++++++++------
 .../aside/comp/modals/CustomFilterModal.vue   |  2 +-
 src/views/home/content/Content.vue            |  5 +--
 .../home/content/modal/FinishPackageModal.vue | 14 ++++----
 .../content/modal/PackageSettingsModal.vue    |  2 +-
 33 files changed, 283 insertions(+), 67 deletions(-)
 create mode 100644 src/assets/icons/ai-approve.svg
 create mode 100644 src/assets/icons/ai-order.svg
 create mode 100644 src/assets/icons/robot-two.svg

diff --git a/components.d.ts b/components.d.ts
index 94c93f7..222bbbd 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -21,8 +21,10 @@ 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']
     NForm: typeof import('naive-ui')['NForm']
     NFormItem: typeof import('naive-ui')['NFormItem']
+    NGi: typeof import('naive-ui')['NGi']
     NGrid: typeof import('naive-ui')['NGrid']
     NGridItem: typeof import('naive-ui')['NGridItem']
     NImage: typeof import('naive-ui')['NImage']
@@ -31,6 +33,7 @@ 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']
diff --git a/src/assets/icons/ai-approve.svg b/src/assets/icons/ai-approve.svg
new file mode 100644
index 0000000..8ac61c6
--- /dev/null
+++ b/src/assets/icons/ai-approve.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="65px" height="65px" viewBox="0 0 65 65" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 11</title>
+    <g id="图审审批" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="3.0生成成功提示" transform="translate(-599.000000, -429.000000)" fill="#507AFD">
+            <g id="编组-28" transform="translate(518.000000, 322.000000)">
+                <g id="编组-19" transform="translate(80.000000, 107.000000)">
+                    <g id="编组-11" transform="translate(1.000000, 0.000000)">
+                        <circle id="椭圆形" fill-opacity="0.1" cx="32.5" cy="32.5" r="32.5"></circle>
+                        <g id="图文详情" transform="translate(18.000000, 18.000000)" fill-rule="nonzero">
+                            <rect id="矩形" opacity="0" x="0" y="0" width="28" height="28"></rect>
+                            <path d="M7.084,8.288 C7.644,8.288 8.12466667,8.48866667 8.526,8.89 C8.92733333,9.29133333 9.128,9.78133333 9.128,10.36 C9.128,10.92 8.92733333,11.4006667 8.526,11.802 C8.12466667,12.2033333 7.644,12.404 7.084,12.404 C6.50533333,12.404 6.02,12.2033333 5.628,11.802 C5.236,11.4006667 5.04,10.92 5.04,10.36 C5.04,9.78133333 5.236,9.29133333 5.628,8.89 C6.02,8.48866667 6.50533333,8.288 7.084,8.288 Z M23.632,1.568 C24.416,1.568 25.046,1.82933333 25.522,2.352 C25.998,2.87466667 26.236,3.472 26.236,4.144 L26.236,19.208 C26.236,19.6373333 26.082,20.0013333 25.774,20.3 C25.466,20.5986667 25.0973333,20.748 24.668,20.748 L22.736,20.748 L22.736,17.36 L23.94,17.36 C24.1453333,17.36 24.3226667,17.2853333 24.472,17.136 C24.6213333,16.9866667 24.696,16.8 24.696,16.576 C24.696,16.3706667 24.6213333,16.1933333 24.472,16.044 C24.3226667,15.8946667 24.1453333,15.82 23.94,15.82 L22.736,15.82 L22.736,13.636 L23.94,13.636 C24.1453333,13.636 24.3226667,13.5613333 24.472,13.412 C24.6213333,13.2626667 24.696,13.0853333 24.696,12.88 C24.696,12.6746667 24.6213333,12.4926667 24.472,12.334 C24.3226667,12.1753333 24.1453333,12.096 23.94,12.096 L22.736,12.096 L22.736,10.108 L23.94,10.108 C24.1453333,10.108 24.3226667,10.0333333 24.472,9.884 C24.6213333,9.73466667 24.696,9.548 24.696,9.324 C24.696,9.11866667 24.6213333,8.94133333 24.472,8.792 C24.3226667,8.64266667 24.1453333,8.568 23.94,8.568 L22.736,8.568 L22.736,6.216 C22.736,5.17066667 22.4933333,4.43333333 22.008,4.004 C21.5226667,3.57466667 20.7013333,3.36 19.544,3.36 L8.764,3.36 L8.764,3.108 C8.764,2.67866667 8.918,2.31466667 9.226,2.016 C9.534,1.71733333 9.90266667,1.568 10.332,1.568 L23.632,1.568 Z M18.928,5.04 C19.656,5.04 20.1833333,5.25 20.51,5.67 C20.8366667,6.09 21,6.636 21,7.308 L21,22.764 C21,23.1933333 20.8226667,23.59 20.468,23.954 C20.1133333,24.318 19.6746667,24.5 19.152,24.5 L3.5,24.5 C3.052,24.5 2.65066667,24.3133333 2.296,23.94 C1.94133333,23.5666667 1.764,23.128 1.764,22.624 L1.764,6.888 C1.764,6.34666667 1.91333333,5.90333333 2.212,5.558 C2.51066667,5.21266667 2.90266667,5.04 3.388,5.04 L18.928,5.04 L18.928,5.04 Z M19.236,7.98 C19.236,7.66266667 19.138,7.38733333 18.942,7.154 C18.746,6.92066667 18.4333333,6.804 18.004,6.804 L4.648,6.804 C4.57333333,6.804 4.47066667,6.818 4.34,6.846 C4.20933333,6.874 4.07866667,6.92066667 3.948,6.986 C3.81733333,7.05133333 3.70533333,7.14 3.612,7.252 C3.51866667,7.364 3.472,7.504 3.472,7.672 L3.472,15.176 C3.62133333,15.344 3.83133333,15.5446667 4.102,15.778 C4.37266667,16.0113333 4.69,16.226 5.054,16.422 C5.418,16.618 5.824,16.786 6.272,16.926 C6.72,17.066 7.20533333,17.136 7.728,17.136 C8.512,17.136 9.198,17.01 9.786,16.758 C10.374,16.506 10.92,16.1886667 11.424,15.806 C11.928,15.4233333 12.4226667,15.0126667 12.908,14.574 C13.3933333,14.1353333 13.93,13.72 14.518,13.328 C15.106,12.936 15.778,12.6046667 16.534,12.334 C17.29,12.0633333 18.1906667,11.9093333 19.236,11.872 L19.236,7.98 Z" id="形状"></path>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/icons/ai-order.svg b/src/assets/icons/ai-order.svg
new file mode 100644
index 0000000..649ce4a
--- /dev/null
+++ b/src/assets/icons/ai-order.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="65px" height="65px" viewBox="0 0 65 65" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 33</title>
+    <g id="图审审批" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="3.0生成成功提示" transform="translate(-788.000000, -429.000000)">
+            <g id="编组-28" transform="translate(518.000000, 322.000000)">
+                <g id="编组-30" transform="translate(269.000000, 107.000000)">
+                    <g id="编组-33" transform="translate(1.000000, 0.000000)">
+                        <circle id="椭圆形备份" fill="#EDF1FE" cx="32.5" cy="32.5" r="32.5"></circle>
+                        <g id="审批" transform="translate(17.000000, 18.000000)" fill="#507AFD" fill-rule="nonzero">
+                            <rect id="矩形" opacity="0" x="0" y="0" width="30" height="30"></rect>
+                            <path d="M15.7625,22.2125 L16.775,20.95 C16.1125,20.15 15.7125,19.125 15.7125,18.025 C15.7125,15.5 17.775,13.4375 20.3125,13.4375 C21.675,13.4375 22.9125,14.0375 23.75,14.975 L23.75,3.96249999 C23.75,3.13749999 23.075,2.46249999 22.25,2.46249999 L6,2.46249999 C5.175,2.46249999 4.5,3.13749999 4.5,3.96249999 L4.5,23.4625 C4.5,24.2875 5.175,24.9625 6,24.9625 L13.2125,24.9625 C13.525,23.65 14.5,22.6 15.7625,22.2125 Z M9.8875,6 L18.3875,6 C18.9375,6 19.3875,6.45 19.3875,7 C19.3875,7.54999998 18.9375,8 18.3875,8 L9.8875,8 C9.3375,8 8.8875,7.55000001 8.8875,7 C8.8875,6.44999997 9.32499999,6 9.8875,6 Z M9.8875,10.5 L18.3875,10.5 C18.9375,10.5 19.3875,10.95 19.3875,11.5 C19.3875,12.05 18.9375,12.5 18.3875,12.5 L9.8875,12.5 C9.3375,12.5 8.8875,12.05 8.8875,11.5 C8.8875,10.95 9.32499999,10.5 9.8875,10.5 Z M8.8875,16 C8.8875,15.45 9.3375,15 9.8875,15 L13.3875,15 C13.9375,15 14.3875,15.45 14.3875,16 C14.3875,16.55 13.9375,17 13.3875,17 L9.8875,17 C9.32499999,17 8.8875,16.55 8.8875,16 Z" id="形状"></path>
+                            <path d="M23.7625,27.5 L16.85,27.5 C15.9,27.5 15.125,26.725 15.125,25.775 C15.125,24.825 15.9,24.05 16.85,24.05 L19.6875,20.525 C18.55,20.25 17.7125,19.2375 17.7125,18.025 C17.7125,16.6 18.875,15.4375 20.3125,15.4375 C21.75,15.4375 22.9125,16.6 22.9125,18.025 C22.9125,19.2375 22.075,20.25 20.9375,20.525 L23.775,24.05 C24.725,24.05 25.5,24.825 25.5,25.775 C25.5,26.725 24.725,27.5 23.7625,27.5 L23.7625,27.5 Z" id="路径"></path>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/icons/robot-two.svg b/src/assets/icons/robot-two.svg
new file mode 100644
index 0000000..33ee42c
--- /dev/null
+++ b/src/assets/icons/robot-two.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>开心 2</title>
+    <g id="图审审批" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="3.0生成成功提示" transform="translate(-536.000000, -340.000000)">
+            <g id="编组-28" transform="translate(518.000000, 322.000000)">
+                <g id="开心-2" transform="translate(18.000000, 18.000000)">
+                    <image id="开心" x="0" y="0" width="80" height="80" xlink:href="data:image/png;base64,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"></image>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/layout/components/Header/UserSettings.vue b/src/layout/components/Header/UserSettings.vue
index 14f518b..3585a3c 100644
--- a/src/layout/components/Header/UserSettings.vue
+++ b/src/layout/components/Header/UserSettings.vue
@@ -3,6 +3,7 @@ import { computed, inject, onMounted, ref } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import { useUser } from "@/store/modules/user";
 import { getImgUrl } from "@/utils/urlUtils";
+import defaultAvatar from '@/assets/icons/avatar.svg';
 
 const emit = defineEmits<{
   (e: "logout"): void;
@@ -107,7 +108,7 @@ const options = computed(() => {
     <div class="container">
       <div class="header">
         <n-avatar
-          :src="getImgUrl(useInfo.usericon)"
+          :src="(useInfo.usericon && getImgUrl(useInfo.usericon)) || defaultAvatar"
           round
           style="width: 53px; height: 53px"
         />
diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue
index f6c6efe..f900d17 100644
--- a/src/views/home/aside/Aside.vue
+++ b/src/views/home/aside/Aside.vue
@@ -12,6 +12,7 @@ import { asideMap } from '@/config/aside'
 import type { AsideConfig } from '/#/api'
 import emitter from '@/utils/mitt'
 import { getFilterList } from '@/api/home/main'
+import dayjs from 'dayjs'
 
 const configStore = useConfig()
 
@@ -105,13 +106,29 @@ configStore.$subscribe(() => {
     Object.keys(customObjRef.value).map(key => {
       if(asideMap.hasOwnProperty(key)) {
         const str = key.toLowerCase()
+        console.log("customObjRef.value[str]1111111111111", customObjRef.value[str]);
         if(str == "izsimilarity" && typeof customObjRef.value[str] == "string") {
           customObjRef.value[str] = customObjRef.value[str].split(',');
+          asideValue[key] = customObjRef.value[str];// 赋值
+        }else if(str == "izyear" && typeof customObjRef.value[str] == "string") {
+          let time = customObjRef.value[str].split('-');
+          time[0] = (new Date(time[0])).getTime();
+          time[1] = (new Date(time[1])).getTime();
+          customObjRef.value[str] = time;
+          asideValue[key] = customObjRef.value[str];// 赋值
+          console.log("时间2222222222", 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);
+          asideValue[key] = customObjRef.value[str];// 赋值
+        }else {
+          asideValue[key] = "";
         }
         // asideMap[str].defaultValue = customObjRef.value[str];// 赋值
-        asideValue[key] = customObjRef.value[str];// 赋值
       }
     });
+
   }
   // console.log("showKeys", showKeys);
   const items = showKeys.reduce((acc, key) => {
@@ -178,6 +195,7 @@ function editFilter(filter: any) {
 }
 
 watch(asideValue, (newVal) => {
+  console.log("asideValue处理后", newVal);
   configStore.setAsideValue(newVal)
 }, { deep: true })
 </script>
diff --git a/src/views/home/aside/comp/items/IzCustomlevel.vue b/src/views/home/aside/comp/items/IzCustomlevel.vue
index 47ee014..9b61489 100644
--- a/src/views/home/aside/comp/items/IzCustomlevel.vue
+++ b/src/views/home/aside/comp/items/IzCustomlevel.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { onBeforeMount, ref } from 'vue'
+import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
 
@@ -31,7 +31,12 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-
+onMounted(() => {
+  if(props.value) {
+    let list = props.value.split(',');
+    formValue.value.plans = list;
+  }
+})
 onBeforeMount(async () => {
   const list = await configStore.fetchIzcustomlevelList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/IzCustomname.vue b/src/views/home/aside/comp/items/IzCustomname.vue
index d1a4e9e..746c480 100644
--- a/src/views/home/aside/comp/items/IzCustomname.vue
+++ b/src/views/home/aside/comp/items/IzCustomname.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { onBeforeMount, ref } from 'vue'
+import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
 
@@ -31,7 +31,12 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-
+onMounted(() => {
+  if(props.value) {
+    let list = props.value.split(',');
+    formValue.value.plans = list;
+  }
+})
 onBeforeMount(async () => {
   const list = await configStore.fetchizcustomnameList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/IzCustomtype.vue b/src/views/home/aside/comp/items/IzCustomtype.vue
index 0f4533b..3eee2c3 100644
--- a/src/views/home/aside/comp/items/IzCustomtype.vue
+++ b/src/views/home/aside/comp/items/IzCustomtype.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { onBeforeMount, ref } from 'vue'
+import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
 
@@ -31,7 +31,12 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-
+onMounted(() => {
+  if(props.value) {
+    let list = props.value.split(',');
+    formValue.value.plans = list;
+  }
+})
 onBeforeMount(async () => {
   const list = await configStore.fetchIzCustomtypeList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/IzCustomtypes.vue b/src/views/home/aside/comp/items/IzCustomtypes.vue
index 5baba2a..fd8ab6c 100644
--- a/src/views/home/aside/comp/items/IzCustomtypes.vue
+++ b/src/views/home/aside/comp/items/IzCustomtypes.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { onBeforeMount, ref } from 'vue'
+import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
 
@@ -37,7 +37,12 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-
+onMounted(() => {
+  if(props.value) {
+    let list = props.value.split(',');
+    formValue.value.plans = list;
+  }
+})
 onBeforeMount(async () => {
   const list = await configStore.fetchIzCustomtypeList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/IzProduct.vue b/src/views/home/aside/comp/items/IzProduct.vue
index 2184b5a..f508b90 100644
--- a/src/views/home/aside/comp/items/IzProduct.vue
+++ b/src/views/home/aside/comp/items/IzProduct.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { onBeforeMount, ref } from 'vue'
+import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
 
@@ -31,7 +31,12 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-
+onMounted(() => {
+  if(props.value) {
+    let list = props.value.split(',');
+    formValue.value.plans = list;
+  }
+})
 onBeforeMount(async () => {
   const list = await configStore.fetchIzproductnameList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/IzProject.vue b/src/views/home/aside/comp/items/IzProject.vue
index f3c11b0..43e26c1 100644
--- a/src/views/home/aside/comp/items/IzProject.vue
+++ b/src/views/home/aside/comp/items/IzProject.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { onBeforeMount, ref } from 'vue'
+import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
 
@@ -32,7 +32,12 @@ const labStyle = {
   fontWeight: 'bold',
   color: '#333333'
 }
-
+onMounted(() => {
+  if(props.value) {
+    let list = props.value.split(',');
+    formValue.value.plans = list;
+  }
+})
 onBeforeMount(async () => {
   const list = await configStore.fetchIzProjectList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/IzProjecttype.vue b/src/views/home/aside/comp/items/IzProjecttype.vue
index da321f2..229317a 100644
--- a/src/views/home/aside/comp/items/IzProjecttype.vue
+++ b/src/views/home/aside/comp/items/IzProjecttype.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup>
-import { onBeforeMount, ref } from 'vue'
+import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
+import { onUpdated } from 'vue';
 
 const props = defineProps<{
   value: string[] | null
@@ -31,7 +32,13 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-
+onMounted(() => {
+  if(props.value) {
+    let list = props.value.split(',');
+    formValue.value.plans = list;
+    console.log("formValue.value.plans", formValue.value.plans);
+  }
+})
 onBeforeMount(async () => {
   const list = await configStore.fetchizizprojecttypeList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/IzSearch.vue b/src/views/home/aside/comp/items/IzSearch.vue
index 8af0b99..f2cb276 100644
--- a/src/views/home/aside/comp/items/IzSearch.vue
+++ b/src/views/home/aside/comp/items/IzSearch.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { onBeforeMount, ref } from 'vue'
+import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
 
@@ -37,7 +37,12 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-
+onMounted(() => {
+  if(props.value) {
+    let list = props.value.split(',');
+    formValue.value.plans = list;
+  }
+})
 onBeforeMount(async () => {
   const list = await configStore.fetchIzSearchList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/IzSearchManager.vue b/src/views/home/aside/comp/items/IzSearchManager.vue
index 5f16e02..aee80bf 100644
--- a/src/views/home/aside/comp/items/IzSearchManager.vue
+++ b/src/views/home/aside/comp/items/IzSearchManager.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { onBeforeMount, ref } from 'vue'
+import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
 
@@ -37,7 +37,12 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-
+onMounted(() => {
+  if(props.value) {
+    let list = props.value.split(',');
+    formValue.value.plans = list;
+  }
+})
 onBeforeMount(async () => {
   const list = await configStore.fetchIzsSearchManagerList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/IzShow.vue b/src/views/home/aside/comp/items/IzShow.vue
index 52b1e68..04f6044 100644
--- a/src/views/home/aside/comp/items/IzShow.vue
+++ b/src/views/home/aside/comp/items/IzShow.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { onBeforeMount, ref } from 'vue'
+import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
 
@@ -31,7 +31,12 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-
+onMounted(() => {
+  if(props.value) {
+    let list = props.value.split(',');
+    formValue.value.plans = list;
+  }
+})
 onBeforeMount(async () => {
   const list = await configStore.fetchIzShowList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/IzStatus.vue b/src/views/home/aside/comp/items/IzStatus.vue
index 84912c3..143c089 100644
--- a/src/views/home/aside/comp/items/IzStatus.vue
+++ b/src/views/home/aside/comp/items/IzStatus.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { onBeforeMount, ref } from 'vue'
+import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
 
@@ -31,7 +31,12 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-
+onMounted(() => {
+  if(props.value) {
+    let list = props.value.split(',');
+    formValue.value.plans = list;
+  }
+})
 onBeforeMount(async () => {
   const list = await configStore.fetchizstatusListt()
   options.value = list
diff --git a/src/views/home/aside/comp/items/IzVisitcity.vue b/src/views/home/aside/comp/items/IzVisitcity.vue
index 27da07d..db026b7 100644
--- a/src/views/home/aside/comp/items/IzVisitcity.vue
+++ b/src/views/home/aside/comp/items/IzVisitcity.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { onBeforeMount, ref } from 'vue'
+import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
 
@@ -31,7 +31,12 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-
+onMounted(() => {
+  if(props.value) {
+    let list = props.value.split(',');
+    formValue.value.plans = list;
+  }
+})
 onBeforeMount(async () => {
   const list = await configStore.fetchizvisitcityList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/Izfiled17.vue b/src/views/home/aside/comp/items/Izfiled17.vue
index d0c3fea..8205625 100644
--- a/src/views/home/aside/comp/items/Izfiled17.vue
+++ b/src/views/home/aside/comp/items/Izfiled17.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { onBeforeMount, ref } from 'vue'
+import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
 
@@ -37,7 +37,12 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-
+onMounted(() => {
+  if(props.value) {
+    let list = props.value.split(',');
+    formValue.value.plans = list;
+  }
+})
 onBeforeMount(async () => {
   const list = await configStore.fetchIzfiled17List()
   options.value = list
diff --git a/src/views/home/aside/comp/items/Izfiled2.vue b/src/views/home/aside/comp/items/Izfiled2.vue
index 9afd54f..e3117b5 100644
--- a/src/views/home/aside/comp/items/Izfiled2.vue
+++ b/src/views/home/aside/comp/items/Izfiled2.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { onBeforeMount, ref } from 'vue'
+import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
 
@@ -37,7 +37,12 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-
+onMounted(() => {
+  if(props.value) {
+    let list = props.value.split(',');
+    formValue.value.plans = list;
+  }
+})
 onBeforeMount(async () => {
   const list = await configStore.fetchIzfiled2List()
   options.value = list
diff --git a/src/views/home/aside/comp/items/Izfiled3.vue b/src/views/home/aside/comp/items/Izfiled3.vue
index 290df05..e850731 100644
--- a/src/views/home/aside/comp/items/Izfiled3.vue
+++ b/src/views/home/aside/comp/items/Izfiled3.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { onBeforeMount, ref } from 'vue'
+import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
 
@@ -37,7 +37,12 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-
+onMounted(() => {
+  if(props.value) {
+    let list = props.value.split(',');
+    formValue.value.plans = list;
+  }
+})
 onBeforeMount(async () => {
   const list = await configStore.fetchIzfiled2List()
   options.value = list
diff --git a/src/views/home/aside/comp/items/Izfiled6.vue b/src/views/home/aside/comp/items/Izfiled6.vue
index c73f4eb..fb49822 100644
--- a/src/views/home/aside/comp/items/Izfiled6.vue
+++ b/src/views/home/aside/comp/items/Izfiled6.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { onBeforeMount, ref } from 'vue'
+import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
 
@@ -37,7 +37,12 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-
+onMounted(() => {
+  if(props.value) {
+    let list = props.value.split(',');
+    formValue.value.plans = list;
+  }
+})
 onBeforeMount(async () => {
   const list = await configStore.fetchIzfiled6List()
   options.value = list
diff --git a/src/views/home/aside/comp/items/Izfirm.vue b/src/views/home/aside/comp/items/Izfirm.vue
index 4fd09d4..d2b7e05 100644
--- a/src/views/home/aside/comp/items/Izfirm.vue
+++ b/src/views/home/aside/comp/items/Izfirm.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { onBeforeMount, ref } from 'vue'
+import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
 
@@ -31,7 +31,12 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-
+onMounted(() => {
+  if(props.value) {
+    let list = props.value.split(',');
+    formValue.value.plans = list;
+  }
+})
 onBeforeMount(async () => {
   const list = await configStore.fetchIzfirmList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/Iztaskrrom.vue b/src/views/home/aside/comp/items/Iztaskrrom.vue
index 4d19625..0848430 100644
--- a/src/views/home/aside/comp/items/Iztaskrrom.vue
+++ b/src/views/home/aside/comp/items/Iztaskrrom.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { onBeforeMount, ref } from 'vue'
+import { onBeforeMount, onMounted, ref } from 'vue'
 import { type FormItemRule, type FormRules, faIR } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
 
@@ -31,7 +31,12 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-
+onMounted(() => {
+  if(props.value) {
+    let list = props.value.split(',');
+    formValue.value.plans = list;
+  }
+})
 onBeforeMount(async () => {
   const list = await configStore.fetchIztaskrromList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/Iztaskstatus.vue b/src/views/home/aside/comp/items/Iztaskstatus.vue
index fe1029f..35f648e 100644
--- a/src/views/home/aside/comp/items/Iztaskstatus.vue
+++ b/src/views/home/aside/comp/items/Iztaskstatus.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { onBeforeMount, ref } from 'vue'
+import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
 
@@ -31,7 +31,12 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-
+onMounted(() => {
+  if(props.value) {
+    let list = props.value.split(',');
+    formValue.value.plans = list;
+  }
+})
 onBeforeMount(async () => {
   const list = await configStore.fetchIztaskstatusList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/Izvisitpro.vue b/src/views/home/aside/comp/items/Izvisitpro.vue
index ba41a11..28467f2 100644
--- a/src/views/home/aside/comp/items/Izvisitpro.vue
+++ b/src/views/home/aside/comp/items/Izvisitpro.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { onBeforeMount, ref } from 'vue'
+import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
 
@@ -31,7 +31,12 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-
+onMounted(() => {
+  if(props.value) {
+    let list = props.value.split(',');
+    formValue.value.plans = list;
+  }
+})
 onBeforeMount(async () => {
   const list = await configStore.fetchIzvisitproList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/Plan.vue b/src/views/home/aside/comp/items/Plan.vue
index a877913..3ad2fb6 100644
--- a/src/views/home/aside/comp/items/Plan.vue
+++ b/src/views/home/aside/comp/items/Plan.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { onBeforeMount, ref } from 'vue'
+import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
 
@@ -31,7 +31,12 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-
+onMounted(() => {
+  if(props.value) {
+    let list = props.value.split(',');
+    formValue.value.plans = list;
+  }
+})
 onBeforeMount(async () => {
   const planList = await configStore.fetchPlanList()
   planOptons.value = planList
diff --git a/src/views/home/aside/comp/items/ReportUser.vue b/src/views/home/aside/comp/items/ReportUser.vue
index ba44abb..0bf6f6e 100644
--- a/src/views/home/aside/comp/items/ReportUser.vue
+++ b/src/views/home/aside/comp/items/ReportUser.vue
@@ -1,7 +1,24 @@
 <script lang="ts" setup>
-import { onBeforeMount, ref } from 'vue'
+import { onBeforeMount, onMounted, onUpdated, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
+import { useConfig } from '@/store/modules/asideConfig'
+
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+  let asideValue = configUseStore.getAsideValue;
+  console.log("asideValue", asideValue);
+  if(asideValue['izupuser']) {
+    setTimeout(() => {
+      let list = asideValue['izupuser'].split(',');
+      formValue.value.users = list;
+      console.log("formValue.value.users1111111111", formValue.value.users);
+    }, 1000);
+  }else {
+    formValue.value.users = [];
+  }
+});
 
 const props = defineProps<{
   value: string[] | null
@@ -15,7 +32,11 @@ const emit = defineEmits<{
 const formValue = ref({
   users: props.value,
 })
-
+if(typeof formValue.value.users == "string") {
+  let list = formValue.value.users.split(',');
+  formValue.value.users = list;
+}
+console.log("formValue.value.users2222222222222", formValue.value.users);
 const rules: FormRules = {
   users: [
     {
diff --git a/src/views/home/aside/comp/items/Time.vue b/src/views/home/aside/comp/items/Time.vue
index 973dd7b..6edda3b 100644
--- a/src/views/home/aside/comp/items/Time.vue
+++ b/src/views/home/aside/comp/items/Time.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import dayjs from 'dayjs';
+import { onUpdated, watch } from 'vue';
 import { onMounted, ref } from 'vue';
 
 const props = defineProps<{
@@ -17,17 +18,29 @@ function onChange(value: [number, number]) {
   emit('update:value', value)
 }
 onMounted(() => {
-    // 获取当前日期
-    const currentDate = dayjs();
-    // 计算前三个月的起始日期和结束日期
-    const endDate =  currentDate.toDate();
-    const startDate = currentDate.subtract(3, 'month').toDate();
-    // 设置默认日期范围为前三个月的起始日期到三个月前的今天
-    time.value = [startDate.getTime(), endDate.getTime()];
-    setTimeout(() => {
-      onChange([startDate.getTime(), endDate.getTime()])
-    },300)
+    if(!props.value) {
+      // 获取当前日期
+      const currentDate = dayjs();
+      // 计算前三个月的起始日期和结束日期
+      const endDate =  currentDate.toDate();
+      const startDate = currentDate.subtract(3, 'month').toDate();
+      // 设置默认日期范围为前三个月的起始日期到三个月前的今天
+      time.value = [startDate.getTime(), endDate.getTime()];
+      console.log('time init', startDate.getTime(), endDate.getTime());
+      setTimeout(() => {
+        onChange([startDate.getTime(), endDate.getTime()])
+      },300)
+    }
 })
+
+watch(() => props.value,
+  (newVal, oldVal) => {
+    time.value = newVal
+    console.log("newVal", newVal, time.value);
+  }, {
+    deep: true
+  }
+);
 </script>
 
 <template>
diff --git a/src/views/home/aside/comp/modals/CustomFilterModal.vue b/src/views/home/aside/comp/modals/CustomFilterModal.vue
index f5131be..b021c0a 100644
--- a/src/views/home/aside/comp/modals/CustomFilterModal.vue
+++ b/src/views/home/aside/comp/modals/CustomFilterModal.vue
@@ -49,7 +49,7 @@ const allCount = computed(() => {
 })
 
 const selectCount = computed(() => {
-  return `全部筛选(共${onList.value.length}个)`
+  return `已经筛选(共${onList.value.length}个)`
 })
 
 defineExpose({
diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 3163054..7d2d512 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -53,7 +53,7 @@ const loading = ref(false)
 const message = useMessage()
 const totalCount = ref(0)
 const sortBy: PictureSortParam = {
-  orderbyname: "asc",
+  orderbyname: "desc",
   orderbyvalue: "pictureResult",
 };
 const imageRef = ref<ComponentElRef | null>()
@@ -155,6 +155,7 @@ watch(() => searchValue.value,
   async (newVal, oldVal) => {
     if(newVal) {
       isInitSeaerch.value = true;
+      pagination.pageNo = 0;
       const more = await featchList()
       listData.value = more;
       isInitSeaerch.value = false;
@@ -176,7 +177,7 @@ async function featchList() {
     pagination.pageNo += 1
     const searchValue = configStore.getSearchValue // rao
     const asideParams = unref(configStore.getAsideValue)
-    const params = filterId ? { userSearchId: filterId } : asideParams
+    const params = filterId ? { userSearchId: filterId } : cloneDeep(asideParams)
     let result = {
       pageCount: 0,
       data: [],
diff --git a/src/views/home/content/modal/FinishPackageModal.vue b/src/views/home/content/modal/FinishPackageModal.vue
index a187b55..74802ee 100644
--- a/src/views/home/content/modal/FinishPackageModal.vue
+++ b/src/views/home/content/modal/FinishPackageModal.vue
@@ -67,10 +67,10 @@ defineExpose({
       </n-card>
     </n-modal> -->
     <div class="header-box">
-      <div class="robot-box"><svg-icon size="80" name="robot2" /></div>
+      <div class="robot-box"><svg-icon size="80" name="robot-two" /></div>
       <div class="text-box">
         <div class="msg-title">生成成功提示</div>
-        <div class="msg-text">AI已根据您的配置要求生成任务包。</div>
+        <div class="msg-text">AI助手已根据您的配置要求生成任务包。</div>
       </div>
       <div class="close-box" @click="closeIconModal">
         <svg-icon size="30" name="close-none-border" />
@@ -78,15 +78,15 @@ defineExpose({
     </div>
     <div class="wrapper-footer">
       <div @click="closeModal('/worksheet')">
-        <svg-icon size="80" name="copy-select" />
+        <svg-icon size="65" name="ai-approve" />
         <div class="footer-text">
-          进入AI工单
+          图审审批
         </div>
       </div>
       <div @click="closeModal('/task')">
-        <svg-icon size="80" name="task-approval-select" />
+        <svg-icon size="65" name="ai-order" />
         <div class="footer-text">
-          进入任务审批
+          任务审批
         </div>
       </div>
     </div>
@@ -96,7 +96,7 @@ defineExpose({
 <style lang="less" scoped>
 .finish-package-modal {
   position: fixed;
-  width: 400px;
+  width: 424px;
   height: 250px;
   top: 50%;
   left: 50%;
diff --git a/src/views/home/content/modal/PackageSettingsModal.vue b/src/views/home/content/modal/PackageSettingsModal.vue
index 6efa521..bb22889 100644
--- a/src/views/home/content/modal/PackageSettingsModal.vue
+++ b/src/views/home/content/modal/PackageSettingsModal.vue
@@ -82,7 +82,7 @@ function afterLeave() {
         </div>
         <n-form ref="formRef" :model="model" require-mark-placement="left" style="margin-top: 8px;" :rules="rules">
           <n-form-item class="wrapper-task-package-name" path="packagename" label="任务包名称">
-            <n-input v-model:value="model.packagename" max="12" @keydown.enter.prevent />
+            <n-input v-model:value="model.packagename" maxlength="12" @keydown.enter.prevent />
           </n-form-item>
           <n-form-item path="mark" :style="formItemStyle">
             <n-checkbox v-model:checked="model.mark">
-- 
2.39.3


From 1d2862c40532fc57a3c9579387f6eaa34fbd0bfc Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Mon, 1 Apr 2024 09:36:48 +0800
Subject: [PATCH 073/143] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=9B=B8?=
 =?UTF-8?q?=E4=BC=BC=E5=9B=BE=E7=89=87=E6=9F=A5=E8=AF=A2id=E4=B8=BA?=
 =?UTF-8?q?=E4=B8=BB=E5=9B=BEid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/content/Content.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index fd77b4f..a4065f5 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -136,7 +136,7 @@ async function featchList() {
   try {
     taskpagination.pageNo += 1;
     const { data, total, pageCount } = await getTaskDetailPictureList(
-      { ...taskpagination, ...sortBy, checkDuplicateId: workStore.activeId, pictureId: taskDetailInfo.value.pictureid }
+      { ...taskpagination, ...sortBy, checkDuplicateId: workStore.activeId, pictureId: taskDetailInfo.value.id }
     );
 
     totalCount.value = total;
-- 
2.39.3


From 75c4fcc396363426301fb4734a5409f1bf87e25e Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Mon, 1 Apr 2024 09:41:41 +0800
Subject: [PATCH 074/143] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/content/Content.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index a4065f5..c292b2c 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -239,7 +239,7 @@ async function handleSelect(item: any) {
 async function sortHandler(orderby: "similarityScore" | "createdate") {
   selectedSortName.value = orderby;
   sortBy.orderName = orderby;
-  sortBy.orderType = sortBy.orderType === "desc" ? "desc" : "asc";
+  sortBy.orderType = sortBy.orderType === "asc" ? "desc" : "asc";
   refreshHandler();
 }
 
-- 
2.39.3


From baab33cd3125de3a765990db645f21d280902a4b Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Mon, 1 Apr 2024 09:44:14 +0800
Subject: [PATCH 075/143] =?UTF-8?q?feat:=20=E5=B7=B2=E5=AE=A1=E6=89=B9=20?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/content/Content.vue | 36 +++++++++++++++----------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index c292b2c..2f2d2ed 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -223,10 +223,8 @@ async function queryDetail(checkDuplicateId: any) {
   refreshHandler();
 }
 async function handleSelect(item: any) {
-  taskDetailInfo.value = await getTaskDetailInfo(workStore.activeId);
-
+  taskDetailInfo.value = await getTaskDetailInfo(item.id)
   const packageid = workStore.getActiveId;
-
   if (isEmpty(packageid)) {
     listData.value.length = 0;
     totalCount.value = 0;
@@ -488,15 +486,21 @@ function reloadList() {
             <n-scrollbar style="max-height: 100%">
               <n-ellipsis style="max-width: 350px">任务ID：{{ taskDetailInfo.taskname }}</n-ellipsis>
               <div class="tags">
-                <div class="tag tag-submiting" v-if="taskDetailInfo.historyStates == 1">{{ TASK_STATUS_OBJ[taskDetailInfo.historyStates]
+                <!-- <div class="tag tag-submiting" v-if="taskDetailInfo.workStatus == '1'">{{ TASK_STATUS_OBJ[taskDetailInfo.workStatus]
                 }}</div>
-                <div class="tag tag-approve" v-else-if="taskDetailInfo.historyStates == 2">{{
+                <div class="tag tag-submited" v-else-if="taskDetailInfo.workStatus == '2'">已审批</div>
+                <div class="tag tag-passed" v-if="taskDetailInfo.historyStates == 2">{{
                   TASK_STATUS_OBJ[taskDetailInfo.historyStates] }}</div>
-                <div class="tag tag-passed" v-else-if="taskDetailInfo.historyStates == 3">{{
+                <div class="tag tag-not-passed" v-else-if="taskDetailInfo.workStatus == 3">{{
                   TASK_STATUS_OBJ[taskDetailInfo.historyStates]
-                }}</div>
-                <div class="tag tag-approved" v-else-if="taskDetailInfo.historyStates == 4">{{
+                }}</div> -->
+                <div class="tag tag-submiting" v-if="taskDetailInfo.historyStates == '1'">待审批</div>
+                <div class="tag tag-submited" v-else-if="taskDetailInfo.historyStates == 2 || taskDetailInfo.workStatus == 3">已审批</div>
+                <div class="tag tag-passed" v-if="taskDetailInfo.historyStates == 2">{{
                   TASK_STATUS_OBJ[taskDetailInfo.historyStates] }}</div>
+                <div class="tag tag-not-passed" v-else-if="taskDetailInfo.workStatus == 3">{{
+                  TASK_STATUS_OBJ[taskDetailInfo.historyStates]
+                }}</div>
               </div>
               <n-divider class="divider-line" />
               <div class="property">
@@ -909,17 +913,21 @@ function reloadList() {
         line-height: 16px;
       }
 
+      .tag-submited {
+        color: #507AFD;
+        border: 1px solid #507AFD;
+      }
       .tag-submiting {
-        color: #feaf2d;
-        border: 1px solid #feaf2d;
+        color: #FFB800;
+        border: 1px solid #FFB800;
       }
 
-      .tag-approve {
-        color: #398ade;
-        border: 1px solid #398ade;
+      .tag-passed {
+        color: #02C984;
+        border: 1px solid #02C984;
       }
 
-      .tag-passed {
+      .tag-not-passed {
         color: #ff7575;
         border: 1px solid #ff7575;
       }
-- 
2.39.3


From da468db98b5b12112b3b08179016965f04ff6713 Mon Sep 17 00:00:00 2001
From: raofuzi <2641346316@qq.com>
Date: Mon, 1 Apr 2024 10:37:18 +0800
Subject: [PATCH 076/143] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               |  3 ---
 src/views/home/aside/Aside.vue                |  4 +--
 .../home/aside/comp/items/IzCustomlevel.vue   | 27 ++++++++++++++-----
 .../home/aside/comp/items/IzCustomname.vue    | 25 ++++++++++++-----
 .../home/aside/comp/items/IzCustomtype.vue    | 25 ++++++++++++-----
 .../home/aside/comp/items/IzCustomtypes.vue   | 25 ++++++++++++-----
 src/views/home/aside/comp/items/IzProduct.vue | 25 ++++++++++++-----
 src/views/home/aside/comp/items/IzProject.vue | 25 ++++++++++++-----
 .../home/aside/comp/items/IzProjecttype.vue   | 26 ++++++++++++------
 src/views/home/aside/comp/items/IzSearch.vue  | 25 ++++++++++++-----
 .../home/aside/comp/items/IzSearchManager.vue | 25 ++++++++++++-----
 src/views/home/aside/comp/items/IzShow.vue    | 25 ++++++++++++-----
 src/views/home/aside/comp/items/IzStatus.vue  | 25 ++++++++++++-----
 .../home/aside/comp/items/IzVisitcity.vue     | 25 ++++++++++++-----
 src/views/home/aside/comp/items/Izfiled17.vue | 25 ++++++++++++-----
 src/views/home/aside/comp/items/Izfiled2.vue  | 25 ++++++++++++-----
 src/views/home/aside/comp/items/Izfiled3.vue  | 26 +++++++++++++-----
 src/views/home/aside/comp/items/Izfiled6.vue  | 25 ++++++++++++-----
 src/views/home/aside/comp/items/Izfirm.vue    | 25 ++++++++++++-----
 .../home/aside/comp/items/Iztaskrrom.vue      | 25 ++++++++++++-----
 .../home/aside/comp/items/Iztaskstatus.vue    | 25 ++++++++++++-----
 .../home/aside/comp/items/Izvisitpro.vue      | 25 ++++++++++++-----
 src/views/home/aside/comp/items/Plan.vue      | 27 +++++++++++++------
 .../home/aside/comp/items/ReportUser.vue      | 10 +++----
 .../home/aside/comp/items/Similarity.vue      | 13 ++++++++-
 src/views/home/aside/comp/items/Time.vue      | 19 +++++++------
 26 files changed, 412 insertions(+), 168 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index f08bf82..d6fb45b 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -22,12 +22,10 @@ declare module 'vue' {
     NDivider: typeof import('naive-ui')['NDivider']
     NDropdown: typeof import('naive-ui')['NDropdown']
     NEllipsis: typeof import('naive-ui')['NEllipsis']
-    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']
-    NGi: typeof import('naive-ui')['NGi']
     NGrid: typeof import('naive-ui')['NGrid']
     NGridItem: typeof import('naive-ui')['NGridItem']
     NImage: typeof import('naive-ui')['NImage']
@@ -37,7 +35,6 @@ declare module 'vue' {
     NNotificationProvider: typeof import('naive-ui')['NNotificationProvider']
     NotPassed: typeof import('./src/components/NotPassed.vue')['default']
     NPopconfirm: typeof import('naive-ui')['NPopconfirm']
-    NPopconfirm: typeof import('naive-ui')['NPopconfirm']
     NPopover: typeof import('naive-ui')['NPopover']
     NPopselect: typeof import('naive-ui')['NPopselect']
     NProgress: typeof import('naive-ui')['NProgress']
diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue
index f900d17..c21fd47 100644
--- a/src/views/home/aside/Aside.vue
+++ b/src/views/home/aside/Aside.vue
@@ -106,7 +106,7 @@ configStore.$subscribe(() => {
     Object.keys(customObjRef.value).map(key => {
       if(asideMap.hasOwnProperty(key)) {
         const str = key.toLowerCase()
-        console.log("customObjRef.value[str]1111111111111", customObjRef.value[str]);
+        // console.log("customObjRef.value[str]1111111111111", customObjRef.value[str]);
         if(str == "izsimilarity" && typeof customObjRef.value[str] == "string") {
           customObjRef.value[str] = customObjRef.value[str].split(',');
           asideValue[key] = customObjRef.value[str];// 赋值
@@ -123,7 +123,7 @@ configStore.$subscribe(() => {
           console.log("list222222", list);
           asideValue[key] = customObjRef.value[str];// 赋值
         }else {
-          asideValue[key] = "";
+          asideValue[key] = null;
         }
         // asideMap[str].defaultValue = customObjRef.value[str];// 赋值
       }
diff --git a/src/views/home/aside/comp/items/IzCustomlevel.vue b/src/views/home/aside/comp/items/IzCustomlevel.vue
index 9b61489..9e909df 100644
--- a/src/views/home/aside/comp/items/IzCustomlevel.vue
+++ b/src/views/home/aside/comp/items/IzCustomlevel.vue
@@ -2,6 +2,20 @@
 import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
+import { useConfig } from '@/store/modules/asideConfig'
+
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+  let asideValue = configUseStore.getAsideValue;
+  if(asideValue['izcustomlevel']) {
+    let list = asideValue['izcustomlevel'].split(',');
+    formValue.value.plans = list;
+    console.log("formValue.value.izcustomlevel", formValue.value.plans);
+  }else {
+    formValue.value.plans = [];
+  }
+});
 
 const props = defineProps<{
   value: string[] | null
@@ -16,6 +30,12 @@ const formValue = ref({
   plans: props.value,
 })
 
+if(typeof formValue.value.plans == "string") {
+  let list = formValue.value.plans.split(',');
+  formValue.value.plans = list;
+}
+console.log("formValue.value.izcustomlevel22222", formValue.value.plans);
+
 const rules: FormRules = {
   plans: [
     {
@@ -31,12 +51,7 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-onMounted(() => {
-  if(props.value) {
-    let list = props.value.split(',');
-    formValue.value.plans = list;
-  }
-})
+
 onBeforeMount(async () => {
   const list = await configStore.fetchIzcustomlevelList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/IzCustomname.vue b/src/views/home/aside/comp/items/IzCustomname.vue
index 746c480..4145b71 100644
--- a/src/views/home/aside/comp/items/IzCustomname.vue
+++ b/src/views/home/aside/comp/items/IzCustomname.vue
@@ -2,7 +2,20 @@
 import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
+import { useConfig } from '@/store/modules/asideConfig'
 
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+  let asideValue = configUseStore.getAsideValue;
+  if(asideValue['izcustomname']) {
+    let list = asideValue['izcustomname'].split(',');
+    formValue.value.plans = list;
+    console.log("formValue.value.izcustomname", formValue.value.plans);
+  }else {
+    formValue.value.plans = [];
+  }
+});
 const props = defineProps<{
   value: string[] | null
   label: string
@@ -15,7 +28,10 @@ const emit = defineEmits<{
 const formValue = ref({
   plans: props.value,
 })
-
+if(typeof formValue.value.plans == "string") {
+  let list = formValue.value.plans.split(',');
+  formValue.value.plans = list;
+}
 const rules: FormRules = {
   plans: [
     {
@@ -31,12 +47,7 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-onMounted(() => {
-  if(props.value) {
-    let list = props.value.split(',');
-    formValue.value.plans = list;
-  }
-})
+
 onBeforeMount(async () => {
   const list = await configStore.fetchizcustomnameList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/IzCustomtype.vue b/src/views/home/aside/comp/items/IzCustomtype.vue
index 3eee2c3..993cf5f 100644
--- a/src/views/home/aside/comp/items/IzCustomtype.vue
+++ b/src/views/home/aside/comp/items/IzCustomtype.vue
@@ -2,7 +2,20 @@
 import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
+import { useConfig } from '@/store/modules/asideConfig'
 
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+  let asideValue = configUseStore.getAsideValue;
+  if(asideValue['izcustomtype']) {
+    let list = asideValue['izcustomtype'].split(',');
+    formValue.value.plans = list;
+    console.log("formValue.value.izcustomtype", formValue.value.plans);
+  }else {
+    formValue.value.plans = [];
+  }
+});
 const props = defineProps<{
   value: string[] | null
   label: string
@@ -15,7 +28,10 @@ const emit = defineEmits<{
 const formValue = ref({
   plans: props.value,
 })
-
+if(typeof formValue.value.plans == "string") {
+  let list = formValue.value.plans.split(',');
+  formValue.value.plans = list;
+}
 const rules: FormRules = {
   plans: [
     {
@@ -31,12 +47,7 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-onMounted(() => {
-  if(props.value) {
-    let list = props.value.split(',');
-    formValue.value.plans = list;
-  }
-})
+
 onBeforeMount(async () => {
   const list = await configStore.fetchIzCustomtypeList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/IzCustomtypes.vue b/src/views/home/aside/comp/items/IzCustomtypes.vue
index fd8ab6c..607c6e6 100644
--- a/src/views/home/aside/comp/items/IzCustomtypes.vue
+++ b/src/views/home/aside/comp/items/IzCustomtypes.vue
@@ -2,7 +2,20 @@
 import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
+import { useConfig } from '@/store/modules/asideConfig'
 
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+  let asideValue = configUseStore.getAsideValue;
+  if(asideValue['izcustomtypes']) {
+    let list = asideValue['izcustomtypes'].split(',');
+    formValue.value.plans = list;
+    console.log("formValue.value.izcustomtypes", formValue.value.plans);
+  }else {
+    formValue.value.plans = [];
+  }
+});
 const props = defineProps<{
   value: string[] | null
   label: string
@@ -15,7 +28,10 @@ const emit = defineEmits<{
 const formValue = ref({
   plans: props.value,
 })
-
+if(typeof formValue.value.plans == "string") {
+  let list = formValue.value.plans.split(',');
+  formValue.value.plans = list;
+}
 const rules: FormRules = {
   plans: [
     {
@@ -37,12 +53,7 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-onMounted(() => {
-  if(props.value) {
-    let list = props.value.split(',');
-    formValue.value.plans = list;
-  }
-})
+
 onBeforeMount(async () => {
   const list = await configStore.fetchIzCustomtypeList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/IzProduct.vue b/src/views/home/aside/comp/items/IzProduct.vue
index f508b90..6beb0e2 100644
--- a/src/views/home/aside/comp/items/IzProduct.vue
+++ b/src/views/home/aside/comp/items/IzProduct.vue
@@ -2,7 +2,20 @@
 import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
+import { useConfig } from '@/store/modules/asideConfig'
 
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+  let asideValue = configUseStore.getAsideValue;
+  if(asideValue['izproduct']) {
+    let list = asideValue['izproduct'].split(',');
+    formValue.value.plans = list;
+    console.log("formValue.value.izproduct", formValue.value.plans);
+  }else {
+    formValue.value.plans = [];
+  }
+});
 const props = defineProps<{
   value: string[] | null
   label: string
@@ -15,7 +28,10 @@ const emit = defineEmits<{
 const formValue = ref({
   plans: props.value,
 })
-
+if(typeof formValue.value.plans == "string") {
+  let list = formValue.value.plans.split(',');
+  formValue.value.plans = list;
+}
 const rules: FormRules = {
   plans: [
     {
@@ -31,12 +47,7 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-onMounted(() => {
-  if(props.value) {
-    let list = props.value.split(',');
-    formValue.value.plans = list;
-  }
-})
+
 onBeforeMount(async () => {
   const list = await configStore.fetchIzproductnameList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/IzProject.vue b/src/views/home/aside/comp/items/IzProject.vue
index 43e26c1..34306d4 100644
--- a/src/views/home/aside/comp/items/IzProject.vue
+++ b/src/views/home/aside/comp/items/IzProject.vue
@@ -2,7 +2,20 @@
 import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
+import { useConfig } from '@/store/modules/asideConfig'
 
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+  let asideValue = configUseStore.getAsideValue;
+  if(asideValue['izproject']) {
+    let list = asideValue['izproject'].split(',');
+    formValue.value.plans = list;
+    console.log("formValue.value.izproject", formValue.value.plans);
+  }else {
+    formValue.value.plans = [];
+  }
+});
 const props = defineProps<{
   value: string[] | null
   label: string
@@ -15,7 +28,10 @@ const emit = defineEmits<{
 const formValue = ref({
   plans: props.value,
 })
-
+if(typeof formValue.value.plans == "string") {
+  let list = formValue.value.plans.split(',');
+  formValue.value.plans = list;
+}
 const rules: FormRules = {
   plans: [
     {
@@ -32,12 +48,7 @@ const labStyle = {
   fontWeight: 'bold',
   color: '#333333'
 }
-onMounted(() => {
-  if(props.value) {
-    let list = props.value.split(',');
-    formValue.value.plans = list;
-  }
-})
+
 onBeforeMount(async () => {
   const list = await configStore.fetchIzProjectList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/IzProjecttype.vue b/src/views/home/aside/comp/items/IzProjecttype.vue
index 229317a..08f9dd3 100644
--- a/src/views/home/aside/comp/items/IzProjecttype.vue
+++ b/src/views/home/aside/comp/items/IzProjecttype.vue
@@ -3,7 +3,20 @@ import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
 import { onUpdated } from 'vue';
+import { useConfig } from '@/store/modules/asideConfig'
 
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+  let asideValue = configUseStore.getAsideValue;
+  if(asideValue['izprojecttype']) {
+    let list = asideValue['izprojecttype'].split(',');
+    formValue.value.plans = list;
+    console.log("formValue.value.izprojecttype", formValue.value.plans);
+  }else {
+    formValue.value.plans = [];
+  }
+});
 const props = defineProps<{
   value: string[] | null
   label: string
@@ -16,7 +29,10 @@ const emit = defineEmits<{
 const formValue = ref({
   plans: props.value,
 })
-
+if(typeof formValue.value.plans == "string") {
+  let list = formValue.value.plans.split(',');
+  formValue.value.plans = list;
+}
 const rules: FormRules = {
   plans: [
     {
@@ -32,13 +48,7 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-onMounted(() => {
-  if(props.value) {
-    let list = props.value.split(',');
-    formValue.value.plans = list;
-    console.log("formValue.value.plans", formValue.value.plans);
-  }
-})
+
 onBeforeMount(async () => {
   const list = await configStore.fetchizizprojecttypeList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/IzSearch.vue b/src/views/home/aside/comp/items/IzSearch.vue
index f2cb276..092c794 100644
--- a/src/views/home/aside/comp/items/IzSearch.vue
+++ b/src/views/home/aside/comp/items/IzSearch.vue
@@ -2,7 +2,20 @@
 import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
+import { useConfig } from '@/store/modules/asideConfig'
 
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+  let asideValue = configUseStore.getAsideValue;
+  if(asideValue['izsearch']) {
+    let list = asideValue['izsearch'].split(',');
+    formValue.value.plans = list;
+    console.log("formValue.value.izsearch", formValue.value.plans);
+  }else {
+    formValue.value.plans = [];
+  }
+});
 const props = defineProps<{
   value: string[] | null
   label: string
@@ -15,7 +28,10 @@ const emit = defineEmits<{
 const formValue = ref({
   plans: props.value,
 })
-
+if(typeof formValue.value.plans == "string") {
+  let list = formValue.value.plans.split(',');
+  formValue.value.plans = list;
+}
 const rules: FormRules = {
   plans: [
     {
@@ -37,12 +53,7 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-onMounted(() => {
-  if(props.value) {
-    let list = props.value.split(',');
-    formValue.value.plans = list;
-  }
-})
+
 onBeforeMount(async () => {
   const list = await configStore.fetchIzSearchList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/IzSearchManager.vue b/src/views/home/aside/comp/items/IzSearchManager.vue
index aee80bf..5684982 100644
--- a/src/views/home/aside/comp/items/IzSearchManager.vue
+++ b/src/views/home/aside/comp/items/IzSearchManager.vue
@@ -2,7 +2,20 @@
 import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
+import { useConfig } from '@/store/modules/asideConfig'
 
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+  let asideValue = configUseStore.getAsideValue;
+  if(asideValue['izsearchmanager']) {
+    let list = asideValue['izsearchmanager'].split(',');
+    formValue.value.plans = list;
+    console.log("formValue.value.izsearchmanager", formValue.value.plans);
+  }else {
+    formValue.value.plans = [];
+  }
+});
 const props = defineProps<{
   value: string[] | null
   label: string
@@ -15,7 +28,10 @@ const emit = defineEmits<{
 const formValue = ref({
   plans: props.value,
 })
-
+if(typeof formValue.value.plans == "string") {
+  let list = formValue.value.plans.split(',');
+  formValue.value.plans = list;
+}
 const rules: FormRules = {
   plans: [
     {
@@ -37,12 +53,7 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-onMounted(() => {
-  if(props.value) {
-    let list = props.value.split(',');
-    formValue.value.plans = list;
-  }
-})
+
 onBeforeMount(async () => {
   const list = await configStore.fetchIzsSearchManagerList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/IzShow.vue b/src/views/home/aside/comp/items/IzShow.vue
index 04f6044..78069f3 100644
--- a/src/views/home/aside/comp/items/IzShow.vue
+++ b/src/views/home/aside/comp/items/IzShow.vue
@@ -2,7 +2,20 @@
 import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
+import { useConfig } from '@/store/modules/asideConfig'
 
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+  let asideValue = configUseStore.getAsideValue;
+  if(asideValue['izshow']) {
+    let list = asideValue['izshow'].split(',');
+    formValue.value.plans = list;
+    console.log("formValue.value.izshow", formValue.value.plans);
+  }else {
+    formValue.value.plans = [];
+  }
+});
 const props = defineProps<{
   value: string[] | null
   label: string
@@ -15,7 +28,10 @@ const emit = defineEmits<{
 const formValue = ref({
   plans: props.value,
 })
-
+if(typeof formValue.value.plans == "string") {
+  let list = formValue.value.plans.split(',');
+  formValue.value.plans = list;
+}
 const rules: FormRules = {
   plans: [
     {
@@ -31,12 +47,7 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-onMounted(() => {
-  if(props.value) {
-    let list = props.value.split(',');
-    formValue.value.plans = list;
-  }
-})
+
 onBeforeMount(async () => {
   const list = await configStore.fetchIzShowList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/IzStatus.vue b/src/views/home/aside/comp/items/IzStatus.vue
index 143c089..3b50147 100644
--- a/src/views/home/aside/comp/items/IzStatus.vue
+++ b/src/views/home/aside/comp/items/IzStatus.vue
@@ -2,7 +2,20 @@
 import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
+import { useConfig } from '@/store/modules/asideConfig'
 
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+  let asideValue = configUseStore.getAsideValue;
+  if(asideValue['izstatus']) {
+    let list = asideValue['izstatus'].split(',');
+    formValue.value.plans = list;
+    console.log("formValue.value.izstatus", formValue.value.plans);
+  }else {
+    formValue.value.plans = [];
+  }
+});
 const props = defineProps<{
   value: string[] | null
   label: string
@@ -15,7 +28,10 @@ const emit = defineEmits<{
 const formValue = ref({
   plans: props.value,
 })
-
+if(typeof formValue.value.plans == "string") {
+  let list = formValue.value.plans.split(',');
+  formValue.value.plans = list;
+}
 const rules: FormRules = {
   plans: [
     {
@@ -31,12 +47,7 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-onMounted(() => {
-  if(props.value) {
-    let list = props.value.split(',');
-    formValue.value.plans = list;
-  }
-})
+
 onBeforeMount(async () => {
   const list = await configStore.fetchizstatusListt()
   options.value = list
diff --git a/src/views/home/aside/comp/items/IzVisitcity.vue b/src/views/home/aside/comp/items/IzVisitcity.vue
index db026b7..16ac3f3 100644
--- a/src/views/home/aside/comp/items/IzVisitcity.vue
+++ b/src/views/home/aside/comp/items/IzVisitcity.vue
@@ -2,7 +2,20 @@
 import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
+import { useConfig } from '@/store/modules/asideConfig'
 
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+  let asideValue = configUseStore.getAsideValue;
+  if(asideValue['izvisitcity']) {
+    let list = asideValue['izvisitcity'].split(',');
+    formValue.value.plans = list;
+    console.log("formValue.value.izvisitcity", formValue.value.plans);
+  }else {
+    formValue.value.plans = [];
+  }
+});
 const props = defineProps<{
   value: string[] | null
   label: string
@@ -15,7 +28,10 @@ const emit = defineEmits<{
 const formValue = ref({
   plans: props.value,
 })
-
+if(typeof formValue.value.plans == "string") {
+  let list = formValue.value.plans.split(',');
+  formValue.value.plans = list;
+}
 const rules: FormRules = {
   plans: [
     {
@@ -31,12 +47,7 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-onMounted(() => {
-  if(props.value) {
-    let list = props.value.split(',');
-    formValue.value.plans = list;
-  }
-})
+
 onBeforeMount(async () => {
   const list = await configStore.fetchizvisitcityList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/Izfiled17.vue b/src/views/home/aside/comp/items/Izfiled17.vue
index 8205625..f8c216a 100644
--- a/src/views/home/aside/comp/items/Izfiled17.vue
+++ b/src/views/home/aside/comp/items/Izfiled17.vue
@@ -2,7 +2,20 @@
 import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
+import { useConfig } from '@/store/modules/asideConfig'
 
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+  let asideValue = configUseStore.getAsideValue;
+  if(asideValue['izfiled17']) {
+    let list = asideValue['izfiled17'].split(',');
+    formValue.value.plans = list;
+    console.log("formValue.value.izfiled17", formValue.value.plans);
+  }else {
+    formValue.value.plans = [];
+  }
+});
 const props = defineProps<{
   value: string[] | null
   label: string
@@ -15,7 +28,10 @@ const emit = defineEmits<{
 const formValue = ref({
   plans: props.value,
 })
-
+if(typeof formValue.value.plans == "string") {
+  let list = formValue.value.plans.split(',');
+  formValue.value.plans = list;
+}
 const rules: FormRules = {
   plans: [
     {
@@ -37,12 +53,7 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-onMounted(() => {
-  if(props.value) {
-    let list = props.value.split(',');
-    formValue.value.plans = list;
-  }
-})
+
 onBeforeMount(async () => {
   const list = await configStore.fetchIzfiled17List()
   options.value = list
diff --git a/src/views/home/aside/comp/items/Izfiled2.vue b/src/views/home/aside/comp/items/Izfiled2.vue
index e3117b5..8016f07 100644
--- a/src/views/home/aside/comp/items/Izfiled2.vue
+++ b/src/views/home/aside/comp/items/Izfiled2.vue
@@ -2,7 +2,20 @@
 import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
+import { useConfig } from '@/store/modules/asideConfig'
 
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+  let asideValue = configUseStore.getAsideValue;
+  if(asideValue['izfiled2']) {
+    let list = asideValue['izfiled2'].split(',');
+    formValue.value.plans = list;
+    console.log("formValue.value.izfiled2", formValue.value.plans);
+  }else {
+    formValue.value.plans = [];
+  }
+});
 const props = defineProps<{
   value: string[] | null
   label: string
@@ -15,7 +28,10 @@ const emit = defineEmits<{
 const formValue = ref({
   plans: props.value,
 })
-
+if(typeof formValue.value.plans == "string") {
+  let list = formValue.value.plans.split(',');
+  formValue.value.plans = list;
+}
 const rules: FormRules = {
   plans: [
     {
@@ -37,12 +53,7 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-onMounted(() => {
-  if(props.value) {
-    let list = props.value.split(',');
-    formValue.value.plans = list;
-  }
-})
+
 onBeforeMount(async () => {
   const list = await configStore.fetchIzfiled2List()
   options.value = list
diff --git a/src/views/home/aside/comp/items/Izfiled3.vue b/src/views/home/aside/comp/items/Izfiled3.vue
index e850731..aa98ce9 100644
--- a/src/views/home/aside/comp/items/Izfiled3.vue
+++ b/src/views/home/aside/comp/items/Izfiled3.vue
@@ -2,7 +2,21 @@
 import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
+import { useConfig } from '@/store/modules/asideConfig'
 
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+  let asideValue = configUseStore.getAsideValue;
+  console.log("asideValue", asideValue);
+  if(asideValue['izfiled3']) {
+    let list = asideValue['izfiled3'].split(',');
+    formValue.value.plans = list;
+    console.log("formValue.value.izfiled3", formValue.value.plans);
+  }else {
+    formValue.value.plans = [];
+  }
+});
 const props = defineProps<{
   value: string[] | null
   label: string
@@ -15,7 +29,10 @@ const emit = defineEmits<{
 const formValue = ref({
   plans: props.value,
 })
-
+if(typeof formValue.value.plans == "string") {
+  let list = formValue.value.plans.split(',');
+  formValue.value.plans = list;
+}
 const rules: FormRules = {
   plans: [
     {
@@ -37,12 +54,7 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-onMounted(() => {
-  if(props.value) {
-    let list = props.value.split(',');
-    formValue.value.plans = list;
-  }
-})
+
 onBeforeMount(async () => {
   const list = await configStore.fetchIzfiled2List()
   options.value = list
diff --git a/src/views/home/aside/comp/items/Izfiled6.vue b/src/views/home/aside/comp/items/Izfiled6.vue
index fb49822..3d7cbd5 100644
--- a/src/views/home/aside/comp/items/Izfiled6.vue
+++ b/src/views/home/aside/comp/items/Izfiled6.vue
@@ -2,7 +2,20 @@
 import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
+import { useConfig } from '@/store/modules/asideConfig'
 
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+  let asideValue = configUseStore.getAsideValue;
+  if(asideValue['izfiled6']) {
+    let list = asideValue['izfiled6'].split(',');
+    formValue.value.plans = list;
+    console.log("formValue.value.izfiled6", formValue.value.plans);
+  }else {
+    formValue.value.plans = [];
+  }
+});
 const props = defineProps<{
   value: string[] | null
   label: string
@@ -15,7 +28,10 @@ const emit = defineEmits<{
 const formValue = ref({
   plans: props.value,
 })
-
+if(typeof formValue.value.plans == "string") {
+  let list = formValue.value.plans.split(',');
+  formValue.value.plans = list;
+}
 const rules: FormRules = {
   plans: [
     {
@@ -37,12 +53,7 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-onMounted(() => {
-  if(props.value) {
-    let list = props.value.split(',');
-    formValue.value.plans = list;
-  }
-})
+
 onBeforeMount(async () => {
   const list = await configStore.fetchIzfiled6List()
   options.value = list
diff --git a/src/views/home/aside/comp/items/Izfirm.vue b/src/views/home/aside/comp/items/Izfirm.vue
index d2b7e05..d9afb15 100644
--- a/src/views/home/aside/comp/items/Izfirm.vue
+++ b/src/views/home/aside/comp/items/Izfirm.vue
@@ -2,7 +2,20 @@
 import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
+import { useConfig } from '@/store/modules/asideConfig'
 
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+  let asideValue = configUseStore.getAsideValue;
+  if(asideValue['izfirm']) {
+    let list = asideValue['izfirm'].split(',');
+    formValue.value.plans = list;
+    console.log("formValue.value.izfirm", formValue.value.plans);
+  }else {
+    formValue.value.plans = [];
+  }
+});
 const props = defineProps<{
   value: string[] | null
   label: string
@@ -15,7 +28,10 @@ const emit = defineEmits<{
 const formValue = ref({
   plans: props.value,
 })
-
+if(typeof formValue.value.plans == "string") {
+  let list = formValue.value.plans.split(',');
+  formValue.value.plans = list;
+}
 const rules: FormRules = {
   plans: [
     {
@@ -31,12 +47,7 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-onMounted(() => {
-  if(props.value) {
-    let list = props.value.split(',');
-    formValue.value.plans = list;
-  }
-})
+
 onBeforeMount(async () => {
   const list = await configStore.fetchIzfirmList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/Iztaskrrom.vue b/src/views/home/aside/comp/items/Iztaskrrom.vue
index 0848430..988504a 100644
--- a/src/views/home/aside/comp/items/Iztaskrrom.vue
+++ b/src/views/home/aside/comp/items/Iztaskrrom.vue
@@ -2,7 +2,20 @@
 import { onBeforeMount, onMounted, ref } from 'vue'
 import { type FormItemRule, type FormRules, faIR } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
+import { useConfig } from '@/store/modules/asideConfig'
 
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+  let asideValue = configUseStore.getAsideValue;
+  if(asideValue['iztaskrrom']) {
+    let list = asideValue['iztaskrrom'].split(',');
+    formValue.value.plans = list;
+    console.log("formValue.value.iztaskrrom", formValue.value.plans);
+  }else {
+    formValue.value.plans = [];
+  }
+});
 const props = defineProps<{
   value: string[] | null
   label: string
@@ -15,7 +28,10 @@ const emit = defineEmits<{
 const formValue = ref({
   plans: props.value,
 })
-
+if(typeof formValue.value.plans == "string") {
+  let list = formValue.value.plans.split(',');
+  formValue.value.plans = list;
+}
 const rules: FormRules = {
   plans: [
     {
@@ -31,12 +47,7 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-onMounted(() => {
-  if(props.value) {
-    let list = props.value.split(',');
-    formValue.value.plans = list;
-  }
-})
+
 onBeforeMount(async () => {
   const list = await configStore.fetchIztaskrromList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/Iztaskstatus.vue b/src/views/home/aside/comp/items/Iztaskstatus.vue
index 35f648e..e4ec175 100644
--- a/src/views/home/aside/comp/items/Iztaskstatus.vue
+++ b/src/views/home/aside/comp/items/Iztaskstatus.vue
@@ -2,7 +2,20 @@
 import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
+import { useConfig } from '@/store/modules/asideConfig'
 
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+  let asideValue = configUseStore.getAsideValue;
+  if(asideValue['iztaskstatus']) {
+    let list = asideValue['iztaskstatus'].split(',');
+    formValue.value.plans = list;
+    console.log("formValue.value.iztaskstatus", formValue.value.plans);
+  }else {
+    formValue.value.plans = [];
+  }
+});
 const props = defineProps<{
   value: string[] | null
   label: string
@@ -15,7 +28,10 @@ const emit = defineEmits<{
 const formValue = ref({
   plans: props.value,
 })
-
+if(typeof formValue.value.plans == "string") {
+  let list = formValue.value.plans.split(',');
+  formValue.value.plans = list;
+}
 const rules: FormRules = {
   plans: [
     {
@@ -31,12 +47,7 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-onMounted(() => {
-  if(props.value) {
-    let list = props.value.split(',');
-    formValue.value.plans = list;
-  }
-})
+
 onBeforeMount(async () => {
   const list = await configStore.fetchIztaskstatusList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/Izvisitpro.vue b/src/views/home/aside/comp/items/Izvisitpro.vue
index 28467f2..e8b1a46 100644
--- a/src/views/home/aside/comp/items/Izvisitpro.vue
+++ b/src/views/home/aside/comp/items/Izvisitpro.vue
@@ -2,7 +2,20 @@
 import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
+import { useConfig } from '@/store/modules/asideConfig'
 
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+  let asideValue = configUseStore.getAsideValue;
+  if(asideValue['izvisitpro']) {
+    let list = asideValue['izvisitpro'].split(',');
+    formValue.value.plans = list;
+    console.log("formValue.value.izvisitpro", formValue.value.plans);
+  }else {
+    formValue.value.plans = [];
+  }
+});
 const props = defineProps<{
   value: string[] | null
   label: string
@@ -15,7 +28,10 @@ const emit = defineEmits<{
 const formValue = ref({
   plans: props.value,
 })
-
+if(typeof formValue.value.plans == "string") {
+  let list = formValue.value.plans.split(',');
+  formValue.value.plans = list;
+}
 const rules: FormRules = {
   plans: [
     {
@@ -31,12 +47,7 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-onMounted(() => {
-  if(props.value) {
-    let list = props.value.split(',');
-    formValue.value.plans = list;
-  }
-})
+
 onBeforeMount(async () => {
   const list = await configStore.fetchIzvisitproList()
   options.value = list
diff --git a/src/views/home/aside/comp/items/Plan.vue b/src/views/home/aside/comp/items/Plan.vue
index 3ad2fb6..944cf8b 100644
--- a/src/views/home/aside/comp/items/Plan.vue
+++ b/src/views/home/aside/comp/items/Plan.vue
@@ -2,7 +2,20 @@
 import { onBeforeMount, onMounted, ref } from 'vue'
 import type { FormItemRule, FormRules } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
+import { useConfig } from '@/store/modules/asideConfig'
 
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+  let asideValue = configUseStore.getAsideValue;
+  if(asideValue['izplan']) {
+    let list = asideValue['izplan'].split(',');
+    formValue.value.plans = list;
+    console.log("formValue.value.izplan", formValue.value.plans);
+  }else {
+    formValue.value.plans = [];
+  }
+});
 const props = defineProps<{
   value: string[] | null
   label: string
@@ -13,9 +26,12 @@ const emit = defineEmits<{
 }>()
 
 const formValue = ref({
-  plans: props.value,
+  plans: props.value || [],
 })
-
+if(typeof formValue.value.plans == "string") {
+  let list = formValue.value.plans.split(',');
+  formValue.value.plans = list;
+}
 const rules: FormRules = {
   plans: [
     {
@@ -31,12 +47,7 @@ const configStore = useDictionary()
 const labStyle = {
   fontWeight: 'bold',
 }
-onMounted(() => {
-  if(props.value) {
-    let list = props.value.split(',');
-    formValue.value.plans = list;
-  }
-})
+
 onBeforeMount(async () => {
   const planList = await configStore.fetchPlanList()
   planOptons.value = planList
diff --git a/src/views/home/aside/comp/items/ReportUser.vue b/src/views/home/aside/comp/items/ReportUser.vue
index 0bf6f6e..7588591 100644
--- a/src/views/home/aside/comp/items/ReportUser.vue
+++ b/src/views/home/aside/comp/items/ReportUser.vue
@@ -10,11 +10,9 @@ configUseStore.$subscribe(() => {
   let asideValue = configUseStore.getAsideValue;
   console.log("asideValue", asideValue);
   if(asideValue['izupuser']) {
-    setTimeout(() => {
-      let list = asideValue['izupuser'].split(',');
-      formValue.value.users = list;
-      console.log("formValue.value.users1111111111", formValue.value.users);
-    }, 1000);
+    let list = asideValue['izupuser'].split(',');
+    formValue.value.users = list;
+    console.log("formValue.value.users1111111111", formValue.value.users);
   }else {
     formValue.value.users = [];
   }
@@ -30,7 +28,7 @@ const emit = defineEmits<{
 }>()
 
 const formValue = ref({
-  users: props.value,
+  users: props.value || [],
 })
 if(typeof formValue.value.users == "string") {
   let list = formValue.value.users.split(',');
diff --git a/src/views/home/aside/comp/items/Similarity.vue b/src/views/home/aside/comp/items/Similarity.vue
index d94c5ae..05e24e3 100644
--- a/src/views/home/aside/comp/items/Similarity.vue
+++ b/src/views/home/aside/comp/items/Similarity.vue
@@ -1,6 +1,17 @@
 <script lang="ts" setup>
 import { ref } from 'vue'
+import { useConfig } from '@/store/modules/asideConfig'
 
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+  let asideValue = configUseStore.getAsideValue;
+  if(asideValue['izsimilarity']) {
+    range.value = asideValue['izsimilarity']
+  }else {
+    range.value = [0, 100];
+  }
+});
 const props = defineProps<{
   value: [number, number]
   label: string
@@ -10,7 +21,7 @@ const emit = defineEmits<{
   (e: 'update:value', value: string): void
 }>()
 
-const range = ref<[number, number]>(props.value)
+const range = ref<[number, number]>(props.value || [])
 
 const marks = {
   0: '0',
diff --git a/src/views/home/aside/comp/items/Time.vue b/src/views/home/aside/comp/items/Time.vue
index 6edda3b..5dd7c8b 100644
--- a/src/views/home/aside/comp/items/Time.vue
+++ b/src/views/home/aside/comp/items/Time.vue
@@ -2,7 +2,18 @@
 import dayjs from 'dayjs';
 import { onUpdated, watch } from 'vue';
 import { onMounted, ref } from 'vue';
+import { useConfig } from '@/store/modules/asideConfig'
 
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+  let asideValue = configUseStore.getAsideValue;
+  if(asideValue['izyear']) {
+    time.value = asideValue['izyear']
+  }else {
+    time.value = null;
+  }
+});
 const props = defineProps<{
   value: [number, number] | null
   label: string
@@ -33,14 +44,6 @@ onMounted(() => {
     }
 })
 
-watch(() => props.value,
-  (newVal, oldVal) => {
-    time.value = newVal
-    console.log("newVal", newVal, time.value);
-  }, {
-    deep: true
-  }
-);
 </script>
 
 <template>
-- 
2.39.3


From d2d4e9cf9089460e1222691e9d46c8fb4cf55670 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Mon, 1 Apr 2024 15:27:50 +0800
Subject: [PATCH 077/143] =?UTF-8?q?feat:=20=E5=B7=A5=E5=8D=95=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E5=BC=B9=E7=AA=97=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/aside/WorkSheetList.vue   |   7 +-
 src/views/worksheet/modal/ApprovalModal.vue   |  90 ++++--
 src/views/worksheet/modal/ApprovalModal2.vue  |   2 +-
 .../worksheet/modal/ApprovalModal_bak.vue     | 260 ++++++++++++++++++
 4 files changed, 325 insertions(+), 34 deletions(-)
 create mode 100644 src/views/worksheet/modal/ApprovalModal_bak.vue

diff --git a/src/views/worksheet/aside/WorkSheetList.vue b/src/views/worksheet/aside/WorkSheetList.vue
index f797a21..330b045 100644
--- a/src/views/worksheet/aside/WorkSheetList.vue
+++ b/src/views/worksheet/aside/WorkSheetList.vue
@@ -33,7 +33,7 @@ const pagination = reactive({
   pageSize: 10,
 })
 
-const approvalModalRef = ref(null)
+const approvalModalRef: any = ref(null)
 const notPassedRef: any = ref(null)
 const overTask = ref<any>(null);
 
@@ -94,8 +94,9 @@ watch(
   (newVal) => {
     if (isEmpty(newVal))
       return
-
-    activeId.value = newVal
+    activeId.value = newVal;
+    approvalModalRef.value.showModal(activeId.value)
+    
   },
 )
 
diff --git a/src/views/worksheet/modal/ApprovalModal.vue b/src/views/worksheet/modal/ApprovalModal.vue
index eac9608..e075306 100644
--- a/src/views/worksheet/modal/ApprovalModal.vue
+++ b/src/views/worksheet/modal/ApprovalModal.vue
@@ -2,9 +2,10 @@
 import { onMounted, reactive, ref, toRefs } from "vue";
 import { format } from "date-fns";
 import { NButton, NDataTable, useDialog, useMessage } from "naive-ui";
-import { aiApprovaltools, aiApprovaltoolsClearmark } from "@/api/work/work";
+import { aiApprovaltools, aiApprovaltoolsClearmark, setTF } from "@/api/work/work";
 import { getToolsCount } from "@/api/home/main";
-
+import { storage } from "@/utils/Storage";
+import { CURRENT_USER } from "@/store/mutation-types";
 const emit = defineEmits<{
   (e: "reject", params: any);
   (e: "notPass", params: any);
@@ -14,7 +15,7 @@ const dialog = useDialog();
 
 const state: any = reactive({
   detail: {},
-  taskId: "",
+  packageid: "",
 });
 const { detail } = toRefs(state);
 const cardStyle = {
@@ -26,23 +27,34 @@ const cardStyle = {
 const show = ref(false);
 
 function showModal(id) {
-  console.log(id);
-  state.taskId = id;
+  state.packageid = id;
   getDetail(id);
 }
 
 async function getDetail(id) {
+  // const userInfo = storage.get(CURRENT_USER);
+  // const nodeType = userInfo.nodeType;
+  id = "264626184091111068";
   const res = await aiApprovaltools({ taskid: id });
   if (res.code === "OK") {
     state.detail = res.data;
     show.value = true;
   }
 
-  console.log(res);
+  console.log(res, "getDetail");
 }
 
+const handleReject = async () => {
+  const res = await setTF({
+    taskchildpictureids: state.detail.taskIdList.join(","),
+    packageid: state.packageid,
+    iztrueorfalse: 0,
+  });
+  console.log(res, "handleReject");
+};
+
 async function clearMark() {
-  const res = await aiApprovaltoolsClearmark({ taskid: state.taskId });
+  const res = await aiApprovaltoolsClearmark({ taskid: state.packageid });
   if (res.code === "OK") closeModal();
 }
 
@@ -69,7 +81,7 @@ async function reject() {
 
 async function viewRepeat(e: MouseEvent) {
   emit("notPass", {
-    id: state.taskId,
+    id: state.packageid,
     detail: state.detail,
   });
   e.preventDefault();
@@ -78,7 +90,7 @@ async function viewRepeat(e: MouseEvent) {
 
 async function getShowStatus() {
   const res = await getToolsCount();
-  if (res.code == 'OK') {
+  if (res.code == "OK") {
     show.value = true;
   }
 }
@@ -92,7 +104,7 @@ defineExpose({
 </script>
 
 <template>
-  <n-modal v-model:show="show" transform-origin="center" class="modal_wrap">
+  <n-modal :show="show" transform-origin="center" class="modal_wrap">
     <div class="wrapper">
       <div class="closed">
         <SvgIcon style="cursor: pointer" name="cut-down" width="32" @click="closeModal" />
@@ -100,31 +112,36 @@ defineExpose({
       <div class="wrapper-hearder">
         <div class="wrapper-title">智能AI审批工具</div>
         <div class="wrapper-mark">
-          {{ detail.tenantusername }}
+          {{ detail.tenantUserName }}-{{ detail.packageName }}
         </div>
       </div>
       <div class="wrapper-content">
-        <n-scrollbar style="height: 200px">
-          <div v-for="i in 1" :key="i" class="item">
-            <div class="imgwrapper" />
-            <div class="content">
-              <div class="task_id">任务ID：{{ detail.taskid }}</div>
-              <div class="tag_box">
-                <div class="tag_item">基线任务</div>
-                <div class="tag_item error">相似图片({{ detail.similarcount }})</div>
-              </div>
-              <div class="time_box">
-                {{ format(detail.createtime, "yyyy-MM-dd HH:mm:ss") }}
+        <div class="item">
+          <div class="imgwrapper" />
+          <div class="content">
+            <div class="task_id">#AI任务包{{ detail.packageId }}</div>
+            <div class="tag_box">
+              <div class="tag_item error">
+                <span style="color: red">error</span> 重复图片({{
+                  detail.similarComplete
+                }})
               </div>
             </div>
+            <div class="time_box">
+              任务包生成时间：
+              {{ format(detail?.createtime || 0, "yyyy-MM-dd HH:mm:ss") }}
+            </div>
           </div>
-        </n-scrollbar>
+        </div>
         <div class="mark_text">
-          智能识别：{{ detail.similarComplete }}张图片来源于网络，建议将图片标记为假，或
-          快速审批不通过！
+          智能提示：{{detail?.similarComplete}} 张图片相似度为100%重复图片，{{detail?.passCount}}张审批状态为<span
+            style="color: #02c984"
+            >通过</span
+          >，剩余{{detail?.pendingApprovaCount}}张图片建议审批为不通过！
         </div>
-        <div class="footer">
-          <SvgIcon
+        <div class="footer" @click="handleReject">
+          立即审批
+          <!-- <SvgIcon
             style="cursor: pointer"
             name="r3"
             width="162"
@@ -137,7 +154,7 @@ defineExpose({
             width="162"
             height="54"
             @click="viewRepeat"
-          />
+          /> -->
         </div>
       </div>
     </div>
@@ -185,7 +202,7 @@ defineExpose({
   .wrapper-content {
     flex: 1;
     border-radius: 8px;
-    margin: 35px 60px 35px 120px;
+    margin: 70px 60px 35px 120px;
     .item {
       display: flex;
       flex-flow: row nowrap;
@@ -249,11 +266,24 @@ defineExpose({
       line-height: 16px;
     }
     .footer {
+      cursor: pointer;
       display: flex;
       flex-flow: row nowrap;
       align-items: center;
       justify-content: center;
-      margin: 20px 30px 0 0;
+      margin: 20px auto 0;
+      width: 132px;
+      height: 40px;
+      background: linear-gradient(135deg, #3258e8, #786efc);
+      border-image: linear-gradient(123deg, #d7dffe 2%, #d7d5ff 88%) 1 1;
+      border-radius: 23px;
+      box-shadow: 0px 2px 6px 0px rgba(116, 153, 253, 0.3);
+      font-size: 20px;
+      font-family: YouSheBiaoTiHei, YouSheBiaoTiHei-Regular;
+      font-weight: Regular;
+      text-align: left;
+      color: #ffffff;
+      line-height: 26px;
     }
   }
 }
diff --git a/src/views/worksheet/modal/ApprovalModal2.vue b/src/views/worksheet/modal/ApprovalModal2.vue
index d706c26..0bbe525 100644
--- a/src/views/worksheet/modal/ApprovalModal2.vue
+++ b/src/views/worksheet/modal/ApprovalModal2.vue
@@ -39,7 +39,7 @@ defineExpose({
 </script>
 
 <template>
-  <n-modal v-model:show="show" transform-origin="center" class="modal_wrap">
+  <n-modal :show="true" transform-origin="center" class="modal_wrap">
     <div class="wrapper">
       <div class="closed">
         <SvgIcon style="cursor: pointer" name="cut-down" width="32" @click="closeModal"/>
diff --git a/src/views/worksheet/modal/ApprovalModal_bak.vue b/src/views/worksheet/modal/ApprovalModal_bak.vue
new file mode 100644
index 0000000..7346134
--- /dev/null
+++ b/src/views/worksheet/modal/ApprovalModal_bak.vue
@@ -0,0 +1,260 @@
+<script lang="ts" setup>
+import { onMounted, reactive, ref, toRefs } from "vue";
+import { format } from "date-fns";
+import { NButton, NDataTable, useDialog, useMessage } from "naive-ui";
+import { aiApprovaltools, aiApprovaltoolsClearmark } from "@/api/work/work";
+import { getToolsCount } from "@/api/home/main";
+
+const emit = defineEmits<{
+  (e: "reject", params: any);
+  (e: "notPass", params: any);
+}>();
+
+const dialog = useDialog();
+
+const state: any = reactive({
+  detail: {},
+  taskId: "",
+});
+const { detail } = toRefs(state);
+const cardStyle = {
+  width: "450px",
+  "--n-padding-bottom": "10px",
+  "--n-padding-left": "0px",
+};
+
+const show = ref(false);
+
+function showModal(id) {
+  console.log(id);
+  state.taskId = id;
+  getDetail(id);
+}
+
+async function getDetail(id) {
+  const res = await aiApprovaltools({ taskid: id });
+  if (res.code === "OK") {
+    state.detail = res.data;
+    show.value = true;
+  }
+
+  console.log(res,'getDetail');
+}
+
+async function clearMark() {
+  const res = await aiApprovaltoolsClearmark({ taskid: state.taskId });
+  if (res.code === "OK") closeModal();
+}
+
+function closeModal() {
+  show.value = false;
+}
+
+async function reject() {
+  // emit('reject', { a: 'todo' })
+  // closeModal()
+  dialog.info({
+    title: "确认提示",
+    content: "确认设置成假吗?",
+    positiveText: "确定",
+    negativeText: "取消",
+    onPositiveClick: async () => {
+      // TODO：需要支持重置
+      // const result = await resetApproval()
+      clearMark();
+    },
+    onNegativeClick: () => {},
+  });
+}
+
+async function viewRepeat(e: MouseEvent) {
+  emit("notPass", {
+    id: state.taskId,
+    detail: state.detail,
+  });
+  e.preventDefault();
+  closeModal();
+}
+
+async function getShowStatus() {
+  const res = await getToolsCount();
+  if (res.code == 'OK') {
+    show.value = true;
+  }
+}
+onMounted(() => {
+  getShowStatus();
+});
+
+defineExpose({
+  showModal,
+});
+</script>
+
+<template>
+  <n-modal :show="show" transform-origin="center" class="modal_wrap">
+    <div class="wrapper">
+      <div class="closed">
+        <SvgIcon style="cursor: pointer" name="cut-down" width="32" @click="closeModal" />
+      </div>
+      <div class="wrapper-hearder">
+        <div class="wrapper-title">智能AI审批工具</div>
+        <div class="wrapper-mark">
+          {{ detail.tenantusername }}
+        </div>
+      </div>
+      <div class="wrapper-content">
+        <n-scrollbar style="height: 200px">
+          <div v-for="i in 1" :key="i" class="item">
+            <div class="imgwrapper" />
+            <div class="content">
+              <div class="task_id">任务ID：{{ detail.taskid }}</div>
+              <div class="tag_box">
+                <div class="tag_item">基线任务</div>
+                <div class="tag_item error">相似图片({{ detail.similarcount }})</div>
+              </div>
+              <div class="time_box">
+                {{ format(detail?.createtime || 0, "yyyy-MM-dd HH:mm:ss") }}
+              </div>
+            </div>
+          </div>
+        </n-scrollbar>
+        <div class="mark_text">
+          智能识别：{{ detail.similarComplete }}张图片来源于网络，建议将图片标记为假，或
+          快速审批不通过！
+        </div>
+        <div class="footer">
+          <SvgIcon
+            style="cursor: pointer"
+            name="r3"
+            width="162"
+            height="54"
+            @click="reject"
+          />
+          <SvgIcon
+            style="cursor: pointer"
+            name="r2"
+            width="162"
+            height="54"
+            @click="viewRepeat"
+          />
+        </div>
+      </div>
+    </div>
+  </n-modal>
+</template>
+
+<style lang="less" scoped>
+.modal_wrap {
+  background-image: url(../../../assets/images/approval_modal_bg.png);
+  background-repeat: no-repeat;
+  background-size: 100%;
+  width: 700px;
+  height: 500px;
+  box-shadow: none !important;
+}
+.wrapper {
+  position: absolute;
+  left: calc(50% - 350px);
+  .closed {
+    position: relative;
+    top: 0px;
+    left: 90%;
+  }
+  .wrapper-hearder {
+    margin-top: 40px;
+    .wrapper-title {
+      text-align: center;
+      font-size: 16px;
+      font-family: PingFang SC, PingFang SC-Semibold;
+      font-weight: Semibold;
+      text-align: center;
+      color: #333333;
+      line-height: 32px;
+    }
+    .wrapper-mark {
+      text-align: center;
+      font-size: 13px;
+      font-family: HarmonyOS Sans SC, HarmonyOS Sans SC-Regular;
+      font-weight: Regular;
+      text-align: center;
+      color: #666666;
+      line-height: 18px;
+    }
+  }
+  .wrapper-content {
+    flex: 1;
+    border-radius: 8px;
+    margin: 35px 60px 35px 120px;
+    .item {
+      display: flex;
+      flex-flow: row nowrap;
+      align-items: center;
+      margin: 20px 0;
+    }
+
+    .imgwrapper {
+      width: 200px;
+      height: 120px;
+      margin-right: 20px;
+      border-radius: 8px;
+      background-image: url("../../../assets/images/test.png");
+      background-repeat: no-repeat;
+      background-size: cover;
+    }
+    .content {
+      .task_id {
+        font-size: 14px;
+        font-family: PingFang SC, PingFang SC-Regular;
+        font-weight: Regular;
+        text-align: left;
+        color: #333333;
+        line-height: 20px;
+      }
+      .tag_box {
+        display: flex;
+        flex-flow: row nowrap;
+        margin: 8px 0;
+        .tag_item {
+          background: rgba(80, 122, 253, 0.1);
+          border-radius: 2px;
+          font-size: 12px;
+          font-family: PingFang SC, PingFang SC-Regular;
+          font-weight: Regular;
+          text-align: left;
+          color: #507afd;
+          line-height: 16px;
+          margin-right: 10px;
+        }
+        .error {
+          background: rgba(255, 78, 79, 0.1);
+          color: #ff4e4f;
+        }
+      }
+      .time_box {
+        font-size: 14px;
+        font-family: PingFang SC, PingFang SC-Regular;
+        font-weight: Regular;
+        text-align: left;
+        color: #333333;
+        line-height: 20px;
+      }
+    }
+    .mark_text {
+      font-size: 13px;
+      font-family: PingFang SC, PingFang SC-Regular;
+      font-weight: Regular;
+      text-align: left;
+      color: #666666;
+      line-height: 16px;
+    }
+    .footer {
+      display: flex;
+      flex-flow: row nowrap;
+      align-items: center;
+      justify-content: center;
+      margin: 20px 30px 0 0;
+    }
+  }
+}
+</style>
-- 
2.39.3


From 6bf748963eb7002d62c436cf2fcf69b50c9ab024 Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Mon, 1 Apr 2024 16:06:55 +0800
Subject: [PATCH 078/143] =?UTF-8?q?=E7=BB=88=E5=AE=A1bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/final/index.ts                        |   6 +-
 src/assets/icons/import.svg                   |   1 +
 src/assets/icons/look.svg                     |   1 +
 src/views/final/comp/ListAction.vue           |   2 +-
 src/views/final/comp/RepeatTaskTableModal.vue | 132 ++++++++++++------
 src/views/final/content/Content.vue           |  24 +++-
 6 files changed, 113 insertions(+), 53 deletions(-)
 create mode 100644 src/assets/icons/import.svg
 create mode 100644 src/assets/icons/look.svg

diff --git a/src/api/final/index.ts b/src/api/final/index.ts
index fab2e62..857eeb2 100644
--- a/src/api/final/index.ts
+++ b/src/api/final/index.ts
@@ -64,7 +64,7 @@ export async function repetitionTask() {
 }
 
 /**
- * 获取审核列表
+ * 获取小结重复列表
  * @returns
  */
 export async function getRepeatList(params: FinalParam) {
@@ -76,8 +76,8 @@ export async function getRepeatList(params: FinalParam) {
 
   const { data: { records, totalPage, totalCount } } = res
   return {
-    pageCount: totalPage,
+    pageCount: 3,
     data: records,
-    totalCount,
+    totalCount: 20,
   }
 }
diff --git a/src/assets/icons/import.svg b/src/assets/icons/import.svg
new file mode 100644
index 0000000..08b665d
--- /dev/null
+++ b/src/assets/icons/import.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1711952592553" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5038" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M178.016 592a16 16 0 0 1 16 16l-0.016 224h635.872V608a16 16 0 0 1 16-16h48a16 16 0 0 1 16 16v272a32 32 0 0 1-29.6 31.92l-2.4 0.08H146.016a32 32 0 0 1-32-32V608a16 16 0 0 1 16-16h48zM514.368 129.024c7.76 0.32 15.424 3.424 21.344 9.344l200.72 200.736a16 16 0 0 1 0 22.624l-33.936 33.936a16 16 0 0 1-22.624 0L552 267.792v394.688a16 16 0 0 1-16 16h-48a16 16 0 0 1-16-16V267.68l-127.984 128a16 16 0 0 1-22.624 0l-33.936-33.952a16 16 0 0 1 0-22.624L488.16 138.368c5.92-5.92 13.584-9.04 21.328-9.344z" p-id="5039" fill="#666666"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/look.svg b/src/assets/icons/look.svg
new file mode 100644
index 0000000..fc64bd6
--- /dev/null
+++ b/src/assets/icons/look.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1711952656753" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5379" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M184.224 514.112c80.672 145.056 199.472 227.936 327.744 227.936 128.288 0 247.088-82.88 327.808-227.936-80.72-145.056-199.536-227.872-327.792-227.872-128.288 0-247.088 82.816-327.76 227.872z m327.744 300.24c-159.28 0-310.432-106.8-404.368-285.648-4.8-9.12-4.8-20.048 0-29.184 93.92-178.848 245.12-285.632 404.368-285.632 159.28 0 310.464 106.784 404.432 285.632 4.8 9.136 4.8 20.048 0 29.184-93.968 178.848-245.152 285.648-404.432 285.648zM512 418.992c-51.696 0-93.728 42.656-93.728 95.136s42.032 95.12 93.728 95.12 93.728-42.656 93.728-95.136S563.68 418.976 512 418.976m0 255.616c-87.136 0-158.08-72-158.08-160.48 0-88.512 70.928-160.464 158.08-160.464 87.168 0 158.128 71.952 158.128 160.48 0 88.448-70.96 160.464-158.128 160.464" p-id="5380"></path></svg>
\ No newline at end of file
diff --git a/src/views/final/comp/ListAction.vue b/src/views/final/comp/ListAction.vue
index e469bdf..f1ef5e2 100644
--- a/src/views/final/comp/ListAction.vue
+++ b/src/views/final/comp/ListAction.vue
@@ -31,7 +31,7 @@ const actions = computed(() => {
   <div :data-id="id">
     <n-button
       v-for="(action, index) in actions" :key="index" class="normal"
-      :class="{ gap: index !== 0, reject: index === 1 }" text @click="(trigger(action) as any)"
+      :class="{ gap: index !== 0, reject: action.key === 'reject' }" text @click="(trigger(action) as any)"
     >
       {{ action.label }}
     </n-button>
diff --git a/src/views/final/comp/RepeatTaskTableModal.vue b/src/views/final/comp/RepeatTaskTableModal.vue
index 0d1c1ae..587fb28 100644
--- a/src/views/final/comp/RepeatTaskTableModal.vue
+++ b/src/views/final/comp/RepeatTaskTableModal.vue
@@ -14,6 +14,7 @@ import {
 } from 'vue'
 import { NDataTable, useDialog, useMessage } from 'naive-ui'
 import type { DataTableColumns, DataTableRowKey } from 'naive-ui'
+import { useRouter } from 'vue-router'
 import {
   ListAction,
   StatusItem,
@@ -21,7 +22,7 @@ import {
 import { RejectModal } from './index'
 import { useDictionary } from '@/store/modules/dictonary'
 import type { RowData } from '@/config/final'
-import { getFinalList, getRepeatList } from '@/api/final'
+import { getRepeatList } from '@/api/final'
 import { formatToDateHMS } from '@/utils/dateUtil'
 import { audit } from '@/api/task/task'
 import NotPassed from '@/components/Approval/NotPassed.vue'
@@ -35,6 +36,7 @@ const show = ref(false)
 const izstatusList = ref([])
 const dialog = useDialog()
 const checkedRowKeys = ref([])
+const router = useRouter()
 
 onBeforeMount(() => {
   dicStore.fetchizstatusListt()
@@ -59,7 +61,7 @@ const columns: DataTableColumns<RowData> = [
     },
   },
   {
-    title: '任务Id',
+    title: '任务ID',
     key: 'id',
     fixed: 'left',
     width: 180,
@@ -234,6 +236,7 @@ function actionHandler(action: any, row: any) {
   const { key } = action
   switch (key) {
     case 'view':
+      goDetail(row)
       break
     case 'reset':
       // resetHandler()
@@ -355,6 +358,10 @@ function reload() {
   checkedRowKeys.value = []
 }
 
+function goDetail(row) {
+  router.push({ name: 'final-detail', query: { id: row.id, packageid: row.packageid } })
+}
+
 defineExpose({
   showModal,
 })
@@ -373,45 +380,45 @@ defineExpose({
         aria-modal="true"
       >
         <div class="wrapper">
-          <span class="wrapper-title">重复任务</span>
-          <div class="wrapper-bar">
-            <div class="wrapper-info">
-              <span :style="{ 'margin-left': '18px' }">任务信息</span>
+          <div class="card-top">
+            <span class="wrapper-title">重复任务</span>
+            <div class="wrapper-bar">
+              <div class="wrapper-info">
+                <span>任务信息</span>
+              </div>
+            </div>
+            <div class="batch">
+              <img 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">
+            </div>
+            <div class="wrapper-content">
+              <NDataTable
+                ref="tableRef"
+                v-model:checked-row-keys="checkedRowKeys"
+                remote
+                :columns="columnsRef"
+                :scroll-x="1250"
+                :max-height="maxHeight"
+                :data="tableData"
+                :loading="loading"
+                :pagination="pagination"
+                :row-key="rowKey"
+                @update:page="handlePageChange"
+                @update-page-size="handlePageSizeChange"
+                @update:checked-row-keys="handleCheck"
+              />
             </div>
-          </div>
-          <div class="batch">
-            <img 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">
-          </div>
-          <div class="wrapper-content">
-            <NDataTable
-              ref="tableRef"
-              v-model:checked-row-keys="checkedRowKeys"
-              remote
-              :columns="columnsRef"
-              :scroll-x="1250"
-              :max-height="maxHeight"
-              :data="tableData"
-              :loading="loading"
-              :pagination="pagination"
-              :row-key="rowKey"
-              @update:page="handlePageChange"
-              @update-page-size="handlePageSizeChange"
-              @update:checked-row-keys="handleCheck"
-            />
           </div>
         </div>
-        <template #footer>
-          <div class="wrapper-footer">
-            <n-button type="info" @click="handleSumbit">
-              确认
-            </n-button>
-            <n-button secondary style="margin-left: 15px" @click="closeModal">
-              取消
-            </n-button>
-          </div>
-        </template>
+        <div class="wrapper-footer">
+          <n-button class="btn1" type="info" @click="handleSumbit">
+            确定
+          </n-button>
+          <n-button secondary class="btn" style="margin-left: 15px" @click="closeModal">
+            取消
+          </n-button>
+        </div>
       </n-card>
     </n-modal>
     <RejectModal ref="rejectModalRef" @commit="rejectHandler" />
@@ -435,9 +442,15 @@ defineExpose({
   display: flex;
   flex-direction: column;
 
+  .card-top{
+    padding: 24px;
+  }
+
   &-title {
-    font-weight: bold;
-    font-size: 16px;
+    font-size: 18px;
+    font-family: PingFang SC, PingFang SC-Medium;
+    font-weight: 600;
+    color: #333333;
   }
 
   &-bar {
@@ -455,19 +468,31 @@ defineExpose({
   &-footer {
     display: flex;
     justify-content: flex-end;
+    border-top: 0.5px solid #d9d9d9;
+    padding: 15px 24px;
   }
 
   &-info {
     font-weight: bold;
     position: relative;
+    height: 29px;
+    background: #f8f8f8;
+    font-size: 16px;
+    font-family: PingFang SC, PingFang SC-Medium;
+    font-weight: 600;
+    color: #333333;
+    display: flex;
+    align-items: center;
+    padding-left: 14px;
 
     &:before {
-      background-color: #1980ff;
+      background-color: #507AFD;
       content: "";
-      width: 5px;
-      border-radius: 2px;
-      top: 0;
-      bottom: 0;
+      height: 18px;
+      width: 4px;
+      border-radius: 3px;
+      top: 5px;
+      left: 0;
       position: absolute;
     }
   }
@@ -488,4 +513,21 @@ defineExpose({
   --n-padding-top: 0px;
   --n-padding-bottom: 12px;
 }
+
+::v-deep(.n-card__content) {
+  padding: 0!important;
+}
+
+::v-deep(.n-data-table .n-data-table-td) {
+  padding: 10px 12px!important;
+}
+
+.btn1{
+  background: #507AFD;
+}
+
+.btn{
+  border: 1px solid #cad2dd;
+  background-color: #fff;
+}
 </style>
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index 71285a0..a28a943 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -17,7 +17,6 @@ import {
 import { rowPropKeys } from 'naive-ui/es/legacy-grid/src/Row'
 import { useRoute, useRouter } from 'vue-router'
 import {
-  Action,
   CustomTabelModal,
   ImportExcelModal,
   ListAction,
@@ -784,11 +783,13 @@ async function refreshHandler(searchId?: any) {
           trigger="click"
         >
           <template #trigger>
-            <SvgIcon style="cursor: pointer" size="20" name="more-ver" />
+            <div class="icon-wrap">
+              <SvgIcon size="20" name="more-blue" />
+            </div>
           </template>
           <ul class="wrapper-header-action">
             <li @click="importHandler">
-              <SvgIcon size="20" name="download" /><span style="margin-left: 5px">批量导入数据</span>
+              <SvgIcon size="20" name="import" /><span style="margin-left: 5px">批量导入数据</span>
             </li>
             <li @click="exportHandler">
               <SvgIcon size="20" name="download" /><span style="margin-left: 5px">导出待审数据</span>
@@ -796,6 +797,9 @@ async function refreshHandler(searchId?: any) {
             <li>
               <SvgIcon size="20" name="download" /><span style="margin-left: 5px">导出全部数据</span>
             </li>
+            <!-- <li>
+              <SvgIcon size="20" name="look" /><span style="margin-left: 5px">查看导入记录</span>
+            </li> -->
           </ul>
         </n-popover>
       </div>
@@ -864,6 +868,7 @@ async function refreshHandler(searchId?: any) {
 .batch {
   display: flex;
   align-items: center;
+  margin-right: 10px;
 
   .btn-approval{
     width: 68px;
@@ -875,6 +880,17 @@ async function refreshHandler(searchId?: any) {
     margin-left: 16px;
   }
 }
+
+.icon-wrap {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 30px;
+  height: 30px;
+  background: rgba(80, 122, 253, 0.1);
+  border-radius: 8px;
+  cursor: pointer;
+}
 .wrapper {
   display: flex;
   flex: 1;
@@ -901,7 +917,7 @@ async function refreshHandler(searchId?: any) {
 
     .xjcc {
       font-weight: bold;
-      color: #6a80fc;
+      color: #507AFD;
       margin-right: 20px;
     }
 
-- 
2.39.3


From 14f203c0ea470a73467ca6bb78702f15056ea516 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Mon, 1 Apr 2024 16:17:50 +0800
Subject: [PATCH 079/143] =?UTF-8?q?feat:=20=E9=AB=98=E7=BA=A7=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E4=BA=A4=E4=BA=92=E8=A1=A5=E5=85=A8=E5=8F=8A=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/comp/FilterModal.vue          |  2 +-
 .../home/aside/comp/modals/FilterModal.vue    | 42 +++++++++++++++----
 src/views/login/components/Login.vue          | 36 ++++++++++------
 src/views/task/content/Content.vue            |  2 +-
 4 files changed, 60 insertions(+), 22 deletions(-)

diff --git a/src/views/final/comp/FilterModal.vue b/src/views/final/comp/FilterModal.vue
index 4c13bf5..d8bc149 100644
--- a/src/views/final/comp/FilterModal.vue
+++ b/src/views/final/comp/FilterModal.vue
@@ -147,7 +147,6 @@ function rowProps(row: RowData) {
 }
 
 function handleCheck(rowKeys: DataTableRowKey[]) {
-  console.log(rowKeys, selectionIds.value, "handleCheck");
   selectionIds.value = rowKeys;
 }
 
@@ -191,6 +190,7 @@ function deleteSelection(id = "") {
   }
 
   deleteCondition({ ids: selectionIds.value.join(",") }).then(() => {
+    selectionIds.value = [];
     query(pagination.page, pagination.pageSize);
   });
 }
diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue
index d12ad9a..4690ee0 100644
--- a/src/views/home/aside/comp/modals/FilterModal.vue
+++ b/src/views/home/aside/comp/modals/FilterModal.vue
@@ -219,6 +219,7 @@ function deleteSelection(id = "") {
   }
 
   deleteCondition({ ids: selectionIds.value.join(",") }).then(() => {
+    selectionIds.value = [];
     query(pagination.page, pagination.pageSize);
   });
 }
@@ -308,6 +309,10 @@ const inputHandler = debounce((word) => {
   keyword.value = word;
   query(1, 5);
 }, 300);
+
+const showSearch = computed(() => {
+  return selectionIds.value.length > 0;
+});
 </script>
 
 <template>
@@ -336,27 +341,49 @@ const inputHandler = debounce((word) => {
               >
             </div>
           </div>
-          <div class="wrapper-form">
+
+          <div class="wrapper-form" v-if="!showSearch">
             <n-input
               :style="{ width: '360px', border: '1px solid #cad2dd' }"
               placeholder="请输入过滤条件名称搜索"
               @input="inputHandler"
             >
               <template #suffix>
-                <SvgIcon size="14px" name="magnifying-1" color="#fff" />
+                <SvgIcon size="14px" name="magnifying-1" />
               </template>
             </n-input>
-            <n-button type="info" style="background: #507afd" @click="handleClick">
+            <n-button type="info" @click="handleClick">
               创建
               <template #icon>
-                <img
-                  src="../../../../../assets/images/addIcon.png"
-                  style="width: 16px; height: 16px"
-                />
+                <SvgIcon size="14px" name="magnifying-1" />
               </template>
             </n-button>
           </div>
 
+          <div class="wrapper-form" v-else>
+            <div class="del_btn">
+              <n-button icon-placement="left" size="medium" @click="deleteSelection">
+                <template #icon>
+                  <SvgIcon name="delete-history" size="16" />
+                </template>
+                删除</n-button
+              >
+            </div>
+            <div class="msg">
+              <span
+                >已选中
+                <span style="color: #507afd; font-size: 16px">{{
+                  selectionIds.length
+                }}</span>
+                项</span
+              >
+              <a @click="selectionIds = []">清空</a>
+            </div>
+          </div>
+
+
+        
+
           <div class="wrapper-table">
             <NDataTable
               ref="tableRef"
@@ -372,6 +399,7 @@ const inputHandler = debounce((word) => {
               @update-page-size="handlePageSizeChange"
               @update:checked-row-keys="handleCheck"
               @update:sorter="sortData"
+              :checked-row-keys="selectionIds"
             />
           </div>
         </div>
diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue
index 4b50660..8d8cd14 100644
--- a/src/views/login/components/Login.vue
+++ b/src/views/login/components/Login.vue
@@ -178,11 +178,15 @@ function handleSubmit(e) {
           const { data: userInfo } = await userStore.getInformation();
           message.destroyAll();
           const toPath = decodeURIComponent((route.query?.redirect || "/") as string);
-          message.success("登录成功，即将进入系统");
           if (route.name === LOGIN_NAME)
-            router.replace(
-              userInfo.frontmenuTList ? userInfo.frontmenuTList[0]["resUrl"] : "/"
-            );
+            if (userInfo.frontmenuTList && userInfo.frontmenuTList.length) {
+              message.success("登录成功，即将进入系统");
+              router.replace(
+                userInfo.frontmenuTList ? userInfo.frontmenuTList[0]["resUrl"] : "/"
+              );
+            } else {
+              message.error("用户无菜单权限，请联系管理员");
+            }
           else router.replace(toPath);
         } else {
           loginSuccess.value = false;
@@ -249,12 +253,18 @@ function handleSmsSubmit(e) {
           const { data: userInfo } = await userStore.getInformation();
           message.destroyAll();
           const toPath = decodeURIComponent((route.query?.redirect || "/") as string);
-          message.success("登录成功，即将进入系统");
-          if (route.name === LOGIN_NAME)
-            router.replace(
-              userInfo.frontmenuTList ? userInfo.frontmenuTList[0]["resUrl"] : "/"
-            );
-          else router.replace(toPath);
+          if (route.name === LOGIN_NAME) {
+            if (userInfo.frontmenuTList && userInfo.frontmenuTList.length) {
+              message.success("登录成功，即将进入系统");
+              router.replace(
+                userInfo.frontmenuTList ? userInfo.frontmenuTList[0]["resUrl"] : "/"
+              );
+            } else {
+              message.error("用户无菜单权限，请联系管理员");
+            }
+          } else {
+            router.replace(toPath);
+          }
         } else {
           message.destroyAll();
           message.info(msg || "登录失败");
@@ -300,10 +310,10 @@ async function sendCode(value) {
     phone: formSms.phone,
     agentcode: formSms.agentcode,
   });
-  if(res.code == 'OK'){
+  if (res.code == "OK") {
     startCount();
-  }else{
-    message.error(res.message)
+  } else {
+    message.error(res.message);
   }
 }
 
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index b7a2d19..651b84c 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -645,7 +645,7 @@ function switchBatch() {
       @reject="rejectHandler"
       @approval="approvalHandler"
     />
-    <CustomSettingModal ref="CustomSettingModalRef" />
+    <CustomSettingModal ref="CustomSettingModalRef"  @onOk="getDetail"/>
   </div>
 </template>
 
-- 
2.39.3


From f80f6ec4d4a4f09afe00ee1f5829a2dc3c2ba9c3 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Mon, 1 Apr 2024 17:15:29 +0800
Subject: [PATCH 080/143] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E5=8D=95?=
 =?UTF-8?q?=E4=B8=AA=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/content/Content.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 2f2d2ed..904a9c1 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -294,6 +294,10 @@ function rejectHandler() {
   const modal = unref(notPassModalRef)! as any
   modal.showModal(selectItems.value)
 }
+function singleRejectHandler(item) {
+  const modal = unref(notPassModalRef)! as any
+  modal.showModal([item])
+}
 function reject(idOrDesc: string, backId: string, isOther: boolean) {
   const formIds: string[] = processItems.map(item => item.id)
   const taskIds: string[] = processItems.map(item => item.taskId)
@@ -609,7 +613,7 @@ function reloadList() {
             </div> -->
             <div v-show="overTask && overTask.id === item.id" class="action">
               <SvgIcon style="cursor: pointer" name="t1" @click.stop="approvalHandler" />
-              <SvgIcon style="cursor: pointer;margin-left: 40px;" name="t2" @click.stop="rejectHandler" />
+              <SvgIcon style="cursor: pointer;margin-left: 40px;" name="t2" @click.stop="singleRejectHandler(item)" />
             </div>
           </div>
         </div>
-- 
2.39.3


From 38cc5d9c3272004767d9098f359d37cbbdda4f56 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Mon, 1 Apr 2024 17:18:20 +0800
Subject: [PATCH 081/143] =?UTF-8?q?feat:=201440=E5=88=86=E8=BE=A8=E7=8E=87?=
 =?UTF-8?q?=E5=9B=BE=E5=AE=A1=E5=AE=A1=E6=89=B9=E7=AE=A1=E7=90=86=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/modal/ApprovalModal.vue | 60 ++++++++++++++-------
 1 file changed, 40 insertions(+), 20 deletions(-)

diff --git a/src/views/worksheet/modal/ApprovalModal.vue b/src/views/worksheet/modal/ApprovalModal.vue
index e075306..a25dd02 100644
--- a/src/views/worksheet/modal/ApprovalModal.vue
+++ b/src/views/worksheet/modal/ApprovalModal.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { onMounted, reactive, ref, toRefs } from "vue";
+import { nextTick, onDeactivated, onMounted, reactive, ref, toRefs } from "vue";
 import { format } from "date-fns";
 import { NButton, NDataTable, useDialog, useMessage } from "naive-ui";
 import { aiApprovaltools, aiApprovaltoolsClearmark, setTF } from "@/api/work/work";
@@ -40,8 +40,6 @@ async function getDetail(id) {
     state.detail = res.data;
     show.value = true;
   }
-
-  console.log(res, "getDetail");
 }
 
 const handleReject = async () => {
@@ -94,8 +92,24 @@ async function getShowStatus() {
     show.value = true;
   }
 }
+
+const initRem = () => {
+  const designWidth = 1440;
+  const rempPx = 16;
+  const scale = window.innerWidth / designWidth;
+  document.documentElement.style.fontSize = scale * rempPx + "px";
+};
 onMounted(() => {
   getShowStatus();
+  nextTick(() => {
+    initRem();
+  });
+  window.addEventListener("resize", () => {
+    initRem();
+  });
+});
+onDeactivated(() => {
+  window.removeEventListener("resize", () => {});
 });
 
 defineExpose({
@@ -134,10 +148,11 @@ defineExpose({
           </div>
         </div>
         <div class="mark_text">
-          智能提示：{{detail?.similarComplete}} 张图片相似度为100%重复图片，{{detail?.passCount}}张审批状态为<span
-            style="color: #02c984"
-            >通过</span
-          >，剩余{{detail?.pendingApprovaCount}}张图片建议审批为不通过！
+          智能提示：{{ detail?.similarComplete }} 张图片相似度为100%重复图片，{{
+            detail?.passCount
+          }}张审批状态为<span style="color: #02c984">通过</span>，剩余{{
+            detail?.pendingApprovaCount
+          }}张图片建议审批为不通过！
         </div>
         <div class="footer" @click="handleReject">
           立即审批
@@ -166,8 +181,10 @@ defineExpose({
   background-image: url(../../../assets/images/approval_modal_bg.png);
   background-repeat: no-repeat;
   background-size: 100%;
-  width: 700px;
-  height: 500px;
+  // width: 700px;
+  // height: 500px;
+  width: 510px;
+  height: 361px;
   box-shadow: none !important;
 }
 .wrapper {
@@ -179,41 +196,40 @@ defineExpose({
     left: 90%;
   }
   .wrapper-hearder {
-    margin-top: 40px;
+    margin-top: 20px;
     .wrapper-title {
       text-align: center;
       font-size: 16px;
       font-family: PingFang SC, PingFang SC-Semibold;
-      font-weight: Semibold;
+      font-weight: 600;
       text-align: center;
       color: #333333;
-      line-height: 32px;
+      line-height: 22px;
     }
     .wrapper-mark {
-      text-align: center;
       font-size: 13px;
       font-family: HarmonyOS Sans SC, HarmonyOS Sans SC-Regular;
-      font-weight: Regular;
+      font-weight: 400;
       text-align: center;
       color: #666666;
       line-height: 18px;
+      margin-top: 8px;
     }
   }
   .wrapper-content {
     flex: 1;
     border-radius: 8px;
-    margin: 70px 60px 35px 120px;
+    margin: 24px 50px 16px 48px;
     .item {
       display: flex;
       flex-flow: row nowrap;
       align-items: center;
-      margin: 20px 0;
     }
 
     .imgwrapper {
-      width: 200px;
-      height: 120px;
-      margin-right: 20px;
+      width: 138px;
+      height: 80px;
+      margin-right: 23px;
       border-radius: 8px;
       background-image: url("../../../assets/images/test.png");
       background-repeat: no-repeat;
@@ -232,6 +248,7 @@ defineExpose({
         display: flex;
         flex-flow: row nowrap;
         margin: 8px 0;
+
         .tag_item {
           background: rgba(80, 122, 253, 0.1);
           border-radius: 2px;
@@ -255,6 +272,7 @@ defineExpose({
         text-align: left;
         color: #333333;
         line-height: 20px;
+        white-space: nowrap;
       }
     }
     .mark_text {
@@ -264,6 +282,7 @@ defineExpose({
       text-align: left;
       color: #666666;
       line-height: 16px;
+      margin-top: 16px;
     }
     .footer {
       cursor: pointer;
@@ -271,7 +290,7 @@ defineExpose({
       flex-flow: row nowrap;
       align-items: center;
       justify-content: center;
-      margin: 20px auto 0;
+      margin: 16px auto 0;
       width: 132px;
       height: 40px;
       background: linear-gradient(135deg, #3258e8, #786efc);
@@ -284,6 +303,7 @@ defineExpose({
       text-align: left;
       color: #ffffff;
       line-height: 26px;
+      font-style: italic;
     }
   }
 }
-- 
2.39.3


From 846a97111bfac3c9b13eb08c36a51bdcc16ce0ca Mon Sep 17 00:00:00 2001
From: raofuzi <2641346316@qq.com>
Date: Mon, 1 Apr 2024 17:35:26 +0800
Subject: [PATCH 082/143] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/aside/Aside.vue                   | 16 +++++++++++++---
 .../home/aside/comp/items/IzCustomlevel.vue      |  9 +++++++--
 src/views/home/aside/comp/items/IzCustomname.vue |  8 +++++++-
 src/views/home/aside/comp/items/IzCustomtype.vue |  9 +++++++--
 .../home/aside/comp/items/IzCustomtypes.vue      |  9 +++++++--
 src/views/home/aside/comp/items/IzProduct.vue    |  9 +++++++--
 src/views/home/aside/comp/items/IzProject.vue    |  9 +++++++--
 .../home/aside/comp/items/IzProjecttype.vue      |  9 +++++++--
 src/views/home/aside/comp/items/IzSearch.vue     |  9 +++++++--
 .../home/aside/comp/items/IzSearchManager.vue    |  9 +++++++--
 src/views/home/aside/comp/items/IzShow.vue       |  9 +++++++--
 src/views/home/aside/comp/items/IzStatus.vue     |  9 +++++++--
 src/views/home/aside/comp/items/IzVisitcity.vue  |  9 +++++++--
 src/views/home/aside/comp/items/Izfiled17.vue    |  9 +++++++--
 src/views/home/aside/comp/items/Izfiled2.vue     |  9 +++++++--
 src/views/home/aside/comp/items/Izfiled3.vue     | 10 +++++++---
 src/views/home/aside/comp/items/Izfiled6.vue     |  9 +++++++--
 src/views/home/aside/comp/items/Izfirm.vue       |  9 +++++++--
 src/views/home/aside/comp/items/Iztaskrrom.vue   |  9 +++++++--
 src/views/home/aside/comp/items/Iztaskstatus.vue |  9 +++++++--
 src/views/home/aside/comp/items/Izvisitpro.vue   |  9 +++++++--
 src/views/home/aside/comp/items/Plan.vue         |  9 +++++++--
 src/views/home/aside/comp/items/ReportUser.vue   | 11 +++++++++--
 src/views/home/aside/comp/items/Similarity.vue   |  9 +++++++--
 src/views/home/aside/comp/items/Time.vue         |  7 ++++++-
 .../home/aside/comp/modals/CustomFilterModal.vue |  2 +-
 src/views/home/content/Content.vue               |  4 +++-
 27 files changed, 186 insertions(+), 52 deletions(-)

diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue
index c21fd47..38906fa 100644
--- a/src/views/home/aside/Aside.vue
+++ b/src/views/home/aside/Aside.vue
@@ -13,6 +13,7 @@ import type { AsideConfig } from '/#/api'
 import emitter from '@/utils/mitt'
 import { getFilterList } from '@/api/home/main'
 import dayjs from 'dayjs'
+import { cloneDeep } from 'lodash-es'
 
 const configStore = useConfig()
 
@@ -27,6 +28,7 @@ Object.keys(asideMap).forEach((key) => {
   const entity = asideMap[key]
   const { defaultValue } = entity
   asideValue[key] = defaultValue
+  console.log("asideMap和asideValue", asideValue);
 })
 
 const filterModalRef = ref(null)
@@ -119,8 +121,8 @@ configStore.$subscribe(() => {
           console.log("时间2222222222", 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);
+          // let list = customObjRef.value[str].split(',');
+          // console.log("list222222", list);
           asideValue[key] = customObjRef.value[str];// 赋值
         }else {
           asideValue[key] = null;
@@ -194,6 +196,14 @@ function editFilter(filter: any) {
   modal.edit(filter)
 }
 
+function updateComponent(key, e) {
+  console.log("跟新值", key, e);
+  let tempobj = cloneDeep(asideValue);
+  tempobj[key] = e;
+  customObjRef.value = tempobj;
+  Object.assign(asideValue, tempobj);
+}
+
 watch(asideValue, (newVal) => {
   console.log("asideValue处理后", newVal);
   configStore.setAsideValue(newVal)
@@ -220,7 +230,7 @@ watch(asideValue, (newVal) => {
 
       <component
         :is="item.config.component" v-for="(item, index) in showItems" :id="item.key" :key="index" 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/items/IzCustomlevel.vue b/src/views/home/aside/comp/items/IzCustomlevel.vue
index 9e909df..0c2079f 100644
--- a/src/views/home/aside/comp/items/IzCustomlevel.vue
+++ b/src/views/home/aside/comp/items/IzCustomlevel.vue
@@ -7,8 +7,12 @@ import { useConfig } from '@/store/modules/asideConfig'
 const configUseStore = useConfig()
 
 configUseStore.$subscribe(() => {
+  if(isLoadValue.value) {
+    isLoadValue.value = false;
+    return
+  }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izcustomlevel']) {
+  if(asideValue['izcustomlevel'] && typeof asideValue['izcustomlevel'] == "string") {
     let list = asideValue['izcustomlevel'].split(',');
     formValue.value.plans = list;
     console.log("formValue.value.izcustomlevel", formValue.value.plans);
@@ -56,8 +60,9 @@ onBeforeMount(async () => {
   const list = await configStore.fetchIzcustomlevelList()
   options.value = list
 })
-
+const isLoadValue = ref(false)
 function onChange(value: Array<string>) {
+  isLoadValue.value = true;
   emit('update:value', value)
 }
 </script>
diff --git a/src/views/home/aside/comp/items/IzCustomname.vue b/src/views/home/aside/comp/items/IzCustomname.vue
index 4145b71..31123ad 100644
--- a/src/views/home/aside/comp/items/IzCustomname.vue
+++ b/src/views/home/aside/comp/items/IzCustomname.vue
@@ -7,8 +7,12 @@ import { useConfig } from '@/store/modules/asideConfig'
 const configUseStore = useConfig()
 
 configUseStore.$subscribe(() => {
+  if(isLoadValue.value) {
+    isLoadValue.value = false;
+    return
+  }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izcustomname']) {
+  if(asideValue['izcustomname'] && typeof asideValue['izcustomname'] == "string") {
     let list = asideValue['izcustomname'].split(',');
     formValue.value.plans = list;
     console.log("formValue.value.izcustomname", formValue.value.plans);
@@ -53,7 +57,9 @@ onBeforeMount(async () => {
   options.value = list
 })
 
+const isLoadValue = ref(false)
 function onChange(value: Array<string>) {
+  isLoadValue.value = true;
   emit('update:value', value)
 }
 </script>
diff --git a/src/views/home/aside/comp/items/IzCustomtype.vue b/src/views/home/aside/comp/items/IzCustomtype.vue
index 993cf5f..ff54dd2 100644
--- a/src/views/home/aside/comp/items/IzCustomtype.vue
+++ b/src/views/home/aside/comp/items/IzCustomtype.vue
@@ -7,8 +7,12 @@ import { useConfig } from '@/store/modules/asideConfig'
 const configUseStore = useConfig()
 
 configUseStore.$subscribe(() => {
+  if(isLoadValue.value) {
+    isLoadValue.value = false;
+    return
+  }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izcustomtype']) {
+  if(asideValue['izcustomtype'] && typeof asideValue['izcustomtype'] == "string") {
     let list = asideValue['izcustomtype'].split(',');
     formValue.value.plans = list;
     console.log("formValue.value.izcustomtype", formValue.value.plans);
@@ -52,8 +56,9 @@ onBeforeMount(async () => {
   const list = await configStore.fetchIzCustomtypeList()
   options.value = list
 })
-
+const isLoadValue = ref(false)
 function onChange(value: Array<string>) {
+  isLoadValue.value = true;
   emit('update:value', value)
 }
 </script>
diff --git a/src/views/home/aside/comp/items/IzCustomtypes.vue b/src/views/home/aside/comp/items/IzCustomtypes.vue
index 607c6e6..aac3662 100644
--- a/src/views/home/aside/comp/items/IzCustomtypes.vue
+++ b/src/views/home/aside/comp/items/IzCustomtypes.vue
@@ -7,8 +7,12 @@ import { useConfig } from '@/store/modules/asideConfig'
 const configUseStore = useConfig()
 
 configUseStore.$subscribe(() => {
+  if(isLoadValue.value) {
+    isLoadValue.value = false;
+    return
+  }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izcustomtypes']) {
+  if(asideValue['izcustomtypes'] && typeof asideValue['izcustomtypes'] == "string") {
     let list = asideValue['izcustomtypes'].split(',');
     formValue.value.plans = list;
     console.log("formValue.value.izcustomtypes", formValue.value.plans);
@@ -58,8 +62,9 @@ onBeforeMount(async () => {
   const list = await configStore.fetchIzCustomtypeList()
   options.value = list
 })
-
+const isLoadValue = ref(false)
 function onChange(value: Array<string>) {
+  isLoadValue.value = true;
   emit('update:value', value)
 }
 </script>
diff --git a/src/views/home/aside/comp/items/IzProduct.vue b/src/views/home/aside/comp/items/IzProduct.vue
index 6beb0e2..f925c15 100644
--- a/src/views/home/aside/comp/items/IzProduct.vue
+++ b/src/views/home/aside/comp/items/IzProduct.vue
@@ -7,8 +7,12 @@ import { useConfig } from '@/store/modules/asideConfig'
 const configUseStore = useConfig()
 
 configUseStore.$subscribe(() => {
+  if(isLoadValue.value) {
+    isLoadValue.value = false;
+    return
+  }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izproduct']) {
+  if(asideValue['izproduct'] && typeof asideValue['izproduct'] == "string") {
     let list = asideValue['izproduct'].split(',');
     formValue.value.plans = list;
     console.log("formValue.value.izproduct", formValue.value.plans);
@@ -52,8 +56,9 @@ onBeforeMount(async () => {
   const list = await configStore.fetchIzproductnameList()
   options.value = list
 })
-
+const isLoadValue = ref(false)
 function onChange(value: Array<string>) {
+  isLoadValue.value = true;
   emit('update:value', value)
 }
 </script>
diff --git a/src/views/home/aside/comp/items/IzProject.vue b/src/views/home/aside/comp/items/IzProject.vue
index 34306d4..223e737 100644
--- a/src/views/home/aside/comp/items/IzProject.vue
+++ b/src/views/home/aside/comp/items/IzProject.vue
@@ -7,8 +7,12 @@ import { useConfig } from '@/store/modules/asideConfig'
 const configUseStore = useConfig()
 
 configUseStore.$subscribe(() => {
+  if(isLoadValue.value) {
+    isLoadValue.value = false;
+    return
+  }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izproject']) {
+  if(asideValue['izproject'] && typeof asideValue['izproject'] == "string") {
     let list = asideValue['izproject'].split(',');
     formValue.value.plans = list;
     console.log("formValue.value.izproject", formValue.value.plans);
@@ -53,8 +57,9 @@ onBeforeMount(async () => {
   const list = await configStore.fetchIzProjectList()
   options.value = list
 })
-
+const isLoadValue = ref(false)
 function onChange(value: Array<string>) {
+  isLoadValue.value = true;
   emit('update:value', value)
 }
 </script>
diff --git a/src/views/home/aside/comp/items/IzProjecttype.vue b/src/views/home/aside/comp/items/IzProjecttype.vue
index 08f9dd3..e16b3c5 100644
--- a/src/views/home/aside/comp/items/IzProjecttype.vue
+++ b/src/views/home/aside/comp/items/IzProjecttype.vue
@@ -8,8 +8,12 @@ import { useConfig } from '@/store/modules/asideConfig'
 const configUseStore = useConfig()
 
 configUseStore.$subscribe(() => {
+  if(isLoadValue.value) {
+    isLoadValue.value = false;
+    return
+  }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izprojecttype']) {
+  if(asideValue['izprojecttype'] && typeof asideValue['izprojecttype'] == "string") {
     let list = asideValue['izprojecttype'].split(',');
     formValue.value.plans = list;
     console.log("formValue.value.izprojecttype", formValue.value.plans);
@@ -53,8 +57,9 @@ onBeforeMount(async () => {
   const list = await configStore.fetchizizprojecttypeList()
   options.value = list
 })
-
+const isLoadValue = ref(false)
 function onChange(value: Array<string>) {
+  isLoadValue.value = true;
   emit('update:value', value)
 }
 </script>
diff --git a/src/views/home/aside/comp/items/IzSearch.vue b/src/views/home/aside/comp/items/IzSearch.vue
index 092c794..6bf0e82 100644
--- a/src/views/home/aside/comp/items/IzSearch.vue
+++ b/src/views/home/aside/comp/items/IzSearch.vue
@@ -7,8 +7,12 @@ import { useConfig } from '@/store/modules/asideConfig'
 const configUseStore = useConfig()
 
 configUseStore.$subscribe(() => {
+  if(isLoadValue.value) {
+    isLoadValue.value = false;
+    return
+  }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izsearch']) {
+  if(asideValue['izsearch'] && typeof asideValue['izsearch'] == "string") {
     let list = asideValue['izsearch'].split(',');
     formValue.value.plans = list;
     console.log("formValue.value.izsearch", formValue.value.plans);
@@ -58,8 +62,9 @@ onBeforeMount(async () => {
   const list = await configStore.fetchIzSearchList()
   options.value = list
 })
-
+const isLoadValue = ref(false)
 function onChange(value: Array<string>) {
+  isLoadValue.value = true;
   emit('update:value', value)
 }
 </script>
diff --git a/src/views/home/aside/comp/items/IzSearchManager.vue b/src/views/home/aside/comp/items/IzSearchManager.vue
index 5684982..41e35ac 100644
--- a/src/views/home/aside/comp/items/IzSearchManager.vue
+++ b/src/views/home/aside/comp/items/IzSearchManager.vue
@@ -7,8 +7,12 @@ import { useConfig } from '@/store/modules/asideConfig'
 const configUseStore = useConfig()
 
 configUseStore.$subscribe(() => {
+  if(isLoadValue.value) {
+    isLoadValue.value = false;
+    return
+  }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izsearchmanager']) {
+  if(asideValue['izsearchmanager'] && typeof asideValue['izsearchmanager'] == "string") {
     let list = asideValue['izsearchmanager'].split(',');
     formValue.value.plans = list;
     console.log("formValue.value.izsearchmanager", formValue.value.plans);
@@ -58,8 +62,9 @@ onBeforeMount(async () => {
   const list = await configStore.fetchIzsSearchManagerList()
   options.value = list
 })
-
+const isLoadValue = ref(false)
 function onChange(value: Array<string>) {
+  isLoadValue.value = true;
   emit('update:value', value)
 }
 </script>
diff --git a/src/views/home/aside/comp/items/IzShow.vue b/src/views/home/aside/comp/items/IzShow.vue
index 78069f3..48870a4 100644
--- a/src/views/home/aside/comp/items/IzShow.vue
+++ b/src/views/home/aside/comp/items/IzShow.vue
@@ -7,8 +7,12 @@ import { useConfig } from '@/store/modules/asideConfig'
 const configUseStore = useConfig()
 
 configUseStore.$subscribe(() => {
+  if(isLoadValue.value) {
+    isLoadValue.value = false;
+    return
+  }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izshow']) {
+  if(asideValue['izshow'] && typeof asideValue['izshow'] == "string") {
     let list = asideValue['izshow'].split(',');
     formValue.value.plans = list;
     console.log("formValue.value.izshow", formValue.value.plans);
@@ -52,8 +56,9 @@ onBeforeMount(async () => {
   const list = await configStore.fetchIzShowList()
   options.value = list
 })
-
+const isLoadValue = ref(false)
 function onChange(value: Array<string>) {
+  isLoadValue.value = true;
   emit('update:value', value)
 }
 </script>
diff --git a/src/views/home/aside/comp/items/IzStatus.vue b/src/views/home/aside/comp/items/IzStatus.vue
index 3b50147..6572d33 100644
--- a/src/views/home/aside/comp/items/IzStatus.vue
+++ b/src/views/home/aside/comp/items/IzStatus.vue
@@ -7,8 +7,12 @@ import { useConfig } from '@/store/modules/asideConfig'
 const configUseStore = useConfig()
 
 configUseStore.$subscribe(() => {
+  if(isLoadValue.value) {
+    isLoadValue.value = false;
+    return
+  }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izstatus']) {
+  if(asideValue['izstatus'] && typeof asideValue['izstatus'] == "string") {
     let list = asideValue['izstatus'].split(',');
     formValue.value.plans = list;
     console.log("formValue.value.izstatus", formValue.value.plans);
@@ -52,8 +56,9 @@ onBeforeMount(async () => {
   const list = await configStore.fetchizstatusListt()
   options.value = list
 })
-
+const isLoadValue = ref(false)
 function onChange(value: Array<string>) {
+  isLoadValue.value = true;
   emit('update:value', value)
 }
 </script>
diff --git a/src/views/home/aside/comp/items/IzVisitcity.vue b/src/views/home/aside/comp/items/IzVisitcity.vue
index 16ac3f3..a5194c9 100644
--- a/src/views/home/aside/comp/items/IzVisitcity.vue
+++ b/src/views/home/aside/comp/items/IzVisitcity.vue
@@ -7,8 +7,12 @@ import { useConfig } from '@/store/modules/asideConfig'
 const configUseStore = useConfig()
 
 configUseStore.$subscribe(() => {
+  if(isLoadValue.value) {
+    isLoadValue.value = false;
+    return
+  }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izvisitcity']) {
+  if(asideValue['izvisitcity'] && typeof asideValue['izvisitcity'] == "string") {
     let list = asideValue['izvisitcity'].split(',');
     formValue.value.plans = list;
     console.log("formValue.value.izvisitcity", formValue.value.plans);
@@ -52,8 +56,9 @@ onBeforeMount(async () => {
   const list = await configStore.fetchizvisitcityList()
   options.value = list
 })
-
+const isLoadValue = ref(false)
 function onChange(value: Array<string>) {
+  isLoadValue.value = true;
   emit('update:value', value)
 }
 </script>
diff --git a/src/views/home/aside/comp/items/Izfiled17.vue b/src/views/home/aside/comp/items/Izfiled17.vue
index f8c216a..ecc496a 100644
--- a/src/views/home/aside/comp/items/Izfiled17.vue
+++ b/src/views/home/aside/comp/items/Izfiled17.vue
@@ -7,8 +7,12 @@ import { useConfig } from '@/store/modules/asideConfig'
 const configUseStore = useConfig()
 
 configUseStore.$subscribe(() => {
+  if(isLoadValue.value) {
+    isLoadValue.value = false;
+    return
+  }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izfiled17']) {
+  if(asideValue['izfiled17'] && typeof asideValue['izfiled17'] == "string") {
     let list = asideValue['izfiled17'].split(',');
     formValue.value.plans = list;
     console.log("formValue.value.izfiled17", formValue.value.plans);
@@ -58,8 +62,9 @@ onBeforeMount(async () => {
   const list = await configStore.fetchIzfiled17List()
   options.value = list
 })
-
+const isLoadValue = ref(false)
 function onChange(value: Array<string>) {
+  isLoadValue.value = true;
   emit('update:value', value)
 }
 </script>
diff --git a/src/views/home/aside/comp/items/Izfiled2.vue b/src/views/home/aside/comp/items/Izfiled2.vue
index 8016f07..9d6fb0b 100644
--- a/src/views/home/aside/comp/items/Izfiled2.vue
+++ b/src/views/home/aside/comp/items/Izfiled2.vue
@@ -7,8 +7,12 @@ import { useConfig } from '@/store/modules/asideConfig'
 const configUseStore = useConfig()
 
 configUseStore.$subscribe(() => {
+  if(isLoadValue.value) {
+    isLoadValue.value = false;
+    return
+  }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izfiled2']) {
+  if(asideValue['izfiled2'] && typeof asideValue['izfiled2'] == "string") {
     let list = asideValue['izfiled2'].split(',');
     formValue.value.plans = list;
     console.log("formValue.value.izfiled2", formValue.value.plans);
@@ -58,8 +62,9 @@ onBeforeMount(async () => {
   const list = await configStore.fetchIzfiled2List()
   options.value = list
 })
-
+const isLoadValue = ref(false)
 function onChange(value: Array<string>) {
+  isLoadValue.value = true;
   emit('update:value', value)
 }
 </script>
diff --git a/src/views/home/aside/comp/items/Izfiled3.vue b/src/views/home/aside/comp/items/Izfiled3.vue
index aa98ce9..ba62f48 100644
--- a/src/views/home/aside/comp/items/Izfiled3.vue
+++ b/src/views/home/aside/comp/items/Izfiled3.vue
@@ -7,9 +7,12 @@ import { useConfig } from '@/store/modules/asideConfig'
 const configUseStore = useConfig()
 
 configUseStore.$subscribe(() => {
+  if(isLoadValue.value) {
+    isLoadValue.value = false;
+    return
+  }
   let asideValue = configUseStore.getAsideValue;
-  console.log("asideValue", asideValue);
-  if(asideValue['izfiled3']) {
+  if(asideValue['izfiled3'] && typeof asideValue['izfiled3'] == "string") {
     let list = asideValue['izfiled3'].split(',');
     formValue.value.plans = list;
     console.log("formValue.value.izfiled3", formValue.value.plans);
@@ -59,8 +62,9 @@ onBeforeMount(async () => {
   const list = await configStore.fetchIzfiled2List()
   options.value = list
 })
-
+const isLoadValue = ref(false)
 function onChange(value: Array<string>) {
+  isLoadValue.value = true;
   emit('update:value', value)
 }
 </script>
diff --git a/src/views/home/aside/comp/items/Izfiled6.vue b/src/views/home/aside/comp/items/Izfiled6.vue
index 3d7cbd5..3ccbed1 100644
--- a/src/views/home/aside/comp/items/Izfiled6.vue
+++ b/src/views/home/aside/comp/items/Izfiled6.vue
@@ -7,8 +7,12 @@ import { useConfig } from '@/store/modules/asideConfig'
 const configUseStore = useConfig()
 
 configUseStore.$subscribe(() => {
+  if(isLoadValue.value) {
+    isLoadValue.value = false;
+    return
+  }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izfiled6']) {
+  if(asideValue['izfiled6'] && typeof asideValue['izfiled6'] == "string") {
     let list = asideValue['izfiled6'].split(',');
     formValue.value.plans = list;
     console.log("formValue.value.izfiled6", formValue.value.plans);
@@ -58,8 +62,9 @@ onBeforeMount(async () => {
   const list = await configStore.fetchIzfiled6List()
   options.value = list
 })
-
+const isLoadValue = ref(false)
 function onChange(value: Array<string>) {
+  isLoadValue.value = true;
   emit('update:value', value)
 }
 </script>
diff --git a/src/views/home/aside/comp/items/Izfirm.vue b/src/views/home/aside/comp/items/Izfirm.vue
index d9afb15..cbd5284 100644
--- a/src/views/home/aside/comp/items/Izfirm.vue
+++ b/src/views/home/aside/comp/items/Izfirm.vue
@@ -7,8 +7,12 @@ import { useConfig } from '@/store/modules/asideConfig'
 const configUseStore = useConfig()
 
 configUseStore.$subscribe(() => {
+  if(isLoadValue.value) {
+    isLoadValue.value = false;
+    return
+  }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izfirm']) {
+  if(asideValue['izfirm'] && typeof asideValue['izfirm'] == "string") {
     let list = asideValue['izfirm'].split(',');
     formValue.value.plans = list;
     console.log("formValue.value.izfirm", formValue.value.plans);
@@ -52,8 +56,9 @@ onBeforeMount(async () => {
   const list = await configStore.fetchIzfirmList()
   options.value = list
 })
-
+const isLoadValue = ref(false)
 function onChange(value: Array<string>) {
+  isLoadValue.value = true;
   emit('update:value', value)
 }
 </script>
diff --git a/src/views/home/aside/comp/items/Iztaskrrom.vue b/src/views/home/aside/comp/items/Iztaskrrom.vue
index 988504a..2964260 100644
--- a/src/views/home/aside/comp/items/Iztaskrrom.vue
+++ b/src/views/home/aside/comp/items/Iztaskrrom.vue
@@ -7,8 +7,12 @@ import { useConfig } from '@/store/modules/asideConfig'
 const configUseStore = useConfig()
 
 configUseStore.$subscribe(() => {
+  if(isLoadValue.value) {
+    isLoadValue.value = false;
+    return
+  }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['iztaskrrom']) {
+  if(asideValue['iztaskrrom'] && typeof asideValue['iztaskrrom'] == "string") {
     let list = asideValue['iztaskrrom'].split(',');
     formValue.value.plans = list;
     console.log("formValue.value.iztaskrrom", formValue.value.plans);
@@ -52,8 +56,9 @@ onBeforeMount(async () => {
   const list = await configStore.fetchIztaskrromList()
   options.value = list
 })
-
+const isLoadValue = ref(false)
 function onChange(value: Array<string>) {
+  isLoadValue.value = true;
   emit('update:value', value)
 }
 </script>
diff --git a/src/views/home/aside/comp/items/Iztaskstatus.vue b/src/views/home/aside/comp/items/Iztaskstatus.vue
index e4ec175..4ee0f7b 100644
--- a/src/views/home/aside/comp/items/Iztaskstatus.vue
+++ b/src/views/home/aside/comp/items/Iztaskstatus.vue
@@ -7,8 +7,12 @@ import { useConfig } from '@/store/modules/asideConfig'
 const configUseStore = useConfig()
 
 configUseStore.$subscribe(() => {
+  if(isLoadValue.value) {
+    isLoadValue.value = false;
+    return
+  }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['iztaskstatus']) {
+  if(asideValue['iztaskstatus'] && typeof asideValue['iztaskstatus'] == "string") {
     let list = asideValue['iztaskstatus'].split(',');
     formValue.value.plans = list;
     console.log("formValue.value.iztaskstatus", formValue.value.plans);
@@ -52,8 +56,9 @@ onBeforeMount(async () => {
   const list = await configStore.fetchIztaskstatusList()
   options.value = list
 })
-
+const isLoadValue = ref(false)
 function onChange(value: Array<string>) {
+  isLoadValue.value = true;
   emit('update:value', value)
 }
 </script>
diff --git a/src/views/home/aside/comp/items/Izvisitpro.vue b/src/views/home/aside/comp/items/Izvisitpro.vue
index e8b1a46..218df02 100644
--- a/src/views/home/aside/comp/items/Izvisitpro.vue
+++ b/src/views/home/aside/comp/items/Izvisitpro.vue
@@ -7,8 +7,12 @@ import { useConfig } from '@/store/modules/asideConfig'
 const configUseStore = useConfig()
 
 configUseStore.$subscribe(() => {
+  if(isLoadValue.value) {
+    isLoadValue.value = false;
+    return
+  }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izvisitpro']) {
+  if(asideValue['izvisitpro'] && typeof asideValue['izvisitpro'] == "string") {
     let list = asideValue['izvisitpro'].split(',');
     formValue.value.plans = list;
     console.log("formValue.value.izvisitpro", formValue.value.plans);
@@ -52,8 +56,9 @@ onBeforeMount(async () => {
   const list = await configStore.fetchIzvisitproList()
   options.value = list
 })
-
+const isLoadValue = ref(false)
 function onChange(value: Array<string>) {
+  isLoadValue.value = true;
   emit('update:value', value)
 }
 </script>
diff --git a/src/views/home/aside/comp/items/Plan.vue b/src/views/home/aside/comp/items/Plan.vue
index 944cf8b..b2fbc1d 100644
--- a/src/views/home/aside/comp/items/Plan.vue
+++ b/src/views/home/aside/comp/items/Plan.vue
@@ -7,8 +7,12 @@ import { useConfig } from '@/store/modules/asideConfig'
 const configUseStore = useConfig()
 
 configUseStore.$subscribe(() => {
+  if(isLoadValue.value) {
+    isLoadValue.value = false;
+    return
+  }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izplan']) {
+  if(asideValue['izplan'] && typeof asideValue['izplan'] == "string") {
     let list = asideValue['izplan'].split(',');
     formValue.value.plans = list;
     console.log("formValue.value.izplan", formValue.value.plans);
@@ -52,8 +56,9 @@ onBeforeMount(async () => {
   const planList = await configStore.fetchPlanList()
   planOptons.value = planList
 })
-
+const isLoadValue = ref(false)
 function onChange(value: Array<string>) {
+  isLoadValue.value = true;
   emit('update:value', value)
 }
 </script>
diff --git a/src/views/home/aside/comp/items/ReportUser.vue b/src/views/home/aside/comp/items/ReportUser.vue
index 7588591..f48d779 100644
--- a/src/views/home/aside/comp/items/ReportUser.vue
+++ b/src/views/home/aside/comp/items/ReportUser.vue
@@ -8,8 +8,12 @@ const configUseStore = useConfig()
 
 configUseStore.$subscribe(() => {
   let asideValue = configUseStore.getAsideValue;
-  console.log("asideValue", asideValue);
-  if(asideValue['izupuser']) {
+  console.log("asideValue接受到的", asideValue);
+  if(isLoadValue.value) {
+    isLoadValue.value = false;
+    return
+  }
+  if(asideValue['izupuser'] && typeof asideValue['izupuser'] == "string") {
     let list = asideValue['izupuser'].split(',');
     formValue.value.users = list;
     console.log("formValue.value.users1111111111", formValue.value.users);
@@ -56,7 +60,10 @@ onBeforeMount(async () => {
   personOptions.value = personList
 })
 
+const isLoadValue = ref(false)
 function onChange(value: Array<string>) {
+  console.log("user选中 ", value);
+  isLoadValue.value = true;
   emit('update:value', value)
 }
 </script>
diff --git a/src/views/home/aside/comp/items/Similarity.vue b/src/views/home/aside/comp/items/Similarity.vue
index 05e24e3..874311e 100644
--- a/src/views/home/aside/comp/items/Similarity.vue
+++ b/src/views/home/aside/comp/items/Similarity.vue
@@ -5,8 +5,12 @@ import { useConfig } from '@/store/modules/asideConfig'
 const configUseStore = useConfig()
 
 configUseStore.$subscribe(() => {
+  if(isLoadValue.value) {
+    isLoadValue.value = false;
+    return
+  }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izsimilarity']) {
+  if(asideValue['izsimilarity'] && typeof asideValue['izsimilarity'] == "string") {
     range.value = asideValue['izsimilarity']
   }else {
     range.value = [0, 100];
@@ -28,8 +32,9 @@ const marks = {
   50: '50',
   100: '100',
 }
-
+const isLoadValue = ref(false)
 function onChange(value: number & number[]) {
+  isLoadValue.value = true;
   let valueStr = value.join('-');
   emit('update:value', valueStr)
 }
diff --git a/src/views/home/aside/comp/items/Time.vue b/src/views/home/aside/comp/items/Time.vue
index 5dd7c8b..299dc18 100644
--- a/src/views/home/aside/comp/items/Time.vue
+++ b/src/views/home/aside/comp/items/Time.vue
@@ -7,6 +7,10 @@ import { useConfig } from '@/store/modules/asideConfig'
 const configUseStore = useConfig()
 
 configUseStore.$subscribe(() => {
+  if(isLoadValue.value) {
+    isLoadValue.value = false;
+    return
+  }
   let asideValue = configUseStore.getAsideValue;
   if(asideValue['izyear']) {
     time.value = asideValue['izyear']
@@ -24,8 +28,9 @@ const emit = defineEmits<{
 }>()
 
 const time = ref<[number, number] | null>(props.value)
-
+const isLoadValue = ref(false)
 function onChange(value: [number, number]) {
+  isLoadValue.value = true;
   emit('update:value', value)
 }
 onMounted(() => {
diff --git a/src/views/home/aside/comp/modals/CustomFilterModal.vue b/src/views/home/aside/comp/modals/CustomFilterModal.vue
index b021c0a..ed86ae7 100644
--- a/src/views/home/aside/comp/modals/CustomFilterModal.vue
+++ b/src/views/home/aside/comp/modals/CustomFilterModal.vue
@@ -49,7 +49,7 @@ const allCount = computed(() => {
 })
 
 const selectCount = computed(() => {
-  return `已经筛选(共${onList.value.length}个)`
+  return `已选筛选(共${onList.value.length}个)`
 })
 
 defineExpose({
diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 7d2d512..895b32c 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -251,7 +251,9 @@ const gridHeight = computed(() => {
 
 async function oneCheck() {
   const asideVal = cloneDeep(configStore.getAsideValue)
-  asideVal.izyear = dayjs(asideVal.izyear[0]).format("YYYY/MM/DD") + '-' + dayjs(asideVal.izyear[1]).format("YYYY/MM/DD")
+  if(asideVal.izyear && asideVal.izyear.length == 2) {
+    asideVal.izyear = dayjs(asideVal.izyear[0]).format("YYYY/MM/DD") + '-' + dayjs(asideVal.izyear[1]).format("YYYY/MM/DD")
+  }
   const tasksLoadingModal = queryRepeatedTasksModalRef.value as any
   
   console.log('calNum.value111111111111111', calNum.value, checkTaskStatus.value);
-- 
2.39.3


From 368942dafa100ab1bd6545845ecd4e49ea1004f3 Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Mon, 1 Apr 2024 17:41:01 +0800
Subject: [PATCH 083/143] bug

---
 src/views/task/aside/Aside.vue      | 11 +++++++++--
 src/views/task/modal/BatchModal.vue |  6 +++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/views/task/aside/Aside.vue b/src/views/task/aside/Aside.vue
index 8212a5a..890ea44 100644
--- a/src/views/task/aside/Aside.vue
+++ b/src/views/task/aside/Aside.vue
@@ -21,7 +21,7 @@ const taskStore = useTaskStore()
 const taskListRef: any = ref(null)
 // 展示字段
 const showFieldList = ref<any[]>([])
-
+const search = ref('')
 function collapseHandler() {
   collapse.value = !collapse.value
 }
@@ -62,6 +62,12 @@ function showFilter() {
 const showSearch = ref(false)
 
 function setShowSearch(value: boolean) {
+  if (!value) {
+    console.log('setShowSearch', value)
+    search.value = ''
+    taskListRef.value.search('')
+    return
+  }
   showSearch.value = value
 }
 
@@ -201,6 +207,7 @@ defineExpose({
 
       <div v-show="showSearch" class="warpper">
         <n-input
+          v-model:value="search"
           style="flex: 1; height: 32px"
           placeholder="请输入你需要搜索的内容"
           @input="inputHandler"
@@ -231,9 +238,9 @@ defineExpose({
     <!-- 过滤列表 -->
     <FilterModalVue
       ref="filterModalRef"
+      :type="2"
       @edit-filter="editFilter"
       @show-new-filter="showModal(newFilterModalRef)"
-      :type="2"
     />
     <!-- 新增过滤 -->
     <NewFilterModalVue ref="newFilterModalRef" />
diff --git a/src/views/task/modal/BatchModal.vue b/src/views/task/modal/BatchModal.vue
index 54b7b46..2a99fb4 100644
--- a/src/views/task/modal/BatchModal.vue
+++ b/src/views/task/modal/BatchModal.vue
@@ -334,6 +334,10 @@ async function refreshHandler() {
 watch(() => taskStore.activeId, async (newValue, oldValue) => {
   refreshHandler()
 })
+
+function switchBatch() {
+  setBatch(!batch.value)
+}
 </script>
 
 <template>
@@ -408,7 +412,7 @@ watch(() => taskStore.activeId, async (newValue, oldValue) => {
                 </n-popselect>
               </div>
               <div>
-                <div v-show="!showActions" class="wrapper-content-form-button" @click="setBatch(true)">
+                <div v-show="!showActions" class="wrapper-content-form-button" @click="switchBatch()">
                   <SvgIcon style="margin-right: 6px;" size="22" name="batch" />
                   批量审批
                 </div>
-- 
2.39.3


From ae974ae4365448317d0681ef500155c39bd6b7e6 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Mon, 1 Apr 2024 17:49:36 +0800
Subject: [PATCH 084/143] =?UTF-8?q?feat:=20=E6=A1=86=E9=80=89=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E6=96=87=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Header/RecycleModal.vue | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue
index d2f7ae5..f56ff8a 100644
--- a/src/layout/components/Header/RecycleModal.vue
+++ b/src/layout/components/Header/RecycleModal.vue
@@ -261,22 +261,19 @@ function closeModal(event: MouseEvent) {
 }
 
 async function remove() {
-  const arr = listData.value.filter((item) => {
-    return item.checked
-  })
-
-  if (arr.length === 0) {
+  if ( !selectIds.value|| selectIds.value.length === 0) {
     message.error('至少选中一个')
     return
   }
 
-  const ids = arr.map(item => item.id).join(',')
+  const ids =  selectIds.value.join(',')
   const res = await removeFiles({ pictureid: ids })
   if (res.code === 'OK') {
     message.success('移除成功')
     pagination.pageNo = 1
     const list = await featchList()
     listData.value = list
+    layout()
   }
 }
 
@@ -311,10 +308,10 @@ function onCheckChange(val: any, item: any) {
       v-model:show="show" :mask-closable="false" style="position: relative;" transform-origin="center"
       @after-enter="afterEnter" @after-leave="afterLeave"
     >
-      <n-card
-        :style="cardStyle" class="card card-1" style="position: fixed;top:64px" :bordered="false" size="huge" role="dialog"
-        aria-modal="true"
-      >
+    <n-card
+    :style="cardStyle" class="card card-1" style="position: fixed;top:64px" :bordered="false" size="huge" role="dialog"
+    aria-modal="true"
+    >
         <div class="wrapper">
           <div class="wrapper-m32">
             <SvgIcon name="recycle" size="16" />
-- 
2.39.3


From 0e8e9df6d059879f9771d3f28c541b679fe5291a Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Mon, 1 Apr 2024 18:02:14 +0800
Subject: [PATCH 085/143] =?UTF-8?q?feat:=20=E6=9A=82=E5=AD=98=E5=8F=AF?=
 =?UTF-8?q?=E7=96=91=E6=96=87=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Header/RecycleModal.vue | 148 ++++++++++++++----
 1 file changed, 117 insertions(+), 31 deletions(-)

diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue
index f56ff8a..9939bb4 100644
--- a/src/layout/components/Header/RecycleModal.vue
+++ b/src/layout/components/Header/RecycleModal.vue
@@ -1,21 +1,17 @@
 <script lang="ts" setup>
-import { computed, onBeforeMount, onMounted, onUpdated, reactive, ref, watch } from 'vue'
 import Masonry from 'masonry-layout'
 import { useDialog, useMessage } from 'naive-ui'
+import { computed, onBeforeMount, onMounted, onUpdated, reactive, ref, watch } from 'vue'
 
+import { dubiousfilelist, removeFiles } from '@/api/task/task'
+import { viewOptions } from '@/config/home'
 import { useInfiniteScroll } from '@vueuse/core'
-import { debounce, throttle } from 'lodash-es'
 import imagesloaded from 'imagesloaded'
-import { randomInt } from '@/utils/index'
-import { viewOptions } from '@/config/home'
-import { dubiousfilelist, removeFiles } from '@/api/task/task'
+import { debounce } from 'lodash-es'
 
+import { audit } from '@/api/task/task'
+import NotPassed from '@/components/Approval/NotPassed.vue'
 import { off, on } from '@/utils/domUtils'
-import img1 from '@/assets/images/1.jpg'
-import img2 from '@/assets/images/2.jpg'
-import img3 from '@/assets/images/3.jpg'
-import img4 from '@/assets/images/4.jpg'
-import img5 from '@/assets/images/5.jpg'
 
 const cardStyle = {
   '--n-padding-bottom': '40px',
@@ -24,7 +20,7 @@ const cardStyle = {
 
 const message = useMessage()
 const timeRange = ref('')
-const check = ref(false)
+const batch = ref(false)
 const timeOptions = [{
   label: '升序',
   value: 'asc',
@@ -61,7 +57,8 @@ let loading = false
 let _masonry: null | Masonry = null
 const show = ref(false)
 
-const urls = [img1, img2, img3, img4, img5]
+const dialog = useDialog();
+let processItems: any[] = [];
 
 const layout = debounce(() => {
   if (!show.value)
@@ -101,11 +98,6 @@ useInfiniteScroll(
   { distance: 10, canLoadMore: () => canloadMore },
 )
 
-function randomUrl() {
-  const index = randomInt(0, urls.length)
-  return urls[index]
-}
-
 async function featchList() {
   loading = true
   try {
@@ -277,20 +269,22 @@ async function remove() {
   }
 }
 
-function getPercent(pictureid: string, item) {
-  console.log(item)
-  const { ocpictureid, pictureresult } = item
-  const splitId = ocpictureid || ''
-  const index = splitId.split(',').indexOf(String(pictureid))
-  const results = (pictureresult || '').split(',')
-  const percent = results[index] || '0'
-  const val = Number.parseFloat(percent)
-  return `${val}%`
-}
 
-function showCheck() {
-  check.value = true
+function setBatch(value) {
+  if (value && batch.value) {
+    batch.value = !value;
+  } else {
+    batch.value = value;
+  }
+  if (value === false) {
+    selectIds.value = []
+    listData.value.forEach((item) => (item.checked = false));
+    listData.value.length = 0;
+  }
 }
+const showActions = computed(() => {
+  return listData.value.length > 0 && batch;
+});
 
 defineExpose({
   showModal,
@@ -300,6 +294,81 @@ const checked = ref(false)
 function onCheckChange(val: any, item: any) {
   checked.value = val
 }
+
+function reset() {
+  pagination.pageNo = 0;
+  pagination.pageSize = 20;
+  listData.value.length = 0;
+  loading = false;
+  canloadMore = true;
+}
+function validate(items: any[]) {
+  if (items.length === 0) return "至少选中一个任务";
+  return null;
+}
+function approvalHandler(items?: any) {
+  let cloneItem: any
+  if (batch.value) {
+    processItems = listData.value
+  }
+  //  任务包图片 => 点击 => 通过/不通过按钮
+  if (items !== undefined && !(items instanceof PointerEvent))
+    processItems = [items]
+
+  const msg = validate(processItems)
+
+  if (msg !== null) {
+    message.error(msg)
+    return
+  }
+
+  const list: any = []
+  processItems.forEach((item) => {
+    list.push({
+      formId: item.id,
+      taskId: item.taskId,
+      taskName: item.fromTaskName,
+    })
+  })
+
+  const param = {
+    result: true,
+    comment: '',
+    disposeType: '',
+    disposeTypeId: '',
+    failCauseId: '',
+    failCauseName: '',
+    flowTaskInfoList: list,
+  }
+
+  dialog.info({
+    title: '确认提示',
+    content: '确认给该任务审批为【通过】吗?',
+    positiveText: '确定',
+    negativeText: '取消',
+    onPositiveClick: () => {
+      doAudit(param)
+    },
+    onNegativeClick: () => { },
+  })
+}
+
+function doAudit(param: any) {
+  audit(param).then((res) => {
+    const { code } = res
+    setBatch(false)
+    if (code === 'OK') {
+      message.info(res.message)
+      // emitter.emit('refresh')
+      // refreshHandler()
+    }
+    else message.error(res.message)
+  })
+}
+function reloadList() {
+  setBatch(false)
+  // refreshHandler()
+}
 </script>
 
 <template>
@@ -341,10 +410,25 @@ function onCheckChange(val: any, item: any) {
                 <div class="remove" @click="remove">
                   移除可疑文件夹
                 </div>
-                <div class="wrapper-content-form-button" @click="showCheck">
+                <div class="wrapper-content-form-button" @click="setBatch(true)">
                   <SvgIcon style="margin-right: 6px;" size="14" name="tf" />
                   批量审批
                 </div>
+                <div v-show="showActions" class="batch">
+                    <n-button text @click="setBatch(false)">
+                      <template #icon>
+                        <SvgIcon name="revoke" />
+                      </template>
+                      返回
+                    </n-button>
+                    <div style="cursor: pointer; margin-left: 16px" @click.stop="rejectHandler">
+                      <SvgIcon width="64" height="28" name="a1" />
+                    </div>
+                    <SvgIcon size="24" name="vs" />
+                    <div style="cursor: pointer" @click.stop="approvalHandler">
+                      <SvgIcon width="64" height="28" name="a2" />
+                    </div>
+                  </div>
               </div>
             </div>
 
@@ -365,7 +449,7 @@ function onCheckChange(val: any, item: any) {
                     :class="{ 'img-fit': viewMode === 'horizontalVersion', 'img-full': viewMode === '3:4' || viewMode === 'verticalVersion' }"
                   />
                   <n-checkbox
-                    v-if="check"
+                    v-if="batch"
                     v-model:checked="item.checked"
                     style="position:absolute;left:20px;top:20px" @click.prevent
                     @update:checked="onCheckChange($event, item)"
@@ -385,6 +469,8 @@ function onCheckChange(val: any, item: any) {
         </div>
       </n-card>
     </n-modal>
+    <NotPassed ref="notPassModalRef" @success="reloadList" />
+
   </div>
 </template>
 
-- 
2.39.3


From 2ccfcca9585fd0645c93fd9c3a7aa419ab8c2812 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Mon, 1 Apr 2024 18:30:31 +0800
Subject: [PATCH 086/143] =?UTF-8?q?feat:=20=E6=89=B9=E9=87=8F=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Header/RecycleModal.vue | 51 +++++++++++++------
 1 file changed, 36 insertions(+), 15 deletions(-)

diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue
index 9939bb4..8f9e985 100644
--- a/src/layout/components/Header/RecycleModal.vue
+++ b/src/layout/components/Header/RecycleModal.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import Masonry from 'masonry-layout'
 import { useDialog, useMessage } from 'naive-ui'
-import { computed, onBeforeMount, onMounted, onUpdated, reactive, ref, watch } from 'vue'
+import { computed, onBeforeMount, onMounted, onUpdated, reactive, ref, unref, watch } from 'vue'
 
 import { dubiousfilelist, removeFiles } from '@/api/task/task'
 import { viewOptions } from '@/config/home'
@@ -56,7 +56,7 @@ const pagination = reactive({
 let loading = false
 let _masonry: null | Masonry = null
 const show = ref(false)
-
+const selectedApproveItems = ref<any[]>([]); // 审核批量选中
 const dialog = useDialog();
 let processItems: any[] = [];
 
@@ -249,6 +249,7 @@ async function onChange() {
 }
 
 function closeModal(event: MouseEvent) {
+  selectedApproveItems.value = []
   show.value = false
 }
 
@@ -277,28 +278,44 @@ function setBatch(value) {
     batch.value = value;
   }
   if (value === false) {
-    selectIds.value = []
-    listData.value.forEach((item) => (item.checked = false));
-    listData.value.length = 0;
+    // selectIds.value = []
+    selectedApproveItems.value.forEach((item) => (item.checked = false));
+    selectedApproveItems.value.length = 0;
   }
 }
-const showActions = computed(() => {
-  return listData.value.length > 0 && batch;
-});
 
 defineExpose({
   showModal,
 })
 
 const checked = ref(false)
-function onCheckChange(val: any, item: any) {
-  checked.value = val
+
+const notPassModalRef = ref(null)
+const showActions = computed(() => {
+  return selectedApproveItems.value.length > 0 && batch;
+});
+
+
+function onCheckChange(checked: any, item: any) {
+  debugger
+  item.checked = checked
+  const index = selectedApproveItems.value.indexOf(item);
+
+  if (index === -1 && checked) selectedApproveItems.value.push(item);
+  else selectedApproveItems.value.splice(index, 1);
+}
+
+function rejectHandler() {
+  const modal = unref(notPassModalRef)! as any
+  modal.showModal(selectedApproveItems.value)
 }
 
 function reset() {
+  batch.value = false;
   pagination.pageNo = 0;
   pagination.pageSize = 20;
   listData.value.length = 0;
+  selectedApproveItems.value.length = 0;
   loading = false;
   canloadMore = true;
 }
@@ -307,9 +324,8 @@ function validate(items: any[]) {
   return null;
 }
 function approvalHandler(items?: any) {
-  let cloneItem: any
   if (batch.value) {
-    processItems = listData.value
+    processItems = selectedApproveItems.value
   }
   //  任务包图片 => 点击 => 通过/不通过按钮
   if (items !== undefined && !(items instanceof PointerEvent))
@@ -360,15 +376,20 @@ function doAudit(param: any) {
     if (code === 'OK') {
       message.info(res.message)
       // emitter.emit('refresh')
-      // refreshHandler()
+      refreshHandler()
+
     }
     else message.error(res.message)
   })
 }
 function reloadList() {
-  setBatch(false)
-  // refreshHandler()
+  refreshHandler()
+}
+function refreshHandler(){
+  reset()
+  featchList()
 }
+
 </script>
 
 <template>
-- 
2.39.3


From 088730eef18f63c62415d3d6993329f7a786a48f Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Mon, 1 Apr 2024 20:21:34 +0800
Subject: [PATCH 087/143] =?UTF-8?q?feat:=20=E5=8F=AF=E7=96=91=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Header/RecycleModal.vue | 6 +++---
 src/views/task/content/Content.vue            | 2 +-
 src/views/worksheet/content/Content.vue       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue
index 8f9e985..4afda80 100644
--- a/src/layout/components/Header/RecycleModal.vue
+++ b/src/layout/components/Header/RecycleModal.vue
@@ -278,7 +278,7 @@ function setBatch(value) {
     batch.value = value;
   }
   if (value === false) {
-    // selectIds.value = []
+    selectIds.value = []
     selectedApproveItems.value.forEach((item) => (item.checked = false));
     selectedApproveItems.value.length = 0;
   }
@@ -292,12 +292,12 @@ const checked = ref(false)
 
 const notPassModalRef = ref(null)
 const showActions = computed(() => {
+  console.log('selectedApproveItems',selectedApproveItems)
   return selectedApproveItems.value.length > 0 && batch;
 });
 
 
 function onCheckChange(checked: any, item: any) {
-  debugger
   item.checked = checked
   const index = selectedApproveItems.value.indexOf(item);
 
@@ -431,7 +431,7 @@ function refreshHandler(){
                 <div class="remove" @click="remove">
                   移除可疑文件夹
                 </div>
-                <div class="wrapper-content-form-button" @click="setBatch(true)">
+                <div class="wrapper-content-form-button" @click="setBatch(true)" v-show="!showActions">
                   <SvgIcon style="margin-right: 6px;" size="14" name="tf" />
                   批量审批
                 </div>
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index 651b84c..1f67f79 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -78,7 +78,7 @@ const fullscreenStyles = computed<any>(() => ({
   position: isFullScreen.value ? 'fixed' : '',
   top: isFullScreen.value ? '0' : '',
   left: isFullScreen.value ? '0' : '',
-  zIndex: isFullScreen.value ? '9999' : '',
+  zIndex: isFullScreen.value ? '100' : '',
 }))
 
 onMounted(() => {
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 904a9c1..bee4397 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -172,7 +172,7 @@ const fullscreenStyles = computed<any>(() => ({
   'position': isFullScreen.value ? 'fixed' : '',
   'top': isFullScreen.value ? '0' : '',
   'left': isFullScreen.value ? '0' : '',
-  'zIndex': isFullScreen.value ? '9999' : '',
+  'zIndex': isFullScreen.value ? '100' : '',
 }));
 
 // 切换全屏状态
-- 
2.39.3


From c65a96826bac4e9209205502d61de528eb0e488d Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Mon, 1 Apr 2024 20:23:28 +0800
Subject: [PATCH 088/143] =?UTF-8?q?feat:=20=E7=BB=9F=E8=AE=A1=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E5=AD=97=E6=AE=B5=E5=8F=98=E6=9B=B4=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/index.vue                          |  7 +++++--
 src/views/home/aside/comp/Search.vue               |  4 +++-
 src/views/home/content/modal/LoginSuccessModal.vue |  4 ++--
 src/views/worksheet/modal/ApprovalModal.vue        | 12 ++++++------
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/views/final/index.vue b/src/views/final/index.vue
index 9e1e3b0..204ad2d 100644
--- a/src/views/final/index.vue
+++ b/src/views/final/index.vue
@@ -5,17 +5,20 @@ import Content from './content/Content.vue'
 import ListContent from './content/ListContent.vue'
 
 const showList = ref(false);
+const contentRef = ref(null);
+const inputChange = (keyword)=>{
 
+}
 
 </script>
 
 <template>
   <div class="main">
     <!-- 侧边 -->
-    <Aside />
+    <Aside @inputChange="inputChange" />
 
     <!-- 内容 -->
-    <Content @changeShow="showList=true" />
+    <Content @changeShow="showList=true" ref="contentRef" />
     <!-- 任务管理 -->
     <!-- TODO:本地演示即可 上传注释注释 -->
     <!-- <ListContent  /> -->
diff --git a/src/views/home/aside/comp/Search.vue b/src/views/home/aside/comp/Search.vue
index 2f6cea7..53a80ad 100644
--- a/src/views/home/aside/comp/Search.vue
+++ b/src/views/home/aside/comp/Search.vue
@@ -10,6 +10,7 @@ defineOptions({ name: 'Search' })
 const emit = defineEmits<{
   (e: 'close'): void
   (e: 'select', key: string): void
+  (e: 'inputChange', value: string): void
 }>()
 
 const data = ref<SearchEntity[]>([])
@@ -18,7 +19,8 @@ const configStore = useConfig()
 const searchKeyword = ref('')
 
 const inputHandler = debounce((keyword) => {
-  searchKeyword.value = keyword
+  searchKeyword.value = keyword;
+  emit('inputChange',keyword)
 }, 300)
 
 configStore.$subscribe(() => {
diff --git a/src/views/home/content/modal/LoginSuccessModal.vue b/src/views/home/content/modal/LoginSuccessModal.vue
index 5d2f947..2b02cb9 100644
--- a/src/views/home/content/modal/LoginSuccessModal.vue
+++ b/src/views/home/content/modal/LoginSuccessModal.vue
@@ -58,7 +58,7 @@ defineExpose({
         <div class="flex_box" style="height: 100px">
           <div class="item">
             <SvgIcon name="task_count" width="80" height="96" />
-            <div class="num_box">{{ toolsData?.taskTotal || 0 }}</div>
+            <div class="num_box">{{ toolsData?.total || 0 }}</div>
             <div class="title_box">任务总数</div>
           </div>
           <div class="item">
@@ -68,7 +68,7 @@ defineExpose({
           </div>
           <div class="item">
             <SvgIcon name="task_over" width="80" height="96" />
-            <div class="num_box">{{ toolsData?.approved || 0 }}</div>
+            <div class="num_box">{{ toolsData?.approvedCount || 0 }}</div>
             <div class="title_box">已审批</div>
           </div>
         </div>
diff --git a/src/views/worksheet/modal/ApprovalModal.vue b/src/views/worksheet/modal/ApprovalModal.vue
index a25dd02..1e9c4d0 100644
--- a/src/views/worksheet/modal/ApprovalModal.vue
+++ b/src/views/worksheet/modal/ApprovalModal.vue
@@ -34,7 +34,7 @@ function showModal(id) {
 async function getDetail(id) {
   // const userInfo = storage.get(CURRENT_USER);
   // const nodeType = userInfo.nodeType;
-  id = "264626184091111068";
+  // id = "264626184091111068";
   const res = await aiApprovaltools({ taskid: id });
   if (res.code === "OK") {
     state.detail = res.data;
@@ -126,7 +126,7 @@ defineExpose({
       <div class="wrapper-hearder">
         <div class="wrapper-title">智能AI审批工具</div>
         <div class="wrapper-mark">
-          {{ detail.tenantUserName }}-{{ detail.packageName }}
+          {{ detail.tenantUserName || '部门信息' }}
         </div>
       </div>
       <div class="wrapper-content">
@@ -137,7 +137,7 @@ defineExpose({
             <div class="tag_box">
               <div class="tag_item error">
                 <span style="color: red">error</span> 重复图片({{
-                  detail.similarComplete
+                  detail.similarComplete || 0
                 }})
               </div>
             </div>
@@ -148,10 +148,10 @@ defineExpose({
           </div>
         </div>
         <div class="mark_text">
-          智能提示：{{ detail?.similarComplete }} 张图片相似度为100%重复图片，{{
-            detail?.passCount
+          智能提示：{{ detail?.similarComplete || 0 }} 张图片相似度为100%重复图片，{{
+            detail?.passCount || 0
           }}张审批状态为<span style="color: #02c984">通过</span>，剩余{{
-            detail?.pendingApprovaCount
+            detail?.pendingApprovaCount || 0
           }}张图片建议审批为不通过！
         </div>
         <div class="footer" @click="handleReject">
-- 
2.39.3


From 03163892acf58abffc350c8d221829ded56791e2 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Mon, 1 Apr 2024 20:39:57 +0800
Subject: [PATCH 089/143] =?UTF-8?q?feat:=20=E9=AB=98=E7=BA=A7=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E9=80=BB=E8=BE=91=E4=BF=AE=E5=A4=8D=EF=BC=8C=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=AE=A1=E6=89=B9=E6=A8=A1=E5=9D=97=E9=AB=98=E7=BA=A7?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89type=E9=94=99=E8=AF=AF=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/aside/Aside.vue               |   6 +-
 .../home/aside/comp/modals/FilterModal.vue    |   2 +
 src/views/task/aside/Aside.vue                | 182 ++++++++++--------
 src/views/task/modal/NewFilterModal.vue       |   4 +-
 4 files changed, 107 insertions(+), 87 deletions(-)

diff --git a/src/views/final/aside/Aside.vue b/src/views/final/aside/Aside.vue
index f98bf3e..8c2aba9 100644
--- a/src/views/final/aside/Aside.vue
+++ b/src/views/final/aside/Aside.vue
@@ -149,6 +149,10 @@ function editFilter(filter: any) {
 watch(asideValue, (newVal) => {
   finalStore.setAsideValue(newVal)
 })
+
+const inputChange = (keyword)=>{
+  
+}
 </script>
 
 <template>
@@ -161,7 +165,7 @@ watch(asideValue, (newVal) => {
     <n-scrollbar trigger="none">
       <div class="aside-header">
         <!-- 搜索跳转模块 -->
-        <Search v-show="showSearch" @select="scrollHandler" @close="setShowSearch(false)" />
+        <Search v-show="showSearch" @select="scrollHandler" @close="setShowSearch(false)" @inputChange="inputChange" />
         <!-- 高级筛选 -->
         <AdvanceFilter
           v-show="!showSearch" :type="1" @select="filterHandler" @update:search="setShowSearch(true)"
diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue
index 4690ee0..95fcbf4 100644
--- a/src/views/home/aside/comp/modals/FilterModal.vue
+++ b/src/views/home/aside/comp/modals/FilterModal.vue
@@ -303,6 +303,8 @@ function closeModal() {
 
 defineExpose({
   showModal,
+  query,
+  pagination
 });
 
 const inputHandler = debounce((word) => {
diff --git a/src/views/task/aside/Aside.vue b/src/views/task/aside/Aside.vue
index 890ea44..9e2ff6e 100644
--- a/src/views/task/aside/Aside.vue
+++ b/src/views/task/aside/Aside.vue
@@ -1,90 +1,97 @@
 <script lang="ts" setup>
-import { debounce } from 'lodash-es'
-import { computed, inject, onBeforeMount, onMounted, ref, shallowRef, unref, watch } from 'vue'
-import CustomFieldModal from '../modal/CustomFieldModal.vue'
-import AdvanceFilter from '../../home/aside/comp/AdvanceFilter.vue'
+import { debounce } from "lodash-es";
 import {
-  FilterModalVue,
-} from '../../home/aside/comp/modals'
-import NewFilterModalVue from '../modal/NewFilterModal.vue'
-import TaskList from './TaskList.vue'
-import type { AsideEntity } from '@/config/aside'
-import { useUser } from '@/store/modules/user'
-import { getAllfieldList, getfieldList } from '@/api/home/filter'
-import { useTaskStore } from '@/store/modules/task'
-import emitter from '@/utils/mitt'
-import { useConfig } from '@/store/modules/asideConfig'
+  computed,
+  inject,
+  onBeforeMount,
+  onMounted,
+  ref,
+  shallowRef,
+  unref,
+  watch,
+} from "vue";
+import CustomFieldModal from "../modal/CustomFieldModal.vue";
+import AdvanceFilter from "../../home/aside/comp/AdvanceFilter.vue";
+import { FilterModalVue } from "../../home/aside/comp/modals";
+import NewFilterModalVue from "../modal/NewFilterModal.vue";
+import TaskList from "./TaskList.vue";
+import type { AsideEntity } from "@/config/aside";
+import { useUser } from "@/store/modules/user";
+import { getAllfieldList, getfieldList } from "@/api/home/filter";
+import { useTaskStore } from "@/store/modules/task";
+import emitter from "@/utils/mitt";
+import { useConfig } from "@/store/modules/asideConfig";
 
-const CustomFieldModalRef = ref(null)
-const collapse = ref(false)
-const taskStore = useTaskStore()
-const taskListRef: any = ref(null)
+const CustomFieldModalRef = ref(null);
+const collapse = ref(false);
+const taskStore = useTaskStore();
+const taskListRef: any = ref(null);
 // 展示字段
-const showFieldList = ref<any[]>([])
-const search = ref('')
+const showFieldList = ref<any[]>([]);
+const search = ref("");
 function collapseHandler() {
-  collapse.value = !collapse.value
+  collapse.value = !collapse.value;
 }
-const mousetrap = inject('mousetrap') as any
-mousetrap.bind('[', collapseHandler)
+const mousetrap = inject("mousetrap") as any;
+mousetrap.bind("[", collapseHandler);
 const asideWidth = computed(() => {
-  return collapse.value ? 0 : 308
-})
+  return collapse.value ? 0 : 308;
+});
 
 const asideStyle = computed(() => {
   return {
     width: `${asideWidth.value}px`,
-  }
-})
+  };
+});
 
 const collapseIcon = computed(() => {
-  return collapse.value ? 'expand-cir' : 'collapse-cir'
-})
+  return collapse.value ? "expand-cir" : "collapse-cir";
+});
 
-const asideEnter = ref(false)
+const asideEnter = ref(false);
 
 const showCollapse = computed(() => {
-  return collapse.value ? true : asideEnter.value
-})
+  return collapse.value ? true : asideEnter.value;
+});
 
 watch(
   () => taskStore.immersion,
   () => {
-    collapse.value = true
-  },
-)
+    collapse.value = true;
+  }
+);
 
 function showFilter() {
-  const modal = unref(CustomFieldModalRef)! as any
-  modal.showModal()
+  const modal = unref(CustomFieldModalRef)! as any;
+  modal.showModal();
 }
 
-const showSearch = ref(false)
+const showSearch = ref(false);
 
 function setShowSearch(value: boolean) {
   if (!value) {
-    console.log('setShowSearch', value)
-    search.value = ''
-    taskListRef.value.search('')
-    return
+    console.log("setShowSearch", value);
+    search.value = "";
+    taskListRef.value.search("");
+    return;
   }
-  showSearch.value = value
+  showSearch.value = value;
 }
 
 const inputHandler = debounce((word) => {
-  (taskListRef.value as any).search(word)
-}, 500)
+  (taskListRef.value as any).search(word);
+}, 500);
 
-const reviewType = 2
+const reviewType = 2;
 async function getshowFieldList() {
-  showFieldList.value = []
-  const userStore = useUser()
-  const userInfo = userStore.getUserInfo
-  let res
-  res = await getAllfieldList(reviewType) // 所有筛选项目
-  const allList = res.data
-  res = await getfieldList(reviewType, userInfo.id) // 当前用户选择的项目
-  const useList = res.data
+  showFieldList.value = [];
+  const userStore = useUser();
+  const userInfo = userStore.getUserInfo;
+  let res;
+  res = await getAllfieldList(reviewType); // 所有筛选项目
+  const allList = res.data;
+  res = await getfieldList(reviewType, userInfo.id); // 当前用户选择的项目
+  const useList = res.data;
   /**
    * name 标题
    * id 键值
@@ -92,20 +99,19 @@ async function getshowFieldList() {
    * checked 是否选中
    */
   if (useList?.userFieldFixed) {
-    useList?.userFieldFixed?.split(',').map((v) => {
-      let item = allList.find(v2 => v2.name == v)
+    useList?.userFieldFixed?.split(",").map((v) => {
+      let item = allList.find((v2) => v2.name == v);
       if (item) {
         item = {
           name: item.fieldDesc,
           id: item.name,
           fix: item.isrequired == 2,
           checked: true,
-        }
-        showFieldList.value.push(item)
+        };
+        showFieldList.value.push(item);
       }
-    })
-  }
-  else {
+    });
+  } else {
     // 若为首次获取 则赋默认值
     allList?.map((v) => {
       if (v.isrequired == 2) {
@@ -114,52 +120,58 @@ async function getshowFieldList() {
           id: v.name,
           fix: v.isrequired == 2,
           checked: true,
-        }
-        showFieldList.value.push(item)
+        };
+        showFieldList.value.push(item);
       }
-    })
+    });
   }
 }
 
 onMounted(() => {
-  getshowFieldList()
-})
+  getshowFieldList();
+});
 
 // 滚动容器，让key对应模块处于可视区域
 function scrollHandler(key: string) {
-  const element = document.querySelector(`#${key}`)
-  element?.scrollIntoView(true)
+  const element = document.querySelector(`#${key}`);
+  element?.scrollIntoView(true);
 }
 // 选择某个过滤配置，刷新图片墙
 function filterHandler(searchId: string) {
-  emitter.emit('filter', searchId)
+  emitter.emit("filter", searchId);
 }
 function showModal(modalRef: any) {
-  const modal = unref(modalRef)! as any
-  modal.showModal()
+  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)
+const showItems = shallowRef<{ key: string; config: AsideEntity }[]>([]);
+const filterModalRef: any = 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)
+  const modal = unref(newFilterModalRef)! as any;
+  modal.showModal();
+  modal.edit(filter);
 }
-const configStore = useConfig()
+const configStore = useConfig();
+const newFilterOk = () => {
+  filterModalRef.value.query(
+    filterModalRef.value.pagination.page,
+    filterModalRef.value.pagination.pageSize
+  );
+};
 onBeforeMount(async () => {
-  configStore.fetchConfig()
-  configStore.fetchCustomConfig()
-})
+  configStore.fetchConfig();
+  configStore.fetchCustomConfig();
+});
 function setAsideItemName(text) {
-  taskListRef.value.setStatusName(text)
+  taskListRef.value.setStatusName(text);
 }
 
 defineExpose({
   setAsideItemName,
-})
+});
 </script>
 
 <template>
@@ -243,7 +255,7 @@ defineExpose({
       @show-new-filter="showModal(newFilterModalRef)"
     />
     <!-- 新增过滤 -->
-    <NewFilterModalVue ref="newFilterModalRef" />
+    <NewFilterModalVue ref="newFilterModalRef" @onOk="newFilterOk" />
   </div>
 </template>
 
diff --git a/src/views/task/modal/NewFilterModal.vue b/src/views/task/modal/NewFilterModal.vue
index d6e8cf2..a64ad43 100644
--- a/src/views/task/modal/NewFilterModal.vue
+++ b/src/views/task/modal/NewFilterModal.vue
@@ -15,6 +15,7 @@ const configStore = useConfig()
 const dicStore = useDictionary()
 const currentStatus = ref<Status>('new')
 let currentEditId: string | null = null
+const emit = defineEmits(['onOk'])
 
 const modalTitle = computed(() => {
   return currentStatus.value === 'new' ? '新建过滤条件' : '编辑过滤条件'
@@ -112,7 +113,7 @@ function handleSumbit(e: MouseEvent) {
 
     const param: FilterCondition = {
       searchname: formValue.name!,
-      type: 1,
+      type: 2,
       ocrUsersearchchildList: list,
     }
 
@@ -121,6 +122,7 @@ function handleSumbit(e: MouseEvent) {
     else
       updateCondition({ id: currentEditId!, ...param })
     closeModal()
+    emit('onOk')
   })
 }
 
-- 
2.39.3


From 98464ea4bca57afcf28db79aca17912fc350d91c Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Mon, 1 Apr 2024 20:41:09 +0800
Subject: [PATCH 090/143] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E7=99=BD=E5=9B=BE=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/content/Content.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index bee4397..305ac53 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -222,8 +222,9 @@ async function queryDetail(checkDuplicateId: any) {
 
   refreshHandler();
 }
+// 点击任务包图片，查看详情
 async function handleSelect(item: any) {
-  taskDetailInfo.value = await getTaskDetailInfo(item.id)
+  // taskDetailInfo.value = await getTaskDetailInfo(item.id)
   const packageid = workStore.getActiveId;
   if (isEmpty(packageid)) {
     listData.value.length = 0;
-- 
2.39.3


From 641d63704c392322e9aa49cf56f7b5f193ace680 Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Mon, 1 Apr 2024 21:00:40 +0800
Subject: [PATCH 091/143] bug

---
 src/views/final/comp/RepeatTaskTableModal.vue | 47 +++++++++++++++++--
 src/views/final/content/Content.vue           | 30 ++++++++++--
 2 files changed, 68 insertions(+), 9 deletions(-)

diff --git a/src/views/final/comp/RepeatTaskTableModal.vue b/src/views/final/comp/RepeatTaskTableModal.vue
index 587fb28..a2acfad 100644
--- a/src/views/final/comp/RepeatTaskTableModal.vue
+++ b/src/views/final/comp/RepeatTaskTableModal.vue
@@ -184,7 +184,7 @@ async function query(page: number, pageSize: number) {
   const result = await getRepeatList({
     sortorder: 'asc',
     pageSize: pagination.pageSize,
-    pageNo: 1,
+    pageNo: pagination.page,
     sortname: '',
   })
   console.log(666666)
@@ -362,6 +362,15 @@ function goDetail(row) {
   router.push({ name: 'final-detail', query: { id: row.id, packageid: row.packageid } })
 }
 
+const showActions = computed(() => {
+  return selectionIds.value.length
+})
+
+function switchBatch() {
+  selectionIds.value = []
+  checkedRowKeys.value = []
+}
+
 defineExpose({
   showModal,
 })
@@ -387,10 +396,26 @@ defineExpose({
                 <span>任务信息</span>
               </div>
             </div>
+
             <div class="batch">
-              <img 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">
+              <div v-show="!showActions" style="display: flex; align-items: center">
+                <div class="btn-batch">
+                  <SvgIcon style="margin-right: 6px" size="22" name="batch" />
+                  批量审批
+                </div>
+              </div>
+              <div v-show="showActions" style="display: flex; align-items: center">
+                <NButton text @click="switchBatch()">
+                  <template #icon>
+                    <SvgIcon name="revoke" />
+                  </template>
+                  取消
+                </NButton>
+
+                <img class="btn-approval btn-left" style="margin-left: 16px" 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">
+              </div>
             </div>
             <div class="wrapper-content">
               <NDataTable
@@ -530,4 +555,18 @@ defineExpose({
   border: 1px solid #cad2dd;
   background-color: #fff;
 }
+
+.btn-batch {
+  width: 118px;
+  height: 36px;
+  background: linear-gradient(135deg, #5b85f8, #3c6cf0);
+  border-radius: 17px;
+  box-shadow: 0px 2px 6px 0px rgba(116, 153, 253, 0.3);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #fff;
+  margin-right: 6px;
+  cursor: pointer;
+}
 </style>
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index a28a943..bc8a4c5 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -629,6 +629,10 @@ function getSelectItems() {
   return tableData.value.filter(item => selectionIds.value.includes(item.id))
 }
 
+const showActions = computed(() => {
+  return selectionIds.value.length
+})
+
 // 单个审批通过
 function singleApproval(row) {
   const param = {
@@ -726,6 +730,11 @@ function doAudit(param: any) {
   })
 }
 
+function switchBatch() {
+  selectionIds.value = []
+  checkedRowKeys.value = []
+}
+
 function reload() {
   selectionIds.value = []
   checkedRowKeys.value = []
@@ -765,15 +774,26 @@ async function refreshHandler(searchId?: any) {
         <NButton class="xjcc" text @click="showModal(repeatModalRef)">
           小结查重
         </NButton>
-        <div class="batch">
+
+        <div v-show="!showActions" style="display: flex; align-items: center">
+          <div class="btn">
+            <SvgIcon style="margin-right: 6px" size="22" name="batch" />
+            批量审批
+          </div>
+        </div>
+        <div v-show="showActions" class="batch">
+          <NButton text @click="switchBatch()">
+            <template #icon>
+              <SvgIcon name="revoke" />
+            </template>
+            取消
+          </NButton>
+
           <img 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">
         </div>
-        <!-- <div class="btn" @click="batchApproval">
-          <SvgIcon style="margin-right: 6px" size="14" name="tf" />
-          批量审批
-        </div> -->
+
         <n-popover
           ref="popover"
           :style="{ padding: '0px' }"
-- 
2.39.3


From 747b1f10c070a47a234f5f613c5ccd7550605916 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Mon, 1 Apr 2024 21:27:58 +0800
Subject: [PATCH 092/143] =?UTF-8?q?feat:=20=E7=BB=88=E5=AE=A1=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E7=AD=9B=E9=80=89=E3=80=82=E5=9B=BE?=
 =?UTF-8?q?=E5=AE=A1=E5=BC=B9=E7=AA=97bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/workOrder.ts              |   9 +-
 src/views/final/aside/Aside.vue             | 240 ++++---
 src/views/final/content/Content.vue         | 698 ++++++++++----------
 src/views/final/index.vue                   |   2 +-
 src/views/worksheet/aside/WorkSheetList.vue | 150 ++---
 src/views/worksheet/modal/ApprovalModal.vue |  25 +-
 types/workorder.d.ts                        |   3 +-
 7 files changed, 591 insertions(+), 536 deletions(-)

diff --git a/src/store/modules/workOrder.ts b/src/store/modules/workOrder.ts
index 5470f90..a729454 100644
--- a/src/store/modules/workOrder.ts
+++ b/src/store/modules/workOrder.ts
@@ -11,7 +11,9 @@ export const useWorkOrderStore = defineStore({
     activeId: '',
     packageList: [],
     immersion: false,
-    name: ''
+    name: '',
+    dataId: '',
+    approvalList: [],
   }),
   getters: {
     getActiveId: (state: OrderState) => state.activeId,
@@ -22,10 +24,11 @@ export const useWorkOrderStore = defineStore({
     setOrderList(list: PackageListItem[]) {
       this.packageList = list
     },
-    setActive(index: number, orderId?: string) {
+    setActive(index: number, orderId?: string, dataId?: string) {
       this.currentIndex = index
       const order = this.packageList[index]
       this.activeId = orderId || order?.checkDuplicateId
+      this.dataId = dataId || order.id;
     },
     forward() {
       const len = this.packageList.length
@@ -46,7 +49,7 @@ export const useWorkOrderStore = defineStore({
     },
     async fetchOrderList(pagination, keyword) {
       const res = await getPackageList(pagination, keyword)
-      if (res.data&&res.data.length > 0) {
+      if (res.data && res.data.length > 0) {
         this.packageList.push(...res.data)
         if (!this.activeId)
           this.setActive(0)
diff --git a/src/views/final/aside/Aside.vue b/src/views/final/aside/Aside.vue
index 8c2aba9..d8fa596 100644
--- a/src/views/final/aside/Aside.vue
+++ b/src/views/final/aside/Aside.vue
@@ -1,162 +1,178 @@
 <script lang="ts" setup>
-import { computed, inject, nextTick, onBeforeMount, onMounted, reactive, ref, shallowRef, unref, watch } from 'vue'
-import { CustomFilterModalVue, FilterModal, NewFilterModal } from '@/views/final/comp'
-import Search from '@/views/home/aside/comp/Search.vue'
-import AdvanceFilter from '@/views/home/aside/comp/AdvanceFilter.vue'
-import { getViewportOffset } from '@/utils/domUtils'
-import { useWindowSizeFn } from '@/hooks/event/useWindowSizeFn'
-import { useFinal } from '@/store/modules/final'
-import type { Filter } from '/#/home'
-import type { AsideEntity } from '@/config/aside'
-import { asideMap } from '@/config/final'
-import type { AsideConfig } from '/#/api'
-import emitter from '@/utils/mitt'
-
-const finalStore = useFinal()
-
+import {
+  computed,
+  inject,
+  nextTick,
+  onBeforeMount,
+  onMounted,
+  reactive,
+  ref,
+  shallowRef,
+  unref,
+  watch,
+} from "vue";
+import { CustomFilterModalVue, FilterModal, NewFilterModal } from "@/views/final/comp";
+import Search from "@/views/home/aside/comp/Search.vue";
+import AdvanceFilter from "@/views/home/aside/comp/AdvanceFilter.vue";
+import { getViewportOffset } from "@/utils/domUtils";
+import { useWindowSizeFn } from "@/hooks/event/useWindowSizeFn";
+import { useFinal } from "@/store/modules/final";
+import type { Filter } from "/#/home";
+import type { AsideEntity } from "@/config/aside";
+import { asideMap } from "@/config/final";
+import type { AsideConfig } from "/#/api";
+import emitter from "@/utils/mitt";
+
+const emit = defineEmits(["inputChange"]);
+const finalStore = useFinal();
 // 所有左侧模块的值
-const asideValue: Record<keyof typeof asideMap, any> = reactive({})
+const asideValue: Record<keyof typeof asideMap, any> = reactive({});
 // 左侧某个模块是否显示: 个人配置
-const asideVisible: Partial<Record<keyof AsideConfig, boolean>> = reactive({})
+const asideVisible: Partial<Record<keyof AsideConfig, boolean>> = reactive({});
 // 当前显示的模块，按照数组顺序显示
-const showItems = shallowRef<{ key: string, config: AsideEntity }[]>([])
+const showItems = shallowRef<{ key: string; config: AsideEntity }[]>([]);
 
 Object.keys(asideMap).forEach((key) => {
-  const { defaultValue, inFilterList } = asideMap[key]
-  if (inFilterList !== false)
-    asideValue[key] = defaultValue
-})
+  const { defaultValue, inFilterList } = asideMap[key];
+  if (inFilterList !== false) asideValue[key] = defaultValue;
+});
 
-const filterModalRef = ref(null)
-const newFilterModalRef = ref(null)
-const customModalRef = ref(null)
+const filterModalRef = ref(null);
+const newFilterModalRef = ref(null);
+const customModalRef = ref(null);
 
 function showModal(modalRef: any) {
-  const modal = unref(modalRef)! as any
-  modal.showModal()
+  const modal = unref(modalRef)! as any;
+  modal.showModal();
 }
-const mousetrap = inject('mousetrap') as any
-mousetrap.bind('[', collapseHandler)
+const mousetrap = inject("mousetrap") as any;
+mousetrap.bind("[", collapseHandler);
 
 onMounted(() => {
   nextTick(() => {
-    computeSlideHeight()
-  })
-})
+    computeSlideHeight();
+  });
+});
 
-const collapse = ref(false)
+const collapse = ref(false);
 
 function collapseHandler() {
-  collapse.value = !collapse.value
+  collapse.value = !collapse.value;
 }
 
 const asideWidth = computed(() => {
-  return collapse.value ? 0 : 308
-})
+  return collapse.value ? 0 : 308;
+});
 
-const asideHeight = ref(500)
+const asideHeight = ref(500);
 const asideStyle = computed(() => {
   return {
     width: `${asideWidth.value}px`,
     height: `${asideHeight.value}px`,
-  }
-})
+  };
+});
 
 const collapseIcon = computed(() => {
-  return collapse.value ? 'expand-cir' : 'collapse-cir'
-})
+  return collapse.value ? "expand-cir" : "collapse-cir";
+});
 
 function computeSlideHeight() {
-  const headEl = document.querySelector('.aside-header')!
-  const { bottomIncludeBody } = getViewportOffset(headEl)
-  const height = bottomIncludeBody
-  asideHeight.value = height - 24
+  const headEl = document.querySelector(".aside-header")!;
+  const { bottomIncludeBody } = getViewportOffset(headEl);
+  const height = bottomIncludeBody;
+  asideHeight.value = height - 24;
 }
 
-useWindowSizeFn(computeSlideHeight, 280)
+useWindowSizeFn(computeSlideHeight, 280);
 
 onBeforeMount(async () => {
-  finalStore.fetchCustomConfig()
-})
+  finalStore.fetchCustomConfig();
+});
 
 finalStore.$subscribe(() => {
-  const customConfig = finalStore.getCustomConfig
+  const customConfig = finalStore.getCustomConfig;
 
-  if (customConfig === null)
-    return
+  if (customConfig === null) return;
 
-  const showKeys: string[] = [...customConfig]
-  const defaultKeys = Object.keys(asideMap).filter(key => asideMap[key].isDefaultFilter)
-  showKeys.unshift(...defaultKeys)
+  const showKeys: string[] = [...customConfig];
+  const defaultKeys = Object.keys(asideMap).filter(
+    (key) => asideMap[key].isDefaultFilter
+  );
+  showKeys.unshift(...defaultKeys);
 
   Object.keys(asideMap).forEach((key) => {
     // 设置显示的或者默认显示的
-    if (key.startsWith('iz'))
-      asideVisible[key] = asideMap[key] && (showKeys.includes(key) || asideMap[key].isDefaultFilter)
-  })
+    if (key.startsWith("iz"))
+      asideVisible[key] =
+        asideMap[key] && (showKeys.includes(key) || asideMap[key].isDefaultFilter);
+  });
 
   const items = showKeys.reduce((acc, key) => {
     if (asideMap[key]) {
       const config = {
         key,
         config: asideMap[key],
-      }
-      return [...acc, config]
-    }
-    else {
-      return acc
+      };
+      return [...acc, config];
+    } else {
+      return acc;
     }
-  }, [])
+  }, []);
 
-  showItems.value = items
-})
+  showItems.value = items;
+});
 
 watch(asideVisible, (newVal) => {
   Object.keys(asideValue).forEach((key) => {
-    if (newVal[key] === false)
-      asideValue[key] = asideMap[key].defaultValue
-  })
-})
+    if (newVal[key] === false) asideValue[key] = asideMap[key].defaultValue;
+  });
+});
 
-const asideEnter = ref(false)
+const asideEnter = ref(false);
 
 const showCollapse = computed(() => {
-  return collapse.value ? true : asideEnter.value
-})
+  return collapse.value ? true : asideEnter.value;
+});
 
-const showSearch = ref(false)
+const showSearch = ref(false);
 
 function setShowSearch(value: boolean) {
-  showSearch.value = value
+  showSearch.value = value;
 }
 
 // 滚动容器，让key对应模块处于可视区域
 function scrollHandler(key: string) {
-  const element = document.querySelector(`#${key}`)
-  element?.scrollIntoView(true)
+  const element = document.querySelector(`#${key}`);
+  element?.scrollIntoView(true);
 }
 
 function filterHandler(searchId: string) {
-  emitter.emit('filter-final', searchId)
+  emitter.emit("filter-final", searchId);
 }
 
 function editFilter(filter: any) {
-  const modal = unref(newFilterModalRef)! as any
-  modal.showModal()
-  modal.edit(filter)
+  const modal = unref(newFilterModalRef)! as any;
+  modal.showModal();
+  modal.edit(filter);
 }
 
 watch(asideValue, (newVal) => {
-  finalStore.setAsideValue(newVal)
-})
+  finalStore.setAsideValue(newVal);
+});
 
-const inputChange = (keyword)=>{
-  
-}
+const inputChange = (keyword) => {
+  console.log("Search Component", keyword);
+  emit("inputChange", keyword);
+};
 </script>
 
 <template>
-  <div class="aside" :style="asideStyle" @mouseenter="asideEnter = true" @mouseleave="asideEnter = false">
+  <div
+    class="aside"
+    :style="asideStyle"
+    @mouseenter="asideEnter = true"
+    @mouseleave="asideEnter = false"
+  >
     <div v-show="showCollapse" class="aside-collapse">
       <div class="aside-collapse-btn" @click="collapseHandler">
         <SvgIcon :name="collapseIcon" size="40" />
@@ -165,23 +181,40 @@ const inputChange = (keyword)=>{
     <n-scrollbar trigger="none">
       <div class="aside-header">
         <!-- 搜索跳转模块 -->
-        <Search v-show="showSearch" @select="scrollHandler" @close="setShowSearch(false)" @inputChange="inputChange" />
+        <Search
+          v-show="showSearch"
+          @select="scrollHandler"
+          @close="setShowSearch(false)"
+          @inputChange="inputChange"
+        />
         <!-- 高级筛选 -->
         <AdvanceFilter
-          v-show="!showSearch" :type="1" @select="filterHandler" @update:search="setShowSearch(true)"
-          @show-custom="showModal(customModalRef)" @show-filter="showModal(filterModalRef)"
+          v-show="!showSearch"
+          :type="1"
+          @select="filterHandler"
+          @update:search="setShowSearch(true)"
+          @show-custom="showModal(customModalRef)"
+          @show-filter="showModal(filterModalRef)"
         />
       </div>
 
       <component
-        :is="item.config.component" v-for="(item, index) in showItems" :id="item.key" :key="index"
-        v-model:value="asideValue[item.key]" :label="item.config.label"
+        :is="item.config.component"
+        v-for="(item, index) in showItems"
+        :id="item.key"
+        :key="index"
+        v-model:value="asideValue[item.key]"
+        :label="item.config.label"
       />
 
       <!-- 筛选 -->
       <CustomFilterModalVue ref="customModalRef" />
       <!-- 过滤列表 -->
-      <FilterModal ref="filterModalRef" @edit-filter="editFilter" @show-new-filter="showModal(newFilterModalRef)" />
+      <FilterModal
+        ref="filterModalRef"
+        @edit-filter="editFilter"
+        @show-new-filter="showModal(newFilterModalRef)"
+      />
       <!-- 新增过滤 -->
       <NewFilterModal ref="newFilterModalRef" />
     </n-scrollbar>
@@ -193,7 +226,7 @@ const inputChange = (keyword)=>{
   display: flex;
   position: relative;
   flex-direction: column;
-  background: #FFF;
+  background: #fff;
   border: 1px solid #efeff5;
   border-radius: 3px;
   box-sizing: border-box;
@@ -230,11 +263,17 @@ const inputChange = (keyword)=>{
     right: -20px;
   }
 
-  ::v-deep(.n-collapse .n-collapse-item.n-collapse-item--right-arrow-placement .n-collapse-item__header .n-collapse-item-arrow) {
+  ::v-deep(.n-collapse
+      .n-collapse-item.n-collapse-item--right-arrow-placement
+      .n-collapse-item__header
+      .n-collapse-item-arrow) {
     margin-left: 8px;
   }
 
-  ::v-deep(.n-collapse .n-collapse-item .n-collapse-item__header .n-collapse-item__header-main) {
+  ::v-deep(.n-collapse
+      .n-collapse-item
+      .n-collapse-item__header
+      .n-collapse-item__header-main) {
     font-weight: bold;
     justify-content: space-between;
   }
@@ -247,11 +286,18 @@ const inputChange = (keyword)=>{
     border-top: 0px;
   }
 
-  ::v-deep(.n-collapse .n-collapse-item .n-collapse-item__content-wrapper .n-collapse-item__content-inner) {
+  ::v-deep(.n-collapse
+      .n-collapse-item
+      .n-collapse-item__content-wrapper
+      .n-collapse-item__content-inner) {
     padding-top: 10px;
   }
 
-  ::v-deep(.n-scrollbar > .n-scrollbar-rail.n-scrollbar-rail--vertical > .n-scrollbar-rail__scrollbar, .n-scrollbar + .n-scrollbar-rail.n-scrollbar-rail--vertical > .n-scrollbar-rail__scrollbar) {
+  ::v-deep(.n-scrollbar
+      > .n-scrollbar-rail.n-scrollbar-rail--vertical
+      > .n-scrollbar-rail__scrollbar, .n-scrollbar
+      + .n-scrollbar-rail.n-scrollbar-rail--vertical
+      > .n-scrollbar-rail__scrollbar) {
     width: 0px;
   }
 }
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index a28a943..72c6b4c 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
-import type { DataTableColumns, DataTableRowKey, PaginationProps } from 'naive-ui'
-import { NButton, NDataTable, useDialog, useMessage } from 'naive-ui'
+import type { DataTableColumns, DataTableRowKey, PaginationProps } from "naive-ui";
+import { NButton, NDataTable, useDialog, useMessage } from "naive-ui";
 import {
   computed,
   defineEmits,
@@ -13,9 +13,9 @@ import {
   ref,
   unref,
   watch,
-} from 'vue'
-import { rowPropKeys } from 'naive-ui/es/legacy-grid/src/Row'
-import { useRoute, useRouter } from 'vue-router'
+} from "vue";
+import { rowPropKeys } from "naive-ui/es/legacy-grid/src/Row";
+import { useRoute, useRouter } from "vue-router";
 import {
   CustomTabelModal,
   ImportExcelModal,
@@ -23,50 +23,50 @@ import {
   RepeatModal,
   RepeatTaskTableModal,
   StatusItem,
-} from '../comp'
-import { getFinalList } from '@/api/final'
-import { audit } from '@/api/task/task'
-import SvgIcon from '@/components/Icon/SvgIcon.vue'
-import type { RowData } from '@/config/final'
-import { findKey, headRules } from '@/config/final'
-import { useWindowSizeFn } from '@/hooks/event/useWindowSizeFn'
-import { useUser } from '@/store/modules/user'
-import { useFinal } from '@/store/modules/final'
-import { getViewportOffset } from '@/utils/domUtils'
-import { isBoolean } from '@/utils/is'
-import { useDictionary } from '@/store/modules/dictonary'
-import NotPassed from '@/components/Approval/NotPassed.vue'
-import type { ApprovalParam } from '/#/api'
-import emitter from '@/utils/mitt'
-import { formatToDateHMS } from '@/utils/dateUtil'
-import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter'
-
-const emit = defineEmits(['changeShow'])
+} from "../comp";
+import { getFinalList } from "@/api/final";
+import { audit } from "@/api/task/task";
+import SvgIcon from "@/components/Icon/SvgIcon.vue";
+import type { RowData } from "@/config/final";
+import { findKey, headRules } from "@/config/final";
+import { useWindowSizeFn } from "@/hooks/event/useWindowSizeFn";
+import { useUser } from "@/store/modules/user";
+import { useFinal } from "@/store/modules/final";
+import { getViewportOffset } from "@/utils/domUtils";
+import { isBoolean } from "@/utils/is";
+import { useDictionary } from "@/store/modules/dictonary";
+import NotPassed from "@/components/Approval/NotPassed.vue";
+import type { ApprovalParam } from "/#/api";
+import emitter from "@/utils/mitt";
+import { formatToDateHMS } from "@/utils/dateUtil";
+import { getAllfieldList, getfieldList, savefield } from "@/api/home/filter";
+
+const emit = defineEmits(["changeShow"]);
 function changeContent() {
-  emit('changeShow')
+  emit("changeShow");
 }
-const checkedRowKeys = ref([])
-const dicStore = useDictionary()
-const izstatusList = ref([])
-const router = useRouter()
-const route = useRoute()
-const reviewType = 0
+const checkedRowKeys = ref([]);
+const dicStore = useDictionary();
+const izstatusList = ref([]);
+const router = useRouter();
+const route = useRoute();
+const reviewType = 0;
 const actionsColumns = {
-  title: '操作',
-  key: 'actions',
+  title: "操作",
+  key: "actions",
   minWidth: 200,
-  fixed: 'right',
+  fixed: "right",
   render(row) {
     return h(ListAction, {
       id: row.id,
       status: row.states,
       trigger: (action) => {
-        actionHandler(action, row)
+        actionHandler(action, row);
       },
-    })
+    });
   },
-}
-const columnsRef = ref<DataTableColumns<RowData>>([])
+};
+const columnsRef = ref<DataTableColumns<RowData>>([]);
 // const columns: DataTableColumns<RowData> = [
 //   {
 //     type: "selection",
@@ -166,234 +166,228 @@ const columnsRef = ref<DataTableColumns<RowData>>([])
 async function getColumns() {
   columnsRef.value = [
     {
-      type: 'selection',
-      fixed: 'left',
+      type: "selection",
+      fixed: "left",
       width: 50,
       disabled(row: any) {
-        return row.states !== 2
+        return row.states !== 2;
       },
     },
-  ]
-
-  const userStore = useUser()
-  const userInfo = userStore.getUserInfo
-  let res
-  res = await getAllfieldList(reviewType) // 所有筛选项目
-  const allList = res.data
-  res = await getfieldList(reviewType, userInfo.id) // 当前用户选择的项目
-  const useList = res.data
-  const userFieldFixed = useList.userFieldFixed?.split(',')
-  const userFieldUnFixed = useList.userFieldUnFixed?.split(',')
-  console.log(userFieldFixed, userFieldUnFixed, 'userFieldUnFixed')
-  console.log(allList, 'allList')
+  ];
+
+  const userStore = useUser();
+  const userInfo = userStore.getUserInfo;
+  let res;
+  res = await getAllfieldList(reviewType); // 所有筛选项目
+  const allList = res.data;
+  res = await getfieldList(reviewType, userInfo.id); // 当前用户选择的项目
+  const useList = res.data;
+  const userFieldFixed = useList.userFieldFixed?.split(",");
+  const userFieldUnFixed = useList.userFieldUnFixed?.split(",");
+  console.log(userFieldFixed, userFieldUnFixed, "userFieldUnFixed");
+  console.log(allList, "allList");
   allList?.map((v) => {
     if (!userFieldFixed?.length && !userFieldUnFixed?.length) {
       if (v.isrequired == 2) {
         columnsRef.value.push({
           title: v.fieldDesc,
-          fixed: 'left',
+          fixed: "left",
           key: v.name,
           width: 120,
-        })
+        });
       }
     }
 
-    if (userFieldFixed?.find(v2 => v2 == v.name)) {
+    if (userFieldFixed?.find((v2) => v2 == v.name)) {
       columnsRef.value.push({
         title: v.fieldDesc,
         key: v.name,
-        fixed: 'left',
+        fixed: "left",
         width: 120,
-      })
+      });
     }
-    if (userFieldUnFixed?.find(v2 => v2 == v.name)) {
+    if (userFieldUnFixed?.find((v2) => v2 == v.name)) {
       columnsRef.value.push({
         title: v.fieldDesc,
         key: v.name,
         width: 120,
-      })
+      });
     }
-  })
-  columnsRef.value.push(actionsColumns as any)
-  formatColumns()
-  console.log(columnsRef.value, 'columnsRef')
+  });
+  columnsRef.value.push(actionsColumns as any);
+  formatColumns();
+  console.log(columnsRef.value, "columnsRef");
 }
 
 async function formatColumns() {
   // TODO处理特殊字段
 
-  let index
-  index = columnsRef.value.findIndex(v => v.title == '任务ID')
+  let index;
+  index = columnsRef.value.findIndex((v) => v.title == "任务ID");
   if (index > -1) {
     columnsRef.value[index] = {
-      title: '任务ID',
+      title: "任务ID",
       key: columnsRef.value[index].key, // "id"
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
       render(row) {
         const item: any = izstatusList.value.find(
-          (item: any) => item.value == row.states,
-        )
+          (item: any) => item.value == row.states
+        );
         return h(
           NButton,
           {
-            'strong': true,
-            'tertiary': true,
-            'text': true,
-            'size': 'small',
-            'text-color': '#507AFD',
-            'onClick': () => goDetail(row),
+            strong: true,
+            tertiary: true,
+            text: true,
+            size: "small",
+            "text-color": "#507AFD",
+            onClick: () => goDetail(row),
           },
-          { default: () => row.id },
-        )
+          { default: () => row.id }
+        );
       },
-    }
+    };
   }
 
-  index = columnsRef.value.findIndex(v => v.title == '所属项目')
+  index = columnsRef.value.findIndex((v) => v.title == "所属项目");
   if (index > -1) {
     columnsRef.value[index] = {
-      title: '所属项目',
+      title: "所属项目",
       key: columnsRef.value[index].key, // "fromtaskname"
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
       ellipsis: {
         tooltip: true,
       },
-    }
+    };
   }
 
-  index = columnsRef.value.findIndex(v => v.title == '任务名称')
+  index = columnsRef.value.findIndex((v) => v.title == "任务名称");
   if (index > -1) {
     columnsRef.value[index] = {
-      title: '任务名称',
+      title: "任务名称",
       key: columnsRef.value[index].key, // "fromtaskname"
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
       ellipsis: {
         tooltip: true,
       },
-    }
+    };
   }
-  index = columnsRef.value.findIndex(v => v.title == '审批状态')
+  index = columnsRef.value.findIndex((v) => v.title == "审批状态");
   if (index > -1) {
     columnsRef.value[index] = {
-      title: '审批状态',
+      title: "审批状态",
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 120,
-      sorter: 'default',
+      sorter: "default",
       renderSorterIcon: ({ order }) => {
-        if (order === false)
-          return h(SvgIcon, { name: 'sort-2' })
-        if (order === 'ascend')
-          return h(SvgIcon, { name: 'sort-1' })
-        if (order === 'descend')
-          return h(SvgIcon, { name: 'sort-3' })
+        if (order === false) return h(SvgIcon, { name: "sort-2" });
+        if (order === "ascend") return h(SvgIcon, { name: "sort-1" });
+        if (order === "descend") return h(SvgIcon, { name: "sort-3" });
       },
       render(row) {
         const item: any = izstatusList.value.find(
-          (item: any) => item.value == row.states,
-        )
+          (item: any) => item.value == row.states
+        );
         return h(StatusItem, {
           id: row.id,
           status: row.states,
-          label: item ? item.label : '',
-        })
+          label: item ? item.label : "",
+        });
       },
-    }
+    };
   }
-  index = columnsRef.value.findIndex(v => v.title == '图片相似度')
+  index = columnsRef.value.findIndex((v) => v.title == "图片相似度");
   if (index > -1) {
     columnsRef.value[index] = {
-      title: '图片相似度',
+      title: "图片相似度",
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 150,
-      sorter: 'default',
+      sorter: "default",
       renderSorterIcon: ({ order }) => {
-        if (order === false)
-          return h(SvgIcon, { name: 'sort-2' })
-        if (order === 'ascend')
-          return h(SvgIcon, { name: 'sort-1' })
-        if (order === 'descend')
-          return h(SvgIcon, { name: 'sort-3' })
+        if (order === false) return h(SvgIcon, { name: "sort-2" });
+        if (order === "ascend") return h(SvgIcon, { name: "sort-1" });
+        if (order === "descend") return h(SvgIcon, { name: "sort-3" });
       },
       render(row: any) {
-        return h('div', {
-          id: row.id,
-          style: { color: row.similarityscore === 100 ? '#FF4E4F' : '' },
-        }, { default: () => row.similarityscore ? `${row.similarityscore}%` : '' })
+        return h(
+          "div",
+          {
+            id: row.id,
+            style: { color: row.similarityscore === 100 ? "#FF4E4F" : "" },
+          },
+          { default: () => (row.similarityscore ? `${row.similarityscore}%` : "") }
+        );
       },
-
-    }
+    };
   }
-  index = columnsRef.value.findIndex(v => v.title == '提报时间')
+  index = columnsRef.value.findIndex((v) => v.title == "提报时间");
   if (index > -1) {
     columnsRef.value[index] = {
-      title: '提报时间',
+      title: "提报时间",
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
-      sorter: 'default',
+      sorter: "default",
       renderSorterIcon: ({ order }) => {
-        if (order === false)
-          return h(SvgIcon, { name: 'sort-2' })
-        if (order === 'ascend')
-          return h(SvgIcon, { name: 'sort-1' })
-        if (order === 'descend')
-          return h(SvgIcon, { name: 'sort-3' })
+        if (order === false) return h(SvgIcon, { name: "sort-2" });
+        if (order === "ascend") return h(SvgIcon, { name: "sort-1" });
+        if (order === "descend") return h(SvgIcon, { name: "sort-3" });
       },
       render(row: any) {
-        return formatToDateHMS(row.createdate || 0)
+        return formatToDateHMS(row.createdate || 0);
       },
-    }
+    };
   }
 
-  index = columnsRef.value.findIndex(v => v.title == '更新时间')
+  index = columnsRef.value.findIndex((v) => v.title == "更新时间");
   if (index > -1) {
     columnsRef.value[index] = {
-      title: '更新时间',
+      title: "更新时间",
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
       render(row: any) {
-        return row.updatetime ? formatToDateHMS(row.updatetime) : ''
+        return row.updatetime ? formatToDateHMS(row.updatetime) : "";
       },
-    }
+    };
   }
 }
 
-const deviceHeight = ref(600)
+const deviceHeight = ref(600);
 
 onMounted(() => {
-  emitter.on('filter-final', refreshHandler)
-  getColumns()
+  emitter.on("filter-final", refreshHandler);
+  getColumns();
 
   nextTick(() => {
-    computeListHeight()
-  })
-})
+    computeListHeight();
+  });
+});
 
 onBeforeMount(() => {
-  dicStore.fetchizstatusListt()
-})
+  dicStore.fetchizstatusListt();
+});
 
 watch(
   () => dicStore.izstatusList,
   (newval) => {
-    izstatusList.value = newval
-  },
-)
+    izstatusList.value = newval;
+  }
+);
 
 onUnmounted(() => {
-  emitter.off('filter-final', refreshHandler)
-})
+  emitter.off("filter-final", refreshHandler);
+});
 
-const tableRef = ref<InstanceType<typeof NDataTable>>()
-const rowKey = (row: RowData) => row.id
-const loading = ref(true)
-const total = ref(0)
+const tableRef = ref<InstanceType<typeof NDataTable>>();
+const rowKey = (row: RowData) => row.id;
+const loading = ref(true);
+const total = ref(0);
 const pagination = reactive({
   page: 1,
   pageCount: 10,
@@ -401,243 +395,238 @@ const pagination = reactive({
   showSizePicker: true,
   pageSizes: [
     {
-      label: '10 每页',
+      label: "10 每页",
       value: 10,
     },
     {
-      label: '15 每页',
+      label: "15 每页",
       value: 15,
     },
     {
-      label: '30 每页',
+      label: "30 每页",
       value: 30,
     },
     {
-      label: '50 每页',
+      label: "50 每页",
       value: 50,
     },
   ],
   showQuickJumper: true,
   prefix: () => `共 ${total.value} 条数据`,
-})
-const tableData = ref<Array<RowData>>([])
-const selectionIds = ref<DataTableRowKey[]>([])
-const dialog = useDialog()
-const message = useMessage()
-const finalStore = useFinal()
+});
+const tableData = ref<Array<RowData>>([]);
+const selectionIds = ref<DataTableRowKey[]>([]);
+const dialog = useDialog();
+const message = useMessage();
+const finalStore = useFinal();
 
 async function query(page: number, pageSize: number, filterId?: any) {
-  const asideParmas = unref(finalStore.getAsideValue)
+  const asideParmas = unref(finalStore.getAsideValue);
   // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
-  const params = filterId ? { userSearchId: filterId } : asideParmas
+  const params = filterId ? { userSearchId: filterId } : asideParmas;
   const result = await getFinalList({
-    sortorder: 'asc',
+    sortorder: "asc",
     pageSize,
     currPage: page,
-    sortname: '',
+    sortname: "",
     ...params,
-  })
-  const { data, pageCount, totalCount } = result
-  tableData.value = data
-  total.value = totalCount
-  pagination.page = page
-  pagination.pageCount = pageCount
-  loading.value = false
+  });
+  const { data, pageCount, totalCount } = result;
+  tableData.value = data;
+  total.value = totalCount;
+  pagination.page = page;
+  pagination.pageCount = pageCount;
+  loading.value = false;
 }
 
 async function handlePageChange(currentPage) {
-  if (loading.value)
-    return
-  const { pageSize } = pagination
-  pagination.page = currentPage
-  await query(currentPage, pageSize)
+  if (loading.value) return;
+  const { pageSize } = pagination;
+  pagination.page = currentPage;
+  await query(currentPage, pageSize);
 }
 async function handlePageSizeChange(currentPageSize) {
-  if (loading.value)
-    return
+  if (loading.value) return;
 
-  const { page } = pagination
-  pagination.pageSize = currentPageSize
+  const { page } = pagination;
+  pagination.pageSize = currentPageSize;
 
-  await query(page, currentPageSize)
+  await query(page, currentPageSize);
 }
 
 function handleCheck(rowKeys: DataTableRowKey[]) {
-  selectionIds.value = rowKeys
+  selectionIds.value = rowKeys;
 }
 
 async function computeListHeight() {
-  const table = unref(tableRef)
-  if (!table)
-    return
-  const tableEl: any = table?.$el
-  const headEl = tableEl.querySelector('.n-data-table-thead ')
-  const { bottomIncludeBody } = getViewportOffset(headEl)
-  const headerH = 64
-  let paginationH = 2
-  const marginH = 60
+  const table = unref(tableRef);
+  if (!table) return;
+  const tableEl: any = table?.$el;
+  const headEl = tableEl.querySelector(".n-data-table-thead ");
+  const { bottomIncludeBody } = getViewportOffset(headEl);
+  const headerH = 64;
+  let paginationH = 2;
+  const marginH = 60;
   if (!isBoolean(unref(pagination))) {
     const paginationEl = tableEl.querySelector(
-      '.n-data-table__pagination',
-    ) as HTMLElement
+      ".n-data-table__pagination"
+    ) as HTMLElement;
     if (paginationEl) {
-      const offsetHeight = paginationEl.offsetHeight
-      paginationH += offsetHeight || 0
-    }
-    else {
-      paginationH += 28
+      const offsetHeight = paginationEl.offsetHeight;
+      paginationH += offsetHeight || 0;
+    } else {
+      paginationH += 28;
     }
   }
-  let height = bottomIncludeBody - (headerH + paginationH + marginH)
-  const maxHeight = 800
-  height = maxHeight && maxHeight < height ? maxHeight : height
-  deviceHeight.value = height
+  let height = bottomIncludeBody - (headerH + paginationH + marginH);
+  const maxHeight = 800;
+  height = maxHeight && maxHeight < height ? maxHeight : height;
+  deviceHeight.value = height;
 }
 
-useWindowSizeFn(computeListHeight)
+useWindowSizeFn(computeListHeight);
 
 const maxHeight = computed(() => {
-  return tableData.value.length ? `${unref(deviceHeight)}px` : 'auto'
-})
+  return tableData.value.length ? `${unref(deviceHeight)}px` : "auto";
+});
 
-query(pagination.page, pagination.pageSize)
+query(pagination.page, pagination.pageSize);
 
-const customTabelRef = ref(null)
-const importExcelRef = ref(null)
-const notPassModalRef = ref(null) // 不通过弹窗
-const repeatModalRef = ref(null)
-const repeatTaskTableModalRef = ref(null)
+const customTabelRef = ref(null);
+const importExcelRef = ref(null);
+const notPassModalRef = ref(null); // 不通过弹窗
+const repeatModalRef = ref(null);
+const repeatTaskTableModalRef = ref(null);
 
 function showModal(modalRef: any) {
-  const modal = unref(modalRef)! as any
-  modal.showModal()
+  const modal = unref(modalRef)! as any;
+  modal.showModal();
 }
 
-const popover = ref<ComponentRef | null>(null)
+const popover = ref<ComponentRef | null>(null);
 
 function importHandler() {
-  (popover.value as any).setShow(false)
-  showModal(importExcelRef)
+  (popover.value as any).setShow(false);
+  showModal(importExcelRef);
 }
 
 function exportHandler() {
-  loading.value = true
-  import('@/utils/exportExcel').then((excel) => {
+  loading.value = true;
+  import("@/utils/exportExcel").then((excel) => {
     const tHeader = [
-      '任务Id',
-      '任务名称',
-      '审批节点',
-      '审批状态',
-      '图片相似度',
-      '提报时间',
-      '更新时间',
-    ]
+      "任务Id",
+      "任务名称",
+      "审批节点",
+      "审批状态",
+      "图片相似度",
+      "提报时间",
+      "更新时间",
+    ];
     const filterVal = [
-      'id',
-      'name',
-      'approvalnode',
-      'approvalstatus',
-      'similarity',
-      'uptime',
-      'updatetime',
-    ]
-    const list = tableData.value
-    const data = formatJson(filterVal, list)
+      "id",
+      "name",
+      "approvalnode",
+      "approvalstatus",
+      "similarity",
+      "uptime",
+      "updatetime",
+    ];
+    const list = tableData.value;
+    const data = formatJson(filterVal, list);
     excel.export_json_to_excel({
       header: tHeader,
       data,
-      filename: 'data',
+      filename: "data",
       autoWidth: true,
-      bookType: 'xlsx',
-    })
-    loading.value = false
-  })
+      bookType: "xlsx",
+    });
+    loading.value = false;
+  });
 }
 
 function formatJson(filterVal, jsonDataList) {
-  return jsonDataList.map(v =>
+  return jsonDataList.map((v) =>
     filterVal.map((j) => {
-      return v[j]
-    }),
-  )
+      return v[j];
+    })
+  );
 }
 
 function sucessHandler(excelData) {
   const data = excelData.content.map((item) => {
-    const obj = {}
+    const obj = {};
     Object.keys(item).forEach((key) => {
-      const k = findKey(columns, key)
-      obj[k] = item[key]
-    })
-    return obj
-  })
+      const k = findKey(columns, key);
+      obj[k] = item[key];
+    });
+    return obj;
+  });
 
-  tableData.value = data
+  tableData.value = data;
 }
 
 function commitHandler(columns) {
-  columnsRef.value = [...columns, actionsColumns]
-  formatColumns()
+  columnsRef.value = [...columns, actionsColumns];
+  formatColumns();
 }
 
 function actionHandler(action: any, row: any) {
-  const { key } = action
+  const { key } = action;
   switch (key) {
-    case 'view':
-      goDetail(row)
-      break
-    case 'reset':
-      resetHandler()
-      break
-    case 'approval':
-      singleApproval(row)
-      break
-    case 'reject':
-      rejectHandler([row])
-      break
+    case "view":
+      goDetail(row);
+      break;
+    case "reset":
+      resetHandler();
+      break;
+    case "approval":
+      singleApproval(row);
+      break;
+    case "reject":
+      rejectHandler([row]);
+      break;
     default:
-      break
+      break;
   }
 }
 
 // states:1未提交，2待审批，3通过，4不通过
 function validate(items: any[]) {
-  if (items.length === 0)
-    return '至少选中一个任务'
-  return null
+  if (items.length === 0) return "至少选中一个任务";
+  return null;
 }
 
 function goDetail(row) {
-  router.push({ name: 'final-detail', query: { id: row.id, packageid: row.packageid } })
+  router.push({ name: "final-detail", query: { id: row.id, packageid: row.packageid } });
 }
 
 function resetHandler() {
   dialog.info({
-    title: '确认提示',
-    content: '确认重置当前选中的任务的审批吗?',
-    positiveText: '确定',
-    negativeText: '取消',
+    title: "确认提示",
+    content: "确认重置当前选中的任务的审批吗?",
+    positiveText: "确定",
+    negativeText: "取消",
     onPositiveClick: async () => {
       // TODO：需要支持重置
       // const result = await resetApproval()
     },
     onNegativeClick: () => {},
-  })
+  });
 }
 
 function getSelectItems() {
-  return tableData.value.filter(item => selectionIds.value.includes(item.id))
+  return tableData.value.filter((item) => selectionIds.value.includes(item.id));
 }
 
 // 单个审批通过
 function singleApproval(row) {
   const param = {
     result: true,
-    comment: '',
-    disposeType: '',
-    disposeTypeId: '',
-    failCauseId: '',
-    failCauseName: '',
+    comment: "",
+    disposeType: "",
+    disposeTypeId: "",
+    failCauseId: "",
+    failCauseName: "",
     flowTaskInfoList: [
       {
         formId: row.id,
@@ -645,112 +634,120 @@ function singleApproval(row) {
         taskName: row.fromTaskName,
       },
     ],
-  }
-  doAudit(param)
+  };
+  doAudit(param);
 }
 
 // 批量通过
 function batchApproval() {
-  const items: any = getSelectItems()
-  const msg = validate(items)
+  const items: any = getSelectItems();
+  const msg = validate(items);
 
   if (msg !== null) {
-    message.error(msg)
-    return
+    message.error(msg);
+    return;
   }
-  console.log(items)
-  const list: any = []
+  console.log(items);
+  const list: any = [];
   items.forEach((item) => {
     list.push({
       formId: item.id,
       taskId: item.taskId,
       taskName: item.fromtaskname,
-    })
-  })
+    });
+  });
 
   const param = {
     result: true,
-    comment: '',
-    disposeType: '',
-    disposeTypeId: '',
-    failCauseId: '',
-    failCauseName: '',
+    comment: "",
+    disposeType: "",
+    disposeTypeId: "",
+    failCauseId: "",
+    failCauseName: "",
     flowTaskInfoList: list,
-  }
+  };
 
-  doAudit(param)
+  doAudit(param);
 }
 
 // 小结批量不通过
 function repeatBatchReject(items) {
-  console.log(items)
-  rejectHandler(items)
+  console.log(items);
+  rejectHandler(items);
 }
 
 // 批量不通过
 function batchReject() {
-  const items: any = getSelectItems()
-  rejectHandler(items)
+  const items: any = getSelectItems();
+  rejectHandler(items);
 }
 
 // 审核不通过
 function rejectHandler(list) {
-  const msg = validate(list)
+  const msg = validate(list);
   if (msg !== null) {
-    message.error(msg)
-    return
+    message.error(msg);
+    return;
   }
 
-  const modal = unref(notPassModalRef)! as any
-  modal.showModal(list)
+  const modal = unref(notPassModalRef)! as any;
+  modal.showModal(list);
 }
 
 // 审核通过
 function doAudit(param: any) {
   dialog.info({
-    title: '确认提示',
-    content: '确认给该任务审批为【通过】吗?',
-    positiveText: '确定',
-    negativeText: '取消',
+    title: "确认提示",
+    content: "确认给该任务审批为【通过】吗?",
+    positiveText: "确定",
+    negativeText: "取消",
     onPositiveClick: () => {
       audit(param).then((res) => {
-        const { code } = res
-        if (code === 'OK') {
-          message.success(res.message)
-          reload()
+        const { code } = res;
+        if (code === "OK") {
+          message.success(res.message);
+          reload();
+        } else {
+          message.error(res.message);
         }
-        else { message.error(res.message) }
-      })
+      });
     },
     onNegativeClick: () => {},
-  })
+  });
 }
 
 function reload() {
-  selectionIds.value = []
-  checkedRowKeys.value = []
+  selectionIds.value = [];
+  checkedRowKeys.value = [];
 
-  const { page, pageSize } = unref(tableRef.value?.pagination) as PaginationProps
-  query(page!, pageSize!)
+  const { page, pageSize } = unref(tableRef.value?.pagination) as PaginationProps;
+  query(page!, pageSize!);
 }
 
 watch(
   () => finalStore.asideValue,
   (newVal, oldVal) => {
-    refreshHandler()
+    refreshHandler();
   },
-  { deep: true },
-)
+  { deep: true }
+);
 
 function reset() {
-  pagination.page = 1
-  pagination.pageCount = 1
+  pagination.page = 1;
+  pagination.pageCount = 1;
 }
 
 async function refreshHandler(searchId?: any) {
-  reset()
-  query(pagination.page, pagination.pageSize, searchId)
+  reset();
+  query(pagination.page, pagination.pageSize, searchId);
 }
+
+const filterTableData = (keyword) => {
+  tableData.value = tableData.value.filter((item) => item.id.indexOf(keyword) > -1);
+};
+defineExpose({
+  filterTableData,
+})
 </script>
 
 <template>
@@ -761,14 +758,27 @@ async function refreshHandler(searchId?: any) {
         <SvgIcon size="32" name="magnifying" @click="changeContent" />
       </div>
       <div>
-        <SvgIcon style="margin-right: 6px;" size="13" name="summary" @click="showModal(repeatModalRef)" />
-        <NButton class="xjcc" text @click="showModal(repeatModalRef)">
-          小结查重
-        </NButton>
+        <SvgIcon
+          style="margin-right: 6px"
+          size="13"
+          name="summary"
+          @click="showModal(repeatModalRef)"
+        />
+        <NButton class="xjcc" text @click="showModal(repeatModalRef)"> 小结查重 </NButton>
         <div class="batch">
-          <img class="btn-approval btn-left" src="@/assets/images/task/btn-not-pass.png" alt="" @click.stop="batchReject">
+          <img
+            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>
         <!-- <div class="btn" @click="batchApproval">
           <SvgIcon style="margin-right: 6px" size="14" name="tf" />
@@ -789,13 +799,19 @@ async function refreshHandler(searchId?: any) {
           </template>
           <ul class="wrapper-header-action">
             <li @click="importHandler">
-              <SvgIcon size="20" name="import" /><span style="margin-left: 5px">批量导入数据</span>
+              <SvgIcon size="20" name="import" /><span style="margin-left: 5px"
+                >批量导入数据</span
+              >
             </li>
             <li @click="exportHandler">
-              <SvgIcon size="20" name="download" /><span style="margin-left: 5px">导出待审数据</span>
+              <SvgIcon size="20" name="download" /><span style="margin-left: 5px"
+                >导出待审数据</span
+              >
             </li>
             <li>
-              <SvgIcon size="20" name="download" /><span style="margin-left: 5px">导出全部数据</span>
+              <SvgIcon size="20" name="download" /><span style="margin-left: 5px"
+                >导出全部数据</span
+              >
             </li>
             <!-- <li>
               <SvgIcon size="20" name="look" /><span style="margin-left: 5px">查看导入记录</span>
@@ -861,8 +877,8 @@ async function refreshHandler(searchId?: any) {
 </template>
 
 <style lang="less" scoped>
-.color-red{
-  color: #FF4E4F!important;
+.color-red {
+  color: #ff4e4f !important;
 }
 
 .batch {
@@ -870,13 +886,13 @@ async function refreshHandler(searchId?: any) {
   align-items: center;
   margin-right: 10px;
 
-  .btn-approval{
+  .btn-approval {
     width: 68px;
     height: 28px;
     cursor: pointer;
   }
 
-  .btn-left{
+  .btn-left {
     margin-left: 16px;
   }
 }
@@ -917,7 +933,7 @@ async function refreshHandler(searchId?: any) {
 
     .xjcc {
       font-weight: bold;
-      color: #507AFD;
+      color: #507afd;
       margin-right: 20px;
     }
 
diff --git a/src/views/final/index.vue b/src/views/final/index.vue
index 204ad2d..f3b3415 100644
--- a/src/views/final/index.vue
+++ b/src/views/final/index.vue
@@ -7,7 +7,7 @@ import ListContent from './content/ListContent.vue'
 const showList = ref(false);
 const contentRef = ref(null);
 const inputChange = (keyword)=>{
-
+  contentRef.value.filterTableData(keyword)
 }
 
 </script>
diff --git a/src/views/worksheet/aside/WorkSheetList.vue b/src/views/worksheet/aside/WorkSheetList.vue
index 330b045..039b0a6 100644
--- a/src/views/worksheet/aside/WorkSheetList.vue
+++ b/src/views/worksheet/aside/WorkSheetList.vue
@@ -1,14 +1,14 @@
 <script lang="ts" setup>
-import { deletePackage } from '@/api/home/main'
-import NotPassed from '@/components/NotPassed.vue'
-import { useWorkOrder } from '@/store/modules/workOrder'
-import { isEmpty } from '@/utils'
-import { useInfiniteScroll } from '@vueuse/core'
-import { useMessage } from 'naive-ui'
-import { reactive, ref, watch } from 'vue'
-import ApprovalModal from '../modal/ApprovalModal.vue'
-import ListItem from './ListItem.vue'
-import type { PackageListItem } from '/#/workorder'
+import { deletePackage } from "@/api/home/main";
+import NotPassed from "@/components/NotPassed.vue";
+import { useWorkOrder } from "@/store/modules/workOrder";
+import { isEmpty } from "@/utils";
+import { useInfiniteScroll } from "@vueuse/core";
+import { useMessage } from "naive-ui";
+import { reactive, ref, watch } from "vue";
+import ApprovalModal from "../modal/ApprovalModal.vue";
+import ListItem from "./ListItem.vue";
+import type { PackageListItem } from "/#/workorder";
 
 defineProps({
   showFieldList: {
@@ -19,132 +19,126 @@ defineProps({
     type: Array,
     default: () => [],
   },
-})
-const workStore = useWorkOrder()
-const data = ref<PackageListItem[]>([])
-const activeId = ref('')
-const el = ref<HTMLDivElement | null>(null)
-const keyword = ref('')
-const canloadMore = ref(true)
-const isLoading = ref(false)
+});
+const workStore = useWorkOrder();
+const data = ref<PackageListItem[]>([]);
+const activeId = ref("");
+const el = ref<HTMLDivElement | null>(null);
+const keyword = ref("");
+const canloadMore = ref(true);
+const isLoading = ref(false);
 
 const pagination = reactive({
   pageNo: 0,
   pageSize: 10,
-})
+});
 
-const approvalModalRef: any = ref(null)
-const notPassedRef: any = ref(null)
+const approvalModalRef: any = ref(null);
+const notPassedRef: any = ref(null);
 const overTask = ref<any>(null);
 
 function selectHandler(id: string, index: number) {
-  workStore.setActive(index)
+  // console.log('selectHandler',id)
+  workStore.setActive(index);
   // showModal(approvalModalRef, id)
 }
 
 useInfiniteScroll(
   el as any,
   () => {
-    loadMore()
+    loadMore();
   },
   {
     distance: 10,
     interval: 1500,
     canLoadMore: () => canloadMore.value,
-  },
-)
+  }
+);
 
 async function loadMore() {
-  if (isLoading.value || el.value == null)
-    return
-  isLoading.value = true
+  if (isLoading.value || el.value == null) return;
+  isLoading.value = true;
   try {
-    const more = await fetchList()
-    more.forEach(ele=>{
-      ele.search = JSON.parse(ele.search)
+    const more = await fetchList();
+    more.forEach((ele) => {
+      ele.search = JSON.parse(ele.search);
       // ele.search.createTime = ele.search.submit_date_timestamp
-    })
-    data.value.push(...more)
-  }
-  finally {
-    isLoading.value = false
+    });
+    data.value.push(...more);
+  } finally {
+    isLoading.value = false;
   }
 }
 
 async function fetchList() {
   try {
-    pagination.pageNo += 1
-    const result = await workStore.fetchOrderList(pagination, keyword.value)
-    const { data, pageCount } = result
-    if (pageCount !== 0)
-      canloadMore.value = pageCount >= pagination.pageNo
-    else
-      canloadMore.value = false
-
-    return data || []
-  }
-  catch (error) {
-    canloadMore.value = false
-    return []
+    pagination.pageNo += 1;
+    const result = await workStore.fetchOrderList(pagination, keyword.value);
+    const { data, pageCount } = result;
+    if (pageCount !== 0) canloadMore.value = pageCount >= pagination.pageNo;
+    else canloadMore.value = false;
+
+    return data || [];
+  } catch (error) {
+    canloadMore.value = false;
+    return [];
   }
 }
 
 watch(
   () => workStore.activeId,
   (newVal) => {
-    if (isEmpty(newVal))
-      return
+    if (isEmpty(newVal)) return;
     activeId.value = newVal;
-    approvalModalRef.value.showModal(activeId.value)
-    
-  },
-)
+    approvalModalRef.value.showModal(workStore.dataId);
+  }
+);
 
 function reset() {
-  pagination.pageNo = 0
-  pagination.pageSize = 10
-  canloadMore.value = true
-  data.value.length = 0
+  pagination.pageNo = 0;
+  pagination.pageSize = 10;
+  canloadMore.value = true;
+  data.value.length = 0;
 
-  workStore.reset()
+  workStore.reset();
 }
 
 function notPass(value) {
-  notPassedRef.value.showModal(value)
+  notPassedRef.value.showModal(value);
 }
 
 async function search(word: string) {
-  keyword.value = word
-  reset()
+  keyword.value = word;
+  reset();
   useInfiniteScroll(
     el as any,
     () => {
-      loadMore()
+      loadMore();
     },
-    { distance: 10, canLoadMore: () => canloadMore.value },
-  )
+    { distance: 10, canLoadMore: () => canloadMore.value }
+  );
 }
 function overTaskHandelr(item: any) {
-  overTask.value = item
+  overTask.value = item;
 }
 function leaveTaskHandler(event) {
-  if(event?.relatedTarget?.id !=="taskPopconfirmRef"){
+  if (event?.relatedTarget?.id !== "taskPopconfirmRef") {
     overTask.value = null;
   }
 }
-const message = useMessage()
-function dismisClick(packageId:string) {
-  deletePackage({packageId: packageId}).then((res) => {
-    if(res.code==="OK"){
-      message.success("解散任务包成功")
-      reset()
-      loadMore()
+const message = useMessage();
+function dismisClick(packageId: string) {
+  deletePackage({ packageId: packageId }).then((res) => {
+    if (res.code === "OK") {
+      message.success("解散任务包成功");
+      reset();
+      loadMore();
     }
-  })
+  });
 }
 defineExpose({
   search,
-})
+});
 </script>
 
 <template>
@@ -161,7 +155,7 @@ defineExpose({
         :dicts="dicts"
         :mouse-over-task="overTask"
         @click="selectHandler(item.id, index)"
-        @mouseover="overTaskHandelr(item)"  
+        @mouseover="overTaskHandelr(item)"
         @mouseleave="leaveTaskHandler"
         @dismisClick="dismisClick"
       />
diff --git a/src/views/worksheet/modal/ApprovalModal.vue b/src/views/worksheet/modal/ApprovalModal.vue
index 1e9c4d0..806ae27 100644
--- a/src/views/worksheet/modal/ApprovalModal.vue
+++ b/src/views/worksheet/modal/ApprovalModal.vue
@@ -3,6 +3,7 @@ import { nextTick, onDeactivated, onMounted, reactive, ref, toRefs } from "vue";
 import { format } from "date-fns";
 import { NButton, NDataTable, useDialog, useMessage } from "naive-ui";
 import { aiApprovaltools, aiApprovaltoolsClearmark, setTF } from "@/api/work/work";
+import { audit } from "@/api/task/task";
 import { getToolsCount } from "@/api/home/main";
 import { storage } from "@/utils/Storage";
 import { CURRENT_USER } from "@/store/mutation-types";
@@ -32,6 +33,7 @@ function showModal(id) {
 }
 
 async function getDetail(id) {
+  console.log('getDetail',id)
   // const userInfo = storage.get(CURRENT_USER);
   // const nodeType = userInfo.nodeType;
   // id = "264626184091111068";
@@ -43,12 +45,13 @@ async function getDetail(id) {
 }
 
 const handleReject = async () => {
-  const res = await setTF({
-    taskchildpictureids: state.detail.taskIdList.join(","),
-    packageid: state.packageid,
-    iztrueorfalse: 0,
-  });
-  console.log(res, "handleReject");
+  const res = await audit()
+  // const res = await setTF({
+  //   taskchildpictureids: state.detail.taskIdList.join(","),
+  //   packageid: state.packageid,
+  //   iztrueorfalse: 0,
+  // });
+  // console.log(res, "handleReject");
 };
 
 async function clearMark() {
@@ -86,13 +89,6 @@ async function viewRepeat(e: MouseEvent) {
   closeModal();
 }
 
-async function getShowStatus() {
-  const res = await getToolsCount();
-  if (res.code == "OK") {
-    show.value = true;
-  }
-}
-
 const initRem = () => {
   const designWidth = 1440;
   const rempPx = 16;
@@ -100,7 +96,6 @@ const initRem = () => {
   document.documentElement.style.fontSize = scale * rempPx + "px";
 };
 onMounted(() => {
-  getShowStatus();
   nextTick(() => {
     initRem();
   });
@@ -126,7 +121,7 @@ defineExpose({
       <div class="wrapper-hearder">
         <div class="wrapper-title">智能AI审批工具</div>
         <div class="wrapper-mark">
-          {{ detail.tenantUserName || '部门信息' }}
+          {{ detail.tenantUserName || "部门信息" }}
         </div>
       </div>
       <div class="wrapper-content">
diff --git a/types/workorder.d.ts b/types/workorder.d.ts
index e0fd016..308ca56 100644
--- a/types/workorder.d.ts
+++ b/types/workorder.d.ts
@@ -17,7 +17,8 @@ export interface OrderState {
   currentIndex: number
   packageList: PackageListItem[]
   approvalList: any[]
-  immersion: boolean
+  immersion: boolean,
+  dataId: string
 }
 
 // 任务实体
-- 
2.39.3


From 088e5629bb4b76e434d322973e99f35b1517f626 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Mon, 1 Apr 2024 21:49:27 +0800
Subject: [PATCH 093/143] =?UTF-8?q?feat:=20=E7=A7=BB=E9=99=A4=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=B9=E5=A2=9E=E5=8A=A0=E7=A1=AE=E8=AE=A4=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icons/exclamation-solid.svg        |   3 +
 src/layout/components/Header/ConfrimModal.vue | 114 ++++++++++++++++
 src/layout/components/Header/RecycleModal.vue | 122 ++++++++----------
 src/views/worksheet/content/Content.vue       |   5 -
 4 files changed, 173 insertions(+), 71 deletions(-)
 create mode 100644 src/assets/icons/exclamation-solid.svg
 create mode 100644 src/layout/components/Header/ConfrimModal.vue

diff --git a/src/assets/icons/exclamation-solid.svg b/src/assets/icons/exclamation-solid.svg
new file mode 100644
index 0000000..26d03f5
--- /dev/null
+++ b/src/assets/icons/exclamation-solid.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 20 20">
+	<path fill="#f6c042" d="M2.93 17.07A10 10 0 1 1 17.07 2.93A10 10 0 0 1 2.93 17.07M9 5v6h2V5zm0 8v2h2v-2z" />
+</svg>
diff --git a/src/layout/components/Header/ConfrimModal.vue b/src/layout/components/Header/ConfrimModal.vue
new file mode 100644
index 0000000..6138e5d
--- /dev/null
+++ b/src/layout/components/Header/ConfrimModal.vue
@@ -0,0 +1,114 @@
+<script lang="ts" setup>
+import { onBeforeMount, ref } from 'vue';
+
+const emit = defineEmits<{
+  (e: 'commit')
+}>()
+const props = defineProps({
+  selectedTotal: {
+    type: Number,
+    default: () => 0,
+  }
+})
+
+const show = ref(false)
+const cardStyle = {
+  'width': '450px',
+  '--n-padding-top': '20px',
+  '--n-padding-bottom': '20px',
+  '--n-padding-left': '20px',
+  '--n-padding-right': '20px',
+}
+
+function showModal() {
+  show.value = true
+}
+
+function closeModal() {
+  show.value = false
+}
+
+defineExpose({
+  showModal,
+})
+
+async function handleSumbit(e: MouseEvent) {
+  e.preventDefault()
+  closeModal()
+  emit('commit')
+}
+
+onBeforeMount(async () => { })
+</script>
+
+<template>
+  <n-modal v-model:show="show" transform-origin="center">
+    <n-card :style="cardStyle" :bordered="false" size="huge" role="dialog" aria-modal="true">
+      <div class="wrapper">
+        <div class="wrapper-header">
+          <SvgIcon name="exclamation-solid" size="16" />
+          <span class="wrapper-left">确认提示</span>
+        </div>
+        <div class="wrapper-content">
+          已选<span class="highlighted-text">{{ props.selectedTotal }}</span>张图片，确认将所选照片移除可疑夹吗？
+        </div>
+      </div>
+      <template #footer>
+        <div class="wrapper-footer">
+          <n-button type="info" @click="handleSumbit">
+            确定
+          </n-button>
+          <n-button secondary style="margin-left:15px" @click="closeModal">
+            取消
+          </n-button>
+        </div>
+      </template>
+    </n-card>
+  </n-modal>
+</template>
+
+<style lang="less" scoped>
+.wrapper {
+  &-header {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    padding: 10px;
+  }
+
+  &-left {
+    font-weight: 600;
+    font-size: 16px;
+    margin-left: 15px;
+  }
+
+  &-content {
+    margin-left: 15px;
+    color: #8e8e8e;
+
+    .highlighted-text {
+      color: #5b85f8;
+      margin: 0 5px;
+    }
+  }
+
+  &-footer {
+    display: flex;
+    justify-content: flex-end;
+  }
+}
+
+::v-deep(.n-card.n-card--content-segmented > .n-card__content:not(:first-child)) {
+  border: 0px;
+}
+
+::v-deep(.n-card > .n-card-header) {
+  --n-padding-top: 0px;
+  --n-padding-bottom: 12px;
+}
+
+::v-deep(.n-divider:not(.n-divider--vertical)) {
+  margin-top: 0px;
+  margin-bottom: 0px;
+}
+</style>
diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue
index 4afda80..c9d2d99 100644
--- a/src/layout/components/Header/RecycleModal.vue
+++ b/src/layout/components/Header/RecycleModal.vue
@@ -12,6 +12,7 @@ import { debounce } from 'lodash-es'
 import { audit } from '@/api/task/task'
 import NotPassed from '@/components/Approval/NotPassed.vue'
 import { off, on } from '@/utils/domUtils'
+import ConfrimModal from "./ConfrimModal.vue"
 
 const cardStyle = {
   '--n-padding-bottom': '40px',
@@ -59,6 +60,7 @@ const show = ref(false)
 const selectedApproveItems = ref<any[]>([]); // 审核批量选中
 const dialog = useDialog();
 let processItems: any[] = [];
+const confrimModalRef = ref<any>();
 
 const layout = debounce(() => {
   if (!show.value)
@@ -252,14 +254,8 @@ function closeModal(event: MouseEvent) {
   selectedApproveItems.value = []
   show.value = false
 }
-
-async function remove() {
-  if ( !selectIds.value|| selectIds.value.length === 0) {
-    message.error('至少选中一个')
-    return
-  }
-
-  const ids =  selectIds.value.join(',')
+async function commit() {
+  const ids = selectIds.value.join(',')
   const res = await removeFiles({ pictureid: ids })
   if (res.code === 'OK') {
     message.success('移除成功')
@@ -269,6 +265,13 @@ async function remove() {
     layout()
   }
 }
+ function remove() {
+  if ( !selectIds.value|| selectIds.value.length === 0) {
+    message.error('至少选中一个')
+    return
+  }
+  confrimModalRef?.value?.showModal()
+}
 
 
 function setBatch(value) {
@@ -288,11 +291,9 @@ defineExpose({
   showModal,
 })
 
-const checked = ref(false)
-
 const notPassModalRef = ref(null)
 const showActions = computed(() => {
-  console.log('selectedApproveItems',selectedApproveItems)
+  console.log('selectedApproveItems', selectedApproveItems)
   return selectedApproveItems.value.length > 0 && batch;
 });
 
@@ -385,7 +386,7 @@ function doAudit(param: any) {
 function reloadList() {
   refreshHandler()
 }
-function refreshHandler(){
+function refreshHandler() {
   reset()
   featchList()
 }
@@ -394,14 +395,10 @@ function refreshHandler(){
 
 <template>
   <div>
-    <n-modal
-      v-model:show="show" :mask-closable="false" style="position: relative;" transform-origin="center"
-      @after-enter="afterEnter" @after-leave="afterLeave"
-    >
-    <n-card
-    :style="cardStyle" class="card card-1" style="position: fixed;top:64px" :bordered="false" size="huge" role="dialog"
-    aria-modal="true"
-    >
+    <n-modal v-model:show="show" :mask-closable="false" style="position: relative;" transform-origin="center"
+      @after-enter="afterEnter" @after-leave="afterLeave">
+      <n-card :style="cardStyle" class="card card-1" style="position: fixed;top:64px" :bordered="false" size="huge"
+        role="dialog" aria-modal="true">
         <div class="wrapper">
           <div class="wrapper-m32">
             <SvgIcon name="recycle" size="16" />
@@ -436,45 +433,37 @@ function refreshHandler(){
                   批量审批
                 </div>
                 <div v-show="showActions" class="batch">
-                    <n-button text @click="setBatch(false)">
-                      <template #icon>
-                        <SvgIcon name="revoke" />
-                      </template>
-                      返回
-                    </n-button>
-                    <div style="cursor: pointer; margin-left: 16px" @click.stop="rejectHandler">
-                      <SvgIcon width="64" height="28" name="a1" />
-                    </div>
-                    <SvgIcon size="24" name="vs" />
-                    <div style="cursor: pointer" @click.stop="approvalHandler">
-                      <SvgIcon width="64" height="28" name="a2" />
-                    </div>
+                  <n-button text @click="setBatch(false)">
+                    <template #icon>
+                      <SvgIcon name="revoke" />
+                    </template>
+                    返回
+                  </n-button>
+                  <div style="cursor: pointer; margin-left: 16px" @click.stop="rejectHandler">
+                    <SvgIcon width="64" height="28" name="a1" />
+                  </div>
+                  <SvgIcon size="24" name="vs" />
+                  <div style="cursor: pointer" @click.stop="approvalHandler">
+                    <SvgIcon width="64" height="28" name="a2" />
                   </div>
+                </div>
               </div>
             </div>
 
             <div ref="el" class="scroll">
               <!-- <n-scrollbar :on-scroll="scrollHandler"> -->
               <div ref="masonryRef" class="grid">
-                <div
-                  v-for="(item, index) in listData" :key="item.id" :data-id="item.id"
-                  :class="{ 'grid-item-selected': isSelected(item.id) }" :style="{ height: gridHeight }" class="grid-item"
-                >
+                <div v-for="(item, index) in listData" :key="item.id" :data-id="item.id"
+                  :class="{ 'grid-item-selected': isSelected(item.id) }" :style="{ height: gridHeight }"
+                  class="grid-item">
                   <!-- <img
                     class="wrapper-content-item-img"
                     :class="{ 'wrapper-content-item-img-fit': viewMode !== 'masonry' }" :src="item.imgUrl"
                   > -->
-                  <n-image
-                    :src="item.imgurl"
-                    class="img "
-                    :class="{ 'img-fit': viewMode === 'horizontalVersion', 'img-full': viewMode === '3:4' || viewMode === 'verticalVersion' }"
-                  />
-                  <n-checkbox
-                    v-if="batch"
-                    v-model:checked="item.checked"
-                    style="position:absolute;left:20px;top:20px" @click.prevent
-                    @update:checked="onCheckChange($event, item)"
-                  />
+                  <n-image :src="item.imgurl" class="img "
+                    :class="{ 'img-fit': viewMode === 'horizontalVersion', 'img-full': viewMode === '3:4' || viewMode === 'verticalVersion' }" />
+                  <n-checkbox v-if="batch" v-model:checked="item.checked" style="position:absolute;left:20px;top:20px"
+                    @click.prevent @update:checked="onCheckChange($event, item)" />
                   <!-- <div class="percent">
                     {{ getPercent(item.pictureid, item) }}
                   </div> -->
@@ -491,6 +480,7 @@ function refreshHandler(){
       </n-card>
     </n-modal>
     <NotPassed ref="notPassModalRef" @success="reloadList" />
+    <ConfrimModal ref="confrimModalRef" @commit="commit" :selectedTotal="selectIds.length"/>
 
   </div>
 </template>
@@ -502,11 +492,9 @@ function refreshHandler(){
   user-select: none;
   border-top-left-radius: 10px;
   border-top-right-radius: 10px;
-
-  /* Standard syntax */
 }
 
-.remove{
+.remove {
   cursor: pointer;
 }
 
@@ -538,7 +526,7 @@ function refreshHandler(){
   }
 }
 
-.img{
+.img {
   border-radius: 8px;
 }
 
@@ -553,7 +541,7 @@ function refreshHandler(){
     padding: 24px 0px 12px 0px;
   }
 
-  &-m32{
+  &-m32 {
     margin-left: 32px;
   }
 
@@ -636,21 +624,23 @@ function refreshHandler(){
   }
 }
 
-.wrapper-content-form-button{
+.wrapper-content-form-button {
   cursor: pointer;
 }
 
 .img-fit {
-      width: 100%;
-      overflow: hidden;
-    }
-    .img-full {
-      width: 100%;
-      overflow: hidden;
-      ::v-deep(img) {
-        width: 100%;
-        height: 100%;
-        object-fit: cover;
-      }
-    }
+  width: 100%;
+  overflow: hidden;
+}
+
+.img-full {
+  width: 100%;
+  overflow: hidden;
+
+  ::v-deep(img) {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+  }
+}
 </style>
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 305ac53..8d7e2e7 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -607,11 +607,6 @@ function reloadList() {
             <div class="pass-status" v-else-if="item.historyStates === 3">
               <SvgIcon name="no-pass-icon" style="width:52;height:24px" />
             </div>
-            <!-- 
-              重复标签
-            <div class="pass-status" v-if="item.historyStates === 1">
-              <SvgIcon name="repeat-icon" style="width:52;height:24px" />
-            </div> -->
             <div v-show="overTask && overTask.id === item.id" class="action">
               <SvgIcon style="cursor: pointer" name="t1" @click.stop="approvalHandler" />
               <SvgIcon style="cursor: pointer;margin-left: 40px;" name="t2" @click.stop="singleRejectHandler(item)" />
-- 
2.39.3


From ef1bfb679cb5cc21e0e8297e10d72d493970127c Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Mon, 1 Apr 2024 22:11:07 +0800
Subject: [PATCH 094/143] =?UTF-8?q?feat:=20=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E5=88=97=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E5=9B=BE=E5=AE=A1=E5=BC=B9=E7=AA=97=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=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 | 12 ++++++--
 src/views/task/modal/CustomSettingModal.vue |  8 +++---
 src/views/worksheet/modal/ApprovalModal.vue | 31 ++++++++++++++-------
 3 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue
index 95a4234..44574fa 100644
--- a/src/views/home/aside/comp/AdvanceFilter.vue
+++ b/src/views/home/aside/comp/AdvanceFilter.vue
@@ -257,7 +257,12 @@ const moveEnd = () => {
             <span style="font-size: 20px; color: #333333; font-weight: Medium">{{
               currentlySelectedAdvanced
             }}</span>
-            <SvgIcon :style="{ marginLeft: '5px' }" name="down" size="14" color="#999999"/>
+            <SvgIcon
+              :style="{ marginLeft: '5px' }"
+              name="down"
+              size="14"
+              color="#999999"
+            />
           </div>
         </template>
         <n-spin :show="loading">
@@ -265,7 +270,7 @@ const moveEnd = () => {
             <n-form :rules="rules" ref="ruleformRef" :model="ruleForm">
               <n-form-item path="keyword">
                 <n-input
-                  :style="{ '--n-border': '0px' }"
+                  :style="{ '--n-border': '0px', '--n-display': 'block' }"
                   placeholder="请输入关键字"
                   @input="inputHandler"
                   :value="ruleForm.keyword"
@@ -429,4 +434,7 @@ const moveEnd = () => {
     align-items: center;
   }
 }
+::v-deep(.wrapper-left-popover .n-form-item){
+  display: block !important;
+}
 </style>
diff --git a/src/views/task/modal/CustomSettingModal.vue b/src/views/task/modal/CustomSettingModal.vue
index 8fb0c1c..8f0e590 100644
--- a/src/views/task/modal/CustomSettingModal.vue
+++ b/src/views/task/modal/CustomSettingModal.vue
@@ -40,6 +40,9 @@ onMounted(async () => {
         Boolean(userFieldUnFixed?.find((v2) => v2 == v.name)),
     };
     offList.value.push(item);
+    if(item.checked){
+      selectIds.value.push(item.id);
+    }
   });
 });
 
@@ -131,21 +134,18 @@ function onCheckAllChange(value) {
       ids.push(item.id);
     }
   }
-
   selectIds.value = value ? ids : [];
 }
 
 function onCheckChange(checked: any, item: any) {
   const index = selectIds.value.indexOf(item.id);
-
   item.checked = checked;
-
   if (index === -1 && checked) selectIds.value.push(item.id);
   else selectIds.value.splice(index, 1);
 }
 
 const indeterminate = computed(() => {
-  return offList.value.length > 0 && offList.value.length > selectIds.value.length;
+  return selectIds.value.length > 0 && offList.value.length > selectIds.value.length;
 });
 </script>
 
diff --git a/src/views/worksheet/modal/ApprovalModal.vue b/src/views/worksheet/modal/ApprovalModal.vue
index 806ae27..28d04bb 100644
--- a/src/views/worksheet/modal/ApprovalModal.vue
+++ b/src/views/worksheet/modal/ApprovalModal.vue
@@ -11,6 +11,7 @@ const emit = defineEmits<{
   (e: "reject", params: any);
   (e: "notPass", params: any);
 }>();
+const message = useMessage()
 
 const dialog = useDialog();
 
@@ -33,25 +34,35 @@ function showModal(id) {
 }
 
 async function getDetail(id) {
-  console.log('getDetail',id)
   // const userInfo = storage.get(CURRENT_USER);
   // const nodeType = userInfo.nodeType;
   // id = "264626184091111068";
   const res = await aiApprovaltools({ taskid: id });
   if (res.code === "OK") {
     state.detail = res.data;
-    show.value = true;
+    if(Number(res.data.similarComplete) > 0){
+      show.value = true;
+    }
   }
 }
 
 const handleReject = async () => {
-  const res = await audit()
-  // const res = await setTF({
-  //   taskchildpictureids: state.detail.taskIdList.join(","),
-  //   packageid: state.packageid,
-  //   iztrueorfalse: 0,
-  // });
-  // console.log(res, "handleReject");
+  const param = {
+    result: false,
+    comment: '',
+    disposeType: '',
+    disposeTypeId: '',
+    failCauseId: '',
+    failCauseName: '',
+    flowTaskInfoList: state.detail.flowTaskInfoList,
+  }
+  const res = await audit(param)
+  if(res.code == 'OK'){
+    message.success(res.message)
+  }else{
+    message.error(res.message)
+  }
+  closeModal();
 };
 
 async function clearMark() {
@@ -138,7 +149,7 @@ defineExpose({
             </div>
             <div class="time_box">
               任务包生成时间：
-              {{ format(detail?.createtime || 0, "yyyy-MM-dd HH:mm:ss") }}
+              {{ format(detail?.createTime || 0, "yyyy-MM-dd HH:mm:ss") }}
             </div>
           </div>
         </div>
-- 
2.39.3


From ee6f52c1864c84bf7662e5b89881a7cbeddb8eca Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Mon, 1 Apr 2024 22:25:39 +0800
Subject: [PATCH 095/143] =?UTF-8?q?feat:=20=E5=88=97=E8=A1=A8=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=89=8D=E7=AB=AF=E5=A2=9E=E5=8A=A0=20checkDuplicateI?=
 =?UTF-8?q?d?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/work/work.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/api/work/work.ts b/src/api/work/work.ts
index bbef956..f7e1259 100644
--- a/src/api/work/work.ts
+++ b/src/api/work/work.ts
@@ -83,7 +83,7 @@ export async function getTaskDetailInfo(checkDuplicateId: string) {
  * @param params
  * @returns
  */
-export async function getTaskDetailPictureList(params: PageParam & PictureSortParam & SimilarityPictureSortParam) {
+export async function getPictureSimilarityList(params: PageParam & PictureSortParam & SimilarityPictureSortParam) {
 
   const res = await http.request({
     url: `/backstage/jifen/ocrtaskchildpicture/getPictureSimilarityList`,
@@ -97,6 +97,7 @@ export async function getTaskDetailPictureList(params: PageParam & PictureSortPa
   const list = records.map((item,index) => {
     return {
       id: item.id,
+      checkDuplicateId: item.checkDuplicateId,
       taskId: item.taskId,
       taskname: item.fromTaskName,
       assignee: item.assignee,
-- 
2.39.3


From 15dd6ce13bbbed47cb83efffedbbe3ee025ea3bb Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Mon, 1 Apr 2024 22:27:40 +0800
Subject: [PATCH 096/143] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=9B=BE?=
 =?UTF-8?q?=E5=AE=A1=E5=BC=B9=E7=AA=97=E5=B1=95=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/modal/ApprovalModal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/worksheet/modal/ApprovalModal.vue b/src/views/worksheet/modal/ApprovalModal.vue
index 28d04bb..b0ad148 100644
--- a/src/views/worksheet/modal/ApprovalModal.vue
+++ b/src/views/worksheet/modal/ApprovalModal.vue
@@ -40,7 +40,7 @@ async function getDetail(id) {
   const res = await aiApprovaltools({ taskid: id });
   if (res.code === "OK") {
     state.detail = res.data;
-    if(Number(res.data.similarComplete) > 0){
+    if(Number(res.data.pendingApprovaCount) > 0){
       show.value = true;
     }
   }
-- 
2.39.3


From 85ae4ead310774c29f1800d63a02a803b0471c4a Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Mon, 1 Apr 2024 22:28:05 +0800
Subject: [PATCH 097/143] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/content/Content.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 8d7e2e7..825192f 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -1,8 +1,7 @@
 <script lang="ts" setup>
 import { audit } from '@/api/task/task';
 import {
-getTaskDetailInfo,
-getTaskDetailPictureList
+getPictureSimilarityList, getTaskDetailInfo
 } from "@/api/work/work";
 import NotPassed from '@/components/Approval/NotPassed.vue';
 import { fieldMap } from "@/config/workorder";
@@ -135,7 +134,7 @@ async function featchList() {
   loading.value = true;
   try {
     taskpagination.pageNo += 1;
-    const { data, total, pageCount } = await getTaskDetailPictureList(
+    const { data, total, pageCount } = await getPictureSimilarityList(
       { ...taskpagination, ...sortBy, checkDuplicateId: workStore.activeId, pictureId: taskDetailInfo.value.id }
     );
 
-- 
2.39.3


From 508eb097098c73fdc55bffcdb5ccfe978ff9a4bc Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Mon, 1 Apr 2024 23:18:58 +0800
Subject: [PATCH 098/143] bug

---
 src/views/task/aside/Aside.vue      | 175 ++++++++++++++--------------
 src/views/task/content/Content.vue  |  20 ++--
 src/views/task/modal/BatchModal.vue |  88 +++++++++++---
 3 files changed, 174 insertions(+), 109 deletions(-)

diff --git a/src/views/task/aside/Aside.vue b/src/views/task/aside/Aside.vue
index 9e2ff6e..8ed0c10 100644
--- a/src/views/task/aside/Aside.vue
+++ b/src/views/task/aside/Aside.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { debounce } from "lodash-es";
+import { debounce } from 'lodash-es'
 import {
   computed,
   inject,
@@ -9,89 +9,89 @@ import {
   shallowRef,
   unref,
   watch,
-} from "vue";
-import CustomFieldModal from "../modal/CustomFieldModal.vue";
-import AdvanceFilter from "../../home/aside/comp/AdvanceFilter.vue";
-import { FilterModalVue } from "../../home/aside/comp/modals";
-import NewFilterModalVue from "../modal/NewFilterModal.vue";
-import TaskList from "./TaskList.vue";
-import type { AsideEntity } from "@/config/aside";
-import { useUser } from "@/store/modules/user";
-import { getAllfieldList, getfieldList } from "@/api/home/filter";
-import { useTaskStore } from "@/store/modules/task";
-import emitter from "@/utils/mitt";
-import { useConfig } from "@/store/modules/asideConfig";
+} from 'vue'
+import CustomFieldModal from '../modal/CustomFieldModal.vue'
+import AdvanceFilter from '../../home/aside/comp/AdvanceFilter.vue'
+import { FilterModalVue } from '../../home/aside/comp/modals'
+import NewFilterModalVue from '../modal/NewFilterModal.vue'
+import TaskList from './TaskList.vue'
+import type { AsideEntity } from '@/config/aside'
+import { useUser } from '@/store/modules/user'
+import { getAllfieldList, getfieldList } from '@/api/home/filter'
+import { useTaskStore } from '@/store/modules/task'
+import emitter from '@/utils/mitt'
+import { useConfig } from '@/store/modules/asideConfig'
 
-const CustomFieldModalRef = ref(null);
-const collapse = ref(false);
-const taskStore = useTaskStore();
-const taskListRef: any = ref(null);
+const CustomFieldModalRef = ref(null)
+const collapse = ref(false)
+const taskStore = useTaskStore()
+const taskListRef: any = ref(null)
 // 展示字段
-const showFieldList = ref<any[]>([]);
-const search = ref("");
+const showFieldList = ref<any[]>([])
+const search = ref('')
 function collapseHandler() {
-  collapse.value = !collapse.value;
+  collapse.value = !collapse.value
 }
-const mousetrap = inject("mousetrap") as any;
-mousetrap.bind("[", collapseHandler);
+const mousetrap = inject('mousetrap') as any
+mousetrap.bind('[', collapseHandler)
 const asideWidth = computed(() => {
-  return collapse.value ? 0 : 308;
-});
+  return collapse.value ? 0 : 308
+})
 
 const asideStyle = computed(() => {
   return {
     width: `${asideWidth.value}px`,
-  };
-});
+  }
+})
 
 const collapseIcon = computed(() => {
-  return collapse.value ? "expand-cir" : "collapse-cir";
-});
+  return collapse.value ? 'expand-cir' : 'collapse-cir'
+})
 
-const asideEnter = ref(false);
+const asideEnter = ref(false)
 
 const showCollapse = computed(() => {
-  return collapse.value ? true : asideEnter.value;
-});
+  return collapse.value ? true : asideEnter.value
+})
 
 watch(
   () => taskStore.immersion,
   () => {
-    collapse.value = true;
-  }
-);
+    collapse.value = true
+  },
+)
 
 function showFilter() {
-  const modal = unref(CustomFieldModalRef)! as any;
-  modal.showModal();
+  const modal = unref(CustomFieldModalRef)! as any
+  modal.showModal()
 }
 
-const showSearch = ref(false);
+const showSearch = ref(false)
 
 function setShowSearch(value: boolean) {
   if (!value) {
-    console.log("setShowSearch", value);
-    search.value = "";
-    taskListRef.value.search("");
-    return;
+    console.log('setShowSearch', value)
+    search.value = ''
+    taskListRef.value.search('')
+    return
   }
-  showSearch.value = value;
+  showSearch.value = value
 }
 
 const inputHandler = debounce((word) => {
-  (taskListRef.value as any).search(word);
-}, 500);
+  (taskListRef.value as any).search(word)
+}, 500)
 
-const reviewType = 2;
+const reviewType = 2
 async function getshowFieldList() {
-  showFieldList.value = [];
-  const userStore = useUser();
-  const userInfo = userStore.getUserInfo;
-  let res;
-  res = await getAllfieldList(reviewType); // 所有筛选项目
-  const allList = res.data;
-  res = await getfieldList(reviewType, userInfo.id); // 当前用户选择的项目
-  const useList = res.data;
+  showFieldList.value = []
+  const userStore = useUser()
+  const userInfo = userStore.getUserInfo
+  let res
+  res = await getAllfieldList(reviewType) // 所有筛选项目
+  const allList = res.data
+  res = await getfieldList(reviewType, userInfo.id) // 当前用户选择的项目
+  const useList = res.data
   /**
    * name 标题
    * id 键值
@@ -99,19 +99,20 @@ async function getshowFieldList() {
    * checked 是否选中
    */
   if (useList?.userFieldFixed) {
-    useList?.userFieldFixed?.split(",").map((v) => {
-      let item = allList.find((v2) => v2.name == v);
+    useList?.userFieldFixed?.split(',').map((v) => {
+      let item = allList.find(v2 => v2.name == v)
       if (item) {
         item = {
           name: item.fieldDesc,
           id: item.name,
           fix: item.isrequired == 2,
           checked: true,
-        };
-        showFieldList.value.push(item);
+        }
+        showFieldList.value.push(item)
       }
-    });
-  } else {
+    })
+  }
+  else {
     // 若为首次获取 则赋默认值
     allList?.map((v) => {
       if (v.isrequired == 2) {
@@ -120,58 +121,58 @@ async function getshowFieldList() {
           id: v.name,
           fix: v.isrequired == 2,
           checked: true,
-        };
-        showFieldList.value.push(item);
+        }
+        showFieldList.value.push(item)
       }
-    });
+    })
   }
 }
 
 onMounted(() => {
-  getshowFieldList();
-});
+  getshowFieldList()
+})
 
 // 滚动容器，让key对应模块处于可视区域
 function scrollHandler(key: string) {
-  const element = document.querySelector(`#${key}`);
-  element?.scrollIntoView(true);
+  const element = document.querySelector(`#${key}`)
+  element?.scrollIntoView(true)
 }
 // 选择某个过滤配置，刷新图片墙
 function filterHandler(searchId: string) {
-  emitter.emit("filter", searchId);
+  emitter.emit('filter', searchId)
 }
 function showModal(modalRef: any) {
-  const modal = unref(modalRef)! as any;
-  modal.showModal();
+  const modal = unref(modalRef)! as any
+  modal.showModal()
 }
 // 当前显示的模块，按照数组顺序显示
-const showItems = shallowRef<{ key: string; config: AsideEntity }[]>([]);
-const filterModalRef: any = ref(null);
-const newFilterModalRef = ref(null);
-const customModalRef = ref(null);
+const showItems = shallowRef<{ key: string, config: AsideEntity }[]>([])
+const filterModalRef: any = 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);
+  const modal = unref(newFilterModalRef)! as any
+  modal.showModal()
+  modal.edit(filter)
 }
-const configStore = useConfig();
-const newFilterOk = () => {
+const configStore = useConfig()
+function newFilterOk() {
   filterModalRef.value.query(
     filterModalRef.value.pagination.page,
-    filterModalRef.value.pagination.pageSize
-  );
-};
+    filterModalRef.value.pagination.pageSize,
+  )
+}
 onBeforeMount(async () => {
-  configStore.fetchConfig();
-  configStore.fetchCustomConfig();
-});
+  configStore.fetchConfig()
+  configStore.fetchCustomConfig()
+})
 function setAsideItemName(text) {
-  taskListRef.value.setStatusName(text);
+  taskListRef.value.setStatusName(text)
 }
 
 defineExpose({
   setAsideItemName,
-});
+})
 </script>
 
 <template>
@@ -255,7 +256,7 @@ defineExpose({
       @show-new-filter="showModal(newFilterModalRef)"
     />
     <!-- 新增过滤 -->
-    <NewFilterModalVue ref="newFilterModalRef" @onOk="newFilterOk" />
+    <NewFilterModalVue ref="newFilterModalRef" @on-ok="newFilterOk" />
   </div>
 </template>
 
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index 1f67f79..23d9c49 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -33,7 +33,7 @@ const selectItems = ref<any[]>([])
 const message = useMessage()
 const dialog = useDialog()
 const notPassModalRef = ref(null)
-const batchModalRef = ref(null)
+const batchModalRef: any = ref(null)
 const totalCount = ref(0)
 const taskId: any = ref('') // 任务id
 const packageId: any = ref('') // 包id
@@ -61,7 +61,7 @@ const showActions = computed(() => {
 
 const taskpagination = reactive({
   pageNo: 1,
-  pageSize: 10,
+  pageSize: 30,
 })
 const taskStore = useTask()
 const overTask = ref<any>(null)
@@ -198,7 +198,7 @@ function approvalHandler(items?: any) {
 
 function rejectHandler(items?: any) {
   const modal = unref(notPassModalRef)! as any
-  modal.showModal(selectItems.value)
+  modal.showModal(items)
 }
 
 function singleRejectHandler() {
@@ -213,13 +213,14 @@ function doAudit(param: any) {
       message.success(res.message)
       setBatch(false)
       reloadList(param, '通过')
+      batchModalRef.value.reload()
     }
   })
 }
 
 function showModal(modalRef: any) {
   const modal = unref(modalRef)! as any
-  modal.showModal()
+  modal.showModal(taskId.value)
 }
 
 function forwardHandler() {
@@ -429,7 +430,7 @@ function switchBatch() {
             class="btn-approval btn-left"
             src="@/assets/images/task/btn-not-pass.png"
             alt=""
-            @click.stop="rejectHandler"
+            @click.stop="rejectHandler(selectItems)"
           >
           <SvgIcon size="24" name="vs" />
           <img
@@ -639,13 +640,18 @@ function switchBatch() {
         <History :data="taskDetailInfo" />
       </n-tab-pane>
     </n-tabs>
-    <NotPassed ref="notPassModalRef" @success="(param) => reloadList(param, '不通过')" />
+    <NotPassed
+      ref="notPassModalRef" @success="(param) => {
+        batchModalRef.value.reload()
+        reloadList(param, '不通过')
+      }"
+    />
     <BatchModal
       ref="batchModalRef"
       @reject="rejectHandler"
       @approval="approvalHandler"
     />
-    <CustomSettingModal ref="CustomSettingModalRef"  @onOk="getDetail"/>
+    <CustomSettingModal ref="CustomSettingModalRef" @on-ok="getDetail" />
   </div>
 </template>
 
diff --git a/src/views/task/modal/BatchModal.vue b/src/views/task/modal/BatchModal.vue
index 2a99fb4..32c16c8 100644
--- a/src/views/task/modal/BatchModal.vue
+++ b/src/views/task/modal/BatchModal.vue
@@ -25,6 +25,7 @@ const cardStyle = {
 
 const totalCount = ref(0)
 const timeRange = ref('all')
+const taskId = ref('')
 const timeLabel = computed(() => {
   const item = timeOptions.find((option) => {
     return option.value === timeRange.value
@@ -110,9 +111,8 @@ useInfiniteScroll(
 async function loadMore() {
   if (loading.value || el.value == null)
     return
-  const taskId = taskStore.getActiveId
 
-  if (!taskId)
+  if (!taskId.value)
     return
 
   const more = await fetchList()
@@ -241,7 +241,9 @@ onMounted(() => {
   show.value && addListeners()
 })
 
-function showModal() {
+function showModal(value) {
+  taskId.value = value
+  refreshHandler()
   show.value = true
 }
 
@@ -249,10 +251,6 @@ function closeModal(event: MouseEvent) {
   show.value = false
 }
 
-defineExpose({
-  showModal,
-})
-
 function forwardHandler() {
   taskStore.forward()
 }
@@ -314,11 +312,9 @@ function reset() {
 
 async function refreshHandler() {
   reset()
-  const taskId = taskStore.getActiveId
-
-  if (!taskId)
+  if (!taskId.value)
     return
-  taskDetailInfo.value = await getTaskDetailInfo(taskId, '')
+  taskDetailInfo.value = await getTaskDetailInfo(taskId.value, '')
 
   nextTick(() => {
     useInfiniteScroll(
@@ -332,12 +328,23 @@ async function refreshHandler() {
 }
 
 watch(() => taskStore.activeId, async (newValue, oldValue) => {
+  taskId.value = taskStore.activeId
+  selectIds.value = []
   refreshHandler()
 })
 
 function switchBatch() {
   setBatch(!batch.value)
 }
+
+function reload() {
+  selectIds.value = []
+  refreshHandler()
+}
+defineExpose({
+  showModal,
+  reload,
+})
 </script>
 
 <template>
@@ -356,7 +363,7 @@ function switchBatch() {
             <span style="margin-left: 8px;">任务审批</span>
           </div>
           <div class="wrapper-title wrapper-m32">
-            <span>任务ID:{{ taskStore.getActiveId }}</span>
+            <span>任务ID:{{ taskDetailInfo.fromtaskname }}</span>
             <SvgIcon size="22" class="forward" name="arrow-left" @click="backHandler" />
             <SvgIcon size="22" class="back" name="arrow-right" @click="forwardHandler" />
           </div>
@@ -386,14 +393,27 @@ function switchBatch() {
                   <td>
                     {{ taskDetailInfo?.createusername }}
                   </td>
-                  <td>{{ TASK_STATUS_OBJ[taskDetailInfo?.states] }}</td>
+                  <td>
+                    <div
+                      class="status-tag"
+                      :class="{
+                        'status-red': taskDetailInfo?.states === 3,
+                        'status-green': taskDetailInfo?.states === 2,
+                      }"
+                    >
+                      {{ TASK_STATUS_OBJ[taskDetailInfo?.states] }}
+                    </div>
+                  </td>
                   <td>{{ taskDetailInfo?.ocrPicture?.createTime }}</td>
-                  <td>{{ taskDetailInfo?.fromsourceid }}</td>
+                  <td>{{ taskDetailInfo?.pictureInfo?.source }}</td>
                   <td>{{ totalCount }}</td>
                 </tr>
               </tbody>
             </table>
           </div>
+          <div class="title wrapper-m32">
+            相似图片
+          </div>
 
           <div class="wrapper-content">
             <div class="wrapper-content-form wrapper-m32">
@@ -500,6 +520,16 @@ function switchBatch() {
   position: relative;
 }
 
+.title{
+  font-size: 18px;
+  font-family: PingFang SC, PingFang SC-Medium;
+  font-weight: 500;
+  text-align: left;
+  color: #333333;
+  margin-top: 14px;
+  margin-bottom: 24px;
+}
+
 .small-mark{
   width: 100%;
   height: 36px;
@@ -544,6 +574,29 @@ function switchBatch() {
   }
 }
 
+.status-tag{
+  display: inline-block;
+  padding: 0 12px;
+  height: 22px;
+  background: #ffc671;
+  border-radius: 12px;
+  align-items: center;
+  justify-content: center;
+  font-size: 13px;
+  font-family: PingFang SC, PingFang SC-Medium;
+  font-weight: 500;
+  text-align: left;
+  color: #ffffff;
+}
+
+.status-tag-green{
+  background: #53c21d;
+}
+
+.status-tag-red{
+  background: #e45656;
+}
+
 .close {
   position: absolute;
   right: -90px;
@@ -610,11 +663,16 @@ function switchBatch() {
       text-align: center;
       font-weight: bold;
       text-align: left;
+      font-size: 14px;
+      font-family: PingFang SC, PingFang SC-Medium;
+      font-weight: 500;
+      text-align: left;
+      color: #333333;
     }
   }
 
   &-m32 {
-    margin-left: 32px;
+    margin-left: 19px;
   }
 
   &-content {
-- 
2.39.3


From 1e175e2647320043e03c0d44440f064fcac41500 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Mon, 1 Apr 2024 23:29:24 +0800
Subject: [PATCH 099/143] =?UTF-8?q?feat:=20=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/aside/comp/AdvanceFilter.vue | 6 +++++-
 src/views/worksheet/modal/ApprovalModal.vue | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue
index 44574fa..80595df 100644
--- a/src/views/home/aside/comp/AdvanceFilter.vue
+++ b/src/views/home/aside/comp/AdvanceFilter.vue
@@ -233,6 +233,10 @@ function unFavoriteHandler(event: MouseEvent, item) {
   }
 }
 
+const handleScroll= (event)=>{
+  console.log(event)
+}
+
 const moveEnd = () => {
   unData.value.map((v, index) => {
     sort(v.id, index);
@@ -291,7 +295,7 @@ const moveEnd = () => {
               </n-form-item>
             </n-form>
 
-            <ul ref="el" class="wrapper-left-list">
+            <ul ref="el" class="wrapper-left-list" @scroll="handleScroll">
               <li
                 v-for="(item, index) in data"
                 :key="index"
diff --git a/src/views/worksheet/modal/ApprovalModal.vue b/src/views/worksheet/modal/ApprovalModal.vue
index b0ad148..1170e4b 100644
--- a/src/views/worksheet/modal/ApprovalModal.vue
+++ b/src/views/worksheet/modal/ApprovalModal.vue
@@ -36,7 +36,7 @@ function showModal(id) {
 async function getDetail(id) {
   // const userInfo = storage.get(CURRENT_USER);
   // const nodeType = userInfo.nodeType;
-  // id = "264626184091111068";
+  // id = "264627119490116380";
   const res = await aiApprovaltools({ taskid: id });
   if (res.code === "OK") {
     state.detail = res.data;
-- 
2.39.3


From 68ebf8f3117c1f54fe3202894dc37dd2dc1053d5 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Mon, 1 Apr 2024 23:31:14 +0800
Subject: [PATCH 100/143] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=8F=B3?=
 =?UTF-8?q?=E4=BE=A7=E5=9B=BE=E7=89=87=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../worksheet/components/PictureInfo.vue      | 183 ++++++++++++++++++
 src/views/worksheet/content/Content.vue       |  38 +---
 2 files changed, 187 insertions(+), 34 deletions(-)
 create mode 100644 src/views/worksheet/components/PictureInfo.vue

diff --git a/src/views/worksheet/components/PictureInfo.vue b/src/views/worksheet/components/PictureInfo.vue
new file mode 100644
index 0000000..a312527
--- /dev/null
+++ b/src/views/worksheet/components/PictureInfo.vue
@@ -0,0 +1,183 @@
+<script setup lang="ts">
+import { fieldMap } from "@/config/workorder";
+import { TASK_STATUS_OBJ } from '@/enums/index';
+import { format } from 'date-fns';
+import { pickBy } from "lodash-es";
+import { computed, defineProps } from "vue";
+
+const props = defineProps({
+  taskDetailInfo: {
+    type: Object,
+    default: () => ({}),
+  },
+});
+
+const propertys = computed(() => {
+  const { ocrPicture } = props.taskDetailInfo;
+  const v = pickBy(ocrPicture, (value, key: string) => {
+    return key.startsWith("field") && value !== null;
+  });
+  return v;
+});
+</script>
+
+<template>
+  <div class="right">
+    <n-scrollbar style="max-height: 100%">
+      <n-ellipsis style="max-width: 350px">任务ID：{{ taskDetailInfo.taskname }}</n-ellipsis>
+      <div class="tags">
+        <div class="tag tag-submiting" v-if="taskDetailInfo.historyStates == '1'">待审批</div>
+        <div class="tag tag-submited" v-else-if="taskDetailInfo.historyStates == 2 || taskDetailInfo.workStatus == 3">已审批</div>
+        <div class="tag tag-passed" v-if="taskDetailInfo.historyStates == 2">{{ TASK_STATUS_OBJ[taskDetailInfo.historyStates] }}</div>
+        <div class="tag tag-not-passed" v-else-if="taskDetailInfo.workStatus == 3">{{ TASK_STATUS_OBJ[taskDetailInfo.historyStates] }}</div>
+      </div>
+      <n-divider class="divider-line" />
+      <div class="property">
+        <span class="property-name top" style="color: #666666">图片大小</span>
+        <span style="color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo?.imgSize && (taskDetailInfo.pictureInfo.imgSize / 1000).toFixed(2) }}KB</span>
+      </div>
+      <div class="property">
+        <span class="property-name top" style="color: #666666">图片格式</span>
+        <span style="color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo?.imgFormat }}</span>
+      </div>
+      <div class="property">
+        <span class="property-name top" style="color: #666666">图片尺寸</span>
+        <span style="color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo?.imgMeasure }}</span>
+      </div>
+      <div class="property">
+        <span class="property-name top" style="color: #666666">色彩空间</span>
+        <span style="color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo?.imgSpace }}</span>
+      </div>
+      <div class="property">
+        <span class="property-name top" style="color: #666666">提报人</span>
+        <span style="color: #333333; font-size: 16px">{{ taskDetailInfo?.upname || "-" }}</span>
+      </div>
+      <div class="property">
+        <span class="property-name top" style="color: #666666">创建时间</span>
+        <span style="color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo?.createTime }}</span>
+      </div>
+      <div class="property">
+        <span class="property-name top" style="color: #666666">提报时间</span>
+        <span style="color: #333333; font-size: 16px">{{ taskDetailInfo?.submitDateTimestamp && format(taskDetailInfo.submitDateTimestamp, 'yyyy-MM-dd HH:mm:ss') || '-' }}</span>
+      </div>
+      <div v-for="(value, key) in propertys" :key="key" class="property">
+        <span class="property-name">{{ fieldMap[key] }}</span>
+        <span class="property-content">{{ value }}</span>
+      </div>
+    </n-scrollbar>
+  </div>
+</template>
+
+<style lang="less" scoped>
+.right {
+  // flex: 1;
+  // display: flex;
+  // flex-direction: column;
+  // justify-content: space-between;
+  // // background: #fafafa;
+
+  // border-radius: 8px;
+  // margin-left: 20px;
+  // padding: 24px;
+  // width: 24vw;
+  flex: 0.5;
+  background: #f9f9f9;
+  border-radius: 8px;
+  margin-left: 20px;
+  padding: 24px;
+  // background: lime;
+
+
+  .task-name {
+    display: inline-block;
+    width: 100%;
+    font-size: 18px;
+    color: #0d0b22;
+    line-height: 25px;
+    font-family: PingFang SC, PingFang SC-Medium;
+    font-weight: Medium;
+    max-width: 445px;
+    /* 设置文本溢出时的样式为省略号 */
+    text-overflow: ellipsis;
+    /* 隐藏超出容器的文本 */
+    overflow: hidden;
+    /* 确保文本不换行 */
+    white-space: nowrap;
+  }
+
+  // ::v-deep(.n-divider:not(.n-divider--vertical)) {
+
+  ::v-deep(.divider-line .n-divider__line) {
+    background-color: #e8e8e8;
+  }
+
+  .tags {
+    display: flex;
+    margin-top: 8px;
+  }
+
+  .tag {
+    border: 1px solid #d8d8d8;
+    box-sizing: border-box;
+    border-radius: 8px;
+    color: #666666;
+    margin-right: 12px;
+    padding: 4px 8px;
+    font-size: 12px;
+    line-height: 16px;
+  }
+
+  .tag-submited {
+    color: #507AFD;
+    border: 1px solid #507AFD;
+  }
+
+  .tag-submiting {
+    color: #FFB800;
+    border: 1px solid #FFB800;
+  }
+
+  .tag-passed {
+    color: #02C984;
+    border: 1px solid #02C984;
+  }
+
+  .tag-not-passed {
+    color: #ff7575;
+    border: 1px solid #ff7575;
+  }
+
+  .tag-approved {
+    color: #507afd;
+    border: 1px solid #507afd;
+  }
+
+  .property {
+    display: flex;
+    align-items: center;
+    margin-top: 12px;
+    line-height: 20px;
+  }
+
+  .property-name {
+    width: 56px;
+    text-align: right;
+    color: #999999;
+    position: relative;
+    margin-right: 32px;
+  }
+
+  .top {}
+
+  .property-content {
+    flex: 1;
+    color: #333333;
+  }
+}
+
+
+::v-deep(.n-divider:not(.n-divider--vertical)) {
+  margin-top: 12px;
+  margin-bottom: 12px;
+}
+</style>
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 825192f..aa732d6 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -4,7 +4,6 @@ import {
 getPictureSimilarityList, getTaskDetailInfo
 } from "@/api/work/work";
 import NotPassed from '@/components/Approval/NotPassed.vue';
-import { fieldMap } from "@/config/workorder";
 import { TASK_STATUS_OBJ } from '@/enums/index';
 import { useWorkOrder } from "@/store/modules/workOrder";
 import { isEmpty } from "@/utils";
@@ -17,6 +16,7 @@ import imagesloaded from "imagesloaded";
 import { clone, debounce, pickBy } from "lodash-es";
 import { useDialog, useMessage } from "naive-ui";
 import { computed, onUnmounted, onUpdated, reactive, ref, unref, watch } from "vue";
+import PictureInfo from "../components/PictureInfo.vue";
 import ConfrimModal from "../modal/ConfrimModal.vue";
 import type { ApprovalParam, SimilarityPictureSortParam } from "/#/api";
 
@@ -486,18 +486,10 @@ function reloadList() {
             </div>
           </div>
           <!-- 右侧任务 标题信息 -->
-          <div class="right">
+          <!-- <div class="right">
             <n-scrollbar style="max-height: 100%">
               <n-ellipsis style="max-width: 350px">任务ID：{{ taskDetailInfo.taskname }}</n-ellipsis>
               <div class="tags">
-                <!-- <div class="tag tag-submiting" v-if="taskDetailInfo.workStatus == '1'">{{ TASK_STATUS_OBJ[taskDetailInfo.workStatus]
-                }}</div>
-                <div class="tag tag-submited" v-else-if="taskDetailInfo.workStatus == '2'">已审批</div>
-                <div class="tag tag-passed" v-if="taskDetailInfo.historyStates == 2">{{
-                  TASK_STATUS_OBJ[taskDetailInfo.historyStates] }}</div>
-                <div class="tag tag-not-passed" v-else-if="taskDetailInfo.workStatus == 3">{{
-                  TASK_STATUS_OBJ[taskDetailInfo.historyStates]
-                }}</div> -->
                 <div class="tag tag-submiting" v-if="taskDetailInfo.historyStates == '1'">待审批</div>
                 <div class="tag tag-submited" v-else-if="taskDetailInfo.historyStates == 2 || taskDetailInfo.workStatus == 3">已审批</div>
                 <div class="tag tag-passed" v-if="taskDetailInfo.historyStates == 2">{{
@@ -549,7 +541,8 @@ function reloadList() {
                 <span class="property-content">{{ propertys[key] }}</span>
               </div>
             </n-scrollbar>
-          </div>
+          </div> -->
+          <PictureInfo :taskDetailInfo="taskDetailInfo"></PictureInfo>
         </div>
         <div style="display: flex; justify-content: space-between; padding: 12px 0px 3px 0">
           <div>
@@ -669,29 +662,6 @@ function reloadList() {
       }
     }
 
-    .right {
-      display: flex;
-      align-items: center;
-
-      .btn {
-        width: 118px;
-        height: 36px;
-        background: linear-gradient(135deg, #5b85f8, #3c6cf0);
-        border-radius: 17px;
-        box-shadow: 0px 2px 6px 0px rgba(116, 153, 253, 0.3);
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        color: #fff;
-        cursor: pointer;
-      }
-
-      .batch {
-        display: flex;
-        align-items: center;
-      }
-    }
-
     .font {
       font-size: 20px;
       font-family: PingFang SC, PingFang SC-Medium;
-- 
2.39.3


From 34724596c3b53b26e97e4e3c6257b646b78a53eb Mon Sep 17 00:00:00 2001
From: raofuzi <2641346316@qq.com>
Date: Mon, 1 Apr 2024 23:41:35 +0800
Subject: [PATCH 101/143] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/asideConfig.ts              |  8 ++
 src/views/home/aside/Aside.vue                | 74 +++++++++++++------
 .../home/aside/comp/items/IzCustomlevel.vue   | 10 ++-
 .../home/aside/comp/items/IzCustomname.vue    | 10 ++-
 .../home/aside/comp/items/IzCustomtype.vue    | 10 ++-
 .../home/aside/comp/items/IzCustomtypes.vue   | 10 ++-
 src/views/home/aside/comp/items/IzProduct.vue | 10 ++-
 src/views/home/aside/comp/items/IzProject.vue | 10 ++-
 .../home/aside/comp/items/IzProjecttype.vue   | 10 ++-
 src/views/home/aside/comp/items/IzSearch.vue  | 10 ++-
 .../home/aside/comp/items/IzSearchManager.vue | 10 ++-
 src/views/home/aside/comp/items/IzShow.vue    | 10 ++-
 src/views/home/aside/comp/items/IzStatus.vue  | 10 ++-
 .../home/aside/comp/items/IzVisitcity.vue     | 10 ++-
 src/views/home/aside/comp/items/Izfiled17.vue | 10 ++-
 src/views/home/aside/comp/items/Izfiled2.vue  | 10 ++-
 src/views/home/aside/comp/items/Izfiled3.vue  | 10 ++-
 src/views/home/aside/comp/items/Izfiled6.vue  | 10 ++-
 src/views/home/aside/comp/items/Izfirm.vue    | 10 ++-
 .../home/aside/comp/items/Iztaskrrom.vue      | 12 ++-
 .../home/aside/comp/items/Iztaskstatus.vue    | 10 ++-
 .../home/aside/comp/items/Izvisitpro.vue      | 10 ++-
 src/views/home/aside/comp/items/Plan.vue      | 10 ++-
 .../home/aside/comp/items/ReportUser.vue      | 10 ++-
 .../home/aside/comp/items/Similarity.vue      |  2 +-
 src/views/home/aside/comp/items/Time.vue      |  2 +-
 .../aside/comp/modals/CustomFilterModal.vue   | 67 +++++++++++++++--
 27 files changed, 278 insertions(+), 97 deletions(-)

diff --git a/src/store/modules/asideConfig.ts b/src/store/modules/asideConfig.ts
index e91108a..81bcf4b 100644
--- a/src/store/modules/asideConfig.ts
+++ b/src/store/modules/asideConfig.ts
@@ -12,6 +12,7 @@ export interface ConfigState {
   searchValue: string
   isAllowDownload: boolean
   timeNum: number
+  filterConfig: string[] // 过滤筛选条件
 }
 
 export const useAsideConfigStore = defineStore({
@@ -23,6 +24,7 @@ export const useAsideConfigStore = defineStore({
     searchValue: "",
     isAllowDownload: true,
     timeNum: 0,
+    filterConfig: [],
   }),
   getters: {
     getConfig(): AsideConfig | null {
@@ -43,6 +45,9 @@ export const useAsideConfigStore = defineStore({
     getTimeNum(): any {
       return this.timeNum
     },
+    getFilterConfig(): any {
+      return this.filterConfig
+    },
   },
   actions: {
     setConfig(config: AsideConfig) {
@@ -64,6 +69,9 @@ export const useAsideConfigStore = defineStore({
     setCustomConfig(value) {
       this.customConfig = value
     },
+    setFilterConfig(value) {
+      this.filterConfig = value
+    },
     // 获取系统配置信息
     async fetchConfig() {
       const response = await getConfig()
diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue
index 38906fa..ef19403 100644
--- a/src/views/home/aside/Aside.vue
+++ b/src/views/home/aside/Aside.vue
@@ -13,12 +13,12 @@ import type { AsideConfig } from '/#/api'
 import emitter from '@/utils/mitt'
 import { getFilterList } from '@/api/home/main'
 import dayjs from 'dayjs'
-import { cloneDeep } from 'lodash-es'
+import { cloneDeep, isEqual } from 'lodash-es'
 
 const configStore = useConfig()
 
 // 所有左侧模块的值
-const asideValue: Record<keyof typeof asideMap, any> = reactive({})
+let asideValue: Record<keyof typeof asideMap, any> = reactive({})
 // 左侧某个模块是否显示: 显示需同时满足系统配置和个人配置
 const asideVisible: Partial<Record<keyof AsideConfig, boolean>> = reactive({})
 // 当前显示的模块，按照数组顺序显示
@@ -28,13 +28,14 @@ Object.keys(asideMap).forEach((key) => {
   const entity = asideMap[key]
   const { defaultValue } = entity
   asideValue[key] = defaultValue
-  console.log("asideMap和asideValue", asideValue);
 })
 
 const filterModalRef = ref(null)
 const newFilterModalRef = ref(null)
 const customModalRef = ref(null)
 const customObjRef = ref<any>(null) // 获取高级筛选获取的值
+const customTempObjRef = ref<any>(null) // 获取高级筛选获取的值(作对比)
+const configFilterRef = ref<any>([]) // 获取排序的值
 
 function showModal(modalRef: any) {
   const modal = unref(modalRef)! as any
@@ -44,6 +45,9 @@ function showModal(modalRef: any) {
 onMounted(() => {
   nextTick(() => {
     computeSlideHeight()
+    let tempAsideValue = cloneDeep(asideValue);
+    // configStore.setAsideValue(tempAsideValue);
+    console.log("asideMap和asideValue", tempAsideValue);
   })
 })
 
@@ -88,7 +92,17 @@ onBeforeMount(async () => {
 configStore.$subscribe(() => {
   const config = configStore.getConfig
   const customConfig = configStore.getCustomConfig
-
+  console.log("config", config);
+  console.log("customConfig", customConfig);
+  console.log("customObjRef.value", customObjRef.value);
+  console.log("customTempObjRef.value", customTempObjRef.value, );
+  console.log("getFilterConfig", configStore.getFilterConfig,);
+  console.log("isEqual(asideValue, configStore.getAsideValue)", isEqual(asideValue, configStore.getAsideValue), );
+  console.log("configStore的getAsideValue", configStore.getAsideValue, );
+  console.log( "getAsideValue", asideValue);
+  if((configFilterRef.value.length > 0 && isEqual(configFilterRef.value, configStore.getFilterConfig)) && customObjRef.value && isEqual(customObjRef.value, customTempObjRef.value)) {
+    return
+  }
   if (config == null || customConfig == null)
     return
   // console.log("config", config, "customConfig", customConfig);
@@ -98,7 +112,11 @@ configStore.$subscribe(() => {
   showKeys.unshift(...defaultKeys)
   */
   
-  const showKeys = [...customConfig];
+  let sortKeyList: any = [];
+  configStore.getFilterConfig.map((item: any) => {
+    sortKeyList.push(item.id);
+  });
+  const showKeys = [...sortKeyList];
 
   Object.keys(config).forEach((key) => {
     if (key.startsWith('iz') && asideMap[key] !== undefined)
@@ -109,16 +127,21 @@ configStore.$subscribe(() => {
       if(asideMap.hasOwnProperty(key)) {
         const str = key.toLowerCase()
         // console.log("customObjRef.value[str]1111111111111", customObjRef.value[str]);
-        if(str == "izsimilarity" && typeof customObjRef.value[str] == "string") {
-          customObjRef.value[str] = customObjRef.value[str].split(',');
+        if(str == "izsimilarity") {
+          if(typeof customObjRef.value[str] == "string") {
+            customObjRef.value[str] = customObjRef.value[str].split(',');
+          }
           asideValue[key] = customObjRef.value[str];// 赋值
-        }else if(str == "izyear" && typeof customObjRef.value[str] == "string") {
-          let time = customObjRef.value[str].split('-');
-          time[0] = (new Date(time[0])).getTime();
-          time[1] = (new Date(time[1])).getTime();
-          customObjRef.value[str] = time;
+          console.log("相似度2222222222", asideValue[key]);
+        }else if(str == "izyear") {
+          if(typeof customObjRef.value[str] == "string") {
+            let time = customObjRef.value[str].split('-');
+            time[0] = (new Date(time[0])).getTime();
+            time[1] = (new Date(time[1])).getTime();
+            customObjRef.value[str] = time;
+          }
           asideValue[key] = customObjRef.value[str];// 赋值
-          console.log("时间2222222222", customObjRef.value[str]);
+          console.log("时间2222222222", asideValue[key]);
         }else if((str != 'izsimilarity' && str != "izyear") && customObjRef.value[str]) {
           console.log("customObjRef.value[str]222222", customObjRef.value[str]);
           // let list = customObjRef.value[str].split(',');
@@ -130,7 +153,11 @@ configStore.$subscribe(() => {
         // asideMap[str].defaultValue = customObjRef.value[str];// 赋值
       }
     });
-
+    customTempObjRef.value = customObjRef.value;
+    console.log("asideValue直接处理后的结果", asideValue);
+    console.log("customTempObjRef.value", customTempObjRef.value);
+    let tempobj = cloneDeep(asideValue);
+    configStore.setAsideValue(tempobj);
   }
   // console.log("showKeys", showKeys);
   const items = showKeys.reduce((acc, key) => {
@@ -149,8 +176,9 @@ configStore.$subscribe(() => {
       return acc
     }
   }, [])
-  console.log("items", items);
+  console.log("showItems=================================", items);
   showItems.value = items
+  configFilterRef.value = configStore.getFilterConfig;
 })
 
 const asideEnter = ref(false)
@@ -198,16 +226,20 @@ function editFilter(filter: any) {
 
 function updateComponent(key, e) {
   console.log("跟新值", key, e);
+  console.log("tempAsideValue跟新值", configStore.getAsideValue, asideValue);
+  // let tempAsideValue = configStore.getAsideValue || asideValue;
   let tempobj = cloneDeep(asideValue);
   tempobj[key] = e;
   customObjRef.value = tempobj;
-  Object.assign(asideValue, tempobj);
+  // asideValue = Object.assign({}, asideValue, tempobj);
+  console.log("asideValue跟新值", tempobj);
+  configStore.setAsideValue(tempobj);
 }
 
-watch(asideValue, (newVal) => {
-  console.log("asideValue处理后", newVal);
-  configStore.setAsideValue(newVal)
-}, { deep: true })
+// watch(asideValue, (newVal) => {
+//   console.log("asideValue处理后", newVal);
+//   configStore.setAsideValue(newVal)
+// }, { deep: true })
 </script>
 
 <template>
@@ -229,7 +261,7 @@ watch(asideValue, (newVal) => {
       </div>
 
       <component
-        :is="item.config.component" v-for="(item, index) in showItems" :id="item.key" :key="index" v-model:value="asideValue[item.key]"
+        :is="item.config.component" v-for="(item, index) in showItems" :id="item.key" :key="item.key" v-model:value="asideValue[item.key]"
         :label="item.config.label"  @update:value="e=>updateComponent(item.key, e)"
       />
 
diff --git a/src/views/home/aside/comp/items/IzCustomlevel.vue b/src/views/home/aside/comp/items/IzCustomlevel.vue
index 0c2079f..61313d5 100644
--- a/src/views/home/aside/comp/items/IzCustomlevel.vue
+++ b/src/views/home/aside/comp/items/IzCustomlevel.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izcustomlevel'] && typeof asideValue['izcustomlevel'] == "string") {
-    let list = asideValue['izcustomlevel'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izcustomlevel']) {
+    if(typeof asideValue['izcustomlevel'] == "string") {
+      let list = asideValue['izcustomlevel'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izcustomlevel'];
+    }
     console.log("formValue.value.izcustomlevel", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/IzCustomname.vue b/src/views/home/aside/comp/items/IzCustomname.vue
index 31123ad..f932cc1 100644
--- a/src/views/home/aside/comp/items/IzCustomname.vue
+++ b/src/views/home/aside/comp/items/IzCustomname.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izcustomname'] && typeof asideValue['izcustomname'] == "string") {
-    let list = asideValue['izcustomname'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izcustomname']) {
+    if(typeof asideValue['izcustomname'] == "string") {
+      let list = asideValue['izcustomname'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izcustomname'];
+    }
     console.log("formValue.value.izcustomname", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/IzCustomtype.vue b/src/views/home/aside/comp/items/IzCustomtype.vue
index ff54dd2..0648505 100644
--- a/src/views/home/aside/comp/items/IzCustomtype.vue
+++ b/src/views/home/aside/comp/items/IzCustomtype.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izcustomtype'] && typeof asideValue['izcustomtype'] == "string") {
-    let list = asideValue['izcustomtype'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izcustomtype']) {
+    if(typeof asideValue['izcustomtype'] == "string") {
+      let list = asideValue['izcustomtype'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izcustomtype'];
+    }
     console.log("formValue.value.izcustomtype", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/IzCustomtypes.vue b/src/views/home/aside/comp/items/IzCustomtypes.vue
index aac3662..c1f7b43 100644
--- a/src/views/home/aside/comp/items/IzCustomtypes.vue
+++ b/src/views/home/aside/comp/items/IzCustomtypes.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izcustomtypes'] && typeof asideValue['izcustomtypes'] == "string") {
-    let list = asideValue['izcustomtypes'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izcustomtypes']) {
+    if(typeof asideValue['izcustomtypes'] == "string") {
+      let list = asideValue['izcustomtypes'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izcustomtypes'];
+    }
     console.log("formValue.value.izcustomtypes", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/IzProduct.vue b/src/views/home/aside/comp/items/IzProduct.vue
index f925c15..3c34a48 100644
--- a/src/views/home/aside/comp/items/IzProduct.vue
+++ b/src/views/home/aside/comp/items/IzProduct.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izproduct'] && typeof asideValue['izproduct'] == "string") {
-    let list = asideValue['izproduct'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izproduct']) {
+    if(typeof asideValue['izproduct'] == "string") {
+      let list = asideValue['izproduct'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izproduct'];
+    }
     console.log("formValue.value.izproduct", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/IzProject.vue b/src/views/home/aside/comp/items/IzProject.vue
index 223e737..0b96368 100644
--- a/src/views/home/aside/comp/items/IzProject.vue
+++ b/src/views/home/aside/comp/items/IzProject.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izproject'] && typeof asideValue['izproject'] == "string") {
-    let list = asideValue['izproject'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izproject']) {
+    if(typeof asideValue['izproject'] == "string") {
+      let list = asideValue['izproject'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izproject'];
+    }
     console.log("formValue.value.izproject", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/IzProjecttype.vue b/src/views/home/aside/comp/items/IzProjecttype.vue
index e16b3c5..a29b725 100644
--- a/src/views/home/aside/comp/items/IzProjecttype.vue
+++ b/src/views/home/aside/comp/items/IzProjecttype.vue
@@ -13,9 +13,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izprojecttype'] && typeof asideValue['izprojecttype'] == "string") {
-    let list = asideValue['izprojecttype'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izprojecttype']) {
+    if(typeof asideValue['izprojecttype'] == "string") {
+      let list = asideValue['izprojecttype'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izprojecttype'];
+    }
     console.log("formValue.value.izprojecttype", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/IzSearch.vue b/src/views/home/aside/comp/items/IzSearch.vue
index 6bf0e82..1ffede6 100644
--- a/src/views/home/aside/comp/items/IzSearch.vue
+++ b/src/views/home/aside/comp/items/IzSearch.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izsearch'] && typeof asideValue['izsearch'] == "string") {
-    let list = asideValue['izsearch'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izsearch']) {
+    if(typeof asideValue['izsearch'] == "string") {
+      let list = asideValue['izsearch'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izsearch'];
+    }
     console.log("formValue.value.izsearch", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/IzSearchManager.vue b/src/views/home/aside/comp/items/IzSearchManager.vue
index 41e35ac..de6a3f9 100644
--- a/src/views/home/aside/comp/items/IzSearchManager.vue
+++ b/src/views/home/aside/comp/items/IzSearchManager.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izsearchmanager'] && typeof asideValue['izsearchmanager'] == "string") {
-    let list = asideValue['izsearchmanager'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izsearchmanager']) {
+    if(typeof asideValue['izsearchmanager'] == "string") {
+      let list = asideValue['izsearchmanager'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izsearchmanager'];
+    }
     console.log("formValue.value.izsearchmanager", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/IzShow.vue b/src/views/home/aside/comp/items/IzShow.vue
index 48870a4..a034ff3 100644
--- a/src/views/home/aside/comp/items/IzShow.vue
+++ b/src/views/home/aside/comp/items/IzShow.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izshow'] && typeof asideValue['izshow'] == "string") {
-    let list = asideValue['izshow'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izshow']) {
+    if(typeof asideValue['izshow'] == "string") {
+      let list = asideValue['izshow'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izshow'];
+    }
     console.log("formValue.value.izshow", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/IzStatus.vue b/src/views/home/aside/comp/items/IzStatus.vue
index 6572d33..733a13a 100644
--- a/src/views/home/aside/comp/items/IzStatus.vue
+++ b/src/views/home/aside/comp/items/IzStatus.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izstatus'] && typeof asideValue['izstatus'] == "string") {
-    let list = asideValue['izstatus'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izstatus']) {
+    if(typeof asideValue['izstatus'] == "string") {
+      let list = asideValue['izstatus'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izstatus'];
+    }
     console.log("formValue.value.izstatus", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/IzVisitcity.vue b/src/views/home/aside/comp/items/IzVisitcity.vue
index a5194c9..fc4db74 100644
--- a/src/views/home/aside/comp/items/IzVisitcity.vue
+++ b/src/views/home/aside/comp/items/IzVisitcity.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izvisitcity'] && typeof asideValue['izvisitcity'] == "string") {
-    let list = asideValue['izvisitcity'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izvisitcity']) {
+    if(typeof asideValue['izvisitcity'] == "string") {
+      let list = asideValue['izvisitcity'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izvisitcity'];
+    }
     console.log("formValue.value.izvisitcity", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/Izfiled17.vue b/src/views/home/aside/comp/items/Izfiled17.vue
index ecc496a..0153d71 100644
--- a/src/views/home/aside/comp/items/Izfiled17.vue
+++ b/src/views/home/aside/comp/items/Izfiled17.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izfiled17'] && typeof asideValue['izfiled17'] == "string") {
-    let list = asideValue['izfiled17'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izfiled17']) {
+    if(typeof asideValue['izfiled17'] == "string") {
+      let list = asideValue['izfiled17'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izfiled17'];
+    }
     console.log("formValue.value.izfiled17", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/Izfiled2.vue b/src/views/home/aside/comp/items/Izfiled2.vue
index 9d6fb0b..63066be 100644
--- a/src/views/home/aside/comp/items/Izfiled2.vue
+++ b/src/views/home/aside/comp/items/Izfiled2.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izfiled2'] && typeof asideValue['izfiled2'] == "string") {
-    let list = asideValue['izfiled2'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izfiled2']) {
+    if(typeof asideValue['izfiled2'] == "string") {
+      let list = asideValue['izfiled2'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izfiled2'];
+    }
     console.log("formValue.value.izfiled2", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/Izfiled3.vue b/src/views/home/aside/comp/items/Izfiled3.vue
index ba62f48..cb5ad4a 100644
--- a/src/views/home/aside/comp/items/Izfiled3.vue
+++ b/src/views/home/aside/comp/items/Izfiled3.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izfiled3'] && typeof asideValue['izfiled3'] == "string") {
-    let list = asideValue['izfiled3'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izfiled3']) {
+    if(typeof asideValue['izfiled3'] == "string") {
+      let list = asideValue['izfiled3'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izfiled3'];
+    }
     console.log("formValue.value.izfiled3", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/Izfiled6.vue b/src/views/home/aside/comp/items/Izfiled6.vue
index 3ccbed1..606dda4 100644
--- a/src/views/home/aside/comp/items/Izfiled6.vue
+++ b/src/views/home/aside/comp/items/Izfiled6.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izfiled6'] && typeof asideValue['izfiled6'] == "string") {
-    let list = asideValue['izfiled6'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izfiled6']) {
+    if(typeof asideValue['izfiled6'] == "string") {
+      let list = asideValue['izfiled6'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izfiled6'];
+    }
     console.log("formValue.value.izfiled6", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/Izfirm.vue b/src/views/home/aside/comp/items/Izfirm.vue
index cbd5284..7ff4fab 100644
--- a/src/views/home/aside/comp/items/Izfirm.vue
+++ b/src/views/home/aside/comp/items/Izfirm.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izfirm'] && typeof asideValue['izfirm'] == "string") {
-    let list = asideValue['izfirm'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izfirm']) {
+    if(typeof asideValue['izfirm'] == "string") {
+      let list = asideValue['izfirm'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izfirm'];
+    }
     console.log("formValue.value.izfirm", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/Iztaskrrom.vue b/src/views/home/aside/comp/items/Iztaskrrom.vue
index 2964260..a764d45 100644
--- a/src/views/home/aside/comp/items/Iztaskrrom.vue
+++ b/src/views/home/aside/comp/items/Iztaskrrom.vue
@@ -7,14 +7,20 @@ import { useConfig } from '@/store/modules/asideConfig'
 const configUseStore = useConfig()
 
 configUseStore.$subscribe(() => {
+  console.log("isLoadValue.value", isLoadValue.value,
+  "configUseStore.getAsideValue", configUseStore.getAsideValue);
   if(isLoadValue.value) {
     isLoadValue.value = false;
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['iztaskrrom'] && typeof asideValue['iztaskrrom'] == "string") {
-    let list = asideValue['iztaskrrom'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['iztaskrrom']) {
+    if(typeof asideValue['iztaskrrom'] == "string") {
+      let list = asideValue['iztaskrrom'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['iztaskrrom'];
+    }
     console.log("formValue.value.iztaskrrom", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/Iztaskstatus.vue b/src/views/home/aside/comp/items/Iztaskstatus.vue
index 4ee0f7b..99859df 100644
--- a/src/views/home/aside/comp/items/Iztaskstatus.vue
+++ b/src/views/home/aside/comp/items/Iztaskstatus.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['iztaskstatus'] && typeof asideValue['iztaskstatus'] == "string") {
-    let list = asideValue['iztaskstatus'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['iztaskstatus']) {
+    if(typeof asideValue['iztaskstatus'] == "string") {
+      let list = asideValue['iztaskstatus'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['iztaskstatus'];
+    }
     console.log("formValue.value.iztaskstatus", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/Izvisitpro.vue b/src/views/home/aside/comp/items/Izvisitpro.vue
index 218df02..5481374 100644
--- a/src/views/home/aside/comp/items/Izvisitpro.vue
+++ b/src/views/home/aside/comp/items/Izvisitpro.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izvisitpro'] && typeof asideValue['izvisitpro'] == "string") {
-    let list = asideValue['izvisitpro'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izvisitpro']) {
+    if(typeof asideValue['izvisitpro'] == "string") {
+      let list = asideValue['izvisitpro'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izvisitpro'];
+    }
     console.log("formValue.value.izvisitpro", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/Plan.vue b/src/views/home/aside/comp/items/Plan.vue
index b2fbc1d..76bc5a5 100644
--- a/src/views/home/aside/comp/items/Plan.vue
+++ b/src/views/home/aside/comp/items/Plan.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izplan'] && typeof asideValue['izplan'] == "string") {
-    let list = asideValue['izplan'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izplan']) {
+    if(typeof asideValue['izplan'] == "string") {
+      let list = asideValue['izplan'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izplan'];
+    }    
     console.log("formValue.value.izplan", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/ReportUser.vue b/src/views/home/aside/comp/items/ReportUser.vue
index f48d779..a89080a 100644
--- a/src/views/home/aside/comp/items/ReportUser.vue
+++ b/src/views/home/aside/comp/items/ReportUser.vue
@@ -13,9 +13,13 @@ configUseStore.$subscribe(() => {
     isLoadValue.value = false;
     return
   }
-  if(asideValue['izupuser'] && typeof asideValue['izupuser'] == "string") {
-    let list = asideValue['izupuser'].split(',');
-    formValue.value.users = list;
+  if(asideValue['izupuser']) {
+    if(typeof asideValue['izupuser'] == "string") {
+      let list = asideValue['izupuser'].split(',');
+      formValue.value.users = list;
+    }else {
+      formValue.value.users = asideValue['izupuser'];
+    }
     console.log("formValue.value.users1111111111", formValue.value.users);
   }else {
     formValue.value.users = [];
diff --git a/src/views/home/aside/comp/items/Similarity.vue b/src/views/home/aside/comp/items/Similarity.vue
index 874311e..82bdef3 100644
--- a/src/views/home/aside/comp/items/Similarity.vue
+++ b/src/views/home/aside/comp/items/Similarity.vue
@@ -10,7 +10,7 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izsimilarity'] && typeof asideValue['izsimilarity'] == "string") {
+  if(asideValue['izsimilarity']) {
     range.value = asideValue['izsimilarity']
   }else {
     range.value = [0, 100];
diff --git a/src/views/home/aside/comp/items/Time.vue b/src/views/home/aside/comp/items/Time.vue
index 299dc18..c52d678 100644
--- a/src/views/home/aside/comp/items/Time.vue
+++ b/src/views/home/aside/comp/items/Time.vue
@@ -44,7 +44,7 @@ onMounted(() => {
       time.value = [startDate.getTime(), endDate.getTime()];
       console.log('time init', startDate.getTime(), endDate.getTime());
       setTimeout(() => {
-        onChange([startDate.getTime(), endDate.getTime()])
+        emit('update:value', [startDate.getTime(), endDate.getTime()])
       },300)
     }
 })
diff --git a/src/views/home/aside/comp/modals/CustomFilterModal.vue b/src/views/home/aside/comp/modals/CustomFilterModal.vue
index ed86ae7..95f15cb 100644
--- a/src/views/home/aside/comp/modals/CustomFilterModal.vue
+++ b/src/views/home/aside/comp/modals/CustomFilterModal.vue
@@ -3,7 +3,7 @@ import { getAllfieldList, getfieldList, setFilter } from '@/api/home/filter'
 import { asideMap } from '@/config/aside'
 import { useConfig } from '@/store/modules/asideConfig'
 import { useUser } from "@/store/modules/user"
-import { debounce, difference, cloneDeep } from 'lodash-es'
+import { debounce, difference, cloneDeep, isEqual } from 'lodash-es'
 import { computed, defineOptions, onMounted, ref, watch } from 'vue'
 import { VueDraggable } from 'vue-draggable-plus'
 
@@ -14,8 +14,10 @@ const show = ref(false)
 const configStore = useConfig()
 const checkAll = ref(false)
 const selectIds = ref<string[]>([])
+const tempList = ref<string[]>([])
 
 function showModal() {
+
   show.value = true
 
   // 重置左右列表数据
@@ -24,8 +26,15 @@ function showModal() {
 
   if (config == null || customConfig == null)
     return
+  if(tempList.value.length > 0 && isEqual(tempList.value, configStore.getFilterConfig)) {
+    return
+  }
+  console.log("开启了啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦筛选条件----------------", customConfig);
   const { showList, hideList } = generatList(config, customConfig)
-  console.log("showList", showList);
+  tempList.value = cloneDeep(showList);
+  if(tempList.value.length > 0) {
+    configStore.setFilterConfig(tempList.value)
+  }
   onList.value = showList
   offList.value = hideList
   // 重置全选状态
@@ -125,13 +134,30 @@ function generatList(config, customConfig) {
   const fixedList = generateDefaultList(config)
   offList.unshift(...fixedList)
   onList.unshift(...fixedList)
+  console.log("原始筛选条件customConfig", customConfig);
   // onList按照customConfig排序
   let tempOnList = cloneDeep(onList);
-  let sortList: any = [];
-  customConfig.map(key => {
-    let tempItem = tempOnList.find(item => item.id == key);
-    sortList.push(tempItem);
+  console.log("原始筛选条件tempOnList", tempOnList);
+  
+  let sortKeyList: any = [];
+  configStore.getFilterConfig.map((item: any) => {
+    sortKeyList.push(item.id);
   });
+  console.log("原始筛选条件sortKeyList", sortKeyList);
+  let sortList: any = [];
+  if(sortKeyList.length > 0) {
+    sortKeyList.map(key => {
+      let tempItem = tempOnList.find(item => item.id == key);
+      sortList.push(tempItem);
+    });
+  }else {
+    customConfig.map(key => {
+      let tempItem = tempOnList.find(item => item.id == key);
+      sortList.push(tempItem);
+    });
+  }
+  console.log("原始筛选条件sortList", sortList );
+  console.log("原始筛选条件configStore.getFilterConfig", configStore.getFilterConfig, );
   // return { showList: onList, hideList: offList }
   return { showList: sortList, hideList: offList }
 }
@@ -142,8 +168,19 @@ configStore.$subscribe(() => {
 
   if (config == null || customConfig == null)
     return
-
+  console.log("tempList.value-----------", tempList.value);
+  console.log("configStore.getFilterConfig-----------", configStore.getFilterConfig);
+  if(tempList.value.length > 0 && isEqual(tempList.value, configStore.getFilterConfig)) {
+    return
+  }
   const { showList, hideList } = generatList(config, customConfig)
+  tempList.value = cloneDeep(showList);
+  console.log("克隆条件", tempList.value);
+  if(tempList.value.length > 0) {
+    configStore.setFilterConfig(tempList.value)
+  }
+  // setTimeout(() => {
+  // }, 500);
   onList.value = showList
   offList.value = hideList
 })
@@ -155,7 +192,21 @@ async function handleSumbit(e: MouseEvent) {
   }).join(',')
 
   await setFilter({ searchcount: param, type: 0 })
-  configStore.fetchCustomConfig()
+  const obj = await configStore.fetchCustomConfig()
+  console.log("obj-------------------------------", obj);
+  let tempOnList = cloneDeep(onList.value);
+  console.log("原始筛选条件tempOnList", tempOnList);
+  let sortList: any = [];
+  obj.map(key => {
+    let tempItem = tempOnList.find(item => item.id == key);
+    sortList.push(tempItem);
+  });
+  console.log("configStore.sortList---------------", sortList);
+  // setTimeout(() => {
+  if(sortList.length > 0) {
+    configStore.setFilterConfig(sortList)
+  }
+  // }, 500);
   closeModal()
 }
 
-- 
2.39.3


From fec125d72ce4ec33540d42b2b15bdaaa9994ba7a Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Tue, 2 Apr 2024 00:27:19 +0800
Subject: [PATCH 102/143] bug

---
 src/api/final/index.ts              |  6 +++---
 src/views/final/content/Content.vue |  2 +-
 src/views/task/content/Content.vue  |  2 ++
 src/views/task/modal/BatchModal.vue | 12 ++++++++----
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/api/final/index.ts b/src/api/final/index.ts
index 857eeb2..d5eae04 100644
--- a/src/api/final/index.ts
+++ b/src/api/final/index.ts
@@ -74,10 +74,10 @@ export async function getRepeatList(params: FinalParam) {
     params,
   })
 
-  const { data: { records, totalPage, totalCount } } = res
+  const { data: { records, total, pages } } = res
   return {
-    pageCount: 3,
+    pageCount: pages,
     data: records,
-    totalCount: 20,
+    totalCount: total,
   }
 }
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index bc8a4c5..dd1793a 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -441,7 +441,7 @@ async function query(page: number, pageSize: number, filterId?: any) {
   tableData.value = data
   total.value = totalCount
   pagination.page = page
-  pagination.pageCount = pageCount
+  pagination.pageCount = Math.ceil(totalCount / pageSize)
   loading.value = false
 }
 
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index 23d9c49..5c7b2c4 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -165,6 +165,8 @@ function approvalHandler(items?: any) {
     return
   }
 
+  console.log(processItems)
+
   const list: any = []
   processItems.forEach((item) => {
     list.push({
diff --git a/src/views/task/modal/BatchModal.vue b/src/views/task/modal/BatchModal.vue
index 32c16c8..e21576f 100644
--- a/src/views/task/modal/BatchModal.vue
+++ b/src/views/task/modal/BatchModal.vue
@@ -310,6 +310,10 @@ function reset() {
   layout()
 }
 
+function onChange() {
+  reload()
+}
+
 async function refreshHandler() {
   reset()
   if (!taskId.value)
@@ -397,11 +401,11 @@ defineExpose({
                     <div
                       class="status-tag"
                       :class="{
-                        'status-red': taskDetailInfo?.states === 3,
-                        'status-green': taskDetailInfo?.states === 2,
+                        'status-tag-red': taskDetailInfo?.userapprove?.statshis === 3,
+                        'status-tag-green': taskDetailInfo?.userapprove?.statshis === 2,
                       }"
                     >
-                      {{ TASK_STATUS_OBJ[taskDetailInfo?.states] }}
+                      {{ TASK_STATUS_OBJ[taskDetailInfo?.userapprove?.statshis] }}
                     </div>
                   </td>
                   <td>{{ taskDetailInfo?.ocrPicture?.createTime }}</td>
@@ -418,7 +422,7 @@ defineExpose({
           <div class="wrapper-content">
             <div class="wrapper-content-form wrapper-m32">
               <div>
-                <n-popselect v-model:value="timeRange" :options="timeOptions" trigger="click">
+                <n-popselect v-model:value="timeRange" :options="timeOptions" trigger="click" @change="onChange">
                   <div class="wrapper-content-form-dropdown">
                     <span>{{ timeLabel || '时间模式' }}</span>
                     <SvgIcon class="wrapper-content-form-dropdown-gap" name="arrow-botton" size="14" />
-- 
2.39.3


From 0533b7faa369b7b2ca135f1196f9f7c5ae56f2da Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Tue, 2 Apr 2024 09:34:45 +0800
Subject: [PATCH 103/143] =?UTF-8?q?feat:=20=E4=B8=80=E9=94=AE=E6=9F=A5?=
 =?UTF-8?q?=E9=87=8D=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E8=A1=A5=E5=85=A8=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=B7=A6=E4=BE=A7?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=A0=8F=E9=9A=90=E8=97=8F=E5=90=8Esvg?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/aside/Aside.vue                |  72 +++-
 src/views/home/aside/comp/AdvanceFilter.vue   |  23 +-
 .../home/aside/comp/modals/NewFilterModal.vue | 360 ++++++++++--------
 src/views/task/aside/Aside.vue                |   3 +-
 src/views/task/modal/NewFilterModal.vue       | 328 +++++++++-------
 5 files changed, 459 insertions(+), 327 deletions(-)

diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue
index 38906fa..b395d41 100644
--- a/src/views/home/aside/Aside.vue
+++ b/src/views/home/aside/Aside.vue
@@ -31,7 +31,7 @@ Object.keys(asideMap).forEach((key) => {
   console.log("asideMap和asideValue", asideValue);
 })
 
-const filterModalRef = ref(null)
+const filterModalRef:any = ref(null)
 const newFilterModalRef = ref(null)
 const customModalRef = ref(null)
 const customObjRef = ref<any>(null) // 获取高级筛选获取的值
@@ -97,7 +97,7 @@ configStore.$subscribe(() => {
   const defaultKeys = Object.keys(asideMap).filter(key => asideMap[key].isDefaultFilter)// 获取asideMap isDefaultFilter的选项
   showKeys.unshift(...defaultKeys)
   */
-  
+
   const showKeys = [...customConfig];
 
   Object.keys(config).forEach((key) => {
@@ -164,6 +164,13 @@ const showSearch = ref(false)
 function setShowSearch(value: boolean) {
   showSearch.value = value
 }
+const newFilterOk = () => {
+  console.log('home', 'newFilterOk',filterModalRef.value);
+  filterModalRef.value.query(
+    filterModalRef.value.pagination.page,
+    filterModalRef.value.pagination.pageSize
+  );
+};
 
 // 滚动容器，让key对应模块处于可视区域
 function scrollHandler(key: string) {
@@ -211,7 +218,12 @@ watch(asideValue, (newVal) => {
 </script>
 
 <template>
-  <div class="aside" :style="asideStyle" @mouseenter="asideEnter = true" @mouseleave="asideEnter = false">
+  <div
+    class="aside"
+    :style="asideStyle"
+    @mouseenter="asideEnter = true"
+    @mouseleave="asideEnter = false"
+  >
     <div v-show="showCollapse" class="aside-collapse">
       <div class="aside-collapse-btn" @click="collapseHandler">
         <SvgIcon :name="collapseIcon" size="40" />
@@ -220,23 +232,40 @@ watch(asideValue, (newVal) => {
     <n-scrollbar trigger="none">
       <div class="aside-header">
         <!-- 搜索跳转模块 -->
-        <Search v-show="showSearch" @select="scrollHandler" @close="setShowSearch(false)" />
+        <Search
+          v-show="showSearch"
+          @select="scrollHandler"
+          @close="setShowSearch(false)"
+        />
         <!-- 高级筛选 -->
         <AdvanceFilter
-          v-show="!showSearch" :type="0" @select="filterHandler" @update:search="setShowSearch(true)"
-          @show-custom="showModal(customModalRef)" @show-filter="showModal(filterModalRef)"
+          v-show="!showSearch"
+          :type="0"
+          @select="filterHandler"
+          @update:search="setShowSearch(true)"
+          @show-custom="showModal(customModalRef)"
+          @show-filter="showModal(filterModalRef)"
         />
       </div>
 
       <component
-        :is="item.config.component" v-for="(item, index) in showItems" :id="item.key" :key="index" v-model:value="asideValue[item.key]"
-        :label="item.config.label"  @update:value="e=>updateComponent(item.key, e)"
+        :is="item.config.component"
+        v-for="(item, index) in showItems"
+        :id="item.key"
+        :key="index"
+        v-model:value="asideValue[item.key]"
+        :label="item.config.label"
+        @update:value="(e) => updateComponent(item.key, e)"
       />
 
       <!-- 过滤列表 -->
-      <FilterModalVue ref="filterModalRef" @edit-filter="editFilter" @show-new-filter="showModal(newFilterModalRef)" />
+      <FilterModalVue
+        ref="filterModalRef"
+        @edit-filter="editFilter"
+        @show-new-filter="showModal(newFilterModalRef)"
+      />
       <!-- 新增过滤 -->
-      <NewFilterModalVue ref="newFilterModalRef" />
+      <NewFilterModalVue ref="newFilterModalRef" @onOk="newFilterOk" />
       <!-- 筛选 -->
       <CustomFilterModalVue ref="customModalRef" />
     </n-scrollbar>
@@ -248,7 +277,7 @@ watch(asideValue, (newVal) => {
   display: flex;
   position: relative;
   flex-direction: column;
-  background: #FFF;
+  background: #fff;
   border: 1px solid #efeff5;
   border-radius: 3px;
   box-sizing: border-box;
@@ -285,11 +314,17 @@ watch(asideValue, (newVal) => {
     right: -20px;
   }
 
-  ::v-deep(.n-collapse .n-collapse-item.n-collapse-item--right-arrow-placement .n-collapse-item__header .n-collapse-item-arrow) {
+  ::v-deep(.n-collapse
+      .n-collapse-item.n-collapse-item--right-arrow-placement
+      .n-collapse-item__header
+      .n-collapse-item-arrow) {
     margin-left: 8px;
   }
 
-  ::v-deep(.n-collapse .n-collapse-item .n-collapse-item__header .n-collapse-item__header-main) {
+  ::v-deep(.n-collapse
+      .n-collapse-item
+      .n-collapse-item__header
+      .n-collapse-item__header-main) {
     font-weight: bold;
     justify-content: space-between;
   }
@@ -302,11 +337,18 @@ watch(asideValue, (newVal) => {
     border-top: 0px;
   }
 
-  ::v-deep(.n-collapse .n-collapse-item .n-collapse-item__content-wrapper .n-collapse-item__content-inner) {
+  ::v-deep(.n-collapse
+      .n-collapse-item
+      .n-collapse-item__content-wrapper
+      .n-collapse-item__content-inner) {
     padding-top: 10px;
   }
 
-  ::v-deep(.n-scrollbar > .n-scrollbar-rail.n-scrollbar-rail--vertical > .n-scrollbar-rail__scrollbar, .n-scrollbar + .n-scrollbar-rail.n-scrollbar-rail--vertical > .n-scrollbar-rail__scrollbar) {
+  ::v-deep(.n-scrollbar
+      > .n-scrollbar-rail.n-scrollbar-rail--vertical
+      > .n-scrollbar-rail__scrollbar, .n-scrollbar
+      + .n-scrollbar-rail.n-scrollbar-rail--vertical
+      > .n-scrollbar-rail__scrollbar) {
     width: 0px;
   }
 }
diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue
index 80595df..4c461d5 100644
--- a/src/views/home/aside/comp/AdvanceFilter.vue
+++ b/src/views/home/aside/comp/AdvanceFilter.vue
@@ -156,12 +156,16 @@ const inputHandler = debounce((word) => {
   getSearchedList(word);
 }, 300);
 
-function getSearchedList(word) {
+function getSearchedList(word, isScroll = false) {
   if (word) {
     pagination.pageSize = 300;
-  } else {
+  }
+  if (!word) {
     pagination.pageSize = 10;
   }
+  if (isScroll) {
+    pagination.pageSize = 300;
+  }
   ruleForm.keyword = word;
   featchList().then((list) => {
     let dataArr: FilterEntity[] = [];
@@ -233,9 +237,16 @@ function unFavoriteHandler(event: MouseEvent, item) {
   }
 }
 
-const handleScroll= (event)=>{
-  console.log(event)
-}
+const handleScroll = (event) => {
+  let timer;
+  if (timer) {
+    clearTimeout(timer);
+  } else {
+    timer = setTimeout(() => {
+      getSearchedList("", true);
+    }, 2000);
+  }
+};
 
 const moveEnd = () => {
   unData.value.map((v, index) => {
@@ -438,7 +449,7 @@ const moveEnd = () => {
     align-items: center;
   }
 }
-::v-deep(.wrapper-left-popover .n-form-item){
+::v-deep(.wrapper-left-popover .n-form-item) {
   display: block !important;
 }
 </style>
diff --git a/src/views/home/aside/comp/modals/NewFilterModal.vue b/src/views/home/aside/comp/modals/NewFilterModal.vue
index 7b1212e..d1369bc 100644
--- a/src/views/home/aside/comp/modals/NewFilterModal.vue
+++ b/src/views/home/aside/comp/modals/NewFilterModal.vue
@@ -1,105 +1,107 @@
 <script lang="ts" setup>
-import type { FormInst, FormItemRule, FormRules } from 'naive-ui'
-import { computed, defineOptions, onBeforeMount, reactive, ref, unref, watch } from 'vue'
-import { asideMap } from '@/config/aside'
-import { useDictionary } from '@/store/modules/dictonary'
-import { useConfig } from '@/store/modules/asideConfig'
-import type { FilterCondition } from '/#/api'
-import { addCondition, updateCondition } from '@/api/home/filter'
-import { formatToDate2, formatToDate3 } from '@/utils/dateUtil'
-
-type Status = 'edit' | 'new'
-
-const show = ref(false)
-const configStore = useConfig()
-const dicStore = useDictionary()
-const currentStatus = ref<Status>('new')
-let currentEditId: string | null = null
+import type { FormInst, FormItemRule, FormRules } from "naive-ui";
+import { computed, defineOptions, onBeforeMount, reactive, ref, unref, watch } from "vue";
+import { asideMap } from "@/config/aside";
+import { useDictionary } from "@/store/modules/dictonary";
+import { useConfig } from "@/store/modules/asideConfig";
+import type { FilterCondition } from "/#/api";
+import { addCondition, updateCondition } from "@/api/home/filter";
+import { formatToDate2, formatToDate3 } from "@/utils/dateUtil";
+
+type Status = "edit" | "new";
+
+const show = ref(false);
+const configStore = useConfig();
+const dicStore = useDictionary();
+const currentStatus = ref<Status>("new");
+let currentEditId: string | null = null;
+const emit = defineEmits(["onOk"]);
 
 const modalTitle = computed(() => {
-  return currentStatus.value === 'new' ? '新建过滤条件' : '编辑过滤条件'
-})
+  return currentStatus.value === "new" ? "新建过滤条件" : "编辑过滤条件";
+});
 
 const cardStyle = {
-  'width': '800px',
-  '--n-padding-bottom': '10px',
-  '--n-padding-left': '10px',
-}
+  width: "800px",
+  "--n-padding-bottom": "10px",
+  "--n-padding-left": "10px",
+};
 
 const noBorderInput = {
-  '--n-border': '0px',
-  '--n-border-hover': '0px',
-  '--n-border-pressed': '0px',
-}
+  "--n-border": "0px",
+  "--n-border-hover": "0px",
+  "--n-border-pressed": "0px",
+};
 
 const formItemStyle = {
-  '--n-label-height': '0px',
-  '--n-feedback-height': '8px',
-}
+  "--n-label-height": "0px",
+  "--n-feedback-height": "8px",
+};
 
 interface FormType {
-  name: string | null
-  logic: string | null
-  conditions: Condition[]
+  name: string | null;
+  logic: string | null;
+  conditions: Condition[];
 }
 
 interface Condition {
-  type: string | null
-  operator: string | null
-  result: any
+  type: string | null;
+  operator: string | null;
+  result: any;
 }
 
 interface Option {
-  label: string
-  value: string
+  label: string;
+  value: string;
 }
 
 const rules: FormRules = {
   name: {
     required: true,
-    message: '请输入过滤条件名称',
-    trigger: 'blur',
+    message: "请输入过滤条件名称",
+    trigger: "blur",
   },
   logic: {
     required: true,
-    message: '请选择逻辑关系',
-    trigger: 'blur',
+    message: "请选择逻辑关系",
+    trigger: "blur",
   },
   conditions: {
     required: true,
     validator(rule: FormItemRule, value: Condition[]) {
       for (const item of value) {
-        const { type, operator, result } = item
+        const { type, operator, result } = item;
 
         if (type === null || operator === null || result === null)
-          return new Error('请选择过滤条件')
+          return new Error("请选择过滤条件");
       }
-      return true
+      return true;
     },
-    trigger: ['input', 'blur'],
+    trigger: ["input", "blur"],
   },
-}
+};
 
-const formRef = ref<FormInst | null>(null)
+const formRef = ref<FormInst | null>(null);
 
 const formValue = reactive<FormType>({
   name: null,
-  logic: 'where',
-  conditions: [{
-    type: null,
-    operator: 'eq',
-    result: null,
-  }],
-})
+  logic: "where",
+  conditions: [
+    {
+      type: null,
+      operator: "eq",
+      result: null,
+    },
+  ],
+});
 
 function handleSumbit(e: MouseEvent) {
-  e.preventDefault()
+  e.preventDefault();
   formRef.value?.validate((errors) => {
-    if (errors)
-      return
+    if (errors) return;
 
     const list = formValue.conditions.map((item, index) => {
-      const { type, operator, result } = item
+      const { type, operator, result } = item;
 
       return {
         searchfield: type!,
@@ -107,191 +109,202 @@ function handleSumbit(e: MouseEvent) {
         searchvalue: formatValue(type!, result),
         searchRelationType: formValue.logic!,
         orderNum: index + 1,
-      }
-    })
+      };
+    });
 
     const param: FilterCondition = {
       searchname: formValue.name!,
       type: 0,
       ocrUsersearchchildList: list,
-    }
-
-    if (currentStatus.value === 'new')
-      addCondition(param)
-    else
-      updateCondition({ id: currentEditId!, ...param })
-    closeModal()
-  })
+    };
+
+    if (currentStatus.value === "new") addCondition(param);
+    else updateCondition({ id: currentEditId!, ...param });
+    emit("onOk");
+    setTimeout(() => {
+      closeModal();
+    }, 300);
+  });
 }
 
 // 调用接口前转换为服务端格式
 function formatValue(searchfield: string, searchvalue: any) {
-  if (searchfield === 'izyear') {
-    const start = formatToDate2(searchvalue[0])
-    const end = formatToDate2(searchvalue[1])
-    return `${start}-${end}`
+  if (searchfield === "izyear") {
+    const start = formatToDate2(searchvalue[0]);
+    const end = formatToDate2(searchvalue[1]);
+    return `${start}-${end}`;
   }
 
-  if (searchfield === 'izsimilarity' && Array.isArray(searchvalue))
-    return searchvalue.join(',')
+  if (searchfield === "izsimilarity" && Array.isArray(searchvalue))
+    return searchvalue.join(",");
 
-  return searchvalue
+  return searchvalue;
 }
 
 // 编辑前前转换为服务端格式
 function unformatValue(searchfield: string, searchvalue: any) {
   // 2022/01/03-2023/02/04
-  if (searchfield === 'izyear') {
-    const dataStrs = searchvalue.split('-')
-    const start = formatToDate3(dataStrs[0])
-    const end = formatToDate3(dataStrs[1])
-    return [start, end]
+  if (searchfield === "izyear") {
+    const dataStrs = searchvalue.split("-");
+    const start = formatToDate3(dataStrs[0]);
+    const end = formatToDate3(dataStrs[1]);
+    return [start, end];
   }
 
   // 80,90
-  if (searchfield === 'izsimilarity')
-    return searchvalue.split(',')
+  if (searchfield === "izsimilarity") return searchvalue.split(",");
 
-  return searchvalue
+  return searchvalue;
 }
 
 function createCondition() {
   formValue.conditions.push({
     type: null,
-    operator: 'eq',
+    operator: "eq",
     result: null,
-  })
+  });
 }
 
 function removeCondition(index: number) {
-  formValue.conditions.splice(index, 1)
+  formValue.conditions.splice(index, 1);
 }
 
 function formLabel(index: number) {
-  return index === 0 ? '筛选条件' : ''
+  return index === 0 ? "筛选条件" : "";
 }
 
-const typeOptions = ref<Option[]>([])
+const typeOptions = ref<Option[]>([]);
 
 const operatorOptions = [
   {
-    label: '等于',
-    value: 'eq',
+    label: "等于",
+    value: "eq",
   },
   {
-    label: '不等于',
-    value: 'notEq',
+    label: "不等于",
+    value: "notEq",
   },
-]
+];
 
-const logicOptions = ref([])
+const logicOptions = ref([]);
 
 const similarityOptions = [
   {
-    label: '80%-90%',
+    label: "80%-90%",
     value: [80, 90],
   },
   {
-    label: '95%-100%',
+    label: "95%-100%",
     value: [95, 100],
   },
   {
-    label: '100%-100%',
+    label: "100%-100%",
     value: [100, 100],
   },
-]
+];
 
 onBeforeMount(() => {
-  dicStore.fetchRelationTypeList()
-})
+  dicStore.fetchRelationTypeList();
+});
 
-watch(() => dicStore.relationTypeList, (newval) => {
-  logicOptions.value = newval
-})
+watch(
+  () => dicStore.relationTypeList,
+  (newval) => {
+    logicOptions.value = newval;
+  }
+);
 
 function showModal() {
-  const list = generateAllData(configStore.systemConfig)
-  typeOptions.value = list
-  show.value = true
+  const list = generateAllData(configStore.systemConfig);
+  typeOptions.value = list;
+  show.value = true;
 }
 
 function closeModal() {
-  show.value = false
+  show.value = false;
 }
 
 function generateAllData(config): Option[] {
-  const initVal: Option[] = []
+  const initVal: Option[] = [];
 
   const list = Object.keys(config).reduce((acc, value) => {
-    if (value.startsWith('iz') && asideMap[value]?.inFilterList !== false) {
-      const name = asideMap[value]?.label
-
-      name && acc.push({
-        value,
-        label: name || '未配置',
-      })
+    if (value.startsWith("iz") && asideMap[value]?.inFilterList !== false) {
+      const name = asideMap[value]?.label;
+
+      name &&
+        acc.push({
+          value,
+          label: name || "未配置",
+        });
     }
-    return acc
-  }, initVal)
+    return acc;
+  }, initVal);
 
-  return list
+  return list;
 }
 
-watch(() => configStore.systemConfig, (newVal) => {
-  if (!newVal)
-    return
+watch(
+  () => configStore.systemConfig,
+  (newVal) => {
+    if (!newVal) return;
 
-  const list = generateAllData(newVal)
-  typeOptions.value = list
-})
+    const list = generateAllData(newVal);
+    typeOptions.value = list;
+  }
+);
 
 function getOptions(key: string) {
-  if (key === 'izsimilarity')
-    return similarityOptions
+  if (key === "izsimilarity") return similarityOptions;
 
-  const getterName = `get${key}`
-  const options = unref(dicStore[getterName])
-  return options || []
+  const getterName = `get${key}`;
+  const options = unref(dicStore[getterName]);
+  return options || [];
 }
 
 function leaveHandler() {
-  currentStatus.value = 'new'
-  currentEditId = null
+  currentStatus.value = "new";
+  currentEditId = null;
 
-  formValue.name = null
+  formValue.name = null;
   formValue.conditions = [
     {
       type: null,
-      operator: 'eq',
+      operator: "eq",
       result: null,
     },
-  ]
+  ];
 }
 
 function edit(editFilter: any) {
-  currentStatus.value = 'edit'
+  currentStatus.value = "edit";
 
-  const { searchname, ocrUsersearchchildList, id } = editFilter
-  currentEditId = id
-  formValue.name = searchname
+  const { searchname, ocrUsersearchchildList, id } = editFilter;
+  currentEditId = id;
+  formValue.name = searchname;
   formValue.conditions = ocrUsersearchchildList.map((item) => {
     return {
       type: item.searchfield,
       operator: item.searchtype,
       result: unformatValue(item.searchfield, item.searchvalue),
-    }
-  })
+    };
+  });
 }
 
 defineExpose({
   showModal,
   edit,
-})
+});
 </script>
 
 <template>
   <n-modal v-model:show="show" transform-origin="center" @after-leave="leaveHandler">
-    <n-card :style="cardStyle" :bordered="false" size="huge" role="dialog" aria-modal="true">
+    <n-card
+      :style="cardStyle"
+      :bordered="false"
+      size="huge"
+      role="dialog"
+      aria-modal="true"
+    >
       <div class="wrapper">
         <span class="wrapper-title">{{ modalTitle }}</span>
         <div class="wrapper-bar">
@@ -302,32 +315,61 @@ defineExpose({
         <div class="wrapper-form">
           <n-form ref="formRef" :model="formValue" :rules="rules">
             <n-form-item path="name" label="标题">
-              <n-input v-model:value="formValue.name" :style="{ width: '780px' }" @keydown.enter.prevent />
+              <n-input
+                v-model:value="formValue.name"
+                :style="{ width: '780px' }"
+                @keydown.enter.prevent
+              />
             </n-form-item>
             <n-form-item path="logic" label="逻辑关系" v-show="false">
-              <n-select filterable 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)"
+              v-for="(item, index) in formValue.conditions"
+              :key="index"
+              :style="formItemStyle"
+              path="conditions"
+              :label="formLabel(index)"
             >
-              <n-select filterable
-                v-model:value="item.type" placeholder="请选择筛选项名称" :options="typeOptions"
+              <n-select
+                filterable
+                v-model:value="item.type"
+                placeholder="请选择筛选项名称"
+                :options="typeOptions"
               />
-              <n-select filterable
-                v-model:value="item.operator" style="margin-left: 8px;" placeholder="请选择"
+              <n-select
+                filterable
+                v-model:value="item.operator"
+                style="margin-left: 8px"
+                placeholder="请选择"
                 :options="operatorOptions"
               />
               <n-space v-if="item.type === 'izyear'">
                 <n-date-picker
-                  v-model:value="item.result" style="margin-left: 8px;width: 240px;" type="daterange"
+                  v-model:value="item.result"
+                  style="margin-left: 8px; width: 240px"
+                  type="daterange"
                   clearable
                 />
               </n-space>
-              <n-select filterable
-                v-else v-model:value="item.result" style="margin-left: 8px;" placeholder="请选择" :options="getOptions(item.type!)"
+              <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)">
+              <n-button
+                :style="noBorderInput"
+                icon-placement="right"
+                @click="removeCondition(index)"
+              >
                 <template #icon>
                   <SvgIcon size="24" name="close" />
                 </template>
@@ -337,15 +379,13 @@ defineExpose({
         </div>
         <div class="wrapper-new" @click="createCondition">
           <span>+</span>
-          <span style="margin-left:8px">添加筛选条件</span>
+          <span style="margin-left: 8px">添加筛选条件</span>
         </div>
       </div>
       <template #footer>
         <div class="wrapper-footer">
-          <n-button type="info" @click="handleSumbit">
-            保存
-          </n-button>
-          <n-button secondary style="margin-left:15px" @click="closeModal">
+          <n-button type="info" @click="handleSumbit"> 保存 </n-button>
+          <n-button secondary style="margin-left: 15px" @click="closeModal">
             取消
           </n-button>
         </div>
@@ -402,7 +442,7 @@ defineExpose({
     position: relative;
 
     &:before {
-      background-color: #1980FF;
+      background-color: #1980ff;
       content: "";
       width: 5px;
       border-radius: 2px;
diff --git a/src/views/task/aside/Aside.vue b/src/views/task/aside/Aside.vue
index 9e2ff6e..484c1d2 100644
--- a/src/views/task/aside/Aside.vue
+++ b/src/views/task/aside/Aside.vue
@@ -186,7 +186,8 @@ defineExpose({
         <SvgIcon :name="collapseIcon" size="40" />
       </div>
     </div>
-    <div class="aside-header">
+    
+    <div class="aside-header" :style="`display:${asideWidth == 0?'none':''}`" >
       <!-- <div v-show="!showSearch" class="warpper">
         <div class="left">
           <svg-icon name="all-worksheet" size="32" />
diff --git a/src/views/task/modal/NewFilterModal.vue b/src/views/task/modal/NewFilterModal.vue
index a64ad43..56a93ff 100644
--- a/src/views/task/modal/NewFilterModal.vue
+++ b/src/views/task/modal/NewFilterModal.vue
@@ -1,106 +1,107 @@
 <script lang="ts" setup>
-import type { FormInst, FormItemRule, FormRules } from 'naive-ui'
-import { computed, onBeforeMount, reactive, ref, unref, watch } from 'vue'
-import { asideTaskMap as asideMap } from '@/config/final'
-import { useDictionary } from '@/store/modules/dictonary'
-import { useConfig } from '@/store/modules/asideConfig'
-import type { FilterCondition } from '/#/api'
-import { addCondition, updateCondition } from '@/api/home/filter'
-import { formatToDate2, formatToDate3 } from '@/utils/dateUtil'
-
-type Status = 'edit' | 'new'
-
-const show = ref(false)
-const configStore = useConfig()
-const dicStore = useDictionary()
-const currentStatus = ref<Status>('new')
-let currentEditId: string | null = null
-const emit = defineEmits(['onOk'])
+import type { FormInst, FormItemRule, FormRules } from "naive-ui";
+import { computed, onBeforeMount, reactive, ref, unref, watch } from "vue";
+import { asideTaskMap as asideMap } from "@/config/final";
+import { useDictionary } from "@/store/modules/dictonary";
+import { useConfig } from "@/store/modules/asideConfig";
+import type { FilterCondition } from "/#/api";
+import { addCondition, updateCondition } from "@/api/home/filter";
+import { formatToDate2, formatToDate3 } from "@/utils/dateUtil";
+
+type Status = "edit" | "new";
+
+const show = ref(false);
+const configStore = useConfig();
+const dicStore = useDictionary();
+const currentStatus = ref<Status>("new");
+let currentEditId: string | null = null;
+const emit = defineEmits(["onOk"]);
 
 const modalTitle = computed(() => {
-  return currentStatus.value === 'new' ? '新建过滤条件' : '编辑过滤条件'
-})
+  return currentStatus.value === "new" ? "新建过滤条件" : "编辑过滤条件";
+});
 
 const cardStyle = {
-  'width': '800px',
-  '--n-padding-bottom': '10px',
-  '--n-padding-left': '10px',
-}
+  width: "800px",
+  "--n-padding-bottom": "10px",
+  "--n-padding-left": "10px",
+};
 
 const noBorderInput = {
-  '--n-border': '0px',
-  '--n-border-hover': '0px',
-  '--n-border-pressed': '0px',
-}
+  "--n-border": "0px",
+  "--n-border-hover": "0px",
+  "--n-border-pressed": "0px",
+};
 
 const formItemStyle = {
-  '--n-label-height': '0px',
-  '--n-feedback-height': '8px',
-}
+  "--n-label-height": "0px",
+  "--n-feedback-height": "8px",
+};
 
 interface FormType {
-  name: string | null
-  logic: string | null
-  conditions: Condition[]
+  name: string | null;
+  logic: string | null;
+  conditions: Condition[];
 }
 
 interface Condition {
-  type: string | null
-  operator: string | null
-  result: any
+  type: string | null;
+  operator: string | null;
+  result: any;
 }
 
 interface Option {
-  label: string
-  value: string
+  label: string;
+  value: string;
 }
 
 const rules: FormRules = {
   name: {
     required: true,
-    message: '请输入过滤条件名称',
-    trigger: 'blur',
+    message: "请输入过滤条件名称",
+    trigger: "blur",
   },
   logic: {
     required: true,
-    message: '请选择逻辑关系',
-    trigger: 'blur',
+    message: "请选择逻辑关系",
+    trigger: "blur",
   },
   conditions: {
     required: true,
     validator(rule: FormItemRule, value: Condition[]) {
       for (const item of value) {
-        const { type, operator, result } = item
+        const { type, operator, result } = item;
 
         if (type === null || operator === null || result === null)
-          return new Error('请选择过滤条件')
+          return new Error("请选择过滤条件");
       }
-      return true
+      return true;
     },
-    trigger: ['input', 'blur'],
+    trigger: ["input", "blur"],
   },
-}
+};
 
-const formRef = ref<FormInst | null>(null)
+const formRef = ref<FormInst | null>(null);
 
 const formValue = reactive<FormType>({
   name: null,
-  logic: 'where',
-  conditions: [{
-    type: null,
-    operator: 'eq',
-    result: null,
-  }],
-})
+  logic: "where",
+  conditions: [
+    {
+      type: null,
+      operator: "eq",
+      result: null,
+    },
+  ],
+});
 
 function handleSumbit(e: MouseEvent) {
-  e.preventDefault()
+  e.preventDefault();
   formRef.value?.validate((errors) => {
-    if (errors)
-      return
+    if (errors) return;
 
     const list = formValue.conditions.map((item, index) => {
-      const { type, operator, result } = item
+      const { type, operator, result } = item;
 
       return {
         searchfield: type!,
@@ -108,157 +109,167 @@ function handleSumbit(e: MouseEvent) {
         searchvalue: formatValue(type!, result),
         searchRelationType: formValue.logic!,
         orderNum: index + 1,
-      }
-    })
+      };
+    });
 
     const param: FilterCondition = {
       searchname: formValue.name!,
       type: 2,
       ocrUsersearchchildList: list,
-    }
-
-    if (currentStatus.value === 'new')
-      addCondition(param)
-    else
-      updateCondition({ id: currentEditId!, ...param })
-    closeModal()
-    emit('onOk')
-  })
+    };
+
+    if (currentStatus.value === "new") addCondition(param);
+    else updateCondition({ id: currentEditId!, ...param });
+    emit("onOk");
+    setTimeout(() => {
+      closeModal();
+    }, 300);
+  });
 }
 
 function formatValue(searchfield: string, searchvalue: any) {
-  if (searchfield === 'izuptime') {
-    const start = formatToDate2(searchvalue[0])
-    const end = formatToDate2(searchvalue[1])
-    return `${start}-${end}`
+  if (searchfield === "izuptime") {
+    const start = formatToDate2(searchvalue[0]);
+    const end = formatToDate2(searchvalue[1]);
+    return `${start}-${end}`;
   }
 
-  return searchvalue
+  return searchvalue;
 }
 
 // 编辑前前转换为服务端格式
 function unformatValue(searchfield: string, searchvalue: any) {
   // 2022/01/03-2023/02/04
-  if (searchfield === 'izuptime') {
-    const dataStrs = searchvalue.split('-')
-    const start = formatToDate3(dataStrs[0])
-    const end = formatToDate3(dataStrs[1])
-    return [start, end]
+  if (searchfield === "izuptime") {
+    const dataStrs = searchvalue.split("-");
+    const start = formatToDate3(dataStrs[0]);
+    const end = formatToDate3(dataStrs[1]);
+    return [start, end];
   }
 
-  return searchvalue
+  return searchvalue;
 }
 
 function createCondition() {
   formValue.conditions.push({
     type: null,
-    operator: 'eq',
+    operator: "eq",
     result: null,
-  })
+  });
 }
 
 function removeCondition(index: number) {
-  formValue.conditions.splice(index, 1)
+  formValue.conditions.splice(index, 1);
 }
 
 function formLabel(index: number) {
-  return index === 0 ? '筛选条件' : ''
+  return index === 0 ? "筛选条件" : "";
 }
 
-const typeOptions = ref<Option[]>([])
+const typeOptions = ref<Option[]>([]);
 
 const operatorOptions = [
   {
-    label: '等于',
-    value: 'eq',
+    label: "等于",
+    value: "eq",
   },
   {
-    label: '不等于',
-    value: 'notEq',
+    label: "不等于",
+    value: "notEq",
   },
-]
+];
 
-const logicOptions = ref([])
+const logicOptions = ref([]);
 
 onBeforeMount(() => {
-  dicStore.fetchRelationTypeList()
-})
+  dicStore.fetchRelationTypeList();
+});
 
-watch(() => dicStore.relationTypeList, (newval) => {
-  logicOptions.value = newval
-})
+watch(
+  () => dicStore.relationTypeList,
+  (newval) => {
+    logicOptions.value = newval;
+  }
+);
 
 function showModal() {
-  show.value = true
+  show.value = true;
 }
 
 function closeModal() {
-  show.value = false
+  show.value = false;
 }
 
 function generateAllData(): Option[] {
-  const initVal: Option[] = []
+  const initVal: Option[] = [];
   const list = Object.keys(asideMap).reduce((acc, value) => {
-    if (value.startsWith('iz') && asideMap[value]?.inFilterList !== false) {
-      const name = asideMap[value]?.label
-
-      name && acc.push({
-        value,
-        label: name || '未配置',
-      })
+    if (value.startsWith("iz") && asideMap[value]?.inFilterList !== false) {
+      const name = asideMap[value]?.label;
+
+      name &&
+        acc.push({
+          value,
+          label: name || "未配置",
+        });
     }
-    return acc
-  }, initVal)
+    return acc;
+  }, initVal);
 
-  return list
+  return list;
 }
 
-typeOptions.value = generateAllData()
+typeOptions.value = generateAllData();
 
 function getOptions(key: string) {
-  const getterName = `get${key}`
-  const options = unref(dicStore[getterName])
-  return options || []
+  const getterName = `get${key}`;
+  const options = unref(dicStore[getterName]);
+  return options || [];
 }
 
 function leaveHandler() {
-  currentStatus.value = 'new'
-  currentEditId = null
+  currentStatus.value = "new";
+  currentEditId = null;
 
-  formValue.name = null
+  formValue.name = null;
   formValue.conditions = [
     {
       type: null,
-      operator: 'eq',
+      operator: "eq",
       result: null,
     },
-  ]
+  ];
 }
 
 function edit(editFilter: any) {
-  currentStatus.value = 'edit'
+  currentStatus.value = "edit";
 
-  const { searchname, ocrUsersearchchildList, id } = editFilter
-  currentEditId = id
-  formValue.name = searchname
+  const { searchname, ocrUsersearchchildList, id } = editFilter;
+  currentEditId = id;
+  formValue.name = searchname;
   formValue.conditions = ocrUsersearchchildList.map((item) => {
     return {
       type: item.searchfield,
       operator: item.searchtype,
       result: unformatValue(item.searchfield, item.searchvalue),
-    }
-  })
+    };
+  });
 }
 
 defineExpose({
   showModal,
   edit,
-})
+});
 </script>
 
 <template>
   <n-modal v-model:show="show" transform-origin="center" @after-leave="leaveHandler">
-    <n-card :style="cardStyle" :bordered="false" size="huge" role="dialog" aria-modal="true">
+    <n-card
+      :style="cardStyle"
+      :bordered="false"
+      size="huge"
+      role="dialog"
+      aria-modal="true"
+    >
       <div class="wrapper">
         <span class="wrapper-title">{{ modalTitle }}</span>
         <div class="wrapper-bar">
@@ -269,32 +280,61 @@ defineExpose({
         <div class="wrapper-form">
           <n-form ref="formRef" :model="formValue" :rules="rules">
             <n-form-item path="name" label="标题">
-              <n-input v-model:value="formValue.name" :style="{ width: '780px' }" @keydown.enter.prevent />
+              <n-input
+                v-model:value="formValue.name"
+                :style="{ width: '780px' }"
+                @keydown.enter.prevent
+              />
             </n-form-item>
             <n-form-item path="logic" label="逻辑关系" v-show="false">
-              <n-select filterable 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)"
+              v-for="(item, index) in formValue.conditions"
+              :key="index"
+              :style="formItemStyle"
+              path="conditions"
+              :label="formLabel(index)"
             >
-              <n-select filterable
-                v-model:value="item.type" placeholder="请选择筛选项名称" :options="typeOptions"
+              <n-select
+                filterable
+                v-model:value="item.type"
+                placeholder="请选择筛选项名称"
+                :options="typeOptions"
               />
-              <n-select filterable
-                v-model:value="item.operator" style="margin-left: 8px;" placeholder="请选择"
+              <n-select
+                filterable
+                v-model:value="item.operator"
+                style="margin-left: 8px"
+                placeholder="请选择"
                 :options="operatorOptions"
               />
               <n-space v-if="item.type === 'izuptime'">
                 <n-date-picker
-                  v-model:value="item.result" style="margin-left: 8px;width: 240px;" type="daterange"
+                  v-model:value="item.result"
+                  style="margin-left: 8px; width: 240px"
+                  type="daterange"
                   clearable
                 />
               </n-space>
-              <n-select filterable
-                v-else v-model:value="item.result" style="margin-left: 8px;" placeholder="请选择" :options="getOptions(item.type!)"
+              <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)">
+              <n-button
+                :style="noBorderInput"
+                icon-placement="right"
+                @click="removeCondition(index)"
+              >
                 <template #icon>
                   <SvgIcon size="24" name="close" />
                 </template>
@@ -304,15 +344,13 @@ defineExpose({
         </div>
         <div class="wrapper-new" @click="createCondition">
           <span>+</span>
-          <span style="margin-left:8px">添加筛选条件</span>
+          <span style="margin-left: 8px">添加筛选条件</span>
         </div>
       </div>
       <template #footer>
         <div class="wrapper-footer">
-          <n-button type="info" @click="handleSumbit">
-            保存
-          </n-button>
-          <n-button secondary style="margin-left:15px" @click="closeModal">
+          <n-button type="info" @click="handleSumbit"> 保存 </n-button>
+          <n-button secondary style="margin-left: 15px" @click="closeModal">
             取消
           </n-button>
         </div>
@@ -369,7 +407,7 @@ defineExpose({
     position: relative;
 
     &:before {
-      background-color: #1980FF;
+      background-color: #1980ff;
       content: "";
       width: 5px;
       border-radius: 2px;
-- 
2.39.3


From 406a6a220544aa17164f723313e3509a1c6a01d9 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Tue, 2 Apr 2024 10:07:06 +0800
Subject: [PATCH 104/143] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8F=AF?=
 =?UTF-8?q?=E7=96=91=E6=96=87=E4=BB=B6=E5=A4=B9=EF=BC=8C=E5=9B=BE=E5=AE=A1?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=89=B9=E9=87=8F=E9=80=89=E6=8B=A9=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Header/RecycleModal.vue |  2 +-
 src/views/worksheet/content/Content.vue       | 90 +++++++------------
 2 files changed, 34 insertions(+), 58 deletions(-)

diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue
index c9d2d99..f24faff 100644
--- a/src/layout/components/Header/RecycleModal.vue
+++ b/src/layout/components/Header/RecycleModal.vue
@@ -460,7 +460,7 @@ function refreshHandler() {
                     class="wrapper-content-item-img"
                     :class="{ 'wrapper-content-item-img-fit': viewMode !== 'masonry' }" :src="item.imgUrl"
                   > -->
-                  <n-image :src="item.imgurl" class="img "
+                  <n-image :src="item.imgUrl" class="img "
                     :class="{ 'img-fit': viewMode === 'horizontalVersion', 'img-full': viewMode === '3:4' || viewMode === 'verticalVersion' }" />
                   <n-checkbox v-if="batch" v-model:checked="item.checked" style="position:absolute;left:20px;top:20px"
                     @click.prevent @update:checked="onCheckChange($event, item)" />
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index aa732d6..51ffcb4 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -485,63 +485,6 @@ function reloadList() {
               <SvgIcon style="cursor: pointer; margin-left: 30px" name="t2" @click.stop="rejectHandler" />
             </div>
           </div>
-          <!-- 右侧任务 标题信息 -->
-          <!-- <div class="right">
-            <n-scrollbar style="max-height: 100%">
-              <n-ellipsis style="max-width: 350px">任务ID：{{ taskDetailInfo.taskname }}</n-ellipsis>
-              <div class="tags">
-                <div class="tag tag-submiting" v-if="taskDetailInfo.historyStates == '1'">待审批</div>
-                <div class="tag tag-submited" v-else-if="taskDetailInfo.historyStates == 2 || taskDetailInfo.workStatus == 3">已审批</div>
-                <div class="tag tag-passed" v-if="taskDetailInfo.historyStates == 2">{{
-                  TASK_STATUS_OBJ[taskDetailInfo.historyStates] }}</div>
-                <div class="tag tag-not-passed" v-else-if="taskDetailInfo.workStatus == 3">{{
-                  TASK_STATUS_OBJ[taskDetailInfo.historyStates]
-                }}</div>
-              </div>
-              <n-divider class="divider-line" />
-              <div class="property">
-                <span class="property-name top" style=" color: #666666">图片大小
-                </span>
-                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo && taskDetailInfo?.pictureInfo?.imgSize&&
-                  (taskDetailInfo?.pictureInfo?.imgSize / 1000).toFixed(2) }}KB</span>
-              </div>
-              <div class="property">
-                <span class="property-name top" style=" color: #666666">图片格式
-                </span>
-                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo?.imgFormat }}</span>
-              </div>
-              <div class="property">
-                <span class="property-name top" style=" color: #666666">图片尺寸
-                </span>
-                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo?.imgMeasure }}</span>
-              </div>
-              <div class="property">
-                <span class="property-name top" style=" color: #666666">色彩空间
-                </span>
-                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo?.imgSpace }}</span>
-              </div>
-              <div class="property">
-                <span class="property-name top" style=" color: #666666">提报人
-                </span>
-                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.upname || "-" }}</span>
-              </div>
-              <div class="property">
-                <span class="property-name top" style=" color: #666666">创建时间
-                </span>
-                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo && taskDetailInfo?.pictureInfo.createTime }}</span>
-              </div>
-              <div class="property">
-                <span class="property-name top" style=" color: #666666">提报时间
-                </span>
-                <span style=" color: #333333; font-size: 16px">{{ taskDetailInfo?.submitDateTimestamp &&
-                  format(taskDetailInfo?.submitDateTimestamp, 'yyyy-MM-dd HH:mm:ss') || '-' }}</span>
-              </div>
-              <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>
-              </div>
-            </n-scrollbar>
-          </div> -->
           <PictureInfo :taskDetailInfo="taskDetailInfo"></PictureInfo>
         </div>
         <div style="display: flex; justify-content: space-between; padding: 12px 0px 3px 0">
@@ -661,6 +604,39 @@ function reloadList() {
         margin-left: 6px;
       }
     }
+    .right {
+      display: flex;
+      align-items: center;
+
+      .btn {
+        width: 118px;
+        height: 36px;
+        background: linear-gradient(135deg, #5b85f8, #3c6cf0);
+        border-radius: 17px;
+        box-shadow: 0px 2px 6px 0px rgba(116, 153, 253, 0.3);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        color: #fff;
+        margin-right: 6px;
+        cursor: pointer;
+      }
+
+      .batch {
+        display: flex;
+        align-items: center;
+
+        .btn-approval {
+          width: 68px;
+          height: 28px;
+          cursor: pointer;
+        }
+
+        .btn-left {
+          margin-left: 16px;
+        }
+      }
+    }
 
     .font {
       font-size: 20px;
-- 
2.39.3


From 9d433b2e323f9cc01626ee78615efdf10b9ee380 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Tue, 2 Apr 2024 11:07:42 +0800
Subject: [PATCH 105/143] =?UTF-8?q?feat:=20=E5=AE=A1=E6=89=B9=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=B1=95=E7=A4=BA=E6=B7=BB=E5=8A=A0=EF=BC=8C=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=AE=A1=E6=89=B9=E5=AE=A1=E6=89=B9=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=8F=98=E6=9B=B4=EF=BC=8C=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/dictionary/index.ts                   | 11 +++
 src/config/final.ts                           |  6 +-
 src/store/modules/dictonary.ts                | 37 +++++++-
 src/views/home/aside/Aside.vue                | 12 +--
 .../aside/comp/items/IzApprovalStatus.vue     | 77 +++++++++++++++++
 .../home/aside/comp/items/Similarity.vue      | 60 +++++++------
 src/views/home/aside/comp/items/index.ts      |  3 +-
 src/views/task/modal/CustomFieldModal.vue     | 12 ++-
 src/views/task/modal/NewFilterModal.vue       |  3 +-
 .../worksheet/modal/CustomFieldModal.vue      | 85 ++++++++++++++-----
 10 files changed, 249 insertions(+), 57 deletions(-)
 create mode 100644 src/views/home/aside/comp/items/IzApprovalStatus.vue

diff --git a/src/api/dictionary/index.ts b/src/api/dictionary/index.ts
index 23ca588..6968f53 100644
--- a/src/api/dictionary/index.ts
+++ b/src/api/dictionary/index.ts
@@ -377,6 +377,17 @@ export async function getizstatusList() {
     url: `/static/admin/web/distionary/bytypecode/izstatus`,
     method: 'get',
   })
+  return res.data[0].distionaryList
+}
 
+/**
+ * 获取审核状态字典(任务审核)
+ * @returns
+ */
+export async function getizApprovalStatusList() {
+  const res = await http.request({
+    url: `/static/admin/web/distionary/bytypecode/izApprovalStatus`,
+    method: 'get',
+  })
   return res.data[0].distionaryList
 }
diff --git a/src/config/final.ts b/src/config/final.ts
index fcc931d..2b6a2e5 100644
--- a/src/config/final.ts
+++ b/src/config/final.ts
@@ -1,5 +1,5 @@
 import type { AsideEntity } from './aside'
-import { IzProjectVue, IzStatus, IztaskrromVue, PictureDownloadVue, PlanVue, ReportUserVue, TimeVue, IzCustomname, IzCustomtype, IzVisitcity, IzCustomlevel, IzProjecttype, IzProductVue, IzvisitproVue, IzfirmVue } from '@/views/home/aside/comp/items'
+import { IzApprovalStatus, IzProjectVue, IzStatus, IztaskrromVue, PictureDownloadVue, PlanVue, ReportUserVue, TimeVue, IzCustomname, IzCustomtype, IzVisitcity, IzCustomlevel, IzProjecttype, IzProductVue, IzvisitproVue, IzfirmVue } from '@/views/home/aside/comp/items'
 
 export interface RowData {
   id: string
@@ -137,8 +137,8 @@ export const asideTaskMap: Recordable<AsideEntity> = {
     label: '审批状态',
     defaultValue: null,
     isDefaultFilter: true,
-    key: 'izstatus',
-    component: IzStatus, // todo
+    key: 'izApprovalStatus',
+    component: IzApprovalStatus, // todo
   },
   izuptime: {
     label: '提报时间',
diff --git a/src/store/modules/dictonary.ts b/src/store/modules/dictonary.ts
index e54fb1b..c43121e 100644
--- a/src/store/modules/dictonary.ts
+++ b/src/store/modules/dictonary.ts
@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia'
 import { store } from '@/store'
-import { getBackList, getBusinessList, getIzShowList, getIztaskstatusList, getPictureTypeList, getRegionList, getRejectList, getRelationTypeList, getTFList, getizstatusList } from '@/api/dictionary'
+import { getBackList, getBusinessList, getIzShowList, getIztaskstatusList, getPictureTypeList, getRegionList, getRejectList, getRelationTypeList, getTFList, getizstatusList, getizApprovalStatusList } from '@/api/dictionary'
 
 export interface DictionaryState {
   regionList: any
@@ -24,6 +24,7 @@ export interface DictionaryState {
   backList: any
   relationTypeList: any
   izstatusList: any
+  izApprovalStatusList: any
 }
 
 export const useDictionaryStore = defineStore({
@@ -50,6 +51,7 @@ export const useDictionaryStore = defineStore({
     backList: null,
     relationTypeList: null,
     izstatusList: null,
+    izApprovalStatusList: null,
   }),
   getters: {
     getRegionList: (state) => {
@@ -100,8 +102,35 @@ export const useDictionaryStore = defineStore({
     getizstatus: (state) => {
       return state.izstatusList
     },
+    getizApprovalStatus: (state) => {
+      return state.izApprovalStatusList
+    }
   },
   actions: {
+    initData(){
+      this.fetchRegionList();
+      this.fetchPictureTypeList();
+      this.fetchPersionList();
+      this.fetchPlanList();
+      this.fetchTFList();
+      this.fetchIzShowList();
+      this.fetchIzProjectList();
+      this.fetchIztaskrromList();
+      this.fetchIztaskstatusList();
+      this.fetchIzvisitproList();
+      this.fetchIzfirmList();
+      this.fetchIzproductnameList();
+      this.fetchizcustomnameList();
+      this.fetchIzCustomtypeList();
+      this.fetchIzcustomlevelList();
+      this.fetchizizprojecttypeList();
+      this.fetchizvisitcityList();
+      this.fetchRejectList();
+      this.fetchBackList();
+      this.fetchRelationTypeList();
+      this.fetchizstatusListt();
+      this.fetchizApprovalStatusList();
+    },
     settfList(config) {
       this.tfList = config
     },
@@ -231,6 +260,12 @@ export const useDictionaryStore = defineStore({
       this.izstatusList = generateOptions2(list, 'codeno', 'name')
       return this.izstatusList
     },
+    // 审核状态(任务审核模块)
+    async fetchizApprovalStatusList() {
+      const list = await getizApprovalStatusList()
+      this.izApprovalStatusList = generateOptions2(list, 'codeno', 'name')
+      return this.izApprovalStatusList
+    },
   },
 })
 
diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue
index b395d41..53ba0a7 100644
--- a/src/views/home/aside/Aside.vue
+++ b/src/views/home/aside/Aside.vue
@@ -18,7 +18,7 @@ import { cloneDeep } from 'lodash-es'
 const configStore = useConfig()
 
 // 所有左侧模块的值
-const asideValue: Record<keyof typeof asideMap, any> = reactive({})
+let asideValue: Record<keyof typeof asideMap, any> = reactive({})
 // 左侧某个模块是否显示: 显示需同时满足系统配置和个人配置
 const asideVisible: Partial<Record<keyof AsideConfig, boolean>> = reactive({})
 // 当前显示的模块，按照数组顺序显示
@@ -165,7 +165,6 @@ function setShowSearch(value: boolean) {
   showSearch.value = value
 }
 const newFilterOk = () => {
-  console.log('home', 'newFilterOk',filterModalRef.value);
   filterModalRef.value.query(
     filterModalRef.value.pagination.page,
     filterModalRef.value.pagination.pageSize
@@ -206,13 +205,16 @@ function editFilter(filter: any) {
 function updateComponent(key, e) {
   console.log("跟新值", key, e);
   let tempobj = cloneDeep(asideValue);
-  tempobj[key] = e;
-  customObjRef.value = tempobj;
-  Object.assign(asideValue, tempobj);
+  // tempobj[key] = e;
+  // customObjRef.value = tempobj;
+  // Object.assign(asideValue, tempobj);
+  asideValue[key] = e;
+  customObjRef.value = cloneDeep(asideValue)
 }
 
 watch(asideValue, (newVal) => {
   console.log("asideValue处理后", newVal);
+  console.log('asideValue--->',asideValue)
   configStore.setAsideValue(newVal)
 }, { deep: true })
 </script>
diff --git a/src/views/home/aside/comp/items/IzApprovalStatus.vue b/src/views/home/aside/comp/items/IzApprovalStatus.vue
new file mode 100644
index 0000000..287bc64
--- /dev/null
+++ b/src/views/home/aside/comp/items/IzApprovalStatus.vue
@@ -0,0 +1,77 @@
+<script lang="ts" setup>
+import { onBeforeMount, onMounted, ref } from 'vue'
+import type { FormRules } from 'naive-ui'
+import { useDictionary } from '@/store/modules/dictonary'
+import { useConfig } from '@/store/modules/asideConfig'
+
+const configUseStore = useConfig()
+
+configUseStore.$subscribe(() => {
+  if(isLoadValue.value) {
+    isLoadValue.value = false;
+    return
+  }
+  let asideValue = configUseStore.getAsideValue;
+  if(asideValue['izApprovalStatus'] && typeof asideValue['izApprovalStatus'] == "string") {
+    let list = asideValue['izApprovalStatus'].split(',');
+    formValue.value.plans = list;
+    console.log("formValue.value.izApprovalStatus", formValue.value.plans);
+  }else {
+    formValue.value.plans = [];
+  }
+});
+const props = defineProps<{
+  value: string[] | null
+  label: string
+}>()
+
+const emit = defineEmits<{
+  (e: 'update:value', value: string[]): void
+}>()
+
+const formValue = ref({
+  plans: props.value,
+})
+if(typeof formValue.value.plans == "string") {
+  let list = formValue.value.plans.split(',');
+  formValue.value.plans = list;
+}
+const rules: FormRules = {
+  plans: [
+    {
+      required: false,
+      type: 'array',
+      trigger: ['blur', 'change'],
+    },
+  ],
+}
+
+const options = ref([])
+const configStore = useDictionary()
+const labStyle = {
+  fontWeight: 'bold',
+}
+
+onBeforeMount(async () => {
+  const list = await configStore.fetchizApprovalStatusList()
+  options.value = list
+})
+const isLoadValue = ref(false)
+function onChange(value: Array<string>) {
+  isLoadValue.value = true;
+  emit('update:value', value)
+}
+</script>
+
+<template>
+  <n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
+    <n-form-item :label="label" path="plans" :label-style="labStyle">
+      <n-select filterable
+        v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择审核状态" multiple
+        :options="options" @update:value="onChange"
+      />
+    </n-form-item>
+  </n-form>
+</template>
+
+<style lang="less" scoped></style>
diff --git a/src/views/home/aside/comp/items/Similarity.vue b/src/views/home/aside/comp/items/Similarity.vue
index 874311e..6b0458f 100644
--- a/src/views/home/aside/comp/items/Similarity.vue
+++ b/src/views/home/aside/comp/items/Similarity.vue
@@ -1,42 +1,46 @@
 <script lang="ts" setup>
-import { ref } from 'vue'
-import { useConfig } from '@/store/modules/asideConfig'
+import { ref } from "vue";
+import { useConfig } from "@/store/modules/asideConfig";
 
-const configUseStore = useConfig()
+const configUseStore = useConfig();
 
 configUseStore.$subscribe(() => {
-  if(isLoadValue.value) {
+  if (isLoadValue.value) {
     isLoadValue.value = false;
-    return
+    return;
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izsimilarity'] && typeof asideValue['izsimilarity'] == "string") {
-    range.value = asideValue['izsimilarity']
-  }else {
-    range.value = [0, 100];
+  console.log(asideValue,'asideValue',asideValue['izsimilarity'])
+  if (asideValue["izsimilarity"] && typeof asideValue["izsimilarity"] == "string") {
+    range.value = asideValue["izsimilarity"];
   }
+  console.log(range.value, 'range.value')
+  //  else {
+  //   range.value = [0, 100];
+  // }
 });
 const props = defineProps<{
-  value: [number, number]
-  label: string
-}>()
+  value: [number, number];
+  label: string;
+}>();
 
 const emit = defineEmits<{
-  (e: 'update:value', value: string): void
-}>()
+  (e: "update:value", value: string): void;
+}>();
 
-const range = ref<[number, number]>(props.value || [])
+const range = ref<[number, number]>(props.value || []);
 
 const marks = {
-  0: '0',
-  50: '50',
-  100: '100',
-}
-const isLoadValue = ref(false)
+  0: "0",
+  50: "50",
+  100: "100",
+};
+const isLoadValue = ref(false);
 function onChange(value: number & number[]) {
+  range.value = value as any;
   isLoadValue.value = true;
-  let valueStr = value.join('-');
-  emit('update:value', valueStr)
+  let valueStr = value.join("-");
+  emit("update:value", valueStr);
 }
 </script>
 
@@ -45,7 +49,13 @@ function onChange(value: number & number[]) {
     <n-collapse :default-expanded-names="['1']" arrow-placement="right">
       <n-collapse-item :title="label" name="1">
         <n-space vertical>
-          <n-slider v-model:value="range" range :marks="marks" :step="10" @update-value="onChange" />
+          <n-slider
+            v-model:value="range"
+            range
+            :marks="marks"
+            :step="10"
+            @update-value="onChange"
+          />
         </n-space>
       </n-collapse-item>
     </n-collapse>
@@ -56,7 +66,7 @@ function onChange(value: number & number[]) {
 .wrapper {
   padding: 10px;
 }
-::v-deep(.n-collapse-item-arrow){
-  color: #999999 !important;;
+::v-deep(.n-collapse-item-arrow) {
+  color: #999999 !important;
 }
 </style>
diff --git a/src/views/home/aside/comp/items/index.ts b/src/views/home/aside/comp/items/index.ts
index 7843f5b..22655ea 100644
--- a/src/views/home/aside/comp/items/index.ts
+++ b/src/views/home/aside/comp/items/index.ts
@@ -19,6 +19,7 @@ import RegionVue from './Region.vue'
 import ReportUserVue from './ReportUser.vue'
 import SimilarityVue from './Similarity.vue'
 import TimeVue from './Time.vue'
+import IzApprovalStatus from './IzApprovalStatus.vue'
 
-export { IzProjecttype, IzStatus, IzVisitcity, IzCustomlevel, IzCustomtype, IzCustomname, IzfirmVue, IzProductVue, IzvisitproVue, IztaskstatusVue, IztaskrromVue, IzProjectVue, PictureDownloadVue, PictureUploadVue, PlaceHolderVue, RegionVue, SimilarityVue, ReportUserVue, PlanVue, PictureTypeVue, TimeVue }
+export { IzProjecttype, IzStatus, IzVisitcity, IzCustomlevel, IzCustomtype, IzCustomname, IzfirmVue, IzProductVue, IzvisitproVue, IztaskstatusVue, IztaskrromVue, IzProjectVue, PictureDownloadVue, PictureUploadVue, PlaceHolderVue, RegionVue, SimilarityVue, ReportUserVue, PlanVue, PictureTypeVue, TimeVue, IzApprovalStatus }
 
diff --git a/src/views/task/modal/CustomFieldModal.vue b/src/views/task/modal/CustomFieldModal.vue
index 3bb4fd0..db84160 100644
--- a/src/views/task/modal/CustomFieldModal.vue
+++ b/src/views/task/modal/CustomFieldModal.vue
@@ -260,7 +260,17 @@ function removeHandler(id: string) {
   offList.value[index].checked = false;
   offShowList.value = cloneDeep(offList.value);
 }
+const initData = ()=>{
+  offList.value = [];
+  onList.value = [];
+  fixList.value = [];
+  offShowList.value = [];
+  onShowList.value = [];
+  fixShowList.value = [];
+  selectIds.value = [];
+}
 const getData = async (type = "") => {
+  initData();
   const userStore = useUser();
   const userInfo = userStore.getUserInfo;
   let res;
@@ -478,7 +488,7 @@ const queryData = (value, type) => {
       <template #footer>
         <div class="wrapper-footer">
           <n-button type="info" @click="handleSumbit"> 确认 </n-button>
-          <n-button secondary style="margin-left: 15px" @click="closeModal">
+          <n-button secondary style="margin-left: 15px" @click="getData();closeModal()">
             取消
           </n-button>
         </div>
diff --git a/src/views/task/modal/NewFilterModal.vue b/src/views/task/modal/NewFilterModal.vue
index 56a93ff..5bac79d 100644
--- a/src/views/task/modal/NewFilterModal.vue
+++ b/src/views/task/modal/NewFilterModal.vue
@@ -182,7 +182,8 @@ const operatorOptions = [
 const logicOptions = ref([]);
 
 onBeforeMount(() => {
-  dicStore.fetchRelationTypeList();
+  // dicStore.fetchRelationTypeList();
+  dicStore.initData();
 });
 
 watch(
diff --git a/src/views/worksheet/modal/CustomFieldModal.vue b/src/views/worksheet/modal/CustomFieldModal.vue
index 0bffa8d..8c0c80d 100644
--- a/src/views/worksheet/modal/CustomFieldModal.vue
+++ b/src/views/worksheet/modal/CustomFieldModal.vue
@@ -91,8 +91,15 @@ function generateDefaultList() {
 }
 
 const show = ref(false);
-const checkAll = ref(false);
-
+const checkAll = computed(() => {
+  let baseNum = 0;
+  offList.value.map((v) => {
+    if (v.fix) {
+      baseNum += 1;
+    }
+  });
+  return onList.value.length == offList.value.length - baseNum;
+});
 function showModal() {
   show.value = true;
 }
@@ -221,11 +228,22 @@ function removeHandler(id: string) {
   });
   if (index !== -1) onList.value.splice(index, 1);
 
-  index = offList.value.findIndex(v=>v.id==id);
+  index = offList.value.findIndex((v) => v.id == id);
   offList.value[index].checked = false;
 }
 
-onMounted(async () => {
+const initData = () => {
+  offList.value = [];
+  onList.value = [];
+  fixList.value = [];
+  // offShowList.value = [];
+  // onShowList.value = [];
+  // fixShowList.value = [];
+  selectIds.value = [];
+};
+
+const getData = async () => {
+  initData();
   const userStore = useUser();
   const userInfo = userStore.getUserInfo;
   let res;
@@ -249,8 +267,8 @@ onMounted(async () => {
       fix: v.isrequired == 2,
       checked:
         v.isrequired == 2 ||
-        Boolean(userFieldFixed?.find(v2=>v2==v.name)) ||
-        Boolean(userFieldUnFixed?.find(v2=>v2==v.name))
+        Boolean(userFieldFixed?.find((v2) => v2 == v.name)) ||
+        Boolean(userFieldUnFixed?.find((v2) => v2 == v.name)),
     };
     if (item.fix) {
       fixList.value.push(item);
@@ -274,8 +292,23 @@ onMounted(async () => {
       }
     }
   });
-  console.log(offList.value,'offList.value');
-  console.log(useList, 'useList');
+};
+
+onMounted(async () => {
+  getData();
+});
+
+const indeterminate = computed(() => {
+  let baseNum = 0;
+  offList.value.map((v) => {
+    if (v.fix) {
+      baseNum += 1;
+    }
+  });
+  return (
+    onList.value.length > 0 &&
+    offList.value.length - baseNum > onList.value.length
+  );
 });
 </script>
 
@@ -311,11 +344,12 @@ onMounted(async () => {
                   </template>
                 </n-input>
                 <div class="draggable-ul">
-                  <div class="draggable-li">
+                  <div class="draggable-li" :class="{ checkAll: indeterminate }">
                     <n-checkbox
                       v-model:checked="checkAll"
                       label="全部"
                       @update:checked="onCheckAllChange"
+                      :indeterminate="indeterminate"
                     />
                   </div>
                   <div class="content">
@@ -377,7 +411,7 @@ onMounted(async () => {
                     :class="{ fix: item.fix }"
                     class="cursor-move draggable-item"
                   >
-                  <SvgIcon name="drag" size="24"  />
+                    <SvgIcon name="drag" size="24" />
                     <span class="ml-2">{{ item.name }}</span>
                     <SvgIcon
                       v-if="!item.fix"
@@ -396,7 +430,7 @@ onMounted(async () => {
       <template #footer>
         <div class="wrapper-footer">
           <n-button type="info" @click="handleSumbit"> 确认 </n-button>
-          <n-button secondary style="margin-left: 15px" @click="closeModal">
+          <n-button secondary style="margin-left: 15px" @click="getData();closeModal();">
             取消
           </n-button>
         </div>
@@ -484,7 +518,7 @@ onMounted(async () => {
     color: #333;
     display: flex;
     align-items: center;
-    border-bottom: 1px solid #E8E8E8;
+    border-bottom: 1px solid #e8e8e8;
   }
 
   .disable-check {
@@ -492,9 +526,7 @@ onMounted(async () => {
   }
 }
 
-::v-deep(
-    .n-card.n-card--content-segmented > .n-card__content:not(:first-child)
-  ) {
+::v-deep(.n-card.n-card--content-segmented > .n-card__content:not(:first-child)) {
   border: 0px;
 }
 
@@ -502,15 +534,28 @@ onMounted(async () => {
   --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;
 }
-::v-deep(.n-scrollbar){
+::v-deep(.n-scrollbar) {
   border-top: none !important;
 }
-::v-deep(.n-button--info-type){
-  background: #507AFD !important;
+::v-deep(.n-button--info-type) {
+  background: #507afd !important;
+}
+::v-deep(.checkAll .n-checkbox.n-checkbox--indeterminate .n-checkbox-box) {
+  background: none;
+  border: none;
+}
+::v-deep(.checkAll .n-checkbox-box__border) {
+  border: 1px solid #e8e8e8 !important;
+}
+::v-deep(.checkAll .n-checkbox-icon) {
+  border: 3px solid #fff;
+  background: #1980ff;
+}
+::v-deep(.checkAll .n-checkbox-icon svg) {
+  display: none !important;
 }
-
 </style>
-- 
2.39.3


From 2b63e8577aab12761636779c7f48b2d98da623c6 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Tue, 2 Apr 2024 11:35:35 +0800
Subject: [PATCH 106/143] =?UTF-8?q?feat:=20=E5=8F=AF=E7=96=91=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=B9=E5=A2=9E=E5=8A=A0=E6=89=B9=E9=87=8F=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Header/RecycleModal.vue | 68 +++++++++++++------
 1 file changed, 46 insertions(+), 22 deletions(-)

diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue
index f24faff..7f66e7b 100644
--- a/src/layout/components/Header/RecycleModal.vue
+++ b/src/layout/components/Header/RecycleModal.vue
@@ -37,7 +37,7 @@ const timeLabel = computed(() => {
   return item?.label
 })
 
-const viewMode = ref('masonry')
+const viewMode = ref('horizontalVersion')
 
 const viewLabel = computed(() => {
   const item = viewOptions.find((option) => {
@@ -134,6 +134,7 @@ async function loadMore() {
 }
 
 onUpdated(() => {
+  console.log('onUpdated',onUpdated)
   layout()
 })
 
@@ -265,8 +266,8 @@ async function commit() {
     layout()
   }
 }
- function remove() {
-  if ( !selectIds.value|| selectIds.value.length === 0) {
+function remove() {
+  if (!selectIds.value || selectIds.value.length === 0) {
     message.error('至少选中一个')
     return
   }
@@ -313,9 +314,8 @@ function rejectHandler() {
 
 function reset() {
   batch.value = false;
-  pagination.pageNo = 0;
+  pagination.pageNo = 1;
   pagination.pageSize = 20;
-  listData.value.length = 0;
   selectedApproveItems.value.length = 0;
   loading = false;
   canloadMore = true;
@@ -386,9 +386,11 @@ function doAudit(param: any) {
 function reloadList() {
   refreshHandler()
 }
-function refreshHandler() {
+async function refreshHandler() {
   reset()
-  featchList()
+  const list = await featchList()
+  listData.value = list
+  layout()
 }
 
 </script>
@@ -413,13 +415,13 @@ function refreshHandler() {
               <div>
                 <n-popselect v-model:value="timeRange" :options="timeOptions" trigger="click" @change="onChange">
                   <div class="wrapper-content-form-dropdown">
-                    <span>{{ timeLabel || '时间排序' }}</span>
+                    <span>时间排序</span>
                     <SvgIcon class="wrapper-content-form-dropdown-gap" name="arrow-botton" size="14" />
                   </div>
                 </n-popselect>
                 <n-popselect v-model:value="viewMode" :options="viewOptions" trigger="click">
                   <div class="wrapper-form-dropdown">
-                    <span>{{ viewLabel || '视图模式' }}</span>
+                    <span>视图模式</span>
                     <SvgIcon class="wrapper-content-form-gap" name="arrow-botton" size="14" />
                   </div>
                 </n-popselect>
@@ -456,17 +458,18 @@ function refreshHandler() {
                 <div v-for="(item, index) in listData" :key="item.id" :data-id="item.id"
                   :class="{ 'grid-item-selected': isSelected(item.id) }" :style="{ height: gridHeight }"
                   class="grid-item">
-                  <!-- <img
-                    class="wrapper-content-item-img"
-                    :class="{ 'wrapper-content-item-img-fit': viewMode !== 'masonry' }" :src="item.imgUrl"
-                  > -->
                   <n-image :src="item.imgUrl" class="img "
                     :class="{ 'img-fit': viewMode === 'horizontalVersion', 'img-full': viewMode === '3:4' || viewMode === 'verticalVersion' }" />
-                  <n-checkbox v-if="batch" v-model:checked="item.checked" style="position:absolute;left:20px;top:20px"
-                    @click.prevent @update:checked="onCheckChange($event, item)" />
-                  <!-- <div class="percent">
-                    {{ getPercent(item.pictureid, item) }}
-                  </div> -->
+                  <n-checkbox v-if="batch && item.historyStates === 1" v-model:checked="item.checked"
+                    style="position:absolute;left:20px;top:20px" @click.prevent
+                    @update:checked="onCheckChange($event, item)" />
+                  <img v-if="item.historyStates === 2" class="tag-status" src="@/assets/images/task/tag-pass.png" alt="">
+                  <img v-if="item.historyStates === 3" class="tag-status" src="@/assets/images/task/tag-not-pass.png"
+                    alt="">
+
+                  <div :class="{ 'percent-red': item.similarityScore === 100 }" class="percent">
+                    {{ item.similarityScore }}<span class="percent-unit">%</span>
+                  </div>
                 </div>
               </div>
               <!-- </n-scrollbar> -->
@@ -480,7 +483,7 @@ function refreshHandler() {
       </n-card>
     </n-modal>
     <NotPassed ref="notPassModalRef" @success="reloadList" />
-    <ConfrimModal ref="confrimModalRef" @commit="commit" :selectedTotal="selectIds.length"/>
+    <ConfrimModal ref="confrimModalRef" @commit="commit" :selectedTotal="selectIds.length" />
 
   </div>
 </template>
@@ -597,20 +600,40 @@ function refreshHandler() {
       width: 214px;
       padding: 16px;
       position: relative;
+
+      .tag-status {
+        width: 46px;
+        height: 22px;
+        position: absolute;
+        left: 16px;
+        top: 20px;
+      }
+
     }
 
     .percent {
       position: absolute;
-      text-align: center;
+      display: flex;
+      align-items: center;
+      justify-content: center;
       width: 35px;
       height: 18px;
       opacity: 0.9;
       background: #6f92fd;
       border-radius: 6px 0px 6px 0px;
       z-index: 5;
-      right: 22px;
-      top: 22px;
+      right: 28px;
+      top: 20px;
       color: #fff;
+      font-size: 14px;
+
+      .percent-unit {
+        font-size: 8px;
+        margin-top: 4px;
+      }
+    }
+    .percent-red {
+      background: #ff4e4f;
     }
 
     .grid-item-selected {
@@ -620,6 +643,7 @@ function refreshHandler() {
     .scroll {
       overflow-y: auto;
       height: calc(100vh - 282px);
+      margin-left: 20px;
     }
   }
 }
-- 
2.39.3


From ef187f22859d115b3c595c63a6981278d0d0da07 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Tue, 2 Apr 2024 12:19:51 +0800
Subject: [PATCH 107/143] =?UTF-8?q?feat:=20=E5=AE=A1=E6=A0=B8=E5=92=8C?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=90=8E=E9=87=8D=E6=96=B0layout=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Header/RecycleModal.vue | 55 +++++++++++++++++--
 1 file changed, 49 insertions(+), 6 deletions(-)

diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue
index 7f66e7b..d3a551e 100644
--- a/src/layout/components/Header/RecycleModal.vue
+++ b/src/layout/components/Header/RecycleModal.vue
@@ -11,6 +11,7 @@ import { debounce } from 'lodash-es'
 
 import { audit } from '@/api/task/task'
 import NotPassed from '@/components/Approval/NotPassed.vue'
+import { formatToDateHMS } from '@/utils/dateUtil'
 import { off, on } from '@/utils/domUtils'
 import ConfrimModal from "./ConfrimModal.vue"
 
@@ -134,7 +135,7 @@ async function loadMore() {
 }
 
 onUpdated(() => {
-  console.log('onUpdated',onUpdated)
+  console.log('onUpdated', onUpdated)
   layout()
 })
 
@@ -243,6 +244,7 @@ async function showModal() {
   pagination.pageNo = 1
   const list = await featchList()
   listData.value = list
+  layout()
 }
 
 async function onChange() {
@@ -470,6 +472,23 @@ async function refreshHandler() {
                   <div :class="{ 'percent-red': item.similarityScore === 100 }" class="percent">
                     {{ item.similarityScore }}<span class="percent-unit">%</span>
                   </div>
+                  <div class="time" style="left: 25px;bottom: 15px;">
+                    <!-- <div class="time-item">
+                      <SvgIcon class="svg-time" color="#FFF" size="16" name="camera-time" />
+                      <span>{{ item?.photoDateTimestamp ?
+                        formatToDateHMS(Number(item.photoDateTimestamp)) : '-' }}</span>
+                    </div>
+                    <div class="time-item time-item2">
+                      <SvgIcon class="svg-time" color="#FFF" size="16" name="submit-time" />
+                      <span>{{ item.submitDateTimestamp ?
+                        formatToDateHMS(Number(item.submitDateTimestamp)) : '-' }}</span>
+                    </div> -->
+                    <div class="time-item">
+                      <SvgIcon class="svg-time" color="#FFF" size="16" name="time" />
+                      <span>{{ item.submitDateTimestamp ?
+                        formatToDateHMS(Number(item.submitDateTimestamp)) : '-' }}</span>
+                    </div>
+                  </div>
                 </div>
               </div>
               <!-- </n-scrollbar> -->
@@ -610,6 +629,9 @@ async function refreshHandler() {
       }
 
     }
+    .grid-item-selected {
+      background-color: #dae3ff;
+    }
 
     .percent {
       position: absolute;
@@ -632,13 +654,35 @@ async function refreshHandler() {
         margin-top: 4px;
       }
     }
+
     .percent-red {
       background: #ff4e4f;
     }
+    .time {
+        position: absolute;
+        z-index: 3;
+        left: 32px;
+        bottom: 32px;
+
+        .time-item {
+          display: flex;
+          align-items: center;
+          font-size: 14px;
+          font-family: PingFang SC, PingFang SC-Medium;
+          font-weight: 500;
+          color: #ffffff;
+          margin-bottom: 4px;
+        }
+
+        .time-item2 {
+          margin-bottom: 0;
+        }
+
+        .svg-time {
+          margin-right: 5px;
+        }
+      }
 
-    .grid-item-selected {
-      background-color: #dae3ff;
-    }
 
     .scroll {
       overflow-y: auto;
@@ -666,5 +710,4 @@ async function refreshHandler() {
     height: 100%;
     object-fit: cover;
   }
-}
-</style>
+}</style>
-- 
2.39.3


From dab66f78eee7848b0a1fe03311297212081398d6 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Tue, 2 Apr 2024 13:42:29 +0800
Subject: [PATCH 108/143] =?UTF-8?q?fix:=20=E5=BA=9F=E5=BC=83=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/dictonary.ts      | 4 ++--
 src/views/final/content/Content.vue | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/store/modules/dictonary.ts b/src/store/modules/dictonary.ts
index c43121e..e912b35 100644
--- a/src/store/modules/dictonary.ts
+++ b/src/store/modules/dictonary.ts
@@ -108,12 +108,12 @@ export const useDictionaryStore = defineStore({
   },
   actions: {
     initData(){
-      this.fetchRegionList();
+      // this.fetchRegionList(); //废弃
       this.fetchPictureTypeList();
       this.fetchPersionList();
       this.fetchPlanList();
       this.fetchTFList();
-      this.fetchIzShowList();
+      // this.fetchIzShowList(); //废弃
       this.fetchIzProjectList();
       this.fetchIztaskrromList();
       this.fetchIztaskstatusList();
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index 75e3945..2678b90 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -184,8 +184,6 @@ async function getColumns() {
   const useList = res.data
   const userFieldFixed = useList.userFieldFixed?.split(',')
   const userFieldUnFixed = useList.userFieldUnFixed?.split(',')
-  console.log(userFieldFixed, userFieldUnFixed, 'userFieldUnFixed')
-  console.log(allList, 'allList')
   allList?.map((v) => {
     if (!userFieldFixed?.length && !userFieldUnFixed?.length) {
       if (v.isrequired == 2) {
-- 
2.39.3


From 51cf07f59ae9ce6716403e5285382fe3eec20d46 Mon Sep 17 00:00:00 2001
From: raofuzi <2641346316@qq.com>
Date: Tue, 2 Apr 2024 13:56:41 +0800
Subject: [PATCH 109/143] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/aside/comp/items/IzProduct.vue | 10 +++++-----
 src/views/home/content/Content.vue            |  7 +++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/views/home/aside/comp/items/IzProduct.vue b/src/views/home/aside/comp/items/IzProduct.vue
index 3c34a48..b399179 100644
--- a/src/views/home/aside/comp/items/IzProduct.vue
+++ b/src/views/home/aside/comp/items/IzProduct.vue
@@ -12,14 +12,14 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izproduct']) {
-    if(typeof asideValue['izproduct'] == "string") {
-      let list = asideValue['izproduct'].split(',');
+  if(asideValue['izproductname']) {
+    if(typeof asideValue['izproductname'] == "string") {
+      let list = asideValue['izproductname'].split(',');
       formValue.value.plans = list;
     }else {
-      formValue.value.plans = asideValue['izproduct'];
+      formValue.value.plans = asideValue['izproductname'];
     }
-    console.log("formValue.value.izproduct", formValue.value.plans);
+    console.log("formValue.value.izproductname", formValue.value.plans);
   }else {
     formValue.value.plans = [];
   }
diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 895b32c..9eb7323 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -254,6 +254,9 @@ async function oneCheck() {
   if(asideVal.izyear && asideVal.izyear.length == 2) {
     asideVal.izyear = dayjs(asideVal.izyear[0]).format("YYYY/MM/DD") + '-' + dayjs(asideVal.izyear[1]).format("YYYY/MM/DD")
   }
+  if(asideVal['izsimilarity'] && typeof asideVal['izsimilarity'] != "string") {
+    asideVal['izsimilarity'] = asideVal['izsimilarity'].join('-');
+  }
   const tasksLoadingModal = queryRepeatedTasksModalRef.value as any
   
   console.log('calNum.value111111111111111', calNum.value, checkTaskStatus.value);
@@ -288,6 +291,10 @@ async function oneCheck() {
               reset()
               loadMore()
             }
+          }else {
+            if(timer.value) {
+              clearInterval(timer.value);
+            }
           }})
       }
     }, 1000);
-- 
2.39.3


From b0a67b9ac3ee5426ffee3b66e7909702983bc20d Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Tue, 2 Apr 2024 14:55:12 +0800
Subject: [PATCH 110/143] =?UTF-8?q?feat:=20=E9=AB=98=E7=BA=A7=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E9=98=88=E5=80=BC=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/aside/Aside.vue                      | 11 +++--------
 src/views/home/aside/comp/modals/NewFilterModal.vue | 11 +++++------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue
index ad6e08a..0928ad9 100644
--- a/src/views/home/aside/Aside.vue
+++ b/src/views/home/aside/Aside.vue
@@ -92,14 +92,6 @@ onBeforeMount(async () => {
 configStore.$subscribe(() => {
   const config = configStore.getConfig
   const customConfig = configStore.getCustomConfig
-  console.log("config", config);
-  console.log("customConfig", customConfig);
-  console.log("customObjRef.value", customObjRef.value);
-  console.log("customTempObjRef.value", customTempObjRef.value, );
-  console.log("getFilterConfig", configStore.getFilterConfig,);
-  console.log("isEqual(asideValue, configStore.getAsideValue)", isEqual(asideValue, configStore.getAsideValue), );
-  console.log("configStore的getAsideValue", configStore.getAsideValue, );
-  console.log( "getAsideValue", asideValue);
   if((configFilterRef.value.length > 0 && isEqual(configFilterRef.value, configStore.getFilterConfig)) && customObjRef.value && isEqual(customObjRef.value, customTempObjRef.value)) {
     return
   }
@@ -157,6 +149,7 @@ configStore.$subscribe(() => {
     console.log("asideValue直接处理后的结果", asideValue);
     console.log("customTempObjRef.value", customTempObjRef.value);
     let tempobj = cloneDeep(asideValue);
+    console.log("tempObj", tempobj);
     configStore.setAsideValue(tempobj);
   }
   // console.log("showKeys", showKeys);
@@ -235,7 +228,9 @@ function updateComponent(key, e) {
   console.log("tempAsideValue跟新值", configStore.getAsideValue, asideValue);
   // let tempAsideValue = configStore.getAsideValue || asideValue;
   let tempobj = cloneDeep(asideValue);
+  console.log(tempobj,'tempobj')
   tempobj[key] = e;
+  console.log(tempobj, 'tempobj After')
   customObjRef.value = tempobj;
   // asideValue = Object.assign({}, asideValue, tempobj);
   console.log("asideValue跟新值", tempobj);
diff --git a/src/views/home/aside/comp/modals/NewFilterModal.vue b/src/views/home/aside/comp/modals/NewFilterModal.vue
index d1369bc..554bf71 100644
--- a/src/views/home/aside/comp/modals/NewFilterModal.vue
+++ b/src/views/home/aside/comp/modals/NewFilterModal.vue
@@ -152,7 +152,7 @@ function unformatValue(searchfield: string, searchvalue: any) {
   }
 
   // 80,90
-  if (searchfield === "izsimilarity") return searchvalue.split(",");
+  // if (searchfield === "izsimilarity") return searchvalue.split(",");
 
   return searchvalue;
 }
@@ -191,15 +191,15 @@ const logicOptions = ref([]);
 const similarityOptions = [
   {
     label: "80%-90%",
-    value: [80, 90],
+    value: '80,90',
   },
   {
     label: "95%-100%",
-    value: [95, 100],
+    value: '95,100',
   },
   {
     label: "100%-100%",
-    value: [100, 100],
+    value: '100,100',
   },
 ];
 
@@ -255,7 +255,6 @@ watch(
 
 function getOptions(key: string) {
   if (key === "izsimilarity") return similarityOptions;
-
   const getterName = `get${key}`;
   const options = unref(dicStore[getterName]);
   return options || [];
@@ -277,7 +276,7 @@ function leaveHandler() {
 
 function edit(editFilter: any) {
   currentStatus.value = "edit";
-
+  console.log(editFilter,'editFilter')
   const { searchname, ocrUsersearchchildList, id } = editFilter;
   currentEditId = id;
   formValue.name = searchname;
-- 
2.39.3


From 43b3ebd07869f2e58f8348ff2e6445e855a4ec9c Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Tue, 2 Apr 2024 15:35:17 +0800
Subject: [PATCH 111/143] =?UTF-8?q?1=E3=80=81=E7=BB=88=E5=AE=A1=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=202=E3=80=81=E7=9B=B8=E4=BC=BC=E5=9B=BE=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=203=E3=80=81=E7=BB=88=E5=AE=A1=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=204=E3=80=81=E5=AE=A1=E6=A0=B8=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E7=8A=B6=E6=80=81=E6=94=B9=E5=8F=98bug=205=E3=80=81?=
 =?UTF-8?q?=E7=9B=B8=E4=BC=BC=E5=9B=BE=E7=AD=9B=E9=80=89=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=206=E3=80=81=E7=BC=A9=E7=95=A5=E5=9B=BE=E9=97=AE=E9=A2=98=207?=
 =?UTF-8?q?=E3=80=81=E5=B0=8F=E7=BB=93=E6=9F=A5=E9=87=8D=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E9=97=AE=E9=A2=98=208=E3=80=81=E7=A7=BB?=
 =?UTF-8?q?=E5=85=A5=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/comp/ListAction.vue           |  16 ++-
 src/views/final/comp/RepeatTaskTableModal.vue |  55 ++++++---
 src/views/final/content/Content.vue           |   7 +-
 src/views/task/aside/Aside.vue                |   2 -
 src/views/task/content/Content.vue            |  13 +-
 src/views/task/modal/BatchModal.vue           | 112 ++++++++++++++----
 6 files changed, 155 insertions(+), 50 deletions(-)

diff --git a/src/views/final/comp/ListAction.vue b/src/views/final/comp/ListAction.vue
index f1ef5e2..72da761 100644
--- a/src/views/final/comp/ListAction.vue
+++ b/src/views/final/comp/ListAction.vue
@@ -28,19 +28,25 @@ const actions = computed(() => {
 </script>
 
 <template>
-  <div :data-id="id">
-    <n-button
-      v-for="(action, index) in actions" :key="index" class="normal"
+  <div :data-id="id" class="wrap">
+    <div
+      v-for="(action, index) in actions" :key="index"
+      class="normal"
       :class="{ gap: index !== 0, reject: action.key === 'reject' }" text @click="(trigger(action) as any)"
     >
       {{ action.label }}
-    </n-button>
+    </div>
   </div>
 </template>
 
 <style scoped>
+.wrap{
+  display: flex;
+  align-items: center;
+}
 .normal {
-  color: #507AFD
+  color: #507AFD;
+  cursor: pointer;
 }
 
 .gap {
diff --git a/src/views/final/comp/RepeatTaskTableModal.vue b/src/views/final/comp/RepeatTaskTableModal.vue
index a2acfad..e0001cf 100644
--- a/src/views/final/comp/RepeatTaskTableModal.vue
+++ b/src/views/final/comp/RepeatTaskTableModal.vue
@@ -397,25 +397,21 @@ defineExpose({
               </div>
             </div>
 
-            <div class="batch">
-              <div v-show="!showActions" style="display: flex; align-items: center">
-                <div class="btn-batch">
-                  <SvgIcon style="margin-right: 6px" size="22" name="batch" />
-                  批量审批
-                </div>
-              </div>
-              <div v-show="showActions" style="display: flex; align-items: center">
-                <NButton text @click="switchBatch()">
-                  <template #icon>
-                    <SvgIcon name="revoke" />
-                  </template>
-                  取消
-                </NButton>
-
+            <div v-show="showActions" class="batch">
+              <div style="display: flex; align-items: center">
                 <img class="btn-approval btn-left" style="margin-left: 16px" 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">
               </div>
+              <div class="batch-right">
+                <div class="select">
+                  已选中 <span class="num">{{ selectionIds.length }}</span>
+                </div>
+                <div class="line" />
+                <div class="clear" @click="switchBatch">
+                  清空
+                </div>
+              </div>
             </div>
             <div class="wrapper-content">
               <NDataTable
@@ -454,6 +450,7 @@ defineExpose({
 .batch {
   display: flex;
   align-items: center;
+  justify-content: space-between;
   margin-top: 27px;
 
   .btn-approval{
@@ -462,6 +459,34 @@ defineExpose({
     cursor: pointer;
   }
 
+  .batch-right {
+    display: flex;
+    align-items: center;
+    .select{
+      font-size: 14px;
+      font-family: PingFang SC, PingFang SC-Regular;
+      font-weight: 500;
+      text-align: center;
+      color: #666666;
+    }
+
+    .num{
+      color: #507AFD;
+    }
+
+    .line{
+      width: 1px;
+      height: 14px;
+      background: #d8d8d8;
+      margin: 0 16px;
+    }
+
+    .clear{
+      color: #507AFD;
+      cursor: pointer;
+    }
+  }
+
 }
 .wrapper {
   display: flex;
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index 75e3945..da7d3f2 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -834,9 +834,9 @@ defineExpose({
             <li>
               <SvgIcon size="20" name="download" /><span style="margin-left: 5px">导出全部数据</span>
             </li>
-            <!-- <li>
+            <li>
               <SvgIcon size="20" name="look" /><span style="margin-left: 5px">查看导入记录</span>
-            </li> -->
+            </li>
           </ul>
         </n-popover>
       </div>
@@ -1076,4 +1076,7 @@ defineExpose({
 :deep(.n-data-table .n-data-table-td.n-data-table-td--fixed-right) {
   z-index: 100 !important;
 }
+:deep(.n-data-table-th__title) {
+  color: #333;
+}
 </style>
diff --git a/src/views/task/aside/Aside.vue b/src/views/task/aside/Aside.vue
index 8ed0c10..cb18e8b 100644
--- a/src/views/task/aside/Aside.vue
+++ b/src/views/task/aside/Aside.vue
@@ -70,10 +70,8 @@ const showSearch = ref(false)
 
 function setShowSearch(value: boolean) {
   if (!value) {
-    console.log('setShowSearch', value)
     search.value = ''
     taskListRef.value.search('')
-    return
   }
   showSearch.value = value
 }
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index 5c7b2c4..8b271ef 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -240,7 +240,9 @@ async function handleDragEnd(event, item) {
     const res = await dubiousfileyd({ pictureid: item.pictureId })
     if (res.code === 'OK') {
       message.success('加入成功')
+      setBatch(false)
       getTableData()
+      getImgList()
     }
     else {
       message.error(res.message)
@@ -355,6 +357,11 @@ async function getDetail() {
   getImgList()
 }
 
+function notPassSuccess(param) {
+  batchModalRef.value.reload()
+  reloadList(param, '不通过')
+}
+
 function reloadList(param, text) {
   // 修改左侧状态
   const id = currentTaskId()
@@ -643,10 +650,8 @@ function switchBatch() {
       </n-tab-pane>
     </n-tabs>
     <NotPassed
-      ref="notPassModalRef" @success="(param) => {
-        batchModalRef.value.reload()
-        reloadList(param, '不通过')
-      }"
+      ref="notPassModalRef"
+      @success="notPassSuccess"
     />
     <BatchModal
       ref="batchModalRef"
diff --git a/src/views/task/modal/BatchModal.vue b/src/views/task/modal/BatchModal.vue
index e21576f..bf4ed6c 100644
--- a/src/views/task/modal/BatchModal.vue
+++ b/src/views/task/modal/BatchModal.vue
@@ -100,15 +100,17 @@ watch(viewMode, () => {
 
 let canloadMore = true
 
-useInfiniteScroll(
-  el as any,
-  () => {
-    loadMore()
-  },
-  { distance: 10, canLoadMore: () => canloadMore },
-)
+// useInfiniteScroll(
+//   el as any,
+//   () => {
+//     console.log(123456)
+//     loadMore()
+//   },
+//   { distance: 10, canLoadMore: () => canloadMore },
+// )
 
 async function loadMore() {
+  console.log('loadMore')
   if (loading.value || el.value == null)
     return
 
@@ -285,8 +287,12 @@ const showActions = computed(() => {
 
 function setBatch(value: boolean) {
   batch.value = value
-  if (value === false)
-    selectIds.value.length = 0
+  if (value === false) {
+    selectIds.value = []
+    listData.value.forEach((item) => {
+      item.checked = false
+    })
+  }
 }
 
 function reject() {
@@ -321,13 +327,15 @@ async function refreshHandler() {
   taskDetailInfo.value = await getTaskDetailInfo(taskId.value, '')
 
   nextTick(() => {
-    useInfiniteScroll(
-      el as any,
-      () => {
-        loadMore()
-      },
-      { distance: 10, canLoadMore: () => canloadMore },
-    )
+    setTimeout(() => {
+      useInfiniteScroll(
+        el as any,
+        () => {
+          loadMore()
+        },
+        { distance: 10, canLoadMore: () => canloadMore },
+      )
+    }, 300)
   })
 }
 
@@ -343,8 +351,31 @@ function switchBatch() {
 
 function reload() {
   selectIds.value = []
+  setBatch(false)
   refreshHandler()
 }
+
+function sortHandler(orderby: 'similarityScore' | 'createdate') {
+  sortBy.orderName = orderby
+  sortBy.orderType = sortBy.orderType === 'asc' ? 'desc' : 'asc'
+
+  refreshHandler()
+}
+
+// const gridHeight = computed(() => {
+//   let height = ''
+//   if (viewMode.value === 'masonry')
+//     height = ''
+//   else if (viewMode.value === 'horizontalVersion')
+//     height = '145px'
+//   else if (viewMode.value === 'verticalVersion')
+//     height = '300px'
+//   else if (viewMode.value === '3:4')
+//     height = '240px'
+
+//   return height
+// })
+
 defineExpose({
   showModal,
   reload,
@@ -364,10 +395,10 @@ defineExpose({
         <div class="wrapper">
           <div class="wrapper-m32">
             <SvgIcon name="task-batch" size="16" />
-            <span style="margin-left: 8px;">任务审批</span>
+            <span style="margin-left: 8px;color: #666;">任务审批</span>
           </div>
           <div class="wrapper-title wrapper-m32">
-            <span>任务ID:{{ taskDetailInfo.fromtaskname }}</span>
+            <span style="color: #333;">任务ID:{{ taskDetailInfo.fromtaskname }}</span>
             <SvgIcon size="22" class="forward" name="arrow-left" @click="backHandler" />
             <SvgIcon size="22" class="back" name="arrow-right" @click="forwardHandler" />
           </div>
@@ -422,7 +453,7 @@ defineExpose({
           <div class="wrapper-content">
             <div class="wrapper-content-form wrapper-m32">
               <div>
-                <n-popselect v-model:value="timeRange" :options="timeOptions" trigger="click" @change="onChange">
+                <!-- <n-popselect v-model:value="timeRange" :options="timeOptions" trigger="click" @change="onChange">
                   <div class="wrapper-content-form-dropdown">
                     <span>{{ timeLabel || '时间模式' }}</span>
                     <SvgIcon class="wrapper-content-form-dropdown-gap" name="arrow-botton" size="14" />
@@ -433,7 +464,22 @@ defineExpose({
                     <span>{{ viewLabel || '视图模式' }}</span>
                     <SvgIcon class="wrapper-content-form-gap" name="arrow-botton" size="14" />
                   </div>
+                </n-popselect> -->
+                <n-popselect v-model:value="viewMode" :options="viewOptions" trigger="click">
+                  <div class="dropdown">
+                    <!-- <span>{{ viewLabel || '请选择' }}</span> -->
+                    <span>视图</span>
+                    <SvgIcon class="gap" name="arrow-botton" size="14" />
+                  </div>
                 </n-popselect>
+                <div style="margin-left: 15px;cursor: pointer;color:#323233" @click="sortHandler('createdate')">
+                  <span>时间排序</span>
+                  <SvgIcon style="margin-left: 8px;" name="sort" size="12" />
+                </div>
+                <div style="margin-left: 15px;cursor: pointer;color:#323233" @click="sortHandler('similarityScore')">
+                  <span>相似度排序</span>
+                  <SvgIcon style="margin-left: 8px;" name="sort" size="12" />
+                </div>
               </div>
               <div>
                 <div v-show="!showActions" class="wrapper-content-form-button" @click="switchBatch()">
@@ -466,10 +512,15 @@ defineExpose({
                   class="grid-item"
                 >
                   <div class="img-wrap">
-                    <img
+                    <!-- <img
                       class="wrapper-content-item-img"
                       :class="{ 'wrapper-content-item-img-fit': viewMode !== 'masonry' }" :src="item.imgUrl"
-                    >
+                    > -->
+                    <n-image
+                      ref="imageRef"
+                      class="img"
+                      :class="{ 'img-fit': viewMode === 'horizontalVersion', 'img-full': viewMode === '3:4' || viewMode === 'verticalVersion' }" :src="item.imgUrl"
+                    />
                     <div class="small-mark" />
                     <div class="time">
                       <div v-if="item.photoDateTimestamp" class="time-item">
@@ -659,7 +710,7 @@ defineExpose({
     margin-bottom: 10px;
 
     th {
-      color: #d7d7d7;
+      color: #999999;
       text-align: left;
     }
 
@@ -733,6 +784,23 @@ defineExpose({
       }
     }
 
+    .img {
+      border-radius: 7px;
+      display: block;
+      height: calc(100% - 25px);
+    }
+
+    .img-full {
+      width: 100%;
+      overflow: hidden;
+
+      ::v-deep(img) {
+        width: 100%;
+        height: 100%;
+        object-fit: cover;
+      }
+    }
+
     .grid-item {
       width: 214px;
       padding: 16px;
-- 
2.39.3


From a8b02071df961212021e93d9ce43ae8a93a497ae Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Tue, 2 Apr 2024 15:35:25 +0800
Subject: [PATCH 112/143] =?UTF-8?q?1=E3=80=81=E7=BB=88=E5=AE=A1=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=202=E3=80=81=E7=9B=B8=E4=BC=BC=E5=9B=BE=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=203=E3=80=81=E7=BB=88=E5=AE=A1=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=204=E3=80=81=E5=AE=A1=E6=A0=B8=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E7=8A=B6=E6=80=81=E6=94=B9=E5=8F=98bug=205=E3=80=81?=
 =?UTF-8?q?=E7=9B=B8=E4=BC=BC=E5=9B=BE=E7=AD=9B=E9=80=89=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=206=E3=80=81=E7=BC=A9=E7=95=A5=E5=9B=BE=E9=97=AE=E9=A2=98=207?=
 =?UTF-8?q?=E3=80=81=E5=B0=8F=E7=BB=93=E6=9F=A5=E9=87=8D=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E9=97=AE=E9=A2=98=208=E3=80=81=E7=A7=BB?=
 =?UTF-8?q?=E5=85=A5=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/content/Content.vue | 3 +++
 src/views/task/modal/BatchModal.vue | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index da7d3f2..bbb289f 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -1079,4 +1079,7 @@ defineExpose({
 :deep(.n-data-table-th__title) {
   color: #333;
 }
+:deep(.n-data-table .n-data-table-td) {
+  color: #666;
+}
 </style>
diff --git a/src/views/task/modal/BatchModal.vue b/src/views/task/modal/BatchModal.vue
index bf4ed6c..b2d1393 100644
--- a/src/views/task/modal/BatchModal.vue
+++ b/src/views/task/modal/BatchModal.vue
@@ -236,6 +236,7 @@ async function afterEnter() {
 }
 
 function afterLeave() {
+  reload()
   removeListeners()
 }
 
@@ -519,7 +520,7 @@ defineExpose({
                     <n-image
                       ref="imageRef"
                       class="img"
-                      :class="{ 'img-fit': viewMode === 'horizontalVersion', 'img-full': viewMode === '3:4' || viewMode === 'verticalVersion' }" :src="item.imgUrl"
+                      :class="{ 'img-fit': viewMode === 'horizontalVersion', 'img-full': viewMode === '3:4' || viewMode === 'verticalVersion' }" :src="item.serverThumbnailUrl || item.imgUrl"
                     />
                     <div class="small-mark" />
                     <div class="time">
-- 
2.39.3


From fad5db402228f1024be0878426cef38f8d5cdb1f Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Tue, 2 Apr 2024 16:39:44 +0800
Subject: [PATCH 113/143] =?UTF-8?q?feat:=20=E9=AB=98=E7=BA=A7=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=96=B0=E5=A2=9E=E7=82=B9=E5=87=BB=E9=81=AE=E7=BD=A9?=
 =?UTF-8?q?=E6=97=A0=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/comp/FilterModal.vue                | 1 +
 src/views/final/comp/NewFilterModal.vue             | 4 ++--
 src/views/home/aside/comp/modals/FilterModal.vue    | 1 +
 src/views/home/aside/comp/modals/NewFilterModal.vue | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/final/comp/FilterModal.vue b/src/views/final/comp/FilterModal.vue
index d8bc149..ad249c2 100644
--- a/src/views/final/comp/FilterModal.vue
+++ b/src/views/final/comp/FilterModal.vue
@@ -299,6 +299,7 @@ const showSearch = computed(() => {
       transform-origin="center"
       display-directive="if"
       @after-leave="afterLeave"
+      :mask-closable="false"
     >
       <n-card
         :style="cardStyle"
diff --git a/src/views/final/comp/NewFilterModal.vue b/src/views/final/comp/NewFilterModal.vue
index 0bf6c22..f93a538 100644
--- a/src/views/final/comp/NewFilterModal.vue
+++ b/src/views/final/comp/NewFilterModal.vue
@@ -255,7 +255,7 @@ defineExpose({
 </script>
 
 <template>
-  <n-modal v-model:show="show" transform-origin="center" @after-leave="leaveHandler">
+  <n-modal v-model:show="show" transform-origin="center" @after-leave="leaveHandler" :mask-closable="false">
     <n-card :style="cardStyle" :bordered="false" size="huge" role="dialog" aria-modal="true">
       <div class="wrapper">
         <span class="wrapper-title">{{ modalTitle }}</span>
@@ -308,7 +308,7 @@ defineExpose({
       <template #footer>
         <div class="wrapper-footer">
           <n-button type="info" @click="handleSumbit">
-            保存
+            确定
           </n-button>
           <n-button secondary style="margin-left:15px" @click="closeModal">
             取消
diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue
index 95fcbf4..c9864e6 100644
--- a/src/views/home/aside/comp/modals/FilterModal.vue
+++ b/src/views/home/aside/comp/modals/FilterModal.vue
@@ -324,6 +324,7 @@ const showSearch = computed(() => {
       transform-origin="center"
       display-directive="if"
       @after-leave="afterLeave"
+      :mask-closable="false"
     >
       <n-card
         :style="cardStyle"
diff --git a/src/views/home/aside/comp/modals/NewFilterModal.vue b/src/views/home/aside/comp/modals/NewFilterModal.vue
index 554bf71..941add5 100644
--- a/src/views/home/aside/comp/modals/NewFilterModal.vue
+++ b/src/views/home/aside/comp/modals/NewFilterModal.vue
@@ -296,7 +296,7 @@ defineExpose({
 </script>
 
 <template>
-  <n-modal v-model:show="show" transform-origin="center" @after-leave="leaveHandler">
+  <n-modal v-model:show="show" transform-origin="center" @after-leave="leaveHandler" :mask-closable="false">
     <n-card
       :style="cardStyle"
       :bordered="false"
-- 
2.39.3


From cad7cea19f49811a80de25e8c396de5673c4b605 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Tue, 2 Apr 2024 17:39:00 +0800
Subject: [PATCH 114/143] =?UTF-8?q?feat:=20=E9=80=BB=E8=BE=91=E8=A1=A5?=
 =?UTF-8?q?=E5=85=A8,=E7=99=BB=E5=BD=95=E9=A6=96=E9=A1=B5=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icons/right_arrow.svg    |  18 +
 src/views/final/aside/Aside.vue     |   4 +-
 src/views/final/content/Content.vue |   6 +-
 src/views/home/content/Content.vue  | 711 ++++++++++++++++------------
 src/views/login/index.vue           |   8 +-
 5 files changed, 430 insertions(+), 317 deletions(-)
 create mode 100644 src/assets/icons/right_arrow.svg

diff --git a/src/assets/icons/right_arrow.svg b/src/assets/icons/right_arrow.svg
new file mode 100644
index 0000000..c3da58b
--- /dev/null
+++ b/src/assets/icons/right_arrow.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>右箭头</title>
+    <defs>
+        <rect id="path-1" x="0" y="0" width="64" height="64"></rect>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="PrevailCloud-Design-图标集" transform="translate(-2504.000000, -8416.000000)">
+            <g id="右箭头" transform="translate(2536.000000, 8448.000000) scale(-1, 1) translate(-2536.000000, -8448.000000) translate(2504.000000, 8416.000000)">
+                <mask id="mask-2" fill="white">
+                    <use xlink:href="#path-1"></use>
+                </mask>
+                <g id="蒙版"></g>
+                <path d="M28.2032063,13.8205721 C28.5937306,13.4300478 29.2268955,13.4300478 29.6174198,13.8205721 L29.6174198,13.8205721 L31.7387402,15.9418924 C32.1292645,16.3324167 32.1292645,16.9655817 31.7387402,17.356106 L31.7387402,17.356106 L20.0942055,28.9996789 L52.663654,29 C53.2159388,29 53.663654,29.4477153 53.663654,30 L53.663654,33 C53.663654,33.5522847 53.2159388,34 52.663654,34 L20.0952055,33.9996789 L31.7387402,45.643894 C32.1292645,46.0344183 32.1292645,46.6675833 31.7387402,47.0581076 L29.6174198,49.1794279 C29.2268955,49.5699522 28.5937306,49.5699522 28.2032063,49.1794279 L11.9379919,32.9142136 C11.1569433,32.133165 11.1569433,30.866835 11.9379919,30.0857864 L13.3522055,28.6715729 L13.3592055,28.6636789 Z" id="形状结合" fill="#FFFFFF" mask="url(#mask-2)"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/views/final/aside/Aside.vue b/src/views/final/aside/Aside.vue
index d8fa596..9148a2d 100644
--- a/src/views/final/aside/Aside.vue
+++ b/src/views/final/aside/Aside.vue
@@ -138,6 +138,9 @@ const showSearch = ref(false);
 
 function setShowSearch(value: boolean) {
   showSearch.value = value;
+  if(!value){
+    inputChange('')
+  }
 }
 
 // 滚动容器，让key对应模块处于可视区域
@@ -161,7 +164,6 @@ watch(asideValue, (newVal) => {
 });
 
 const inputChange = (keyword) => {
-  console.log("Search Component", keyword);
   emit("inputChange", keyword);
 };
 </script>
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index 7c20fca..99a15ae 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -765,7 +765,11 @@ async function refreshHandler(searchId?: any) {
 }
 
 function filterTableData(keyword) {
-  tableData.value = tableData.value.filter(item => item.id.includes(keyword))
+  if(keyword){
+    tableData.value = tableData.value.filter(item => item.id.includes(keyword))
+  }else{
+    query(pagination.page, pagination.pageSize)
+  }
 }
 defineExpose({
   filterTableData,
diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 9eb7323..6399f37 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -1,207 +1,240 @@
 <script lang="ts" setup>
-import { createPackage, getCheckDuplicateStatus, getLastCheckNo, getPictureList, oneClickCheckTaskPackage, queryPageListByCheckNo, removeCheckDuplicate } from '@/api/home/main'
-import avatar from '@/assets/images/avatar.jpg'
-import { timeOptions, viewOptions } from '@/config/home'
-import { useWindowSizeFn } from '@/hooks/event/useWindowSizeFn'
-import { useConfig } from '@/store/modules/asideConfig'
-import { getViewportOffset } from '@/utils/domUtils'
-import { hideDownload } from '@/utils/image'
-import emitter from '@/utils/mitt'
-import { getImgUrl } from '@/utils/urlUtils'
 import {
-EllipsisHorizontal, EyeOutline as EyeOutlineIcon
-} from '@vicons/ionicons5'
+  createPackage,
+  getCheckDuplicateStatus,
+  getLastCheckNo,
+  getPictureList,
+  oneClickCheckTaskPackage,
+  queryPageListByCheckNo,
+  removeCheckDuplicate,
+} from "@/api/home/main";
+import avatar from "@/assets/images/avatar.jpg";
+import { timeOptions, viewOptions } from "@/config/home";
+import { useWindowSizeFn } from "@/hooks/event/useWindowSizeFn";
+import { useConfig } from "@/store/modules/asideConfig";
+import { getViewportOffset } from "@/utils/domUtils";
+import { hideDownload } from "@/utils/image";
+import emitter from "@/utils/mitt";
+import { getImgUrl } from "@/utils/urlUtils";
+import { EllipsisHorizontal, EyeOutline as EyeOutlineIcon } from "@vicons/ionicons5";
+import { Download as DownloadIcon, Upload as UploadIcon } from "@vicons/tabler";
+import { Icon } from "@vicons/utils";
+import { useInfiniteScroll } from "@vueuse/core";
+import dayjs from "dayjs";
+import imagesloaded from "imagesloaded";
+import { cloneDeep, debounce } from "lodash-es";
+import Masonry from "masonry-layout";
+import { NIcon, useMessage } from "naive-ui";
+import type { Component } from "vue";
 import {
-Download as DownloadIcon, Upload as UploadIcon
-} from '@vicons/tabler'
-import { Icon } from '@vicons/utils'
-import { useInfiniteScroll } from '@vueuse/core'
-import dayjs from 'dayjs'
-import imagesloaded from 'imagesloaded'
-import { cloneDeep, debounce } from 'lodash-es'
-import Masonry from 'masonry-layout'
-import { NIcon, useMessage } from 'naive-ui'
-import type { Component } from 'vue'
-import { computed, h, nextTick, onMounted, onUnmounted, onUpdated, reactive, ref, unref, watch } from 'vue'
-import CheckingTaskModal from './modal/CheckingTaskModal.vue'
-import FinishPackageModal from './modal/FinishPackageModal.vue'
-import GeneratePackageModal from './modal/GeneratePackageModal.vue'
-import LoginSuccessModal from './modal/LoginSuccessModal.vue'
-import PackageSettingsModal from './modal/PackageSettingsModal.vue'
-import QueryRepeatedTasksModal from './modal/QueryRepeatedTasksModal.vue'
-import type { PictureSortParam } from "/#/api"
-import defaultAvatar from '@/assets/icons/avatar.svg'
-
-const deviceHeight = ref(600)
-let _masonry: null | Masonry = null
-let _imagesload: any
-const masonryRef = ref<ComponentRef>(null)
-const el = ref<HTMLDivElement | null>(null)
-const viewMode = ref('masonry')
+  computed,
+  h,
+  nextTick,
+  onMounted,
+  onUnmounted,
+  onUpdated,
+  reactive,
+  ref,
+  unref,
+  watch,
+} from "vue";
+import CheckingTaskModal from "./modal/CheckingTaskModal.vue";
+import FinishPackageModal from "./modal/FinishPackageModal.vue";
+import GeneratePackageModal from "./modal/GeneratePackageModal.vue";
+import LoginSuccessModal from "./modal/LoginSuccessModal.vue";
+import PackageSettingsModal from "./modal/PackageSettingsModal.vue";
+import QueryRepeatedTasksModal from "./modal/QueryRepeatedTasksModal.vue";
+import type { PictureSortParam } from "/#/api";
+import defaultAvatar from "@/assets/icons/avatar.svg";
+
+const deviceHeight = ref(600);
+let _masonry: null | Masonry = null;
+let _imagesload: any;
+const masonryRef = ref<ComponentRef>(null);
+const el = ref<HTMLDivElement | null>(null);
+const viewMode = ref("masonry");
 const pagination = reactive({
   pageNo: 0,
   pageSize: 30,
-})
-const configStore = useConfig()
-const packageModalRef = ref(null)
-const generateModalRef = ref(null)
-const queryRepeatedTasksModalRef = ref(null)
-const LoginSuccessModalRef = ref(null)
-const checkingTaskModalRef = ref(null)
-const finishPackageModal = ref(null)
-const loading = ref(false)
-const message = useMessage()
-const totalCount = ref(0)
+});
+const configStore = useConfig();
+const packageModalRef = ref(null);
+const generateModalRef = ref(null);
+const queryRepeatedTasksModalRef = ref(null);
+const LoginSuccessModalRef = ref(null);
+const checkingTaskModalRef = ref(null);
+const finishPackageModal = ref(null);
+const loading = ref(false);
+const message = useMessage();
+const totalCount = ref(0);
 const sortBy: PictureSortParam = {
   orderbyname: "desc",
   orderbyvalue: "pictureResult",
 };
-const imageRef = ref<ComponentElRef | null>()
-const checkDuplicateNo = ref('')
-const checkTaskStatus = ref(null) // 1.执行中 2.执行完毕  3.执行失败
-const isRefresh = ref(true) // 生成任务包前，点击刷新数据，并将【一键查重】切换按钮为【生成任务包】
+const imageRef = ref<ComponentElRef | null>();
+const checkDuplicateNo = ref("");
+const checkTaskStatus = ref(null); // 1.执行中 2.执行完毕  3.执行失败
+const isRefresh = ref(true); // 生成任务包前，点击刷新数据，并将【一键查重】切换按钮为【生成任务包】
 
-let canloadMore = true
-let filterId = null
+let canloadMore = true;
+let filterId = null;
 
 async function computeListHeight() {
-  const headEl = document.querySelector('.wrapper-content')!
-  const { bottomIncludeBody } = getViewportOffset(headEl)
-  const height = bottomIncludeBody
-  deviceHeight.value = height - 40 - 16 - 24
+  const headEl = document.querySelector(".wrapper-content")!;
+  const { bottomIncludeBody } = getViewportOffset(headEl);
+  const height = bottomIncludeBody;
+  deviceHeight.value = height - 40 - 16 - 24;
 }
 
-useWindowSizeFn(computeListHeight)
+useWindowSizeFn(computeListHeight);
 
 const listStyle = computed(() => {
   return {
     height: `${deviceHeight.value}px`,
-  }
-})
+  };
+});
 
 const layout = debounce(() => {
-  if (masonryRef.value == null || el.value == null)
-    return
+  if (masonryRef.value == null || el.value == null) return;
 
-  if (_masonry !== null)
-    (_masonry as any).addItems()
+  if (_masonry !== null) (_masonry as any).addItems();
 
   _masonry = new Masonry(masonryRef.value as any, {
-    itemSelector: '.grid-item',
+    itemSelector: ".grid-item",
     gutter: 17,
     columnWidth: 182,
     percentPosition: true,
     stagger: 10,
-  })
+  });
 
-  _imagesload = imagesloaded('.grid-item')
+  _imagesload = imagesloaded(".grid-item");
 
-  _imagesload.on('done', (instance) => {
-    (_masonry as any).layout()
-    if (!el.value)
-      return
-    loading.value = false
-  })
+  _imagesload.on("done", (instance) => {
+    (_masonry as any).layout();
+    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);
 
 useInfiniteScroll(
   el as any,
   () => {
-    loadMore()
+    loadMore();
   },
-  { distance: 10, canLoadMore: () => canloadMore },
-)
+  { distance: 10, canLoadMore: () => canloadMore }
+);
 
 onUpdated(() => {
-  layout()
-})
+  layout();
+});
 
-const timeRange = ref('')
+const timeRange = ref("");
 const timeLabel = computed(() => {
   const item = timeOptions.find((option) => {
-    return option.value === timeRange.value
-  })
+    return option.value === timeRange.value;
+  });
 
-  return item?.label
-})
+  return item?.label;
+});
 
 const viewLabel = computed(() => {
   const item = viewOptions.find((option) => {
-    return option.value === viewMode.value
-  })
+    return option.value === viewMode.value;
+  });
 
-  return item?.label
-})
+  return item?.label;
+});
 
-let isAllowDownload = ref(true)
+let isAllowDownload = ref(true);
 let calNum = ref(0);
-const searchValue = ref('');
-const isInitSeaerch = ref(false);// 是否初始化搜索
+const searchValue = ref("");
+const isInitSeaerch = ref(false); // 是否初始化搜索
 
 configStore.$subscribe(() => {
+  console.log("subscribe", "configStore");
   isAllowDownload.value = configStore.isAllowDownload;
   calNum.value = configStore.getTimeNum;
   // console.log("calNum.value----------", calNum.value);
   searchValue.value = configStore.getSearchValue;
-})
-
+  console.log(configStore.getSearchValue, "getSearchValue");
+});
 
-watch(() => searchValue.value,
+watch(
+  () => searchValue.value,
   async (newVal, oldVal) => {
-    if(newVal) {
+    if (newVal) {
       isInitSeaerch.value = true;
       pagination.pageNo = 0;
-      const more = await featchList()
+      const more = await featchList();
       listData.value = more;
       isInitSeaerch.value = false;
       // configStore.setSearchValue("");
+    } else {
+      isInitSeaerch.value = true;
+      pagination.pageNo = 0;
+      const more = await featchList();
+      listData.value = more;
+      isInitSeaerch.value = false;
     }
-  },
+  }
 );
 
-const listData = ref<any[]>([])
+const listData = ref<any[]>([]);
 
 async function featchList() {
-  loading.value = true
+  loading.value = true;
   try {
     const contentParams = {
       search_month: timeRange.value,
       search_history: 0,
-    }
+    };
 
-    pagination.pageNo += 1
-    const searchValue = configStore.getSearchValue // rao
-    const asideParams = unref(configStore.getAsideValue)
-    const params = filterId ? { userSearchId: filterId } : cloneDeep(asideParams)
+    pagination.pageNo += 1;
+    const searchValue = configStore.getSearchValue; // rao
+    const asideParams = unref(configStore.getAsideValue);
+    const params = filterId ? { userSearchId: filterId } : cloneDeep(asideParams);
     let result = {
       pageCount: 0,
       data: [],
       total: 0,
+    };
+    let sortObj: any = {}; // rao start
+    if (sortBy.orderbyvalue == "pictureResult") {
+      sortObj.ordertype = sortBy.orderbyname;
+    } else if (sortBy.orderbyvalue == "fromuptime") {
+      sortObj.orderByTime = sortBy.orderbyname;
     }
-    let sortObj: any = {} // rao start
-    if(sortBy.orderbyvalue == "pictureResult") {
-      sortObj.ordertype = sortBy.orderbyname
-    }else if(sortBy.orderbyvalue == "fromuptime") {
-      sortObj.orderByTime = sortBy.orderbyname
-    }
-    if(params['izsimilarity'] && typeof params['izsimilarity'] != "string") {
-      params['izsimilarity'] = params['izsimilarity'].join('-');
+    if (params["izsimilarity"] && typeof params["izsimilarity"] != "string") {
+      params["izsimilarity"] = params["izsimilarity"].join("-");
     }
     // rao end
-    
+
     if (checkTaskStatus.value === 2 && isRefresh) {
-      result = await queryPageListByCheckNo({ ...pagination, ...contentParams, ...params, ...sortObj, checkDuplicateNo: checkDuplicateNo.value, upUserName: searchValue })
+      result = await queryPageListByCheckNo({
+        ...pagination,
+        ...contentParams,
+        ...params,
+        ...sortObj,
+        checkDuplicateNo: checkDuplicateNo.value,
+        upUserName: searchValue,
+      });
     } else {
-      result = await getPictureList({ ...pagination, ...contentParams, ...params, ...sortObj, upUserName: searchValue })
+      result = await getPictureList({
+        ...pagination,
+        ...contentParams,
+        ...params,
+        ...sortObj,
+        upUserName: searchValue,
+      });
     }
-    const { data, pageCount, total } = result
-    totalCount.value = total
-    canloadMore = pageCount >= pagination.pageNo && pageCount > 0
+    const { data, pageCount, total } = result;
+    totalCount.value = total;
+    canloadMore = pageCount >= pagination.pageNo && pageCount > 0;
 
     const list = data.map((item) => {
       return {
@@ -211,240 +244,245 @@ async function featchList() {
         ocrPictureclass: item.ocrPictureclass,
         uphead: item.uphead,
         similar: item.similarityscore || -1,
-        imgName: item.imgname
-      }
-    })
+        imgName: item.imgname,
+      };
+    });
 
-    return list
-  }
-  catch (error) {
-    canloadMore = false
-    return []
+    return list;
+  } catch (error) {
+    canloadMore = false;
+    return [];
   }
 }
 
 async function loadMore() {
-  if (loading.value || el.value == null)
-    return
+  if (loading.value || el.value == null) return;
 
-  const more = await featchList()
+  const more = await featchList();
   // if(isInitSeaerch.value) {
   //   listData.value = [];
   //   isInitSeaerch.value = false;
   // }
-  listData.value.push(...more)
+  listData.value.push(...more);
 }
 
 const gridHeight = computed(() => {
-  let height = ""
-  if (viewMode.value === 'masonry') {
-    height = ''
-  } else if (viewMode.value === 'horizontalVersion') {
-    height = '145px'
-  } else if (viewMode.value === 'verticalVersion') {
-    height = '300px'
-  } else if (viewMode.value === '3:4') {
-    height = '240px'
+  let height = "";
+  if (viewMode.value === "masonry") {
+    height = "";
+  } else if (viewMode.value === "horizontalVersion") {
+    height = "145px";
+  } else if (viewMode.value === "verticalVersion") {
+    height = "300px";
+  } else if (viewMode.value === "3:4") {
+    height = "240px";
   }
-  return height
-})
+  return height;
+});
 
 async function oneCheck() {
-  const asideVal = cloneDeep(configStore.getAsideValue)
-  if(asideVal.izyear && asideVal.izyear.length == 2) {
-    asideVal.izyear = dayjs(asideVal.izyear[0]).format("YYYY/MM/DD") + '-' + dayjs(asideVal.izyear[1]).format("YYYY/MM/DD")
+  const asideVal = cloneDeep(configStore.getAsideValue);
+  if (asideVal.izyear && asideVal.izyear.length == 2) {
+    asideVal.izyear =
+      dayjs(asideVal.izyear[0]).format("YYYY/MM/DD") +
+      "-" +
+      dayjs(asideVal.izyear[1]).format("YYYY/MM/DD");
   }
-  if(asideVal['izsimilarity'] && typeof asideVal['izsimilarity'] != "string") {
-    asideVal['izsimilarity'] = asideVal['izsimilarity'].join('-');
+  if (asideVal["izsimilarity"] && typeof asideVal["izsimilarity"] != "string") {
+    asideVal["izsimilarity"] = asideVal["izsimilarity"].join("-");
   }
-  const tasksLoadingModal = queryRepeatedTasksModalRef.value as any
-  
-  console.log('calNum.value111111111111111', calNum.value, checkTaskStatus.value);
-  if(calNum.value == 0 && isRefresh.value) {
-    if(timer.value) {
+  const tasksLoadingModal = queryRepeatedTasksModalRef.value as any;
+
+  console.log("calNum.value111111111111111", calNum.value, checkTaskStatus.value);
+  if (calNum.value == 0 && isRefresh.value) {
+    if (timer.value) {
       clearInterval(timer.value);
     }
     timer.value = setInterval(() => {
-      console.log('calNum.value2222222222222', calNum.value,checkTaskStatus.value);
+      console.log("calNum.value2222222222222", calNum.value, checkTaskStatus.value);
       if (checkDuplicateNo.value) {
         getCheckDuplicateStatus(checkDuplicateNo.value).then((res) => {
           if (res.code === "OK") {
             checkTaskStatus.value = res.data.status;
-            if(calNum.value < 90) {
+            if (calNum.value < 90) {
               calNum.value = calNum.value + 10;
             }
             configStore.setTimeNum(calNum.value);
-            if(checkTaskStatus.value === 2 || checkTaskStatus.value === 3) {
-              if(checkTaskStatus.value === 2) {
-                message.success('任务执行完毕，正在刷新数据...');
-              }else {
-                message.error('查询异常');
+            if (checkTaskStatus.value === 2 || checkTaskStatus.value === 3) {
+              if (checkTaskStatus.value === 2) {
+                message.success("任务执行完毕，正在刷新数据...");
+              } else {
+                message.error("查询异常");
               }
               tasksLoadingModal.closeOnlyModal();
               configStore.setTimeNum(100);
-              if(timer.value) {
+              if (timer.value) {
                 clearInterval(timer.value);
               }
               setTimeout(() => {
                 configStore.setTimeNum(0);
               }, 1000);
-              reset()
-              loadMore()
+              reset();
+              loadMore();
             }
-          }else {
-            if(timer.value) {
+          } else {
+            if (timer.value) {
               clearInterval(timer.value);
             }
-          }})
+          }
+        });
       }
     }, 1000);
   }
   // 查重任务编号,状态不为空,或者状态执行中..
-  if(checkDuplicateNo.value && checkTaskStatus.value && checkTaskStatus.value===1){// 暂时rao
-    tasksLoadingModal.showModal()
-	  return;
+  if (checkDuplicateNo.value && checkTaskStatus.value && checkTaskStatus.value === 1) {
+    // 暂时rao
+    tasksLoadingModal.showModal();
+    return;
   }
   //调用查重任务开启流程
   oneClickCheckTaskPackage(asideVal).then((res) => {
     if (res.code === "OK") {
-      checkDuplicateNo.value = res.data.checkDuplicateNo
-  	  checkTaskStatus.value = res.data.status
-  	  tasksLoadingModal.showModal() // 暂时rao
+      checkDuplicateNo.value = res.data.checkDuplicateNo;
+      checkTaskStatus.value = res.data.status;
+      tasksLoadingModal.showModal(); // 暂时rao
     } else {
-      message.error(res.message || '查重失败')
+      message.error(res.message || "查重失败");
     }
-  })
+  });
 }
 
 /**
  * 显示添加任务包
  */
 async function showAddPackage() {
-	const modal = packageModalRef.value as any
-	modal.showModal()
+  const modal = packageModalRef.value as any;
+  modal.showModal();
 }
 
 //查重任务加载提示框,关闭回调
 async function tasksLoadingCloseCallback() {
-	const checkingTaskModal = checkingTaskModalRef.value as any
-	checkingTaskModal.showModal()
-  if(isRefresh.value) {
+  const checkingTaskModal = checkingTaskModalRef.value as any;
+  checkingTaskModal.showModal();
+  if (isRefresh.value) {
     refresh(true);
   }
 }
 
 async function showLoginSuccessModal() {
-  const modal = LoginSuccessModalRef.value as any
+  const modal = LoginSuccessModalRef.value as any;
   // modal.showModal()
 }
 
 // 包id
-const packageIdRef = ref('');
+const packageIdRef = ref("");
 
 async function commitHandler(settingParam) {
   const params = {
     name: settingParam.packagename,
-    checkDuplicateNo: checkDuplicateNo.value
-  }
-  const modal = generateModalRef.value as any
-  const finishModal = finishPackageModal.value as any
-  modal.showModal()
+    checkDuplicateNo: checkDuplicateNo.value,
+  };
+  const modal = generateModalRef.value as any;
+  const finishModal = finishPackageModal.value as any;
+  modal.showModal();
   createPackage(params).then((res) => {
     if (res.code === "OK") {
       message.success(res.data);
       packageIdRef.value = res.data.id;
-      modal.closeModal()
-      finishModal.showModal()
-	  //清空查重任务状态和编号
-	  checkDuplicateNo.value='';
-	  checkTaskStatus.value = null;
+      modal.closeModal();
+      finishModal.showModal();
+      //清空查重任务状态和编号
+      checkDuplicateNo.value = "";
+      checkTaskStatus.value = null;
     }
-  })
-  const asideVal = configStore.getAsideValue
-  const finalParam = { ...asideVal }
-  finalParam.buessinessno = settingParam.packagename
-  finalParam.search_history = settingParam.comparehistory ? 1 : 0
-
+  });
+  const asideVal = configStore.getAsideValue;
+  const finalParam = { ...asideVal };
+  finalParam.buessinessno = settingParam.packagename;
+  finalParam.search_history = settingParam.comparehistory ? 1 : 0;
 }
 
 onMounted(() => {
-  emitter.on('filter', refreshHandler)
+  emitter.on("filter", refreshHandler);
   // 一件键重——获取任务编号
   getLastCheckNo().then((res) => {
     if (res.code === "OK") {
-      checkDuplicateNo.value = res.data
+      checkDuplicateNo.value = res.data;
     }
-  })
+  });
   nextTick(() => {
-    computeListHeight()
+    computeListHeight();
     // 登录后展示成功
     // showLoginSuccessModal()
-  })
-})
+  });
+});
 
 onUnmounted(() => {
-  emitter.off('filter', refreshHandler)
-})
+  emitter.off("filter", refreshHandler);
+});
 
 watch(timeRange, () => {
-  refreshHandler()
-})
+  refreshHandler();
+});
 
-watch(() => configStore.asideValue, (newVal, oldVal) => {
-  refreshHandler()
-}, { deep: true })
+watch(
+  () => configStore.asideValue,
+  (newVal, oldVal) => {
+    refreshHandler();
+  },
+  { deep: true }
+);
 
 function reset() {
-  pagination.pageNo = 0
-  pagination.pageSize = 30
-  listData.value.length = 0
-  loading.value = false
-  canloadMore = true
-  filterId = null
-
-  layout()
+  pagination.pageNo = 0;
+  pagination.pageSize = 30;
+  listData.value.length = 0;
+  loading.value = false;
+  canloadMore = true;
+  filterId = null;
+
+  layout();
 }
 
 async function refreshHandler(filtersearchId?: any) {
-  reset()
+  reset();
 
-  if (filtersearchId)
-    filterId = filtersearchId
+  if (filtersearchId) filterId = filtersearchId;
 
   nextTick(() => {
     setTimeout(() => {
       useInfiniteScroll(
         el as any,
         () => {
-          loadMore()
+          loadMore();
         },
-        { distance: 10, canLoadMore: () => canloadMore },
-      )
-    }, 300)
-  })
+        { distance: 10, canLoadMore: () => canloadMore }
+      );
+    }, 300);
+  });
 }
 
 function getAvatar(url: string): string {
-  return url ? getImgUrl(url) : avatar
+  return url ? getImgUrl(url) : avatar;
 }
 
 function sortHandler(orderby: "pictureResult" | "fromuptime") {
   sortBy.orderbyvalue = orderby;
   sortBy.orderbyname = sortBy.orderbyname === "asc" ? "desc" : "asc";
 
-  refreshHandler()
+  refreshHandler();
 }
 async function downloadImage(item) {
   if (!item.thumburl) {
-    message.error('请输入有效的图片链接地址')
+    message.error("请输入有效的图片链接地址");
     return;
   }
   try {
     // 使用 fetch 发送 GET 请求获取图片
     const response = await fetch(item.thumburl, {
-      method: 'GET',
-      mode: 'cors', // 确保跨域请求被正确处理
-      cache: 'default',
+      method: "GET",
+      mode: "cors", // 确保跨域请求被正确处理
+      cache: "default",
     });
     // 检查响应状态码，确保请求成功
     if (!response.ok) {
@@ -455,10 +493,10 @@ async function downloadImage(item) {
     const blob = await response.blob();
 
     // 创建一个新的a标签
-    const link = document.createElement('a');
+    const link = document.createElement("a");
     link.href = URL.createObjectURL(blob);
     link.download = item.imgName; // 设置下载的文件名
-    link.style.display = 'none'; // 隐藏链接
+    link.style.display = "none"; // 隐藏链接
 
     // 将链接添加到 DOM 中
     document.body.appendChild(link);
@@ -470,7 +508,7 @@ async function downloadImage(item) {
     URL.revokeObjectURL(link.href);
     document.body.removeChild(link);
   } catch (error) {
-    console.error('下载图片时发生错误:', error);
+    console.error("下载图片时发生错误:", error);
   }
 }
 
@@ -488,38 +526,41 @@ const timer = ref();
  */
 function refresh(val?: any) {
   // delete asideVal.izsimilarity
-  const checkingTaskModal = checkingTaskModalRef.value as any
+  const checkingTaskModal = checkingTaskModalRef.value as any;
   if (checkDuplicateNo.value) {
     getCheckDuplicateStatus(checkDuplicateNo.value).then((res) => {
       if (res.code === "OK") {
-        checkTaskStatus.value = res.data.status // 1.执行中 2.执行完毕
+        checkTaskStatus.value = res.data.status; // 1.执行中 2.执行完毕
         // if (isRefresh.value === false) {
         //   const modal = packageModalRef.value as any
         //   modal.showModal()
         //   return
         // }
-        
-        if ((checkTaskStatus.value === 2 || checkTaskStatus.value === 3) && isRefresh.value) {
+
+        if (
+          (checkTaskStatus.value === 2 || checkTaskStatus.value === 3) &&
+          isRefresh.value
+        ) {
           configStore.setTimeNum(100);
-          checkingTaskModal.closeModal()
-          isRefresh.value = false
-          if(checkTaskStatus.value === 2) {
-            message.success('任务执行完毕，正在刷新数据...');
-          }else {
-            message.error('查询异常');
+          checkingTaskModal.closeModal();
+          isRefresh.value = false;
+          if (checkTaskStatus.value === 2) {
+            message.success("任务执行完毕，正在刷新数据...");
+          } else {
+            message.error("查询异常");
           }
-          if(timer.value) {
+          if (timer.value) {
             clearInterval(timer.value);
           }
-          reset()
-          loadMore()
+          reset();
+          loadMore();
           configStore.setTimeNum(0);
         } else if (checkTaskStatus.value === 1) {
-          return
+          return;
         }
       }
-    })
-    return
+    });
+    return;
   }
 }
 /**
@@ -529,40 +570,39 @@ function cancel(val) {
   if (checkTaskStatus.value === 1) {
     removeCheckDuplicate(checkDuplicateNo.value).then((res) => {
       if (res.code === "OK") {
-		checkDuplicateNo.value='';
-		checkTaskStatus.value = null;
-        message.success("查重任务取消成功")
+        checkDuplicateNo.value = "";
+        checkTaskStatus.value = null;
+        message.success("查重任务取消成功");
       }
-    })
+    });
   }
 }
 
 const renderIcon = (icon: Component) => {
   return () => {
     return h(NIcon, null, {
-      default: () => h(icon)
-    })
-  }
-}
+      default: () => h(icon),
+    });
+  };
+};
 
 const dropdownOptions = ref([
   {
-    label: '导入任务数据',
-    key: 'profile',
-    icon: renderIcon(UploadIcon)
+    label: "导入任务数据",
+    key: "profile",
+    icon: renderIcon(UploadIcon),
   },
   {
-    label: '导出任务数据',
-    key: 'editProfile',
-    icon: renderIcon(DownloadIcon)
+    label: "导出任务数据",
+    key: "editProfile",
+    icon: renderIcon(DownloadIcon),
   },
   {
-    label: '查看导入记录',
-    key: 'logout',
-    icon: renderIcon(EyeOutlineIcon)
-  }
+    label: "查看导入记录",
+    key: "logout",
+    icon: renderIcon(EyeOutlineIcon),
+  },
 ]);
-
 </script>
 
 <template>
@@ -573,27 +613,33 @@ const dropdownOptions = ref([
         <span class="font">AI一键查重</span>
       </div>
       <div class="flex-btn-icon">
-        <SvgIcon v-show="checkTaskStatus !== 2" style="cursor: pointer;" size="105" name="yijianchachong"
-          @click="oneCheck" />
-        <SvgIcon v-show="checkTaskStatus === 2" style="cursor: pointer;" size="105" name="shengchengrenwubao"
-          @click="showAddPackage" />
-        <n-dropdown
-          trigger="hover"
-          placement="bottom-start"
-          :options="dropdownOptions"
-        >
+        <SvgIcon
+          v-show="checkTaskStatus !== 2"
+          style="cursor: pointer"
+          size="105"
+          name="yijianchachong"
+          @click="oneCheck"
+        />
+        <SvgIcon
+          v-show="checkTaskStatus === 2"
+          style="cursor: pointer"
+          size="105"
+          name="shengchengrenwubao"
+          @click="showAddPackage"
+        />
+        <n-dropdown trigger="hover" placement="bottom-start" :options="dropdownOptions">
           <span class="expand-icon">
-            <Icon style="position: relative; top: 2px;">
-              <EllipsisHorizontal style="color: #507afd;"/>
+            <Icon style="position: relative; top: 2px">
+              <EllipsisHorizontal style="color: #507afd" />
             </Icon>
           </span>
         </n-dropdown>
       </div>
     </div>
     <div class="wrapper-content">
-      <div style="display: flex;justify-content: space-between;">
+      <div style="display: flex; justify-content: space-between">
         <div class="form">
-<!--          <n-popselect v-model:value="timeRange" :options="timeOptions" trigger="click">
+          <!--          <n-popselect v-model:value="timeRange" :options="timeOptions" trigger="click">
             <div class="dropdown">
               <span>{{ timeLabel || '请选择' }}</span>
               <SvgIcon class="gap" name="arrow-botton" size="14" />
@@ -606,40 +652,65 @@ const dropdownOptions = ref([
               <SvgIcon class="gap" name="arrow-botton" size="14" />
             </div>
           </n-popselect>
-          <div style="margin-left: 15px;cursor: pointer;color:#323233" @click="sortHandler('fromuptime')">
+          <div
+            style="margin-left: 15px; cursor: pointer; color: #323233"
+            @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;color:#323233" @click="sortHandler('pictureResult')">
+          <div
+            style="margin-left: 15px; cursor: pointer; color: #323233"
+            @click="sortHandler('pictureResult')"
+          >
             <span>相似度排序</span>
-            <SvgIcon style="margin-left: 8px;" name="sort" size="12" />
+            <SvgIcon style="margin-left: 8px" name="sort" size="12" />
           </div>
         </div>
-        <span style="font-size: 16px;color: #333">共 <span style="color: #507AFD;font-weight: 500;">{{ totalCount
-        }}</span> 项</span>
+        <span style="font-size: 16px; color: #333"
+          >共
+          <span style="color: #507afd; font-weight: 500">{{ totalCount }}</span> 项</span
+        >
       </div>
       <n-spin :show="loading">
         <div ref="el" class="scroll" :style="listStyle">
           <!-- <n-scrollbar :on-scroll="scrollHandler"> -->
           <div ref="masonryRef" class="grid">
-            <div v-for="(item, index) in listData" :key="index" :style="{ height: gridHeight }" class="grid-item">
+            <div
+              v-for="(item, index) in listData"
+              :key="index"
+              :style="{ height: gridHeight }"
+              class="grid-item"
+            >
               <!-- <div :style="{ 'background-color': randomColor(0.2) }" class="wrapper-content-item-img" /> -->
               <!-- <img
                 class="wrapper-content-item-img" :class="{ 'wrapper-content-item-img-fit': viewMode !== 'masonry' }"
                 :src="item.imgUrl"
               > -->
-              <n-image class="img" :img-props="{ onClick: hideDownload }"
-                :class="{ 'img-fit': viewMode === 'horizontalVersion', 'img-full': viewMode === '3:4' || viewMode === 'verticalVersion' }"
-                :preview-src="item.imgUrl" :src="item.thumburl" ref="imageRef" />
-              <div class="percent" v-if="item.similar!=-1">
+              <n-image
+                class="img"
+                :img-props="{ onClick: hideDownload }"
+                :class="{
+                  'img-fit': viewMode === 'horizontalVersion',
+                  'img-full': viewMode === '3:4' || viewMode === 'verticalVersion',
+                }"
+                :preview-src="item.imgUrl"
+                :src="item.thumburl"
+                ref="imageRef"
+              />
+              <div class="percent" v-if="item.similar != -1">
                 <SvgIcon size="42" name="tag" />
                 <div class="val">
                   {{ `${item.similar}%` }}
                 </div>
               </div>
               <div class="glass" v-if="isAllowDownload">
-                <SvgIcon size="16" name="download" style="margin-top: -6px;cursor: pointer;"
-                  @click="downloadImage(item)" />
+                <SvgIcon
+                  size="16"
+                  name="download"
+                  style="margin-top: -6px; cursor: pointer"
+                  @click="downloadImage(item)"
+                />
               </div>
 
               <div class="info">
@@ -653,11 +724,19 @@ const dropdownOptions = ref([
                     </n-tooltip>
                   </div>
                   <div class="icon-wrap" @click="previewHandler(index, $event)">
-                    <SvgIcon size="13" name="magnifying-2" style="cursor: pointer;color:#898481" />
+                    <SvgIcon
+                      size="13"
+                      name="magnifying-2"
+                      style="cursor: pointer; color: #898481"
+                    />
                   </div>
                 </div>
                 <div class="left">
-                  <n-avatar :src="(item.uphead && getAvatar(item.uphead)) || defaultAvatar" class="avatar" round />
+                  <n-avatar
+                    :src="(item.uphead && getAvatar(item.uphead)) || defaultAvatar"
+                    class="avatar"
+                    round
+                  />
                   <span>{{ item.upname }}</span>
                 </div>
                 <!-- <div class="right">
@@ -673,9 +752,12 @@ const dropdownOptions = ref([
     </div>
     <PackageSettingsModal ref="packageModalRef" @commit="commitHandler" />
     <GeneratePackageModal ref="generateModalRef" />
-    <QueryRepeatedTasksModal ref="queryRepeatedTasksModalRef" @closeCallback="tasksLoadingCloseCallback"/>
+    <QueryRepeatedTasksModal
+      ref="queryRepeatedTasksModalRef"
+      @closeCallback="tasksLoadingCloseCallback"
+    />
     <LoginSuccessModal ref="LoginSuccessModalRef" />
-    <FinishPackageModal ref="finishPackageModal" :id="packageIdRef"/>
+    <FinishPackageModal ref="finishPackageModal" :id="packageIdRef" />
     <CheckingTaskModal ref="checkingTaskModalRef" @refresh="refresh" @cancel="cancel" />
   </div>
 </template>
@@ -693,7 +775,7 @@ const dropdownOptions = ref([
     display: flex;
     justify-content: space-between;
     align-items: center;
-    background: #FFF;
+    background: #fff;
     padding: 0px 15px 0px 15px;
     box-sizing: border-box;
     height: 64px;
@@ -719,7 +801,7 @@ const dropdownOptions = ref([
     flex: 1;
     padding: 16px 16px 0px 16px;
     margin-top: 16px;
-    background: #FFF;
+    background: #fff;
     border-radius: 3px;
     border: 1px solid rgb(239, 239, 245);
 
@@ -800,7 +882,7 @@ const dropdownOptions = ref([
       .glass {
         position: absolute;
         display: none !important;
-        background-color: #FFF;
+        background-color: #fff;
         border-radius: 6px;
         padding: 3px;
         top: 10px;
@@ -818,12 +900,12 @@ const dropdownOptions = ref([
         justify-content: space-between;
         align-items: center;
         padding: 0 10px;
-        background: rgba(0, 0, 0, .35);
+        background: rgba(0, 0, 0, 0.35);
         border-radius: 7px;
 
         .img-name {
           width: 70%;
-          color: #FFF;
+          color: #fff;
           /* 设置文本溢出时的样式为省略号 */
           text-overflow: ellipsis;
           /* 隐藏超出容器的文本 */
@@ -837,13 +919,12 @@ const dropdownOptions = ref([
           height: 22px;
           line-height: 22px;
           text-align: center;
-          background-color: #FFF;
+          background-color: #fff;
           border-radius: 6px;
         }
       }
 
       &:hover {
-
         .percent {
           display: none;
         }
@@ -864,7 +945,7 @@ const dropdownOptions = ref([
       z-index: 3;
       right: 0px;
       top: -6px;
-      color: #FFF;
+      color: #fff;
 
       .val {
         position: absolute;
@@ -900,9 +981,13 @@ const dropdownOptions = ref([
     width: 30px;
     height: 30px;
     line-height: 30px;
-    background: linear-gradient(144deg, rgba(115, 167, 249, 0.1) 0%, rgba(62, 110, 241, 0.1) 96%); 
+    background: linear-gradient(
+      144deg,
+      rgba(115, 167, 249, 0.1) 0%,
+      rgba(62, 110, 241, 0.1) 96%
+    );
     border-radius: 8px;
     text-align: center;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 08a9cf7..6d3e13b 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -62,7 +62,7 @@ function close() {
       </div>
       <div class="text">企业级 SaaS 智能审批解决方案</div>
       <img class="img-icon-2" src="../../assets/images/login/img-icon-2.png" alt="" />
-      <div class="btn-login-2 f-c-c" @click="showLogin">立即登录 -></div>
+      <div class="flex btn-login-2 f-c-c" @click="showLogin">立即登录 <SvgIcon name="right_arrow" class="right_arrow"/></div>
       <div class="item-wrap f-c">
         <div class="item">
           <img class="item-img" src="../../assets/images/login/item-1.png" alt="" />
@@ -300,5 +300,9 @@ function close() {
   color: #FF4E4F !important;
   font-size: .75rem !important;
 }
-
+.right_arrow{
+  height: 1.25rem !important;
+  width: 1.25rem !important;
+  margin-top: .2rem;
+}
 </style>
-- 
2.39.3


From 4266ab4f74b431cdc08c3d136ad62b44b38e398b Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Tue, 2 Apr 2024 17:40:11 +0800
Subject: [PATCH 115/143] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/content/Content.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 51ffcb4..01b09d3 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -430,13 +430,13 @@ function reloadList() {
             <div class="footer-times">
               <div class="time" style="margin-bottom: 4px;">
                 <SvgIcon color="#FFF" size="16" name="camera" />
-                <span class="time-value">{{ taskDetailInfo?.submitDateTimestamp ? format(
-                  taskDetailInfo.submitDateTimestamp, 'yyyy-MM-dd HH:mm:ss') : '-' }} </span>
+                <span class="time-value">{{ taskDetailInfo?.photoDateTimestamp ? format(
+                  taskDetailInfo.photoDateTimestamp, 'yyyy-MM-dd HH:mm:ss') : '-' }} </span>
               </div>
               <div class="time">
                 <SvgIcon color="#FFF" size="16" name="save" />
                 <span class="time-value">{{
-                  taskDetailInfo?.photoDateTimestamp ? format(taskDetailInfo?.photoDateTimestamp, 'yyyy-MM-dd HH:mm:ss') :
+                  taskDetailInfo?.submitDateTimestamp ? format(taskDetailInfo?.submitDateTimestamp, 'yyyy-MM-dd HH:mm:ss') :
                   '-'
                 }} </span>
               </div>
-- 
2.39.3


From 6ec415481e591b5210fd1e9c162b007a64a61bae Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Tue, 2 Apr 2024 18:02:03 +0800
Subject: [PATCH 116/143] =?UTF-8?q?fix:=20=E7=BB=88=E5=AE=A1=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8columns=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/comp/CustomTabelModal.vue |   4 +-
 src/views/final/content/Content.vue       | 746 ++++++++++++----------
 2 files changed, 393 insertions(+), 357 deletions(-)

diff --git a/src/views/final/comp/CustomTabelModal.vue b/src/views/final/comp/CustomTabelModal.vue
index bd752d9..085ccd9 100644
--- a/src/views/final/comp/CustomTabelModal.vue
+++ b/src/views/final/comp/CustomTabelModal.vue
@@ -433,13 +433,13 @@ const indeterminate = computed(() => {
                     >
                       <SvgIcon name="drag" size="14" color="#666666" />
                       <span class="ml-2">{{ item.name }}</span>
-                      <SvgIcon
+                      <!-- <SvgIcon
                         v-if="!item.fix"
                         size="16px"
                         style="display: block; margin-left: auto; cursor: pointer"
                         name="clear"
                         @click="removeHandler(item.id, 'fix')"
-                      />
+                      /> -->
                     </div>
                   </VueDraggable>
                   <div>不固定</div>
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index 99a15ae..24f68fa 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
-import type { DataTableColumns, DataTableRowKey, PaginationProps } from 'naive-ui'
-import { NButton, NDataTable, useDialog, useMessage } from 'naive-ui'
+import type { DataTableColumns, DataTableRowKey, PaginationProps } from "naive-ui";
+import { NButton, NDataTable, useDialog, useMessage } from "naive-ui";
 import {
   computed,
   defineEmits,
@@ -13,9 +13,9 @@ import {
   ref,
   unref,
   watch,
-} from 'vue'
-import { rowPropKeys } from 'naive-ui/es/legacy-grid/src/Row'
-import { useRoute, useRouter } from 'vue-router'
+} from "vue";
+import { rowPropKeys } from "naive-ui/es/legacy-grid/src/Row";
+import { useRoute, useRouter } from "vue-router";
 import {
   CustomTabelModal,
   ImportExcelModal,
@@ -23,50 +23,50 @@ import {
   RepeatModal,
   RepeatTaskTableModal,
   StatusItem,
-} from '../comp'
-import { getFinalList } from '@/api/final'
-import { audit } from '@/api/task/task'
-import SvgIcon from '@/components/Icon/SvgIcon.vue'
-import type { RowData } from '@/config/final'
-import { findKey, headRules } from '@/config/final'
-import { useWindowSizeFn } from '@/hooks/event/useWindowSizeFn'
-import { useUser } from '@/store/modules/user'
-import { useFinal } from '@/store/modules/final'
-import { getViewportOffset } from '@/utils/domUtils'
-import { isBoolean } from '@/utils/is'
-import { useDictionary } from '@/store/modules/dictonary'
-import NotPassed from '@/components/Approval/NotPassed.vue'
-import type { ApprovalParam } from '/#/api'
-import emitter from '@/utils/mitt'
-import { formatToDateHMS } from '@/utils/dateUtil'
-import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter'
-
-const emit = defineEmits(['changeShow'])
+} from "../comp";
+import { getFinalList } from "@/api/final";
+import { audit } from "@/api/task/task";
+import SvgIcon from "@/components/Icon/SvgIcon.vue";
+import type { RowData } from "@/config/final";
+import { findKey, headRules } from "@/config/final";
+import { useWindowSizeFn } from "@/hooks/event/useWindowSizeFn";
+import { useUser } from "@/store/modules/user";
+import { useFinal } from "@/store/modules/final";
+import { getViewportOffset } from "@/utils/domUtils";
+import { isBoolean } from "@/utils/is";
+import { useDictionary } from "@/store/modules/dictonary";
+import NotPassed from "@/components/Approval/NotPassed.vue";
+import type { ApprovalParam } from "/#/api";
+import emitter from "@/utils/mitt";
+import { formatToDateHMS } from "@/utils/dateUtil";
+import { getAllfieldList, getfieldList, savefield } from "@/api/home/filter";
+
+const emit = defineEmits(["changeShow"]);
 function changeContent() {
-  emit('changeShow')
+  emit("changeShow");
 }
-const checkedRowKeys = ref([])
-const dicStore = useDictionary()
-const izstatusList = ref([])
-const router = useRouter()
-const route = useRoute()
-const reviewType = 0
+const checkedRowKeys = ref([]);
+const dicStore = useDictionary();
+const izstatusList = ref([]);
+const router = useRouter();
+const route = useRoute();
+const reviewType = 0;
 const actionsColumns = {
-  title: '操作',
-  key: 'actions',
+  title: "操作",
+  key: "actions",
   minWidth: 200,
-  fixed: 'right',
+  fixed: "right",
   render(row) {
     return h(ListAction, {
       id: row.id,
       status: row.states,
       trigger: (action) => {
-        actionHandler(action, row)
+        actionHandler(action, row);
       },
-    })
+    });
   },
-}
-const columnsRef = ref<DataTableColumns<RowData>>([])
+};
+const columnsRef = ref<DataTableColumns<RowData>>([]);
 // const columns: DataTableColumns<RowData> = [
 //   {
 //     type: "selection",
@@ -166,235 +166,261 @@ const columnsRef = ref<DataTableColumns<RowData>>([])
 async function getColumns() {
   columnsRef.value = [
     {
-      type: 'selection',
-      fixed: 'left',
+      type: "selection",
+      fixed: "left",
       width: 50,
       disabled(row: any) {
-        return row.states !== 2
+        return row.states !== 2;
       },
     },
-  ]
-
-  const userStore = useUser()
-  const userInfo = userStore.getUserInfo
-  let res
-  res = await getAllfieldList(reviewType) // 所有筛选项目
-  const allList = res.data
-  res = await getfieldList(reviewType, userInfo.id) // 当前用户选择的项目
-  const useList = res.data
-  const userFieldFixed = useList.userFieldFixed?.split(',')
-  const userFieldUnFixed = useList.userFieldUnFixed?.split(',')
-  allList?.map((v) => {
-    if (!userFieldFixed?.length && !userFieldUnFixed?.length) {
+  ];
+
+  const userStore = useUser();
+  const userInfo = userStore.getUserInfo;
+  let res;
+  res = await getAllfieldList(reviewType); // 所有筛选项目
+  const allList = res.data;
+  res = await getfieldList(reviewType, userInfo.id); // 当前用户选择的项目
+  const useList = res.data;
+  const userFieldFixed = useList.userFieldFixed?.split(",");
+  const userFieldUnFixed = useList.userFieldUnFixed?.split(",");
+  if (!userFieldFixed?.length && !userFieldUnFixed?.length) {
+    allList?.map((v) => {
       if (v.isrequired == 2) {
         columnsRef.value.push({
           title: v.fieldDesc,
-          fixed: 'left',
+          fixed: "left",
           key: v.name,
           width: 120,
-        })
+        });
       }
-    }
-
-    if (userFieldFixed?.find(v2 => v2 == v.name)) {
+    });
+  } else {
+    userFieldFixed.map((v) => {
+      let item = allList.find((v2) => v2.name == v);
       columnsRef.value.push({
-        title: v.fieldDesc,
-        key: v.name,
-        fixed: 'left',
+        title: item.fieldDesc,
+        key: item.name,
+        fixed: "left",
         width: 120,
-      })
-    }
-    if (userFieldUnFixed?.find(v2 => v2 == v.name)) {
+      });
+    });
+    userFieldUnFixed.map((v) => {
+      let item = allList.find((v2) => v2.name == v);
       columnsRef.value.push({
-        title: v.fieldDesc,
-        key: v.name,
+        title: item.fieldDesc,
+        key: item.name,
         width: 120,
-      })
-    }
-  })
-  columnsRef.value.push(actionsColumns as any)
-  formatColumns()
-  console.log(columnsRef.value, 'columnsRef')
+      });
+    });
+  }
+  // TODO: 会导致排序问题 废弃
+  // #region
+  // allList?.map((v) => {
+  //   if (!userFieldFixed?.length && !userFieldUnFixed?.length) {
+  //     if (v.isrequired == 2) {
+  //       columnsRef.value.push({
+  //         title: v.fieldDesc,
+  //         fixed: "left",
+  //         key: v.name,
+  //         width: 120,
+  //       });
+  //     }
+  //   }
+
+  //   if (userFieldFixed?.find((v2) => v2 == v.name)) {
+  //     columnsRef.value.push({
+  //       title: v.fieldDesc,
+  //       key: v.name,
+  //       fixed: "left",
+  //       width: 120,
+  //     });
+  //   }
+  //   if (userFieldUnFixed?.find((v2) => v2 == v.name)) {
+  //     columnsRef.value.push({
+  //       title: v.fieldDesc,
+  //       key: v.name,
+  //       width: 120,
+  //     });
+  //   }
+  // });
+  // #endregion
+
+  columnsRef.value.push(actionsColumns as any);
+  console.log(columnsRef.value, "columnsRef111");
+  formatColumns();
+  console.log(columnsRef.value, "columnsRef222");
 }
 
 async function formatColumns() {
   // TODO处理特殊字段
 
-  let index
-  index = columnsRef.value.findIndex(v => v.title == '任务ID')
+  let index;
+  index = columnsRef.value.findIndex((v) => v.title == "任务ID");
   if (index > -1) {
     columnsRef.value[index] = {
-      title: '任务ID',
+      title: "任务ID",
       key: columnsRef.value[index].key, // "id"
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
       render(row) {
         const item: any = izstatusList.value.find(
-          (item: any) => item.value == row.states,
-        )
+          (item: any) => item.value == row.states
+        );
         return h(
           NButton,
           {
-            'strong': true,
-            'tertiary': true,
-            'text': true,
-            'size': 'small',
-            'text-color': '#507AFD',
-            'onClick': () => goDetail(row),
+            strong: true,
+            tertiary: true,
+            text: true,
+            size: "small",
+            "text-color": "#507AFD",
+            onClick: () => goDetail(row),
           },
-          { default: () => row.id },
-        )
+          { default: () => row.id }
+        );
       },
-    }
+    };
   }
 
-  index = columnsRef.value.findIndex(v => v.title == '所属项目')
+  index = columnsRef.value.findIndex((v) => v.title == "所属项目");
   if (index > -1) {
     columnsRef.value[index] = {
-      title: '所属项目',
+      title: "所属项目",
       key: columnsRef.value[index].key, // "fromtaskname"
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
       ellipsis: {
         tooltip: true,
       },
-    }
+    };
   }
 
-  index = columnsRef.value.findIndex(v => v.title == '任务名称')
+  index = columnsRef.value.findIndex((v) => v.title == "任务名称");
   if (index > -1) {
     columnsRef.value[index] = {
-      title: '任务名称',
+      title: "任务名称",
       key: columnsRef.value[index].key, // "fromtaskname"
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
       ellipsis: {
         tooltip: true,
       },
-    }
+    };
   }
-  index = columnsRef.value.findIndex(v => v.title == '审批状态')
+  index = columnsRef.value.findIndex((v) => v.title == "审批状态");
   if (index > -1) {
     columnsRef.value[index] = {
-      title: '审批状态',
+      title: "审批状态",
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 120,
-      sorter: 'default',
+      sorter: "default",
       renderSorterIcon: ({ order }) => {
-        if (order === false)
-          return h(SvgIcon, { name: 'sort-2' })
-        if (order === 'ascend')
-          return h(SvgIcon, { name: 'sort-1' })
-        if (order === 'descend')
-          return h(SvgIcon, { name: 'sort-3' })
+        if (order === false) return h(SvgIcon, { name: "sort-2" });
+        if (order === "ascend") return h(SvgIcon, { name: "sort-1" });
+        if (order === "descend") return h(SvgIcon, { name: "sort-3" });
       },
       render(row) {
         const item: any = izstatusList.value.find(
-          (item: any) => item.value == row.states,
-        )
+          (item: any) => item.value == row.states
+        );
         return h(StatusItem, {
           id: row.id,
           status: row.states,
-          label: item ? item.label : '',
-        })
+          label: item ? item.label : "",
+        });
       },
-    }
+    };
   }
-  index = columnsRef.value.findIndex(v => v.title == '图片相似度')
+  index = columnsRef.value.findIndex((v) => v.title == "图片相似度");
   if (index > -1) {
     columnsRef.value[index] = {
-      title: '图片相似度',
+      title: "图片相似度",
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 150,
-      sorter: 'default',
+      sorter: "default",
       renderSorterIcon: ({ order }) => {
-        if (order === false)
-          return h(SvgIcon, { name: 'sort-2' })
-        if (order === 'ascend')
-          return h(SvgIcon, { name: 'sort-1' })
-        if (order === 'descend')
-          return h(SvgIcon, { name: 'sort-3' })
+        if (order === false) return h(SvgIcon, { name: "sort-2" });
+        if (order === "ascend") return h(SvgIcon, { name: "sort-1" });
+        if (order === "descend") return h(SvgIcon, { name: "sort-3" });
       },
       render(row: any) {
         return h(
-          'div',
+          "div",
           {
             id: row.id,
-            style: { color: row.similarityscore === 100 ? '#FF4E4F' : '' },
+            style: { color: row.similarityscore === 100 ? "#FF4E4F" : "" },
           },
-          { default: () => (row.similarityscore ? `${row.similarityscore}%` : '') },
-        )
+          { default: () => (row.similarityscore ? `${row.similarityscore}%` : "") }
+        );
       },
-    }
+    };
   }
-  index = columnsRef.value.findIndex(v => v.title == '提报时间')
+  index = columnsRef.value.findIndex((v) => v.title == "提报时间");
   if (index > -1) {
     columnsRef.value[index] = {
-      title: '提报时间',
+      title: "提报时间",
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
-      sorter: 'default',
+      sorter: "default",
       renderSorterIcon: ({ order }) => {
-        if (order === false)
-          return h(SvgIcon, { name: 'sort-2' })
-        if (order === 'ascend')
-          return h(SvgIcon, { name: 'sort-1' })
-        if (order === 'descend')
-          return h(SvgIcon, { name: 'sort-3' })
+        if (order === false) return h(SvgIcon, { name: "sort-2" });
+        if (order === "ascend") return h(SvgIcon, { name: "sort-1" });
+        if (order === "descend") return h(SvgIcon, { name: "sort-3" });
       },
       render(row: any) {
-        return formatToDateHMS(row.createdate || 0)
+        return formatToDateHMS(row.createdate || 0);
       },
-    }
+    };
   }
 
-  index = columnsRef.value.findIndex(v => v.title == '更新时间')
+  index = columnsRef.value.findIndex((v) => v.title == "更新时间");
   if (index > -1) {
     columnsRef.value[index] = {
-      title: '更新时间',
+      title: "更新时间",
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
       render(row: any) {
-        return row.updatetime ? formatToDateHMS(row.updatetime) : ''
+        return row.updatetime ? formatToDateHMS(row.updatetime) : "";
       },
-    }
+    };
   }
 }
 
-const deviceHeight = ref(600)
+const deviceHeight = ref(600);
 
 onMounted(() => {
-  emitter.on('filter-final', refreshHandler)
-  getColumns()
+  emitter.on("filter-final", refreshHandler);
+  getColumns();
 
   nextTick(() => {
-    computeListHeight()
-  })
-})
+    computeListHeight();
+  });
+});
 
 onBeforeMount(() => {
-  dicStore.fetchizstatusListt()
-})
+  dicStore.fetchizstatusListt();
+});
 
 watch(
   () => dicStore.izstatusList,
   (newval) => {
-    izstatusList.value = newval
-  },
-)
+    izstatusList.value = newval;
+  }
+);
 
 onUnmounted(() => {
-  emitter.off('filter-final', refreshHandler)
-})
+  emitter.off("filter-final", refreshHandler);
+});
 
-const tableRef = ref<InstanceType<typeof NDataTable>>()
-const rowKey = (row: RowData) => row.id
-const loading = ref(true)
-const total = ref(0)
+const tableRef = ref<InstanceType<typeof NDataTable>>();
+const rowKey = (row: RowData) => row.id;
+const loading = ref(true);
+const total = ref(0);
 const pagination = reactive({
   page: 1,
   pageCount: 10,
@@ -402,247 +428,242 @@ const pagination = reactive({
   showSizePicker: true,
   pageSizes: [
     {
-      label: '10 每页',
+      label: "10 每页",
       value: 10,
     },
     {
-      label: '15 每页',
+      label: "15 每页",
       value: 15,
     },
     {
-      label: '30 每页',
+      label: "30 每页",
       value: 30,
     },
     {
-      label: '50 每页',
+      label: "50 每页",
       value: 50,
     },
   ],
   showQuickJumper: true,
   prefix: () => `共 ${total.value} 条数据`,
-})
-const tableData = ref<Array<RowData>>([])
-const selectionIds = ref<DataTableRowKey[]>([])
-const dialog = useDialog()
-const message = useMessage()
-const finalStore = useFinal()
+});
+const tableData = ref<Array<RowData>>([]);
+const selectionIds = ref<DataTableRowKey[]>([]);
+const dialog = useDialog();
+const message = useMessage();
+const finalStore = useFinal();
 
 async function query(page: number, pageSize: number, filterId?: any) {
-  const asideParmas = unref(finalStore.getAsideValue)
+  const asideParmas = unref(finalStore.getAsideValue);
   // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
-  const params = filterId ? { userSearchId: filterId } : asideParmas
+  const params = filterId ? { userSearchId: filterId } : asideParmas;
   const result = await getFinalList({
-    sortorder: 'asc',
+    sortorder: "asc",
     pageSize,
     currPage: page,
-    sortname: '',
+    sortname: "",
     ...params,
-  })
-  const { data, pageCount, totalCount } = result
-  tableData.value = data
-  total.value = totalCount
-  pagination.page = page
-  pagination.pageCount = Math.ceil(totalCount / pageSize)
-  loading.value = false
+  });
+  const { data, pageCount, totalCount } = result;
+  tableData.value = data;
+  total.value = totalCount;
+  pagination.page = page;
+  pagination.pageCount = Math.ceil(totalCount / pageSize);
+  loading.value = false;
 }
 
 async function handlePageChange(currentPage) {
-  if (loading.value)
-    return
-  const { pageSize } = pagination
-  pagination.page = currentPage
-  await query(currentPage, pageSize)
+  if (loading.value) return;
+  const { pageSize } = pagination;
+  pagination.page = currentPage;
+  await query(currentPage, pageSize);
 }
 async function handlePageSizeChange(currentPageSize) {
-  if (loading.value)
-    return
+  if (loading.value) return;
 
-  const { page } = pagination
-  pagination.pageSize = currentPageSize
+  const { page } = pagination;
+  pagination.pageSize = currentPageSize;
 
-  await query(page, currentPageSize)
+  await query(page, currentPageSize);
 }
 
 function handleCheck(rowKeys: DataTableRowKey[]) {
-  selectionIds.value = rowKeys
+  selectionIds.value = rowKeys;
 }
 
 async function computeListHeight() {
-  const table = unref(tableRef)
-  if (!table)
-    return
-  const tableEl: any = table?.$el
-  const headEl = tableEl.querySelector('.n-data-table-thead ')
-  const { bottomIncludeBody } = getViewportOffset(headEl)
-  const headerH = 64
-  let paginationH = 2
-  const marginH = 60
+  const table = unref(tableRef);
+  if (!table) return;
+  const tableEl: any = table?.$el;
+  const headEl = tableEl.querySelector(".n-data-table-thead ");
+  const { bottomIncludeBody } = getViewportOffset(headEl);
+  const headerH = 64;
+  let paginationH = 2;
+  const marginH = 60;
   if (!isBoolean(unref(pagination))) {
     const paginationEl = tableEl.querySelector(
-      '.n-data-table__pagination',
-    ) as HTMLElement
+      ".n-data-table__pagination"
+    ) as HTMLElement;
     if (paginationEl) {
-      const offsetHeight = paginationEl.offsetHeight
-      paginationH += offsetHeight || 0
-    }
-    else {
-      paginationH += 28
+      const offsetHeight = paginationEl.offsetHeight;
+      paginationH += offsetHeight || 0;
+    } else {
+      paginationH += 28;
     }
   }
-  let height = bottomIncludeBody - (headerH + paginationH + marginH)
-  const maxHeight = 800
-  height = maxHeight && maxHeight < height ? maxHeight : height
-  deviceHeight.value = height
+  let height = bottomIncludeBody - (headerH + paginationH + marginH);
+  const maxHeight = 800;
+  height = maxHeight && maxHeight < height ? maxHeight : height;
+  deviceHeight.value = height;
 }
 
-useWindowSizeFn(computeListHeight)
+useWindowSizeFn(computeListHeight);
 
 const maxHeight = computed(() => {
-  return tableData.value.length ? `${unref(deviceHeight)}px` : 'auto'
-})
+  return tableData.value.length ? `${unref(deviceHeight)}px` : "auto";
+});
 
-query(pagination.page, pagination.pageSize)
+query(pagination.page, pagination.pageSize);
 
-const customTabelRef = ref(null)
-const importExcelRef = ref(null)
-const notPassModalRef = ref(null) // 不通过弹窗
-const repeatModalRef = ref(null)
-const repeatTaskTableModalRef = ref(null)
+const customTabelRef = ref(null);
+const importExcelRef = ref(null);
+const notPassModalRef = ref(null); // 不通过弹窗
+const repeatModalRef = ref(null);
+const repeatTaskTableModalRef = ref(null);
 
 function showModal(modalRef: any) {
-  const modal = unref(modalRef)! as any
-  modal.showModal()
+  const modal = unref(modalRef)! as any;
+  modal.showModal();
 }
 
-const popover = ref<ComponentRef | null>(null)
+const popover = ref<ComponentRef | null>(null);
 
 function importHandler() {
-  (popover.value as any).setShow(false)
-  showModal(importExcelRef)
+  (popover.value as any).setShow(false);
+  showModal(importExcelRef);
 }
 
 function exportHandler() {
-  loading.value = true
-  import('@/utils/exportExcel').then((excel) => {
+  loading.value = true;
+  import("@/utils/exportExcel").then((excel) => {
     const tHeader = [
-      '任务Id',
-      '任务名称',
-      '审批节点',
-      '审批状态',
-      '图片相似度',
-      '提报时间',
-      '更新时间',
-    ]
+      "任务Id",
+      "任务名称",
+      "审批节点",
+      "审批状态",
+      "图片相似度",
+      "提报时间",
+      "更新时间",
+    ];
     const filterVal = [
-      'id',
-      'name',
-      'approvalnode',
-      'approvalstatus',
-      'similarity',
-      'uptime',
-      'updatetime',
-    ]
-    const list = tableData.value
-    const data = formatJson(filterVal, list)
+      "id",
+      "name",
+      "approvalnode",
+      "approvalstatus",
+      "similarity",
+      "uptime",
+      "updatetime",
+    ];
+    const list = tableData.value;
+    const data = formatJson(filterVal, list);
     excel.export_json_to_excel({
       header: tHeader,
       data,
-      filename: 'data',
+      filename: "data",
       autoWidth: true,
-      bookType: 'xlsx',
-    })
-    loading.value = false
-  })
+      bookType: "xlsx",
+    });
+    loading.value = false;
+  });
 }
 
 function formatJson(filterVal, jsonDataList) {
-  return jsonDataList.map(v =>
+  return jsonDataList.map((v) =>
     filterVal.map((j) => {
-      return v[j]
-    }),
-  )
+      return v[j];
+    })
+  );
 }
 
 function sucessHandler(excelData) {
   const data = excelData.content.map((item) => {
-    const obj = {}
+    const obj = {};
     Object.keys(item).forEach((key) => {
-      const k = findKey(columns, key)
-      obj[k] = item[key]
-    })
-    return obj
-  })
+      const k = findKey(columns, key);
+      obj[k] = item[key];
+    });
+    return obj;
+  });
 
-  tableData.value = data
+  tableData.value = data;
 }
 
 function commitHandler(columns) {
-  columnsRef.value = [...columns, actionsColumns]
-  formatColumns()
+  columnsRef.value = [...columns, actionsColumns];
+  formatColumns();
 }
 
 function actionHandler(action: any, row: any) {
-  const { key } = action
+  const { key } = action;
   switch (key) {
-    case 'view':
-      goDetail(row)
-      break
-    case 'reset':
-      resetHandler()
-      break
-    case 'approval':
-      singleApproval(row)
-      break
-    case 'reject':
-      rejectHandler([row])
-      break
+    case "view":
+      goDetail(row);
+      break;
+    case "reset":
+      resetHandler();
+      break;
+    case "approval":
+      singleApproval(row);
+      break;
+    case "reject":
+      rejectHandler([row]);
+      break;
     default:
-      break
+      break;
   }
 }
 
 // states:1未提交，2待审批，3通过，4不通过
 function validate(items: any[]) {
-  if (items.length === 0)
-    return '至少选中一个任务'
-  return null
+  if (items.length === 0) return "至少选中一个任务";
+  return null;
 }
 
 function goDetail(row) {
-  router.push({ name: 'final-detail', query: { id: row.id, packageid: row.packageid } })
+  router.push({ name: "final-detail", query: { id: row.id, packageid: row.packageid } });
 }
 
 function resetHandler() {
   dialog.info({
-    title: '确认提示',
-    content: '确认重置当前选中的任务的审批吗?',
-    positiveText: '确定',
-    negativeText: '取消',
+    title: "确认提示",
+    content: "确认重置当前选中的任务的审批吗?",
+    positiveText: "确定",
+    negativeText: "取消",
     onPositiveClick: async () => {
       // TODO：需要支持重置
       // const result = await resetApproval()
     },
     onNegativeClick: () => {},
-  })
+  });
 }
 
 function getSelectItems() {
-  return tableData.value.filter(item => selectionIds.value.includes(item.id))
+  return tableData.value.filter((item) => selectionIds.value.includes(item.id));
 }
 
 const showActions = computed(() => {
-  return selectionIds.value.length
-})
+  return selectionIds.value.length;
+});
 
 // 单个审批通过
 function singleApproval(row) {
   const param = {
     result: true,
-    comment: '',
-    disposeType: '',
-    disposeTypeId: '',
-    failCauseId: '',
-    failCauseName: '',
+    comment: "",
+    disposeType: "",
+    disposeTypeId: "",
+    failCauseId: "",
+    failCauseName: "",
     flowTaskInfoList: [
       {
         formId: row.id,
@@ -650,130 +671,129 @@ function singleApproval(row) {
         taskName: row.fromTaskName,
       },
     ],
-  }
-  doAudit(param)
+  };
+  doAudit(param);
 }
 
 // 批量通过
 function batchApproval() {
-  const items: any = getSelectItems()
-  const msg = validate(items)
+  const items: any = getSelectItems();
+  const msg = validate(items);
 
   if (msg !== null) {
-    message.error(msg)
-    return
+    message.error(msg);
+    return;
   }
-  console.log(items)
-  const list: any = []
+  console.log(items);
+  const list: any = [];
   items.forEach((item) => {
     list.push({
       formId: item.id,
       taskId: item.taskId,
       taskName: item.fromtaskname,
-    })
-  })
+    });
+  });
 
   const param = {
     result: true,
-    comment: '',
-    disposeType: '',
-    disposeTypeId: '',
-    failCauseId: '',
-    failCauseName: '',
+    comment: "",
+    disposeType: "",
+    disposeTypeId: "",
+    failCauseId: "",
+    failCauseName: "",
     flowTaskInfoList: list,
-  }
+  };
 
-  doAudit(param)
+  doAudit(param);
 }
 
 // 小结批量不通过
 function repeatBatchReject(items) {
-  console.log(items)
-  rejectHandler(items)
+  console.log(items);
+  rejectHandler(items);
 }
 
 // 批量不通过
 function batchReject() {
-  const items: any = getSelectItems()
-  rejectHandler(items)
+  const items: any = getSelectItems();
+  rejectHandler(items);
 }
 
 // 审核不通过
 function rejectHandler(list) {
-  const msg = validate(list)
+  const msg = validate(list);
   if (msg !== null) {
-    message.error(msg)
-    return
+    message.error(msg);
+    return;
   }
 
-  const modal = unref(notPassModalRef)! as any
-  modal.showModal(list)
+  const modal = unref(notPassModalRef)! as any;
+  modal.showModal(list);
 }
 
 // 审核通过
 function doAudit(param: any) {
   dialog.info({
-    title: '确认提示',
-    content: '确认给该任务审批为【通过】吗?',
-    positiveText: '确定',
-    negativeText: '取消',
+    title: "确认提示",
+    content: "确认给该任务审批为【通过】吗?",
+    positiveText: "确定",
+    negativeText: "取消",
     onPositiveClick: () => {
       audit(param).then((res) => {
-        const { code } = res
-        if (code === 'OK') {
-          message.success(res.message)
-          reload()
+        const { code } = res;
+        if (code === "OK") {
+          message.success(res.message);
+          reload();
+        } else {
+          message.error(res.message);
         }
-        else {
-          message.error(res.message)
-        }
-      })
+      });
     },
     onNegativeClick: () => {},
-  })
+  });
 }
 
 function switchBatch() {
-  selectionIds.value = []
-  checkedRowKeys.value = []
+  selectionIds.value = [];
+  checkedRowKeys.value = [];
 }
 
 function reload() {
-  selectionIds.value = []
-  checkedRowKeys.value = []
+  selectionIds.value = [];
+  checkedRowKeys.value = [];
 
-  const { page, pageSize } = unref(tableRef.value?.pagination) as PaginationProps
-  query(page!, pageSize!)
+  const { page, pageSize } = unref(tableRef.value?.pagination) as PaginationProps;
+  query(page!, pageSize!);
 }
 
 watch(
   () => finalStore.asideValue,
   (newVal, oldVal) => {
-    refreshHandler()
+    refreshHandler();
   },
-  { deep: true },
-)
+  { deep: true }
+);
 
 function reset() {
-  pagination.page = 1
-  pagination.pageCount = 1
+  pagination.page = 1;
+  pagination.pageCount = 1;
 }
 
 async function refreshHandler(searchId?: any) {
-  reset()
-  query(pagination.page, pagination.pageSize, searchId)
+  reset();
+  query(pagination.page, pagination.pageSize, searchId);
 }
 
 function filterTableData(keyword) {
-  if(keyword){
-    tableData.value = tableData.value.filter(item => item.id.includes(keyword))
-  }else{
-    query(pagination.page, pagination.pageSize)
+  if (keyword) {
+    tableData.value = tableData.value.filter((item) => item.id.includes(keyword));
+  } else {
+    query(pagination.page, pagination.pageSize);
   }
 }
 defineExpose({
   filterTableData,
-})
+});
 </script>
 
 <template>
@@ -784,10 +804,13 @@ defineExpose({
         <SvgIcon size="32" name="magnifying" @click="changeContent" />
       </div>
       <div>
-        <SvgIcon style="margin-right: 6px;" size="13" name="summary" @click="showModal(repeatModalRef)" />
-        <NButton class="xjcc" text @click="showModal(repeatModalRef)">
-          小结查重
-        </NButton>
+        <SvgIcon
+          style="margin-right: 6px"
+          size="13"
+          name="summary"
+          @click="showModal(repeatModalRef)"
+        />
+        <NButton class="xjcc" text @click="showModal(repeatModalRef)"> 小结查重 </NButton>
 
         <div v-show="!showActions" style="display: flex; align-items: center">
           <div class="btn">
@@ -803,14 +826,19 @@ defineExpose({
             取消
           </NButton>
 
-          <img class="btn-approval btn-left" src="@/assets/images/task/btn-not-pass.png" alt="" @click.stop="batchReject">
+          <img
+            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"
-          >
+          />
         </div>
 
         <n-popover
@@ -828,16 +856,24 @@ defineExpose({
           </template>
           <ul class="wrapper-header-action">
             <li @click="importHandler">
-              <SvgIcon size="20" name="import" /><span style="margin-left: 5px">批量导入数据</span>
+              <SvgIcon size="20" name="import" /><span style="margin-left: 5px"
+                >批量导入数据</span
+              >
             </li>
             <li @click="exportHandler">
-              <SvgIcon size="20" name="download" /><span style="margin-left: 5px">导出待审数据</span>
+              <SvgIcon size="20" name="download" /><span style="margin-left: 5px"
+                >导出待审数据</span
+              >
             </li>
             <li>
-              <SvgIcon size="20" name="download" /><span style="margin-left: 5px">导出全部数据</span>
+              <SvgIcon size="20" name="download" /><span style="margin-left: 5px"
+                >导出全部数据</span
+              >
             </li>
             <li>
-              <SvgIcon size="20" name="look" /><span style="margin-left: 5px">查看导入记录</span>
+              <SvgIcon size="20" name="look" /><span style="margin-left: 5px"
+                >查看导入记录</span
+              >
             </li>
           </ul>
         </n-popover>
-- 
2.39.3


From 73ad5f8f644aa7e66a8b8ce8f3384e89d98c8cdb Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Tue, 2 Apr 2024 18:17:26 +0800
Subject: [PATCH 117/143] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E7=85=A7?=
 =?UTF-8?q?=E7=89=87=E5=A2=99=E7=BB=84=E4=BB=B6=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=8F=AF=E7=96=91=E6=96=87=E4=BB=B6=E5=A4=B9=E5=A4=9A=E9=80=89?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4id=E9=94=99=E8=AF=AF=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Header/RecycleModal.vue |  12 +-
 src/views/worksheet/components/PhotoWall.vue  | 491 ++++++++++++++++++
 2 files changed, 497 insertions(+), 6 deletions(-)
 create mode 100644 src/views/worksheet/components/PhotoWall.vue

diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue
index d3a551e..c5e7fe5 100644
--- a/src/layout/components/Header/RecycleModal.vue
+++ b/src/layout/components/Header/RecycleModal.vue
@@ -173,15 +173,14 @@ function imUpdateSelectIds(x: number, y: number, w: number, h: number) {
   items.forEach((item: HTMLDivElement) => {
     const rect = item.getBoundingClientRect()
     const index = selectIds.value.indexOf(item.dataset.id!)
-
     if (rect.right > x && rect.bottom > y && rect.left < x + w && rect.top < y + h)
       index === -1 && selectIds.value.push(item.dataset.id!)
     else index !== -1 && selectIds.value.splice(index, 1)
   })
 }
 
-function isSelected(id: number) {
-  return selectIds.value.includes(String(id))
+function isSelected(pictureId: number) {
+  return selectIds.value.includes(String(pictureId))
 }
 
 function moveHandler(e: MouseEvent) {
@@ -241,6 +240,7 @@ onMounted(() => {
 
 async function showModal() {
   show.value = true
+  reset()
   pagination.pageNo = 1
   const list = await featchList()
   listData.value = list
@@ -296,7 +296,6 @@ defineExpose({
 
 const notPassModalRef = ref(null)
 const showActions = computed(() => {
-  console.log('selectedApproveItems', selectedApproveItems)
   return selectedApproveItems.value.length > 0 && batch;
 });
 
@@ -318,6 +317,7 @@ function reset() {
   batch.value = false;
   pagination.pageNo = 1;
   pagination.pageSize = 20;
+  selectIds.value = [];
   selectedApproveItems.value.length = 0;
   loading = false;
   canloadMore = true;
@@ -457,8 +457,8 @@ async function refreshHandler() {
             <div ref="el" class="scroll">
               <!-- <n-scrollbar :on-scroll="scrollHandler"> -->
               <div ref="masonryRef" class="grid">
-                <div v-for="(item, index) in listData" :key="item.id" :data-id="item.id"
-                  :class="{ 'grid-item-selected': isSelected(item.id) }" :style="{ height: gridHeight }"
+                <div v-for="(item, index) in listData" :key="item.pictureId" :data-id="item.pictureId"
+                  :class="{ 'grid-item-selected': isSelected(item.pictureId) }" :style="{ height: gridHeight }"
                   class="grid-item">
                   <n-image :src="item.imgUrl" class="img "
                     :class="{ 'img-fit': viewMode === 'horizontalVersion', 'img-full': viewMode === '3:4' || viewMode === 'verticalVersion' }" />
diff --git a/src/views/worksheet/components/PhotoWall.vue b/src/views/worksheet/components/PhotoWall.vue
new file mode 100644
index 0000000..2ed8321
--- /dev/null
+++ b/src/views/worksheet/components/PhotoWall.vue
@@ -0,0 +1,491 @@
+<script lang="ts" setup>
+import { audit } from '@/api/task/task';
+import {
+getPictureSimilarityList
+} from "@/api/work/work";
+import NotPassed from '@/components/Approval/NotPassed.vue';
+import { useWorkOrder } from "@/store/modules/workOrder";
+import { isEmpty } from "@/utils";
+import { formatToDateHMS } from "@/utils/dateUtil";
+import emitter from '@/utils/mitt';
+import { useInfiniteScroll } from "@vueuse/core";
+import imagesloaded from "imagesloaded";
+import { clone, debounce } from "lodash-es";
+import { useDialog, useMessage } from "naive-ui";
+import { onMounted, onUnmounted, onUpdated, reactive, ref, toRefs, unref, watch } from "vue";
+import ConfrimModal from "../modal/ConfrimModal.vue";
+import type { ApprovalParam, SimilarityPictureSortParam } from "/#/api";
+
+const props = defineProps({
+  taskDetailInfo: {
+    type: Object,
+    default: () => ({}),
+  },
+});
+const { taskDetailInfo } = toRefs(props)
+
+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) {
+  if (value && batch.value) {
+    batch.value = !value;
+  } else {
+    batch.value = value;
+  }
+  if (value === false) {
+    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;
+
+  if (index === -1 && checked) selectItems.value.push(item);
+  else selectItems.value.splice(index, 1);
+}
+
+
+const taskpagination = reactive({
+  pageNo: 1,
+  pageSize: 10,
+});
+const sortBy: SimilarityPictureSortParam = {
+  orderType: "desc",
+  orderName: "similarityScore",
+};
+const workStore = useWorkOrder();
+const selectTask = ref<any>(null);
+const overTask = ref<any>(null);
+const confrimModalRef = ref(null);
+const listData = ref<any[]>([]);
+const loading = ref(false);
+const el = ref<HTMLDivElement | null>(null);
+const selectedSortName = ref('');
+const notPassModalRef = ref(null)
+
+let canloadMore = true;
+
+let processItems: any[] = [];
+
+function validate(items: any[]) {
+  if (items.length === 0) return "至少选中一个任务";
+
+  return null;
+}
+
+function reset() {
+  taskpagination.pageNo = 0;
+  taskpagination.pageSize = 20;
+  listData.value.length = 0;
+  loading.value = false;
+  canloadMore = true;
+}
+
+async function refreshHandler() {
+  reset();
+  useInfiniteScroll(
+    el as any,
+    () => {
+
+      loadMore();
+    },
+    { distance: 10, canLoadMore: () => canloadMore }
+  );
+}
+
+async function loadMore() {
+  if (loading.value || el.value == null) return;
+  const more = await featchList();
+  listData.value.push(...more);
+}
+
+async function featchList() {
+  loading.value = true;
+  try {
+    taskpagination.pageNo += 1;
+    const { data, total, pageCount } = await getPictureSimilarityList(
+      { ...taskpagination, ...sortBy, checkDuplicateId: workStore.activeId, pictureId: taskDetailInfo.value.id }
+    );
+    totalCount.value = total;
+    canloadMore = pageCount >= taskpagination.pageNo && pageCount > 0;
+
+    return data;
+  } catch (error) {
+    canloadMore = false;
+    return [];
+  }
+}
+
+const layout = debounce(() => {
+  if (el.value == null) return;
+
+  _imagesload = imagesloaded(".grid-item");
+
+  _imagesload.on("done", (instance) => {
+    if (!el.value) return;
+    loading.value = false;
+  });
+
+  _imagesload.on("fail", (instance) => {
+    message.error("图片错误");
+    loading.value = false;
+  });
+}, 300);
+
+
+watch(
+  () => taskDetailInfo.value.id,
+  async (newValue, oldValue) => {
+    if (newValue !== oldValue) {
+      if (isEmpty(taskDetailInfo.value.id)) {
+        listData.value.length = 0;
+        totalCount.value = 0;
+        return;
+      }
+      reset();
+      const more = await featchList();
+      listData.value.push(...more);
+    }
+  }, { deep: true, immediate: true }
+);
+
+
+// 点击任务包图片，查看详情
+async function handleSelect(item: any) {
+  const packageid = workStore.getActiveId;
+  if (isEmpty(packageid)) {
+    listData.value.length = 0;
+    totalCount.value = 0;
+    return;
+  }
+
+}
+
+async function sortHandler(orderby: "similarityScore" | "createdate") {
+  selectedSortName.value = orderby;
+  sortBy.orderName = orderby;
+  sortBy.orderType = sortBy.orderType === "asc" ? "desc" : "asc";
+  refreshHandler();
+}
+
+function overTaskHandelr(item: any) {
+  if (item?.historyStates === 2 || item?.historyStates == 3) {
+    overTask.value = null;
+    return;
+  }
+
+  if (validate([item]) == null && batch.value === false) overTask.value = item;
+}
+
+function leaveTaskHandler() {
+  overTask.value = null;
+}
+
+
+function singleRejectHandler(item) {
+  const modal = unref(notPassModalRef)! as any
+  modal.showModal([item])
+}
+
+function approvalHandler(items?: any) {
+  let cloneItem: any
+  if (batch.value) {
+    processItems = selectItems.value
+  }
+  else if (overTask.value) {
+    cloneItem = clone(overTask.value)
+    processItems = [cloneItem]
+  }
+  //  任务包图片 => 点击 => 通过/不通过按钮
+  if (items !== undefined && !(items instanceof PointerEvent))
+    processItems = [items]
+
+  const msg = validate(processItems)
+
+  if (msg !== null) {
+    message.error(msg)
+    return
+  }
+
+  const list: any = []
+  processItems.forEach((item) => {
+    list.push({
+      formId: item.id,
+      taskId: item.taskId,
+      taskName: item.fromTaskName,
+    })
+  })
+
+  const param = {
+    result: true,
+    comment: '',
+    disposeType: '',
+    disposeTypeId: '',
+    failCauseId: '',
+    failCauseName: '',
+    flowTaskInfoList: list,
+  }
+
+  dialog.info({
+    title: '确认提示',
+    content: '确认给该任务审批为【通过】吗?',
+    positiveText: '确定',
+    negativeText: '取消',
+    onPositiveClick: () => {
+      doAudit(param)
+    },
+    onNegativeClick: () => { },
+  })
+}
+
+function doAudit(param: any) {
+  audit(param).then((res) => {
+    const { code } = res
+    setBatch(false)
+    if (code === 'OK') {
+      message.info(res.message)
+      emitter.emit('refresh')
+      refreshHandler()
+    }
+    else message.error(res.message)
+  })
+}
+
+function reloadList() {
+  setBatch(false)
+  refreshHandler()
+}
+function reject(idOrDesc: string, backId: string, isOther: boolean) {
+  const formIds: string[] = processItems.map(item => item.id)
+  const taskIds: string[] = processItems.map(item => item.taskId)
+  const tasknames: string[] = processItems.map(item => item.taskname)
+
+  const param: ApprovalParam = {
+    formid: formIds,
+    taskId: taskIds,
+    approvd: false,
+    taskComment: idOrDesc,
+    taskname: isOther ? tasknames : ['其他'],
+  }
+
+  doAudit(param)
+}
+
+onMounted(async () => {
+
+})
+
+onUpdated(() => {
+  layout();
+});
+
+onUnmounted(() => {
+  workStore.reset();
+});
+</script>
+
+<template>
+  <div>
+    <div style="display: flex; justify-content: space-between; padding: 12px 0px 3px 0">
+      <div>
+        <span
+          style="font-size: 18px; font-weight: Medium;color: #333333;font-family: PingFang SC, PingFang SC-Medium;">任务包图片</span>
+      </div>
+      <div style="display: flex; align-items: center;font-size: 14px;margin-right: 25px;color:#323233">
+        <div style="cursor: pointer" @click="sortHandler('createdate')">
+          <span>时间排序</span>
+          <SvgIcon style="margin-left: 5px" name="sort" size="12" v-show="selectedSortName !== 'createdate'" />
+          <SvgIcon style="margin-left: 5px" name="active-sort" size="12" v-show="selectedSortName === 'createdate'" />
+        </div>
+        <div style="margin-left: 15px; cursor: pointer" @click="sortHandler('similarityScore')">
+          <span>相似度排序</span>
+          <SvgIcon style="margin-left: 5px" name="sort" size="12" v-show="selectedSortName !== 'similarityScore'" />
+          <SvgIcon style="margin-left: 5px" name="active-sort" size="12"
+            v-show="selectedSortName === 'similarityScore'" />
+        </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)" @mouseleave="leaveTaskHandler">
+        <div class="img-wrapper" :style="{ 'background-image': `url(${item.imgurl})` }" />
+        <div class="time-wrapper">
+          <div class="time">
+            <SvgIcon color="#FFF" size="16" name="camera" />
+            <span class="current-time">{{ item.photoDateTimestamp ? formatToDateHMS(Number(item.photoDateTimestamp) ||
+              0) : '-'
+            }}</span>
+          </div>
+          <div class="time">
+            <SvgIcon color="#FFF" size="16" name="save" />
+            <span class="current-time">{{ item.submitDateTimestamp ? formatToDateHMS(Number(item.submitDateTimestamp)
+              || 0) : '-'
+            }}</span>
+          </div>
+        </div>
+        <div class="check">
+          <n-checkbox v-show="batch && item.historyStates !== 2 && item.historyStates !== 3"
+            v-model:checked="item.checked" @click.stop @update:checked="onCheckChange($event, item)" />
+        </div>
+        <div class="percent">
+          <SvgIcon size="42" name="tag" />
+          <div class="val">
+            {{ item?.maxSimilarity && Number(item?.maxSimilarity).toFixed(0) }}%
+          </div>
+        </div>
+
+        <div class="pass-status" v-if="item.historyStates === 2">
+          <SvgIcon name="pass-icon" style="width:52;height:24px" />
+        </div>
+        <div class="pass-status" v-else-if="item.historyStates === 3">
+          <SvgIcon name="no-pass-icon" style="width:52;height:24px" />
+        </div>
+        <div v-show="overTask && overTask.id === item.id" class="action">
+          <SvgIcon style="cursor: pointer" name="t1" @click.stop="approvalHandler" />
+          <SvgIcon style="cursor: pointer;margin-left: 40px;" name="t2" @click.stop="singleRejectHandler(item)" />
+        </div>
+      </div>
+    </div>
+    <NotPassed ref="notPassModalRef" @success="reloadList" />
+    <ConfrimModal ref="confrimModalRef" @commit="reject" />
+
+  </div>
+</template>
+
+<style lang="less" scoped>
+.wrapper-list {
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: row;
+  justify-content: flex-start;
+  flex-shrink: 0;
+
+  .item-selected {
+    box-shadow: 0px 2px 8px 0px rgba(0, 65, 207, 0.28);
+    background-color: #fff;
+  }
+
+  .grid-item {
+    box-sizing: border-box;
+    border-radius: 8px;
+    padding: 9px 5px;
+    position: relative;
+
+    .img-wrapper {
+      width: 230px;
+      height: 130px;
+      overflow: hidden;
+      background-size: cover;
+      background-position: center;
+      background-repeat: no-repeat;
+      border-radius: 8px;
+    }
+
+    .time-wrapper {
+      position: absolute;
+      bottom: 9px;
+      width: calc(100% - 11px);
+      height: 58px;
+      background: linear-gradient(180deg, rgba(0, 0, 0, 0.01), rgba(0, 0, 0, 0.71) 100%);
+      border-radius: 8px;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      font-weight: Medium;
+      padding-left: 12px;
+      color: white;
+
+      .time .current-time {
+        margin-left: 9px;
+        font-weight: Medium;
+      }
+    }
+
+    .check {
+      position: absolute;
+      z-index: 3;
+      left: 12px;
+      top: 12px;
+    }
+
+    .percent {
+      position: absolute;
+      text-align: center;
+      z-index: 3;
+      right: 17px;
+      top: 2px;
+      color: #fff;
+
+      .val {
+        position: absolute;
+        left: 0;
+        top: 0;
+        display: block;
+        width: 100%;
+        height: 100%;
+        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;
+      }
+    }
+
+    .pass-status {
+      position: absolute;
+      left: 0px;
+      top: 15px;
+    }
+
+    .mark {
+      position: absolute;
+      z-index: 3;
+      right: 62px;
+      top: 9px;
+      width: 64px;
+      height: 40px;
+      overflow: hidden;
+      overflow: hidden;
+
+      svg {
+        position: absolute;
+        top: -20px;
+      }
+    }
+
+
+    .action {
+      position: absolute;
+      z-index: 5;
+      left: 4px;
+      top: 9px;
+      width: 230px;
+      height: 130px;
+      display: flex;
+      border-radius: 8px;
+      align-items: center;
+      justify-content: center;
+      background-color: rgba(0, 0, 0, 0.48);
+    }
+
+
+  }
+}
+
+
+::v-deep(.n-divider:not(.n-divider--vertical)) {
+  margin-top: 12px;
+  margin-bottom: 12px;
+}
+</style>
-- 
2.39.3


From 94e6b79e875c940f20007d16e1e91e2b0449c776 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Tue, 2 Apr 2024 18:22:42 +0800
Subject: [PATCH 118/143] =?UTF-8?q?feat:=20=E6=9B=B4=E6=94=B9=E7=BB=BC?=
 =?UTF-8?q?=E5=90=88=E6=90=9C=E7=B4=A2title=E5=8F=8A=E5=9B=BE=E5=AE=A1?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86icon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icons/error_icon.svg             | 17 +++++++++++++++++
 src/components/Search/Search.vue            |  2 +-
 src/views/worksheet/modal/ApprovalModal.vue |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 src/assets/icons/error_icon.svg

diff --git a/src/assets/icons/error_icon.svg b/src/assets/icons/error_icon.svg
new file mode 100644
index 0000000..d772a90
--- /dev/null
+++ b/src/assets/icons/error_icon.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>形状</title>
+    <g id="登录" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="登录_1.2未输入密码提示" transform="translate(-537.000000, -488.000000)" fill="#FF4E4F">
+            <g id="编组-11" transform="translate(510.000000, 165.000000)">
+                <g id="登录" transform="translate(0.000000, 44.000000)">
+                    <g id="Group-10" transform="translate(27.000000, 276.000000)">
+                        <g id="警示" transform="translate(0.000000, 3.000000)">
+                            <path d="M7,0.875 C3.61757813,0.875 0.875,3.61757813 0.875,7 C0.875,10.3824219 3.61757813,13.125 7,13.125 C10.3824219,13.125 13.125,10.3824219 13.125,7 C13.125,3.61757813 10.3824219,0.875 7,0.875 Z M6.5625,4.046875 C6.5625,3.98671875 6.61171875,3.9375 6.671875,3.9375 L7.328125,3.9375 C7.38828125,3.9375 7.4375,3.98671875 7.4375,4.046875 L7.4375,7.765625 C7.4375,7.82578125 7.38828125,7.875 7.328125,7.875 L6.671875,7.875 C6.61171875,7.875 6.5625,7.82578125 6.5625,7.765625 L6.5625,4.046875 Z M7,10.0625 C6.63769531,10.0625 6.34375,9.76855469 6.34375,9.40625 C6.34375,9.04394531 6.63769531,8.75 7,8.75 C7.36230469,8.75 7.65625,9.04394531 7.65625,9.40625 C7.65625,9.76855469 7.36230469,10.0625 7,10.0625 Z" id="形状"></path>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/components/Search/Search.vue b/src/components/Search/Search.vue
index ebd6294..b26a1d9 100644
--- a/src/components/Search/Search.vue
+++ b/src/components/Search/Search.vue
@@ -31,7 +31,7 @@ async function handlerSearch(value) {
   if (res.code === 'OK') {
     state.resultList = [
       {
-        title: 'AI工单管理',
+        title: '图审审批管理',
         path: 'worksheet',
         data: res.data.ai,
       },
diff --git a/src/views/worksheet/modal/ApprovalModal.vue b/src/views/worksheet/modal/ApprovalModal.vue
index 1170e4b..5aabc13 100644
--- a/src/views/worksheet/modal/ApprovalModal.vue
+++ b/src/views/worksheet/modal/ApprovalModal.vue
@@ -142,7 +142,7 @@ defineExpose({
             <div class="task_id">#AI任务包{{ detail.packageId }}</div>
             <div class="tag_box">
               <div class="tag_item error">
-                <span style="color: red">error</span> 重复图片({{
+                <span style="color: red"><SvgIcon name="error_icon" size="14"/></span> 重复图片({{
                   detail.similarComplete || 0
                 }})
               </div>
-- 
2.39.3


From 08e74159c08e5ee89135dff1b4a8bd418fb4f66b Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Tue, 2 Apr 2024 18:22:56 +0800
Subject: [PATCH 119/143] =?UTF-8?q?feat:=20=E4=B8=8D=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/components/PictureInfo.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/worksheet/components/PictureInfo.vue b/src/views/worksheet/components/PictureInfo.vue
index a312527..5a001ca 100644
--- a/src/views/worksheet/components/PictureInfo.vue
+++ b/src/views/worksheet/components/PictureInfo.vue
@@ -26,10 +26,10 @@ const propertys = computed(() => {
     <n-scrollbar style="max-height: 100%">
       <n-ellipsis style="max-width: 350px">任务ID：{{ taskDetailInfo.taskname }}</n-ellipsis>
       <div class="tags">
-        <div class="tag tag-submiting" v-if="taskDetailInfo.historyStates == '1'">待审批</div>
+        <div class="tag tag-submiting" v-if="taskDetailInfo.historyStates == 1">待审批</div>
         <div class="tag tag-submited" v-else-if="taskDetailInfo.historyStates == 2 || taskDetailInfo.workStatus == 3">已审批</div>
         <div class="tag tag-passed" v-if="taskDetailInfo.historyStates == 2">{{ TASK_STATUS_OBJ[taskDetailInfo.historyStates] }}</div>
-        <div class="tag tag-not-passed" v-else-if="taskDetailInfo.workStatus == 3">{{ TASK_STATUS_OBJ[taskDetailInfo.historyStates] }}</div>
+        <div class="tag tag-not-passed" v-else-if="taskDetailInfo.historyStates == 3">{{ TASK_STATUS_OBJ[taskDetailInfo.historyStates] }}</div>
       </div>
       <n-divider class="divider-line" />
       <div class="property">
-- 
2.39.3


From ab9e50ff0c8a7fa72e79aec7967fe321bbc04dda Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Tue, 2 Apr 2024 18:40:05 +0800
Subject: [PATCH 120/143] =?UTF-8?q?fix:=20=E9=A6=96=E9=A1=B5=E9=AB=98?=
 =?UTF-8?q?=E7=BA=A7=E7=AD=9B=E9=80=89=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=B8=8E=E5=8F=B3=E4=BE=A7=E6=95=B0=E6=8D=AE=E8=81=94=E5=8A=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/aside/comp/Search.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/home/aside/comp/Search.vue b/src/views/home/aside/comp/Search.vue
index 53a80ad..df4acad 100644
--- a/src/views/home/aside/comp/Search.vue
+++ b/src/views/home/aside/comp/Search.vue
@@ -58,6 +58,7 @@ const searchName = () => {
 
 const close = () => {
   searchKeyword.value = "";
+  configStore.setSearchValue(searchKeyword.value);
   emit('close');
 }
 
-- 
2.39.3


From 6d1b319acfdd1a4d21c82e3fafc73ffe794c764d Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Tue, 2 Apr 2024 20:18:27 +0800
Subject: [PATCH 121/143] =?UTF-8?q?feat:=20=E5=9B=BE=E5=AE=A1=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E6=94=B9=E4=B8=BA=E5=9B=BE=E6=A3=80=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Search/Search.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Search/Search.vue b/src/components/Search/Search.vue
index b26a1d9..729f970 100644
--- a/src/components/Search/Search.vue
+++ b/src/components/Search/Search.vue
@@ -31,7 +31,7 @@ async function handlerSearch(value) {
   if (res.code === 'OK') {
     state.resultList = [
       {
-        title: '图审审批管理',
+        title: '图检审批',
         path: 'worksheet',
         data: res.data.ai,
       },
-- 
2.39.3


From 84fea70b5b7b8ab17ae0900f2405ac05f82b00ce Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Tue, 2 Apr 2024 20:25:50 +0800
Subject: [PATCH 122/143] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E4=B8=BB?=
 =?UTF-8?q?=E5=9B=BE=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/content/Content.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 01b09d3..1919492 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -294,6 +294,10 @@ function rejectHandler() {
   const modal = unref(notPassModalRef)! as any
   modal.showModal(selectItems.value)
 }
+function detailRejectHandler() {
+  const modal = unref(notPassModalRef)! as any
+  modal.showModal([taskDetailInfo.value])
+}
 function singleRejectHandler(item) {
   const modal = unref(notPassModalRef)! as any
   modal.showModal([item])
@@ -482,7 +486,7 @@ function reloadList() {
             <!-- 操作 -->
             <div v-show="overTask && overTask.id === taskDetailInfo.id" class="action" @click.stop="hideAction">
               <SvgIcon style="cursor: pointer" name="t1" @click.stop="approvalHandler" />
-              <SvgIcon style="cursor: pointer; margin-left: 30px" name="t2" @click.stop="rejectHandler" />
+              <SvgIcon style="cursor: pointer; margin-left: 30px" name="t2" @click.stop="detailRejectHandler" />
             </div>
           </div>
           <PictureInfo :taskDetailInfo="taskDetailInfo"></PictureInfo>
-- 
2.39.3


From 8237e77973bc48599593175912a2ba6e3dbde075 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Tue, 2 Apr 2024 20:48:06 +0800
Subject: [PATCH 123/143] =?UTF-8?q?feat:=20100=E7=99=BE=E5=88=86=E5=8F=B7?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E6=94=B9=E6=88=90=E7=BA=A2=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/content/Content.vue | 46 +++++++++++--------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 1919492..c0ac090 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -533,10 +533,9 @@ function reloadList() {
               <n-checkbox v-show="batch && item.historyStates !== 2 && item.historyStates !== 3" v-model:checked="item.checked" @click.stop
                 @update:checked="onCheckChange($event, item)" />
             </div>
-            <div class="percent">
-              <SvgIcon size="42" name="tag" />
+            <div class="percent" :class="{ 'percent-red': item?.maxSimilarity >= 100  }">
               <div class="val">
-                {{ item?.maxSimilarity && Number(item?.maxSimilarity).toFixed(0) }}%
+                {{ item?.maxSimilarity && Number(item?.maxSimilarity).toFixed(0) }}<span class="percent-unit">%</span>
               </div>
             </div>
 
@@ -967,29 +966,26 @@ function reloadList() {
 
       .percent {
         position: absolute;
-        text-align: center;
-        z-index: 3;
-        right: 17px;
-        top: 2px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 35px;
+        height: 18px;
+        opacity: 0.9;
+        background: #6f92fd;
+        border-radius: 6px 0px 6px 0px;
+        z-index: 5;
+        right: 12px;
+        top: 15px;
         color: #fff;
-
-        .val {
-          position: absolute;
-          left: 0;
-          top: 0;
-          display: block;
-          width: 100%;
-          height: 100%;
-          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;
-        }
+        font-size: 14px;
+      }
+      .percent-unit {
+        font-size: 8px;
+        margin-top: 4px;
+      }
+      .percent-red{
+        background: #ff4e4f;
       }
 
       .pass-status {
-- 
2.39.3


From 5638e1a4162357a4db42a183bcb27523e9cf6da1 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Tue, 2 Apr 2024 21:11:50 +0800
Subject: [PATCH 124/143] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4taskId?=
 =?UTF-8?q?=E4=B8=BAtaskchildpictureid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/content/Content.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index c0ac090..0737451 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -13,7 +13,7 @@ import emitter from '@/utils/mitt';
 import { useInfiniteScroll } from "@vueuse/core";
 import { format } from 'date-fns';
 import imagesloaded from "imagesloaded";
-import { clone, debounce, pickBy } from "lodash-es";
+import { clone, cloneDeep, debounce, pickBy } from "lodash-es";
 import { useDialog, useMessage } from "naive-ui";
 import { computed, onUnmounted, onUpdated, reactive, ref, unref, watch } from "vue";
 import PictureInfo from "../components/PictureInfo.vue";
@@ -296,8 +296,11 @@ function rejectHandler() {
 }
 function detailRejectHandler() {
   const modal = unref(notPassModalRef)! as any
-  modal.showModal([taskDetailInfo.value])
+  const params = cloneDeep(taskDetailInfo.value)
+  params.id = params.taskchildpictureid
+  modal.showModal([params])
 }
+
 function singleRejectHandler(item) {
   const modal = unref(notPassModalRef)! as any
   modal.showModal([item])
@@ -324,6 +327,7 @@ function approvalHandler(items?: any) {
   }
   else if (overTask.value) {
     cloneItem = clone(overTask.value)
+    cloneItem.id = cloneItem.taskchildpictureid
     processItems = [cloneItem]
   }
   //  任务包图片 => 点击 => 通过/不通过按钮
-- 
2.39.3


From c0aa814aec657022c1fcab9e43524f6ebfea095b Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Tue, 2 Apr 2024 21:52:59 +0800
Subject: [PATCH 125/143] =?UTF-8?q?feat:=20=E4=BB=BB=E5=8A=A1=E5=8C=85?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{PhotoWall.vue => PictureWall.vue}        |  0
 src/views/worksheet/content/Content.vue       | 54 ++++++++++++++++++-
 2 files changed, 52 insertions(+), 2 deletions(-)
 rename src/views/worksheet/components/{PhotoWall.vue => PictureWall.vue} (100%)

diff --git a/src/views/worksheet/components/PhotoWall.vue b/src/views/worksheet/components/PictureWall.vue
similarity index 100%
rename from src/views/worksheet/components/PhotoWall.vue
rename to src/views/worksheet/components/PictureWall.vue
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 0737451..6072447 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -320,7 +320,7 @@ function reject(idOrDesc: string, backId: string, isOther: boolean) {
 
   doAudit(param)
 }
-function approvalHandler(items?: any) {
+function detailApprovalHandler(items?: any){
   let cloneItem: any
   if (batch.value) {
     processItems = selectItems.value
@@ -371,6 +371,56 @@ function approvalHandler(items?: any) {
     onNegativeClick: () => { },
   })
 }
+function approvalHandler(items?: any) {
+  let cloneItem: any
+  if (batch.value) {
+    processItems = selectItems.value
+  }
+  else if (overTask.value) {
+    cloneItem = clone(overTask.value)
+    processItems = [cloneItem]
+  }
+  //  任务包图片 => 点击 => 通过/不通过按钮
+  if (items !== undefined && !(items instanceof PointerEvent))
+    processItems = [items]
+
+  const msg = validate(processItems)
+
+  if (msg !== null) {
+    message.error(msg)
+    return
+  }
+
+  const list: any = []
+  processItems.forEach((item) => {
+    list.push({
+      formId: item.id,
+      taskId: item.taskId,
+      taskName: item.fromTaskName,
+    })
+  })
+
+  const param = {
+    result: true,
+    comment: '',
+    disposeType: '',
+    disposeTypeId: '',
+    failCauseId: '',
+    failCauseName: '',
+    flowTaskInfoList: list,
+  }
+
+  dialog.info({
+    title: '确认提示',
+    content: '确认给该任务审批为【通过】吗?',
+    positiveText: '确定',
+    negativeText: '取消',
+    onPositiveClick: () => {
+      doAudit(param)
+    },
+    onNegativeClick: () => { },
+  })
+}
 
 function doAudit(param: any) {
   audit(param).then((res) => {
@@ -489,7 +539,7 @@ function reloadList() {
             </div>
             <!-- 操作 -->
             <div v-show="overTask && overTask.id === taskDetailInfo.id" class="action" @click.stop="hideAction">
-              <SvgIcon style="cursor: pointer" name="t1" @click.stop="approvalHandler" />
+              <SvgIcon style="cursor: pointer" name="t1" @click.stop="detailApprovalHandler" />
               <SvgIcon style="cursor: pointer; margin-left: 30px" name="t2" @click.stop="detailRejectHandler" />
             </div>
           </div>
-- 
2.39.3


From b281600df60ba56a2fd6082b027c8731c11cf445 Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Tue, 2 Apr 2024 22:15:23 +0800
Subject: [PATCH 126/143] =?UTF-8?q?=E7=9B=B8=E4=BC=BC=E5=9B=BE=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/content/Content.vue | 689 ++++++++++++++--------------
 src/views/task/modal/BatchModal.vue | 159 ++++---
 2 files changed, 445 insertions(+), 403 deletions(-)

diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index 24f68fa..6ac61ce 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
-import type { DataTableColumns, DataTableRowKey, PaginationProps } from "naive-ui";
-import { NButton, NDataTable, useDialog, useMessage } from "naive-ui";
+import type { DataTableColumns, DataTableRowKey, PaginationProps } from 'naive-ui'
+import { NButton, NDataTable, useDialog, useMessage } from 'naive-ui'
 import {
   computed,
   defineEmits,
@@ -13,9 +13,9 @@ import {
   ref,
   unref,
   watch,
-} from "vue";
-import { rowPropKeys } from "naive-ui/es/legacy-grid/src/Row";
-import { useRoute, useRouter } from "vue-router";
+} from 'vue'
+import { rowPropKeys } from 'naive-ui/es/legacy-grid/src/Row'
+import { useRoute, useRouter } from 'vue-router'
 import {
   CustomTabelModal,
   ImportExcelModal,
@@ -23,50 +23,50 @@ import {
   RepeatModal,
   RepeatTaskTableModal,
   StatusItem,
-} from "../comp";
-import { getFinalList } from "@/api/final";
-import { audit } from "@/api/task/task";
-import SvgIcon from "@/components/Icon/SvgIcon.vue";
-import type { RowData } from "@/config/final";
-import { findKey, headRules } from "@/config/final";
-import { useWindowSizeFn } from "@/hooks/event/useWindowSizeFn";
-import { useUser } from "@/store/modules/user";
-import { useFinal } from "@/store/modules/final";
-import { getViewportOffset } from "@/utils/domUtils";
-import { isBoolean } from "@/utils/is";
-import { useDictionary } from "@/store/modules/dictonary";
-import NotPassed from "@/components/Approval/NotPassed.vue";
-import type { ApprovalParam } from "/#/api";
-import emitter from "@/utils/mitt";
-import { formatToDateHMS } from "@/utils/dateUtil";
-import { getAllfieldList, getfieldList, savefield } from "@/api/home/filter";
-
-const emit = defineEmits(["changeShow"]);
+} from '../comp'
+import { getFinalList } from '@/api/final'
+import { audit } from '@/api/task/task'
+import SvgIcon from '@/components/Icon/SvgIcon.vue'
+import type { RowData } from '@/config/final'
+import { findKey, headRules } from '@/config/final'
+import { useWindowSizeFn } from '@/hooks/event/useWindowSizeFn'
+import { useUser } from '@/store/modules/user'
+import { useFinal } from '@/store/modules/final'
+import { getViewportOffset } from '@/utils/domUtils'
+import { isBoolean } from '@/utils/is'
+import { useDictionary } from '@/store/modules/dictonary'
+import NotPassed from '@/components/Approval/NotPassed.vue'
+import type { ApprovalParam } from '/#/api'
+import emitter from '@/utils/mitt'
+import { formatToDateHMS } from '@/utils/dateUtil'
+import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter'
+
+const emit = defineEmits(['changeShow'])
 function changeContent() {
-  emit("changeShow");
+  emit('changeShow')
 }
-const checkedRowKeys = ref([]);
-const dicStore = useDictionary();
-const izstatusList = ref([]);
-const router = useRouter();
-const route = useRoute();
-const reviewType = 0;
+const checkedRowKeys = ref([])
+const dicStore = useDictionary()
+const izstatusList = ref([])
+const router = useRouter()
+const route = useRoute()
+const reviewType = 0
 const actionsColumns = {
-  title: "操作",
-  key: "actions",
+  title: '操作',
+  key: 'actions',
   minWidth: 200,
-  fixed: "right",
+  fixed: 'right',
   render(row) {
     return h(ListAction, {
       id: row.id,
       status: row.states,
       trigger: (action) => {
-        actionHandler(action, row);
+        actionHandler(action, row)
       },
-    });
+    })
   },
-};
-const columnsRef = ref<DataTableColumns<RowData>>([]);
+}
+const columnsRef = ref<DataTableColumns<RowData>>([])
 // const columns: DataTableColumns<RowData> = [
 //   {
 //     type: "selection",
@@ -166,53 +166,54 @@ const columnsRef = ref<DataTableColumns<RowData>>([]);
 async function getColumns() {
   columnsRef.value = [
     {
-      type: "selection",
-      fixed: "left",
+      type: 'selection',
+      fixed: 'left',
       width: 50,
       disabled(row: any) {
-        return row.states !== 2;
+        return row.states !== 2
       },
     },
-  ];
-
-  const userStore = useUser();
-  const userInfo = userStore.getUserInfo;
-  let res;
-  res = await getAllfieldList(reviewType); // 所有筛选项目
-  const allList = res.data;
-  res = await getfieldList(reviewType, userInfo.id); // 当前用户选择的项目
-  const useList = res.data;
-  const userFieldFixed = useList.userFieldFixed?.split(",");
-  const userFieldUnFixed = useList.userFieldUnFixed?.split(",");
+  ]
+
+  const userStore = useUser()
+  const userInfo = userStore.getUserInfo
+  let res
+  res = await getAllfieldList(reviewType) // 所有筛选项目
+  const allList = res.data
+  res = await getfieldList(reviewType, userInfo.id) // 当前用户选择的项目
+  const useList = res.data
+  const userFieldFixed = useList.userFieldFixed?.split(',')
+  const userFieldUnFixed = useList.userFieldUnFixed?.split(',')
   if (!userFieldFixed?.length && !userFieldUnFixed?.length) {
     allList?.map((v) => {
       if (v.isrequired == 2) {
         columnsRef.value.push({
           title: v.fieldDesc,
-          fixed: "left",
+          fixed: 'left',
           key: v.name,
           width: 120,
-        });
+        })
       }
-    });
-  } else {
+    })
+  }
+  else {
     userFieldFixed.map((v) => {
-      let item = allList.find((v2) => v2.name == v);
+      const item = allList.find(v2 => v2.name == v)
       columnsRef.value.push({
         title: item.fieldDesc,
         key: item.name,
-        fixed: "left",
+        fixed: 'left',
         width: 120,
-      });
-    });
+      })
+    })
     userFieldUnFixed.map((v) => {
-      let item = allList.find((v2) => v2.name == v);
+      const item = allList.find(v2 => v2.name == v)
       columnsRef.value.push({
         title: item.fieldDesc,
         key: item.name,
         width: 120,
-      });
-    });
+      })
+    })
   }
   // TODO: 会导致排序问题 废弃
   // #region
@@ -246,181 +247,190 @@ async function getColumns() {
   // });
   // #endregion
 
-  columnsRef.value.push(actionsColumns as any);
-  console.log(columnsRef.value, "columnsRef111");
-  formatColumns();
-  console.log(columnsRef.value, "columnsRef222");
+  columnsRef.value.push(actionsColumns as any)
+  console.log(columnsRef.value, 'columnsRef111')
+  formatColumns()
+  console.log(columnsRef.value, 'columnsRef222')
 }
 
 async function formatColumns() {
   // TODO处理特殊字段
 
-  let index;
-  index = columnsRef.value.findIndex((v) => v.title == "任务ID");
+  let index
+  index = columnsRef.value.findIndex(v => v.title == '任务ID')
   if (index > -1) {
     columnsRef.value[index] = {
-      title: "任务ID",
+      title: '任务ID',
       key: columnsRef.value[index].key, // "id"
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
       render(row) {
         const item: any = izstatusList.value.find(
-          (item: any) => item.value == row.states
-        );
+          (item: any) => item.value == row.states,
+        )
         return h(
           NButton,
           {
-            strong: true,
-            tertiary: true,
-            text: true,
-            size: "small",
-            "text-color": "#507AFD",
-            onClick: () => goDetail(row),
+            'strong': true,
+            'tertiary': true,
+            'text': true,
+            'size': 'small',
+            'text-color': '#507AFD',
+            'onClick': () => goDetail(row),
           },
-          { default: () => row.id }
-        );
+          { default: () => row.id },
+        )
       },
-    };
+    }
   }
 
-  index = columnsRef.value.findIndex((v) => v.title == "所属项目");
+  index = columnsRef.value.findIndex(v => v.title == '所属项目')
   if (index > -1) {
     columnsRef.value[index] = {
-      title: "所属项目",
+      title: '所属项目',
       key: columnsRef.value[index].key, // "fromtaskname"
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
       ellipsis: {
         tooltip: true,
       },
-    };
+    }
   }
 
-  index = columnsRef.value.findIndex((v) => v.title == "任务名称");
+  index = columnsRef.value.findIndex(v => v.title == '任务名称')
   if (index > -1) {
     columnsRef.value[index] = {
-      title: "任务名称",
+      title: '任务名称',
       key: columnsRef.value[index].key, // "fromtaskname"
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
       ellipsis: {
         tooltip: true,
       },
-    };
+    }
   }
-  index = columnsRef.value.findIndex((v) => v.title == "审批状态");
+  index = columnsRef.value.findIndex(v => v.title == '审批状态')
   if (index > -1) {
     columnsRef.value[index] = {
-      title: "审批状态",
+      title: '审批状态',
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 120,
-      sorter: "default",
+      sorter: 'default',
       renderSorterIcon: ({ order }) => {
-        if (order === false) return h(SvgIcon, { name: "sort-2" });
-        if (order === "ascend") return h(SvgIcon, { name: "sort-1" });
-        if (order === "descend") return h(SvgIcon, { name: "sort-3" });
+        if (order === false)
+          return h(SvgIcon, { name: 'sort-2' })
+        if (order === 'ascend')
+          return h(SvgIcon, { name: 'sort-1' })
+        if (order === 'descend')
+          return h(SvgIcon, { name: 'sort-3' })
       },
       render(row) {
         const item: any = izstatusList.value.find(
-          (item: any) => item.value == row.states
-        );
+          (item: any) => item.value == row.states,
+        )
         return h(StatusItem, {
           id: row.id,
           status: row.states,
-          label: item ? item.label : "",
-        });
+          label: item ? item.label : '',
+        })
       },
-    };
+    }
   }
-  index = columnsRef.value.findIndex((v) => v.title == "图片相似度");
+  index = columnsRef.value.findIndex(v => v.title == '图片相似度')
   if (index > -1) {
     columnsRef.value[index] = {
-      title: "图片相似度",
+      title: '图片相似度',
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 150,
-      sorter: "default",
+      sorter: 'default',
       renderSorterIcon: ({ order }) => {
-        if (order === false) return h(SvgIcon, { name: "sort-2" });
-        if (order === "ascend") return h(SvgIcon, { name: "sort-1" });
-        if (order === "descend") return h(SvgIcon, { name: "sort-3" });
+        if (order === false)
+          return h(SvgIcon, { name: 'sort-2' })
+        if (order === 'ascend')
+          return h(SvgIcon, { name: 'sort-1' })
+        if (order === 'descend')
+          return h(SvgIcon, { name: 'sort-3' })
       },
       render(row: any) {
         return h(
-          "div",
+          'div',
           {
             id: row.id,
-            style: { color: row.similarityscore === 100 ? "#FF4E4F" : "" },
+            style: { color: row.similarityscore === 100 ? '#FF4E4F' : '' },
           },
-          { default: () => (row.similarityscore ? `${row.similarityscore}%` : "") }
-        );
+          { default: () => (row.similarityscore ? `${row.similarityscore}%` : '') },
+        )
       },
-    };
+    }
   }
-  index = columnsRef.value.findIndex((v) => v.title == "提报时间");
+  index = columnsRef.value.findIndex(v => v.title == '提报时间')
   if (index > -1) {
     columnsRef.value[index] = {
-      title: "提报时间",
+      title: '提报时间',
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
-      sorter: "default",
+      sorter: 'default',
       renderSorterIcon: ({ order }) => {
-        if (order === false) return h(SvgIcon, { name: "sort-2" });
-        if (order === "ascend") return h(SvgIcon, { name: "sort-1" });
-        if (order === "descend") return h(SvgIcon, { name: "sort-3" });
+        if (order === false)
+          return h(SvgIcon, { name: 'sort-2' })
+        if (order === 'ascend')
+          return h(SvgIcon, { name: 'sort-1' })
+        if (order === 'descend')
+          return h(SvgIcon, { name: 'sort-3' })
       },
       render(row: any) {
-        return formatToDateHMS(row.createdate || 0);
+        return formatToDateHMS(row.createdate || 0)
       },
-    };
+    }
   }
 
-  index = columnsRef.value.findIndex((v) => v.title == "更新时间");
+  index = columnsRef.value.findIndex(v => v.title == '更新时间')
   if (index > -1) {
     columnsRef.value[index] = {
-      title: "更新时间",
+      title: '更新时间',
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
       render(row: any) {
-        return row.updatetime ? formatToDateHMS(row.updatetime) : "";
+        return row.updatetime ? formatToDateHMS(row.updatetime) : ''
       },
-    };
+    }
   }
 }
 
-const deviceHeight = ref(600);
+const deviceHeight = ref(600)
 
 onMounted(() => {
-  emitter.on("filter-final", refreshHandler);
-  getColumns();
+  emitter.on('filter-final', refreshHandler)
+  getColumns()
 
   nextTick(() => {
-    computeListHeight();
-  });
-});
+    computeListHeight()
+  })
+})
 
 onBeforeMount(() => {
-  dicStore.fetchizstatusListt();
-});
+  dicStore.fetchizstatusListt()
+})
 
 watch(
   () => dicStore.izstatusList,
   (newval) => {
-    izstatusList.value = newval;
-  }
-);
+    izstatusList.value = newval
+  },
+)
 
 onUnmounted(() => {
-  emitter.off("filter-final", refreshHandler);
-});
+  emitter.off('filter-final', refreshHandler)
+})
 
-const tableRef = ref<InstanceType<typeof NDataTable>>();
-const rowKey = (row: RowData) => row.id;
-const loading = ref(true);
-const total = ref(0);
+const tableRef = ref<InstanceType<typeof NDataTable>>()
+const rowKey = (row: RowData) => row.id
+const loading = ref(true)
+const total = ref(0)
 const pagination = reactive({
   page: 1,
   pageCount: 10,
@@ -428,242 +438,247 @@ const pagination = reactive({
   showSizePicker: true,
   pageSizes: [
     {
-      label: "10 每页",
+      label: '10 每页',
       value: 10,
     },
     {
-      label: "15 每页",
+      label: '15 每页',
       value: 15,
     },
     {
-      label: "30 每页",
+      label: '30 每页',
       value: 30,
     },
     {
-      label: "50 每页",
+      label: '50 每页',
       value: 50,
     },
   ],
   showQuickJumper: true,
   prefix: () => `共 ${total.value} 条数据`,
-});
-const tableData = ref<Array<RowData>>([]);
-const selectionIds = ref<DataTableRowKey[]>([]);
-const dialog = useDialog();
-const message = useMessage();
-const finalStore = useFinal();
+})
+const tableData = ref<Array<RowData>>([])
+const selectionIds = ref<DataTableRowKey[]>([])
+const dialog = useDialog()
+const message = useMessage()
+const finalStore = useFinal()
 
 async function query(page: number, pageSize: number, filterId?: any) {
-  const asideParmas = unref(finalStore.getAsideValue);
+  const asideParmas = unref(finalStore.getAsideValue)
   // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
-  const params = filterId ? { userSearchId: filterId } : asideParmas;
+  const params = filterId ? { userSearchId: filterId } : asideParmas
   const result = await getFinalList({
-    sortorder: "asc",
+    sortorder: 'asc',
     pageSize,
     currPage: page,
-    sortname: "",
+    sortname: '',
     ...params,
-  });
-  const { data, pageCount, totalCount } = result;
-  tableData.value = data;
-  total.value = totalCount;
-  pagination.page = page;
-  pagination.pageCount = Math.ceil(totalCount / pageSize);
-  loading.value = false;
+  })
+  const { data, pageCount, totalCount } = result
+  tableData.value = data
+  total.value = totalCount
+  pagination.page = page
+  pagination.pageCount = Math.ceil(totalCount / pageSize)
+  loading.value = false
 }
 
 async function handlePageChange(currentPage) {
-  if (loading.value) return;
-  const { pageSize } = pagination;
-  pagination.page = currentPage;
-  await query(currentPage, pageSize);
+  if (loading.value)
+    return
+  const { pageSize } = pagination
+  pagination.page = currentPage
+  await query(currentPage, pageSize)
 }
 async function handlePageSizeChange(currentPageSize) {
-  if (loading.value) return;
+  if (loading.value)
+    return
 
-  const { page } = pagination;
-  pagination.pageSize = currentPageSize;
+  const { page } = pagination
+  pagination.pageSize = currentPageSize
 
-  await query(page, currentPageSize);
+  await query(page, currentPageSize)
 }
 
 function handleCheck(rowKeys: DataTableRowKey[]) {
-  selectionIds.value = rowKeys;
+  selectionIds.value = rowKeys
 }
 
 async function computeListHeight() {
-  const table = unref(tableRef);
-  if (!table) return;
-  const tableEl: any = table?.$el;
-  const headEl = tableEl.querySelector(".n-data-table-thead ");
-  const { bottomIncludeBody } = getViewportOffset(headEl);
-  const headerH = 64;
-  let paginationH = 2;
-  const marginH = 60;
+  const table = unref(tableRef)
+  if (!table)
+    return
+  const tableEl: any = table?.$el
+  const headEl = tableEl.querySelector('.n-data-table-thead ')
+  const { bottomIncludeBody } = getViewportOffset(headEl)
+  const headerH = 64
+  let paginationH = 2
+  const marginH = 60
   if (!isBoolean(unref(pagination))) {
     const paginationEl = tableEl.querySelector(
-      ".n-data-table__pagination"
-    ) as HTMLElement;
+      '.n-data-table__pagination',
+    ) as HTMLElement
     if (paginationEl) {
-      const offsetHeight = paginationEl.offsetHeight;
-      paginationH += offsetHeight || 0;
-    } else {
-      paginationH += 28;
+      const offsetHeight = paginationEl.offsetHeight
+      paginationH += offsetHeight || 0
+    }
+    else {
+      paginationH += 28
     }
   }
-  let height = bottomIncludeBody - (headerH + paginationH + marginH);
-  const maxHeight = 800;
-  height = maxHeight && maxHeight < height ? maxHeight : height;
-  deviceHeight.value = height;
+  let height = bottomIncludeBody - (headerH + paginationH + marginH)
+  const maxHeight = 800
+  height = maxHeight && maxHeight < height ? maxHeight : height
+  deviceHeight.value = height
 }
 
-useWindowSizeFn(computeListHeight);
+useWindowSizeFn(computeListHeight)
 
 const maxHeight = computed(() => {
-  return tableData.value.length ? `${unref(deviceHeight)}px` : "auto";
-});
+  return tableData.value.length ? `${unref(deviceHeight)}px` : 'auto'
+})
 
-query(pagination.page, pagination.pageSize);
+query(pagination.page, pagination.pageSize)
 
-const customTabelRef = ref(null);
-const importExcelRef = ref(null);
-const notPassModalRef = ref(null); // 不通过弹窗
-const repeatModalRef = ref(null);
-const repeatTaskTableModalRef = ref(null);
+const customTabelRef = ref(null)
+const importExcelRef = ref(null)
+const notPassModalRef = ref(null) // 不通过弹窗
+const repeatModalRef = ref(null)
+const repeatTaskTableModalRef = ref(null)
 
 function showModal(modalRef: any) {
-  const modal = unref(modalRef)! as any;
-  modal.showModal();
+  const modal = unref(modalRef)! as any
+  modal.showModal()
 }
 
-const popover = ref<ComponentRef | null>(null);
+const popover = ref<ComponentRef | null>(null)
 
 function importHandler() {
-  (popover.value as any).setShow(false);
-  showModal(importExcelRef);
+  (popover.value as any).setShow(false)
+  showModal(importExcelRef)
 }
 
 function exportHandler() {
-  loading.value = true;
-  import("@/utils/exportExcel").then((excel) => {
+  loading.value = true
+  import('@/utils/exportExcel').then((excel) => {
     const tHeader = [
-      "任务Id",
-      "任务名称",
-      "审批节点",
-      "审批状态",
-      "图片相似度",
-      "提报时间",
-      "更新时间",
-    ];
+      '任务Id',
+      '任务名称',
+      '审批节点',
+      '审批状态',
+      '图片相似度',
+      '提报时间',
+      '更新时间',
+    ]
     const filterVal = [
-      "id",
-      "name",
-      "approvalnode",
-      "approvalstatus",
-      "similarity",
-      "uptime",
-      "updatetime",
-    ];
-    const list = tableData.value;
-    const data = formatJson(filterVal, list);
+      'id',
+      'name',
+      'approvalnode',
+      'approvalstatus',
+      'similarity',
+      'uptime',
+      'updatetime',
+    ]
+    const list = tableData.value
+    const data = formatJson(filterVal, list)
     excel.export_json_to_excel({
       header: tHeader,
       data,
-      filename: "data",
+      filename: 'data',
       autoWidth: true,
-      bookType: "xlsx",
-    });
-    loading.value = false;
-  });
+      bookType: 'xlsx',
+    })
+    loading.value = false
+  })
 }
 
 function formatJson(filterVal, jsonDataList) {
-  return jsonDataList.map((v) =>
+  return jsonDataList.map(v =>
     filterVal.map((j) => {
-      return v[j];
-    })
-  );
+      return v[j]
+    }),
+  )
 }
 
 function sucessHandler(excelData) {
   const data = excelData.content.map((item) => {
-    const obj = {};
+    const obj = {}
     Object.keys(item).forEach((key) => {
-      const k = findKey(columns, key);
-      obj[k] = item[key];
-    });
-    return obj;
-  });
+      const k = findKey(columns, key)
+      obj[k] = item[key]
+    })
+    return obj
+  })
 
-  tableData.value = data;
+  tableData.value = data
 }
 
 function commitHandler(columns) {
-  columnsRef.value = [...columns, actionsColumns];
-  formatColumns();
+  columnsRef.value = [...columns, actionsColumns]
+  formatColumns()
 }
 
 function actionHandler(action: any, row: any) {
-  const { key } = action;
+  const { key } = action
   switch (key) {
-    case "view":
-      goDetail(row);
-      break;
-    case "reset":
-      resetHandler();
-      break;
-    case "approval":
-      singleApproval(row);
-      break;
-    case "reject":
-      rejectHandler([row]);
-      break;
+    case 'view':
+      goDetail(row)
+      break
+    case 'reset':
+      resetHandler()
+      break
+    case 'approval':
+      singleApproval(row)
+      break
+    case 'reject':
+      rejectHandler([row])
+      break
     default:
-      break;
+      break
   }
 }
 
 // states:1未提交，2待审批，3通过，4不通过
 function validate(items: any[]) {
-  if (items.length === 0) return "至少选中一个任务";
-  return null;
+  if (items.length === 0)
+    return '至少选中一个任务'
+  return null
 }
 
 function goDetail(row) {
-  router.push({ name: "final-detail", query: { id: row.id, packageid: row.packageid } });
+  router.push({ name: 'final-detail', query: { id: row.id, packageid: row.packageid } })
 }
 
 function resetHandler() {
   dialog.info({
-    title: "确认提示",
-    content: "确认重置当前选中的任务的审批吗?",
-    positiveText: "确定",
-    negativeText: "取消",
+    title: '确认提示',
+    content: '确认重置当前选中的任务的审批吗?',
+    positiveText: '确定',
+    negativeText: '取消',
     onPositiveClick: async () => {
       // TODO：需要支持重置
       // const result = await resetApproval()
     },
     onNegativeClick: () => {},
-  });
+  })
 }
 
 function getSelectItems() {
-  return tableData.value.filter((item) => selectionIds.value.includes(item.id));
+  return tableData.value.filter(item => selectionIds.value.includes(item.id))
 }
 
 const showActions = computed(() => {
-  return selectionIds.value.length;
-});
+  return selectionIds.value.length
+})
 
 // 单个审批通过
 function singleApproval(row) {
   const param = {
     result: true,
-    comment: "",
-    disposeType: "",
-    disposeTypeId: "",
-    failCauseId: "",
-    failCauseName: "",
+    comment: '',
+    disposeType: '',
+    disposeTypeId: '',
+    failCauseId: '',
+    failCauseName: '',
     flowTaskInfoList: [
       {
         formId: row.id,
@@ -671,129 +686,129 @@ function singleApproval(row) {
         taskName: row.fromTaskName,
       },
     ],
-  };
-  doAudit(param);
+  }
+  doAudit(param)
 }
 
 // 批量通过
 function batchApproval() {
-  const items: any = getSelectItems();
-  const msg = validate(items);
+  const items: any = getSelectItems()
+  const msg = validate(items)
 
   if (msg !== null) {
-    message.error(msg);
-    return;
+    message.error(msg)
+    return
   }
-  console.log(items);
-  const list: any = [];
+  console.log(items)
+  const list: any = []
   items.forEach((item) => {
     list.push({
       formId: item.id,
       taskId: item.taskId,
       taskName: item.fromtaskname,
-    });
-  });
+    })
+  })
 
   const param = {
     result: true,
-    comment: "",
-    disposeType: "",
-    disposeTypeId: "",
-    failCauseId: "",
-    failCauseName: "",
+    comment: '',
+    disposeType: '',
+    disposeTypeId: '',
+    failCauseId: '',
+    failCauseName: '',
     flowTaskInfoList: list,
-  };
+  }
 
-  doAudit(param);
+  doAudit(param)
 }
 
 // 小结批量不通过
 function repeatBatchReject(items) {
-  console.log(items);
-  rejectHandler(items);
+  console.log(items)
+  rejectHandler(items)
 }
 
 // 批量不通过
 function batchReject() {
-  const items: any = getSelectItems();
-  rejectHandler(items);
+  const items: any = getSelectItems()
+  rejectHandler(items)
 }
 
 // 审核不通过
 function rejectHandler(list) {
-  const msg = validate(list);
+  const msg = validate(list)
   if (msg !== null) {
-    message.error(msg);
-    return;
+    message.error(msg)
+    return
   }
 
-  const modal = unref(notPassModalRef)! as any;
-  modal.showModal(list);
+  const modal = unref(notPassModalRef)! as any
+  modal.showModal(list)
 }
 
 // 审核通过
 function doAudit(param: any) {
   dialog.info({
-    title: "确认提示",
-    content: "确认给该任务审批为【通过】吗?",
-    positiveText: "确定",
-    negativeText: "取消",
+    title: '确认提示',
+    content: '确认给该任务审批为【通过】吗?',
+    positiveText: '确定',
+    negativeText: '取消',
     onPositiveClick: () => {
       audit(param).then((res) => {
-        const { code } = res;
-        if (code === "OK") {
-          message.success(res.message);
-          reload();
-        } else {
-          message.error(res.message);
+        const { code } = res
+        if (code === 'OK') {
+          message.success(res.message)
+          reload()
+        }
+        else {
+          message.error(res.message)
         }
-      });
+      })
     },
     onNegativeClick: () => {},
-  });
+  })
 }
 
 function switchBatch() {
-  selectionIds.value = [];
-  checkedRowKeys.value = [];
+  selectionIds.value = []
+  checkedRowKeys.value = []
 }
 
 function reload() {
-  selectionIds.value = [];
-  checkedRowKeys.value = [];
+  selectionIds.value = []
+  checkedRowKeys.value = []
 
-  const { page, pageSize } = unref(tableRef.value?.pagination) as PaginationProps;
-  query(page!, pageSize!);
+  const { page, pageSize } = unref(tableRef.value?.pagination) as PaginationProps
+  query(page!, pageSize!)
 }
 
 watch(
   () => finalStore.asideValue,
   (newVal, oldVal) => {
-    refreshHandler();
+    refreshHandler()
   },
-  { deep: true }
-);
+  { deep: true },
+)
 
 function reset() {
-  pagination.page = 1;
-  pagination.pageCount = 1;
+  pagination.page = 1
+  pagination.pageCount = 1
 }
 
 async function refreshHandler(searchId?: any) {
-  reset();
-  query(pagination.page, pagination.pageSize, searchId);
+  reset()
+  query(pagination.page, pagination.pageSize, searchId)
 }
 
 function filterTableData(keyword) {
-  if (keyword) {
-    tableData.value = tableData.value.filter((item) => item.id.includes(keyword));
-  } else {
-    query(pagination.page, pagination.pageSize);
-  }
+  if (keyword)
+    tableData.value = tableData.value.filter(item => item.id.includes(keyword))
+  else
+    query(pagination.page, pagination.pageSize)
 }
 defineExpose({
   filterTableData,
-});
+})
 </script>
 
 <template>
@@ -810,7 +825,9 @@ defineExpose({
           name="summary"
           @click="showModal(repeatModalRef)"
         />
-        <NButton class="xjcc" text @click="showModal(repeatModalRef)"> 小结查重 </NButton>
+        <NButton class="xjcc" text @click="showModal(repeatModalRef)">
+          小结查重
+        </NButton>
 
         <div v-show="!showActions" style="display: flex; align-items: center">
           <div class="btn">
@@ -831,14 +848,14 @@ defineExpose({
             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"
-          />
+          >
         </div>
 
         <n-popover
@@ -856,24 +873,16 @@ defineExpose({
           </template>
           <ul class="wrapper-header-action">
             <li @click="importHandler">
-              <SvgIcon size="20" name="import" /><span style="margin-left: 5px"
-                >批量导入数据</span
-              >
+              <SvgIcon size="20" name="import" /><span style="margin-left: 5px">批量导入数据</span>
             </li>
             <li @click="exportHandler">
-              <SvgIcon size="20" name="download" /><span style="margin-left: 5px"
-                >导出待审数据</span
-              >
+              <SvgIcon size="20" name="download" /><span style="margin-left: 5px">导出待审数据</span>
             </li>
             <li>
-              <SvgIcon size="20" name="download" /><span style="margin-left: 5px"
-                >导出全部数据</span
-              >
+              <SvgIcon size="20" name="download" /><span style="margin-left: 5px">导出全部数据</span>
             </li>
             <li>
-              <SvgIcon size="20" name="look" /><span style="margin-left: 5px"
-                >查看导入记录</span
-              >
+              <SvgIcon size="20" name="look" /><span style="margin-left: 5px">查看导入记录</span>
             </li>
           </ul>
         </n-popover>
diff --git a/src/views/task/modal/BatchModal.vue b/src/views/task/modal/BatchModal.vue
index b2d1393..0cd380b 100644
--- a/src/views/task/modal/BatchModal.vue
+++ b/src/views/task/modal/BatchModal.vue
@@ -5,8 +5,10 @@ import { useInfiniteScroll } from '@vueuse/core'
 import { debounce } from 'lodash-es'
 import imagesloaded from 'imagesloaded'
 import { useMessage } from 'naive-ui'
+import { useWindowSizeFn } from '@/hooks/event/useWindowSizeFn'
+import { getViewportOffset, off, on } from '@/utils/domUtils'
+
 import { timeOptions, viewOptions } from '@/config/home'
-import { off, on } from '@/utils/domUtils'
 import { useTask } from '@/store/modules/task'
 import { TASK_STATUS_OBJ } from '@/enums/index'
 import { formatToDateHMS } from '@/utils/dateUtil'
@@ -43,6 +45,7 @@ const viewLabel = computed(() => {
 
   return item?.label
 })
+const deviceHeight = ref(600)
 
 const taskStore = useTask()
 const masonryRef = ref<ComponentRef>(null)
@@ -64,6 +67,14 @@ const sortBy: any = {
 const batch = ref(false)
 let _imagesload: any
 const message = useMessage()
+async function computeListHeight() {
+  const headEl = document.querySelector('.wrapper-content')!
+  const { bottomIncludeBody } = getViewportOffset(headEl)
+  const height = bottomIncludeBody
+  deviceHeight.value = height - 40 - 16 - 24
+}
+
+useWindowSizeFn(computeListHeight)
 
 const layout = debounce(() => {
   if (!show.value)
@@ -74,6 +85,7 @@ const layout = debounce(() => {
 
   _masonry = new Masonry(masonryRef.value as any, {
     itemSelector: '.grid-item',
+    gutter: 17,
     columnWidth: 214,
     percentPosition: true,
     stagger: 10,
@@ -208,9 +220,9 @@ function upHandler(event: MouseEvent) {
   start = null
 }
 
-const gridHeight = computed(() => {
-  return viewMode.value !== 'masonry' ? '157px' : ''
-})
+// const gridHeight = computed(() => {
+//   return viewMode.value !== 'masonry' ? '157px' : ''
+// })
 
 function addListeners() {
   selectionBox = document.querySelector('.selection-box') as HTMLDivElement
@@ -346,6 +358,12 @@ watch(() => taskStore.activeId, async (newValue, oldValue) => {
   refreshHandler()
 })
 
+const listStyle = computed(() => {
+  return {
+    height: `${deviceHeight.value}px`,
+  }
+})
+
 function switchBatch() {
   setBatch(!batch.value)
 }
@@ -363,19 +381,19 @@ function sortHandler(orderby: 'similarityScore' | 'createdate') {
   refreshHandler()
 }
 
-// const gridHeight = computed(() => {
-//   let height = ''
-//   if (viewMode.value === 'masonry')
-//     height = ''
-//   else if (viewMode.value === 'horizontalVersion')
-//     height = '145px'
-//   else if (viewMode.value === 'verticalVersion')
-//     height = '300px'
-//   else if (viewMode.value === '3:4')
-//     height = '240px'
-
-//   return height
-// })
+const gridHeight = computed(() => {
+  let height = ''
+  if (viewMode.value === 'masonry')
+    height = ''
+  else if (viewMode.value === 'horizontalVersion')
+    height = '122px'
+  else if (viewMode.value === 'verticalVersion')
+    height = '300px'
+  else if (viewMode.value === '3:4')
+    height = '240px'
+
+  return height
+})
 
 defineExpose({
   showModal,
@@ -505,51 +523,57 @@ defineExpose({
               </div>
             </div>
 
-            <div ref="el" class="scroll">
-              <!-- <n-scrollbar :on-scroll="scrollHandler"> -->
-              <div ref="masonryRef" class="grid">
-                <div
-                  v-for="(item, index) in listData" :key="index" :data-id="item.id" :style="{ height: gridHeight }"
-                  class="grid-item"
-                >
-                  <div class="img-wrap">
-                    <!-- <img
-                      class="wrapper-content-item-img"
-                      :class="{ 'wrapper-content-item-img-fit': viewMode !== 'masonry' }" :src="item.imgUrl"
-                    > -->
-                    <n-image
-                      ref="imageRef"
-                      class="img"
-                      :class="{ 'img-fit': viewMode === 'horizontalVersion', 'img-full': viewMode === '3:4' || viewMode === 'verticalVersion' }" :src="item.serverThumbnailUrl || item.imgUrl"
-                    />
-                    <div class="small-mark" />
-                    <div class="time">
-                      <div v-if="item.photoDateTimestamp" class="time-item">
-                        <SvgIcon class="svg-time" color="#FFF" size="14" name="camera-time" />
-                        <span>{{ formatToDateHMS(Number(item.photoDateTimestamp) || 0) }}</span>
+            <n-spin :show="loading">
+              <div ref="el" class="scroll" :style="listStyle">
+                <!-- <n-scrollbar :on-scroll="scrollHandler"> -->
+                <div ref="masonryRef" class="grid">
+                  <div
+                    v-for="(item, index) in listData"
+                    :key="index"
+                    :style="{ height: gridHeight }"
+                    class="grid-item"
+                  >
+                    <div>
+                      <n-image
+                        ref="imageRef"
+                        class="img"
+
+                        :class="{
+                          'img-fit': viewMode === 'horizontalVersion',
+                          'img-full': viewMode === '3:4' || viewMode === 'verticalVersion',
+                        }"
+
+                        :src="item.serverThumbnailUrl || item.imgUrl"
+                      />
+                      <div class="small-mark" />
+                      <div class="time">
+                        <div v-if="item.photoDateTimestamp" class="time-item">
+                          <SvgIcon class="svg-time" color="#FFF" size="14" name="camera-time" />
+                          <span>{{ formatToDateHMS(Number(item.photoDateTimestamp) || 0) }}</span>
+                        </div>
+                        <div v-if="item.submitDateTimestamp" class="time-item time-item2">
+                          <SvgIcon class="svg-time" color="#FFF" size="14" name="submit-time" />
+                          <span>{{ formatToDateHMS(Number(item.submitDateTimestamp) || 0) }}</span>
+                        </div>
                       </div>
-                      <div v-if="item.submitDateTimestamp" class="time-item time-item2">
-                        <SvgIcon class="svg-time" color="#FFF" size="14" name="submit-time" />
-                        <span>{{ formatToDateHMS(Number(item.submitDateTimestamp) || 0) }}</span>
+                      <img v-if="item.historyStates === 2" class="tag-status" src="@/assets/images/task/tag-pass.png" alt="">
+                      <img v-if="item.historyStates === 3" class="tag-status" src="@/assets/images/task/tag-not-pass.png" alt="">
+                      <div class="check">
+                        <n-checkbox
+                          v-show="batch && item.historyStates === 1"
+                          v-model:checked="item.checked" @click.prevent
+                          @update:checked="onCheckChange($event, item)"
+                        />
+                      </div>
+                      <div :class="{ 'percent-red': item.similarityScore === 100 }" class="percent">
+                        {{ item.similarityScore }}<span class="percent-unit">%</span>
                       </div>
-                    </div>
-                    <img v-if="item.historyStates === 2" class="tag-status" src="@/assets/images/task/tag-pass.png" alt="">
-                    <img v-if="item.historyStates === 3" class="tag-status" src="@/assets/images/task/tag-not-pass.png" alt="">
-                    <div class="check">
-                      <n-checkbox
-                        v-show="batch && item.historyStates === 1"
-                        v-model:checked="item.checked" @click.prevent
-                        @update:checked="onCheckChange($event, item)"
-                      />
-                    </div>
-                    <div :class="{ 'percent-red': item.similarityScore === 100 }" class="percent">
-                      {{ item.similarityScore }}<span class="percent-unit">%</span>
                     </div>
                   </div>
                 </div>
+                <!-- </n-scrollbar> -->
               </div>
-              <!-- </n-scrollbar> -->
-            </div>
+            </n-spin>
           </div>
 
           <div class="close" @pointerdown="closeModal">
@@ -728,7 +752,7 @@ defineExpose({
   }
 
   &-m32 {
-    margin-left: 19px;
+    // margin-left: 19px;
   }
 
   &-content {
@@ -778,17 +802,20 @@ defineExpose({
         display: block;
         height: 100%;
       }
+    }
 
-      &-img-fit {
-        width: 100%;
-        object-fit: cover;
-      }
+    .img-fit {
+      width: 100%;
+      object-fit: cover;
+      overflow: hidden;
     }
 
     .img {
       border-radius: 7px;
       display: block;
-      height: calc(100% - 25px);
+      // height: calc(100% - 25px);
+      height: 100%;
+      width: 100%;
     }
 
     .img-full {
@@ -804,8 +831,11 @@ defineExpose({
 
     .grid-item {
       width: 214px;
-      padding: 16px;
+      // padding: 16px;
+      // width: 182px;
       position: relative;
+      margin-bottom: 32px;
+      transition: 0.5s;
 
       .check{
         position: absolute;
@@ -851,4 +881,7 @@ defineExpose({
     }
   }
 }
+::v-deep(.n-image img) {
+  width: 100%!important;
+}
 </style>
-- 
2.39.3


From 4a1e137707d937c96ef01fe9e3a2a78d777cba08 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Tue, 2 Apr 2024 22:27:28 +0800
Subject: [PATCH 127/143] =?UTF-8?q?feat:=20=E5=9B=BE=E5=AE=A1=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E6=93=8D=E4=BD=9C=E5=90=8E=E5=88=B7=E6=96=B0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0=EF=BC=8C=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E9=80=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../content/modal/PackageSettingsModal.vue    |  6 ++--
 src/views/worksheet/aside/Aside.vue           | 16 +++++-----
 src/views/worksheet/aside/WorkSheetList.vue   |  8 ++++-
 src/views/worksheet/content/Content.vue       |  5 ++--
 src/views/worksheet/index.vue                 | 30 ++++++++++++-------
 src/views/worksheet/modal/ApprovalModal.vue   |  5 ++--
 6 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/src/views/home/content/modal/PackageSettingsModal.vue b/src/views/home/content/modal/PackageSettingsModal.vue
index bb22889..d817e38 100644
--- a/src/views/home/content/modal/PackageSettingsModal.vue
+++ b/src/views/home/content/modal/PackageSettingsModal.vue
@@ -84,11 +84,11 @@ function afterLeave() {
           <n-form-item class="wrapper-task-package-name" path="packagename" label="任务包名称">
             <n-input v-model:value="model.packagename" maxlength="12" @keydown.enter.prevent />
           </n-form-item>
-          <n-form-item path="mark" :style="formItemStyle">
-            <n-checkbox v-model:checked="model.mark">
+          <!-- <n-form-item path="mark" :style="formItemStyle">
+            <n-checkbox v-model:checked="model.mark" >
               是否给重复图片增加重复标识
             </n-checkbox>
-          </n-form-item>
+          </n-form-item> -->
         </n-form>
       </div>
       <template #footer>
diff --git a/src/views/worksheet/aside/Aside.vue b/src/views/worksheet/aside/Aside.vue
index cc9c9e6..525764d 100644
--- a/src/views/worksheet/aside/Aside.vue
+++ b/src/views/worksheet/aside/Aside.vue
@@ -14,12 +14,14 @@ onMounted,
 ref,
 unref,
 toRaw,
-watch
+watch,
+defineEmits
 } from "vue";
 import CustomFieldModalVue from "../modal/CustomFieldModal.vue";
 import WorkSheetList from "./WorkSheetList.vue";
 
 defineOptions({ name: "AsideContent" });
+const emit = defineEmits(["ApprovalOver"]);
 
 const collapse = ref(false);
 const workStore = useWorkOrder();
@@ -151,6 +153,10 @@ const inputHandler = debounce((word) => {
   searchKeyword.value = word;
   (packageListRef.value as any).search(word);
 }, 500);
+
+const ApprovalOver = (packageId)=>{
+  emit('ApprovalOver',packageId)
+}
 </script>
 
 <template>
@@ -210,12 +216,9 @@ const inputHandler = debounce((word) => {
       class="work-sheet-list"
       :showFieldList="showFieldList"
       :dicts="dicts"
+      @ApprovalOver="ApprovalOver"
     />
-    <CustomFieldModalVue
-      ref="filterModalRef"
-      :review-type="1"
-      @onOk="getshowFieldList"
-    />
+    <CustomFieldModalVue ref="filterModalRef" :review-type="1" @onOk="getshowFieldList" />
   </div>
 </template>
 
@@ -279,5 +282,4 @@ const inputHandler = debounce((word) => {
     z-index: 10;
   }
 }
-
 </style>
diff --git a/src/views/worksheet/aside/WorkSheetList.vue b/src/views/worksheet/aside/WorkSheetList.vue
index 039b0a6..b9b5641 100644
--- a/src/views/worksheet/aside/WorkSheetList.vue
+++ b/src/views/worksheet/aside/WorkSheetList.vue
@@ -10,6 +10,8 @@ import ApprovalModal from "../modal/ApprovalModal.vue";
 import ListItem from "./ListItem.vue";
 import type { PackageListItem } from "/#/workorder";
 
+const emit = defineEmits(["ApprovalOver"]);
+
 defineProps({
   showFieldList: {
     type: Array,
@@ -136,13 +138,17 @@ function dismisClick(packageId: string) {
     }
   });
 }
+const ApprovalOver = (packageId) => {
+  emit("ApprovalOver",packageId);
+};
+
 defineExpose({
   search,
 });
 </script>
 
 <template>
-  <ApprovalModal ref="approvalModalRef" @not-pass="notPass" />
+  <ApprovalModal ref="approvalModalRef" @not-pass="notPass" @reject="ApprovalOver" />
   <NotPassed ref="notPassedRef" />
   <n-spin :show="isLoading">
     <div ref="el" class="list">
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 01b09d3..2a18667 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -188,8 +188,6 @@ watch(
   () => workStore.activeId,
   async (newValue, oldValue) => {
     const packageid = workStore.getActiveId;
-
-
     if (isEmpty(packageid)) {
       listData.value.length = 0;
       totalCount.value = 0;
@@ -381,6 +379,9 @@ function reloadList() {
   setBatch(false)
   refreshHandler()
 }
+defineExpose({
+  queryDetail
+})
 </script>
 
 <template>
diff --git a/src/views/worksheet/index.vue b/src/views/worksheet/index.vue
index 22109af..5c8c3c2 100644
--- a/src/views/worksheet/index.vue
+++ b/src/views/worksheet/index.vue
@@ -1,22 +1,30 @@
 <script lang="ts" setup>
-import DataHeader from '@/components/DataHeader/index.vue';
-import Aside from './aside/Aside.vue';
-import Content from './content/Content.vue';
+import DataHeader from "@/components/DataHeader/index.vue";
+import { ref } from "vue";
+import Aside from "./aside/Aside.vue";
+import Content from "./content/Content.vue";
+import { useWorkOrder } from "@/store/modules/workOrder";
+const workStore = useWorkOrder();
+const contentRef: any = ref(null);
+const ApprovalOver = (packageId) => {
+  const id: string = workStore.getActiveId;
+  contentRef.value.queryDetail(id);
+};
 </script>
 
 <template>
-  <div style="width: 100%;">
+  <div style="width: 100%">
     <div class="header">
-      <DataHeader  v-show="false"/>
+      <DataHeader v-show="false" />
     </div>
-  <div class="main">
-    <!-- 侧边 -->
-    <Aside />
+    <div class="main">
+      <!-- 侧边 -->
+      <Aside @ApprovalOver="ApprovalOver" />
 
-    <!-- 内容 -->
-    <Content />
+      <!-- 内容 -->
+      <Content ref="contentRef" />
+    </div>
   </div>
-</div>
 </template>
 
 <style lang="less" scoped>
diff --git a/src/views/worksheet/modal/ApprovalModal.vue b/src/views/worksheet/modal/ApprovalModal.vue
index 5aabc13..85324f5 100644
--- a/src/views/worksheet/modal/ApprovalModal.vue
+++ b/src/views/worksheet/modal/ApprovalModal.vue
@@ -8,7 +8,7 @@ import { getToolsCount } from "@/api/home/main";
 import { storage } from "@/utils/Storage";
 import { CURRENT_USER } from "@/store/mutation-types";
 const emit = defineEmits<{
-  (e: "reject", params: any);
+  (e: "reject", params?: any);
   (e: "notPass", params: any);
 }>();
 const message = useMessage()
@@ -62,6 +62,7 @@ const handleReject = async () => {
   }else{
     message.error(res.message)
   }
+  emit('reject',state.packageid)
   closeModal();
 };
 
@@ -139,7 +140,7 @@ defineExpose({
         <div class="item">
           <div class="imgwrapper" />
           <div class="content">
-            <div class="task_id">#AI任务包{{ detail.packageId }}</div>
+            <div class="task_id">{{ detail.packageName }}</div>
             <div class="tag_box">
               <div class="tag_item error">
                 <span style="color: red"><SvgIcon name="error_icon" size="14"/></span> 重复图片({{
-- 
2.39.3


From f2555cbdf9741a66b5eafb833d030ad69e87e1ae Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Tue, 2 Apr 2024 22:56:44 +0800
Subject: [PATCH 128/143] =?UTF-8?q?feat:=20=E4=B8=BB=E5=9B=BE=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E5=90=8E=E7=8A=B6=E6=80=81=E4=B8=8D=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../worksheet/components/PictureWall.vue      | 46 ++++++-------
 src/views/worksheet/content/Content.vue       | 68 +++++++++++--------
 2 files changed, 62 insertions(+), 52 deletions(-)

diff --git a/src/views/worksheet/components/PictureWall.vue b/src/views/worksheet/components/PictureWall.vue
index 2ed8321..564072d 100644
--- a/src/views/worksheet/components/PictureWall.vue
+++ b/src/views/worksheet/components/PictureWall.vue
@@ -334,10 +334,9 @@ onUnmounted(() => {
           <n-checkbox v-show="batch && item.historyStates !== 2 && item.historyStates !== 3"
             v-model:checked="item.checked" @click.stop @update:checked="onCheckChange($event, item)" />
         </div>
-        <div class="percent">
-          <SvgIcon size="42" name="tag" />
+        <div class="percent" :class="{ 'percent-red': item?.maxSimilarity >= 100 }">
           <div class="val">
-            {{ item?.maxSimilarity && Number(item?.maxSimilarity).toFixed(0) }}%
+            {{ item?.maxSimilarity && Number(item?.maxSimilarity).toFixed(0) }}<span class="percent-unit">%</span>
           </div>
         </div>
 
@@ -417,29 +416,28 @@ onUnmounted(() => {
 
     .percent {
       position: absolute;
-      text-align: center;
-      z-index: 3;
-      right: 17px;
-      top: 2px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 35px;
+      height: 18px;
+      opacity: 0.9;
+      background: #6f92fd;
+      border-radius: 6px 0px 6px 0px;
+      z-index: 5;
+      right: 12px;
+      top: 15px;
       color: #fff;
+      font-size: 14px;
+    }
 
-      .val {
-        position: absolute;
-        left: 0;
-        top: 0;
-        display: block;
-        width: 100%;
-        height: 100%;
-        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;
-      }
+    .percent-unit {
+      font-size: 8px;
+      margin-top: 4px;
+    }
+
+    .percent-red {
+      background: #ff4e4f;
     }
 
     .pass-status {
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 6072447..9de4d70 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -71,6 +71,7 @@ const el = ref<HTMLDivElement | null>(null);
 const selectedSortName = ref('');
 const isFullScreen = ref(false);
 const notPassModalRef = ref(null)
+const mainImageModalRef = ref(null)
 
 let canloadMore = true;
 
@@ -272,7 +273,7 @@ function immersionHandler() {
 }
 
 function showAction() {
-  const item = taskDetailInfo.value;  
+  const item = taskDetailInfo.value;
   if (item.historyStates === 2 || item.historyStates === 3) {
     return
   }
@@ -294,12 +295,6 @@ function rejectHandler() {
   const modal = unref(notPassModalRef)! as any
   modal.showModal(selectItems.value)
 }
-function detailRejectHandler() {
-  const modal = unref(notPassModalRef)! as any
-  const params = cloneDeep(taskDetailInfo.value)
-  params.id = params.taskchildpictureid
-  modal.showModal([params])
-}
 
 function singleRejectHandler(item) {
   const modal = unref(notPassModalRef)! as any
@@ -320,22 +315,24 @@ function reject(idOrDesc: string, backId: string, isOther: boolean) {
 
   doAudit(param)
 }
-function detailApprovalHandler(items?: any){
+function handleRejectMainImage() {
+  const modal = unref(mainImageModalRef)! as any
+  const params = cloneDeep(taskDetailInfo.value)
+  params.id = params.taskchildpictureid
+  modal.showModal([params])
+}
+async function reloadDetailInfo(){
+  const packageid = workStore.getActiveId;
+  taskDetailInfo.value = await getTaskDetailInfo(packageid);
+}
+function handleApproveMainImage(items?: any) {
   let cloneItem: any
-  if (batch.value) {
-    processItems = selectItems.value
-  }
-  else if (overTask.value) {
+  if (overTask.value) {
     cloneItem = clone(overTask.value)
     cloneItem.id = cloneItem.taskchildpictureid
     processItems = [cloneItem]
   }
-  //  任务包图片 => 点击 => 通过/不通过按钮
-  if (items !== undefined && !(items instanceof PointerEvent))
-    processItems = [items]
-
   const msg = validate(processItems)
-
   if (msg !== null) {
     message.error(msg)
     return
@@ -366,7 +363,15 @@ function detailApprovalHandler(items?: any){
     positiveText: '确定',
     negativeText: '取消',
     onPositiveClick: () => {
-      doAudit(param)
+      audit(param).then(async(res) => {
+        const { code } = res
+        if (code === 'OK') {
+          message.info(res.message)
+          const packageid = workStore.getActiveId;
+          taskDetailInfo.value = await getTaskDetailInfo(packageid);
+        }
+        else message.error(res.message)
+      })
     },
     onNegativeClick: () => { },
   })
@@ -456,8 +461,8 @@ function reloadList() {
             批量审批
           </div>
           <div class="icon-wrap">
-            <SvgIcon size="20" v-if="isFullScreen" name="power-off" @click="immersionHandler" style="cursor: pointer;"/>
-            <SvgIcon size="20" v-else name="immersion-model" @click="immersionHandler" style="cursor: pointer;"/>
+            <SvgIcon size="20" v-if="isFullScreen" name="power-off" @click="immersionHandler" style="cursor: pointer;" />
+            <SvgIcon size="20" v-else name="immersion-model" @click="immersionHandler" style="cursor: pointer;" />
           </div>
         </div>
 
@@ -494,13 +499,15 @@ function reloadList() {
               <div class="time">
                 <SvgIcon color="#FFF" size="16" name="save" />
                 <span class="time-value">{{
-                  taskDetailInfo?.submitDateTimestamp ? format(taskDetailInfo?.submitDateTimestamp, 'yyyy-MM-dd HH:mm:ss') :
+                  taskDetailInfo?.submitDateTimestamp ? format(taskDetailInfo?.submitDateTimestamp, 'yyyy-MM-dd HH:mm:ss')
+                  :
                   '-'
                 }} </span>
               </div>
             </div>
             <div class="status">
-              <img v-show="taskDetailInfo?.historyStates === 2" class="img-status" src="@/assets/images/task/pass.png" alt="">
+              <img v-show="taskDetailInfo?.historyStates === 2" class="img-status" src="@/assets/images/task/pass.png"
+                alt="">
               <img v-show="taskDetailInfo?.historyStates === 3" class="img-status" src="@/assets/images/task/not_pass.png"
                 alt="">
             </div>
@@ -539,8 +546,8 @@ function reloadList() {
             </div>
             <!-- 操作 -->
             <div v-show="overTask && overTask.id === taskDetailInfo.id" class="action" @click.stop="hideAction">
-              <SvgIcon style="cursor: pointer" name="t1" @click.stop="detailApprovalHandler" />
-              <SvgIcon style="cursor: pointer; margin-left: 30px" name="t2" @click.stop="detailRejectHandler" />
+              <SvgIcon style="cursor: pointer" name="t1" @click.stop="handleApproveMainImage" />
+              <SvgIcon style="cursor: pointer; margin-left: 30px" name="t2" @click.stop="handleRejectMainImage" />
             </div>
           </div>
           <PictureInfo :taskDetailInfo="taskDetailInfo"></PictureInfo>
@@ -584,10 +591,10 @@ function reloadList() {
               </div>
             </div>
             <div class="check">
-              <n-checkbox v-show="batch && item.historyStates !== 2 && item.historyStates !== 3" v-model:checked="item.checked" @click.stop
-                @update:checked="onCheckChange($event, item)" />
+              <n-checkbox v-show="batch && item.historyStates !== 2 && item.historyStates !== 3"
+                v-model:checked="item.checked" @click.stop @update:checked="onCheckChange($event, item)" />
             </div>
-            <div class="percent" :class="{ 'percent-red': item?.maxSimilarity >= 100  }">
+            <div class="percent" :class="{ 'percent-red': item?.maxSimilarity >= 100 }">
               <div class="val">
                 {{ item?.maxSimilarity && Number(item?.maxSimilarity).toFixed(0) }}<span class="percent-unit">%</span>
               </div>
@@ -609,6 +616,7 @@ function reloadList() {
     </n-spin>
     <ConfrimModal ref="confrimModalRef" @commit="reject" />
     <NotPassed ref="notPassModalRef" @success="reloadList" />
+    <NotPassed ref="mainImageModalRef" @success="reloadDetailInfo" />
   </div>
 </template>
 
@@ -661,6 +669,7 @@ function reloadList() {
         margin-left: 6px;
       }
     }
+
     .right {
       display: flex;
       align-items: center;
@@ -919,6 +928,7 @@ function reloadList() {
         color: #507AFD;
         border: 1px solid #507AFD;
       }
+
       .tag-submiting {
         color: #FFB800;
         border: 1px solid #FFB800;
@@ -1034,11 +1044,13 @@ function reloadList() {
         color: #fff;
         font-size: 14px;
       }
+
       .percent-unit {
         font-size: 8px;
         margin-top: 4px;
       }
-      .percent-red{
+
+      .percent-red {
         background: #ff4e4f;
       }
 
-- 
2.39.3


From 9fa25d4614e798ac16be70aadfc81436654dd0c4 Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Tue, 2 Apr 2024 23:12:47 +0800
Subject: [PATCH 129/143] =?UTF-8?q?=E7=BB=88=E5=AE=A1=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E4=B9=8B=E5=90=8E=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/modules/final.ts                   |   2 +-
 src/views/final/comp/RepeatTaskTableModal.vue |   4 +
 src/views/final/content/Content.vue           |   4 +-
 src/views/message/content/List.vue            | 143 +++++++++---------
 src/views/task/content/Content.vue            |   2 +-
 src/views/task/modal/BatchModal.vue           |   2 +-
 6 files changed, 84 insertions(+), 73 deletions(-)

diff --git a/src/router/modules/final.ts b/src/router/modules/final.ts
index 9ede89c..98a65a2 100644
--- a/src/router/modules/final.ts
+++ b/src/router/modules/final.ts
@@ -38,7 +38,7 @@ const routes: Array<RouteRecordRaw> = [
         path: 'final-detail',
         name: 'final-detail',
         meta: {
-          title: '任务终审详情',
+          title: '任务详情',
         },
         component: () => import('@/views/task/content/Content.vue'),
       },
diff --git a/src/views/final/comp/RepeatTaskTableModal.vue b/src/views/final/comp/RepeatTaskTableModal.vue
index e0001cf..7adf491 100644
--- a/src/views/final/comp/RepeatTaskTableModal.vue
+++ b/src/views/final/comp/RepeatTaskTableModal.vue
@@ -68,6 +68,9 @@ const columns: DataTableColumns<RowData> = [
     ellipsis: {
       tooltip: true,
     },
+    render(row: any) {
+      return row.fromtaskname
+    },
   },
   {
     title: '任务名称',
@@ -356,6 +359,7 @@ function showModal() {
 function reload() {
   selectionIds.value = []
   checkedRowKeys.value = []
+  query(pagination.page, pagination.pageSize)
 }
 
 function goDetail(row) {
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index 6ac61ce..33e6ed6 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -278,7 +278,7 @@ async function formatColumns() {
             'text-color': '#507AFD',
             'onClick': () => goDetail(row),
           },
-          { default: () => row.id },
+          { default: () => row.fromtaskname },
         )
       },
     }
@@ -471,7 +471,7 @@ async function query(page: number, pageSize: number, filterId?: any) {
     sortorder: 'asc',
     pageSize,
     currPage: page,
-    sortname: '',
+    sortname: 'states',
     ...params,
   })
   const { data, pageCount, totalCount } = result
diff --git a/src/views/message/content/List.vue b/src/views/message/content/List.vue
index 3c13e54..896181c 100644
--- a/src/views/message/content/List.vue
+++ b/src/views/message/content/List.vue
@@ -1,32 +1,32 @@
 <script lang="ts" setup>
-import { reactive, ref, toRefs } from "vue";
-import { format } from "date-fns";
-import { useRoute, useRouter } from "vue-router";
-import { getMessageList, readAllMsg, readMsg } from "@/api/message/message";
-import iconApproveActive from "@/assets/images/message/approve-active.png";
-import iconApprove from "@/assets/images/message/approve.png";
-import iconSystemActive from "@/assets/images/message/system-active.png";
-import iconSystem from "@/assets/images/message/system.png";
-import iconArrowActive from "@/assets/images/message/arrow-active.png";
-import iconArrow from "@/assets/images/message/arrow.png";
-import iconClear from "@/assets/images/message/clear.png";
-import iconArrowDown from "@/assets/images/message/arrow-down.png";
-
-const emit = defineEmits(["goDetail"]);
-const router = useRouter();
-const route = useRoute();
-const hasNextPage = ref(false);
+import { reactive, ref, toRefs } from 'vue'
+import { format } from 'date-fns'
+import { useRoute, useRouter } from 'vue-router'
+import { getMessageList, readAllMsg, readMsg } from '@/api/message/message'
+import iconApproveActive from '@/assets/images/message/approve-active.png'
+import iconApprove from '@/assets/images/message/approve.png'
+import iconSystemActive from '@/assets/images/message/system-active.png'
+import iconSystem from '@/assets/images/message/system.png'
+import iconArrowActive from '@/assets/images/message/arrow-active.png'
+import iconArrow from '@/assets/images/message/arrow.png'
+import iconClear from '@/assets/images/message/clear.png'
+import iconArrowDown from '@/assets/images/message/arrow-down.png'
+
+const emit = defineEmits(['goDetail'])
+const router = useRouter()
+const route = useRoute()
+const hasNextPage = ref(false)
 
 const state = reactive({
   tabList: [
     {
-      name: "审批通知",
+      name: '审批通知',
       icon: iconApprove,
       activeIcon: iconApproveActive,
       value: 1,
     },
     {
-      name: "系统消息",
+      name: '系统消息',
       icon: iconSystem,
       activeIcon: iconSystemActive,
       value: 2,
@@ -34,102 +34,105 @@ const state = reactive({
   ],
   list: [] as any,
   pageNo: 1,
-});
+})
 
-const { list, tabList } = toRefs(state);
+const { list, tabList } = toRefs(state)
 
-const tab = ref(1);
+const tab = ref(1)
 
-async function getList(type = "") {
+async function getList(type = '') {
   let res = await getMessageList({
     pageNo: state.pageNo,
-    pageSize: "7",
+    pageSize: '7',
     msgCategory: tab.value,
-  });
-  if (type == "more") {
+  })
+  if (type == 'more') {
     while (res.data.endRow > 0) {
-      if (res.code == "OK") {
+      if (res.code == 'OK') {
         if (tab.value === 1) {
           res.data.list.forEach((item) => {
-            item.tag = JSON.parse(item.busJson);
-          });
+            item.tag = JSON.parse(item.busJson)
+          })
         }
-        state.list = state.list.concat(res.data.list);
-        state.pageNo++;
+        state.list = state.list.concat(res.data.list)
+        state.pageNo++
         res = await getMessageList({
           pageNo: state.pageNo,
-          pageSize: "7",
+          pageSize: '7',
           msgCategory: tab.value,
-        });
+        })
       }
     }
-    hasNextPage.value = res.data.hasNextPage;
-  } else {
-    if (res.code === "OK") {
-      hasNextPage.value = res.data.hasNextPage;
+    hasNextPage.value = res.data.hasNextPage
+  }
+  else {
+    if (res.code === 'OK') {
+      hasNextPage.value = res.data.hasNextPage
       if (tab.value === 1) {
         res.data.list.forEach((item) => {
-          item.tag = JSON.parse(item.busJson);
-        });
+          item.tag = JSON.parse(item.busJson)
+        })
       }
-      state.list = state.list.concat(res.data.list);
+      state.list = state.list.concat(res.data.list)
     }
   }
 }
 
-getList();
+getList()
 
 async function clearMsg() {
-  const res = await readAllMsg({ msgCategory: tab.value });
-  if (res.code === "OK") {
-    state.list = [];
-    state.pageNo = 1;
-    getList();
+  const res = await readAllMsg({ msgCategory: tab.value })
+  if (res.code === 'OK') {
+    state.list = []
+    state.pageNo = 1
+    getList()
   }
 }
 
 function switchTab(type: number) {
-  tab.value = type;
-  state.list = [];
-  state.pageNo = 1;
-  getList();
+  tab.value = type
+  state.list = []
+  state.pageNo = 1
+  getList()
 }
 
 function goFinalDetail(row) {
-  console.log(row);
+  console.log(row)
   router.push({
-    name: "final-detail",
-    query: { id: row.tag.taskId, packageid: row.packageid },
-  });
+    name: 'final-detail',
+    query: { id: row.tag.fromId, packageid: row.packageid },
+  })
 }
 
 function goDetail(item) {
   if (tab.value === 1) {
-    clearMsgOne(item.id);
-    goFinalDetail(item);
+    clearMsgOne(item.id)
+    goFinalDetail(item)
   }
   // emit('goDetail', item.id)
   else {
-    router.push({ name: "message-detail", query: { id: item.id } });
+    router.push({ name: 'message-detail', query: { id: item.id } })
   }
 }
 
 async function clearMsgOne(id) {
-  const res = await readMsg({ msgid: id });
+  const res = await readMsg({ msgid: id })
 }
 
 function getMore() {
-  state.pageNo += 1;
-  getList("more");
+  state.pageNo += 1
+  getList('more')
 }
 </script>
 
 <template>
   <div class="wrapper-message">
     <div class="flex justify-between header">
-      <div class="header-title">消息通知</div>
+      <div class="header-title">
+        消息通知
+      </div>
       <div class="clear" @click="clearMsg">
-        <img class="icon-clear" :src="iconClear" alt="" />
+        <img class="icon-clear" :src="iconClear" alt="">
         清除未读
       </div>
     </div>
@@ -147,7 +150,7 @@ function getMore() {
               class="icon"
               :src="tab === item.value ? item.activeIcon : item.icon"
               alt=""
-            />
+            >
             <div :class="{ 'text-active': tab === item.value }" class="text">
               {{ item.name }}
             </div>
@@ -156,7 +159,7 @@ function getMore() {
             class="icon-arrow"
             :src="tab === item.value ? iconArrowActive : iconArrow"
             alt=""
-          />
+          >
           <div v-if="tab === item.value" class="line" />
         </div>
       </div>
@@ -164,7 +167,7 @@ function getMore() {
         <div
           v-for="(item, index) in list"
           :key="item.id"
-          :class="{ pt0: index === 0, 'item-disabled': item.readFlag }"
+          :class="{ 'pt0': index === 0, 'item-disabled': item.readFlag }"
           class="item"
           @click="goDetail(item)"
         >
@@ -185,7 +188,9 @@ function getMore() {
               {{ item.titile }}
             </div>
             <div v-if="tab === 1" class="status">
-              <div class="tag tag-blue">审批节点：{{ item.tag.nodeName }}</div>
+              <div class="tag tag-blue">
+                审批节点：{{ item.tag.nodeName }}
+              </div>
               <div :class="item.tag.states === 5 ? 'tag-red' : 'tag-green'" class="tag">
                 审批状态：{{ item.tag.states }}
               </div>
@@ -199,11 +204,13 @@ function getMore() {
               <span class="time">{{ format(item.sendTime, "yyyy-MM-dd HH:mm:ss") }}</span>
             </div>
           </div>
-          <div class="look">查看</div>
+          <div class="look">
+            查看
+          </div>
         </div>
 
         <div v-if="hasNextPage" class="more" @click="getMore">
-          查看更多<img class="icon-more" :src="iconArrowDown" alt="" />
+          查看更多<img class="icon-more" :src="iconArrowDown" alt="">
         </div>
       </div>
     </div>
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index 8b271ef..d7f090a 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -581,7 +581,7 @@ function switchBatch() {
                 <div
                   draggable="true"
                   class="img-wrapper"
-                  :style="{ 'background-image': `url(${item.imgUrl})` }"
+                  :style="{ 'background-image': `url(${item.serverThumbnailUrl})` }"
                   @dragend="
                     (event) => {
                       handleDragEnd(event, item);
diff --git a/src/views/task/modal/BatchModal.vue b/src/views/task/modal/BatchModal.vue
index 0cd380b..93ce8e3 100644
--- a/src/views/task/modal/BatchModal.vue
+++ b/src/views/task/modal/BatchModal.vue
@@ -543,7 +543,7 @@ defineExpose({
                           'img-full': viewMode === '3:4' || viewMode === 'verticalVersion',
                         }"
 
-                        :src="item.serverThumbnailUrl || item.imgUrl"
+                        :src="item.serverThumbnailUrl"
                       />
                       <div class="small-mark" />
                       <div class="time">
-- 
2.39.3


From b2192bbd5ce02b844e9bc913627dc77214eb9143 Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Tue, 2 Apr 2024 23:31:48 +0800
Subject: [PATCH 130/143] =?UTF-8?q?=E5=B0=8F=E7=BB=93=E6=9F=A5=E9=87=8D?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E4=B8=8D=E9=80=9A=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/comp/RepeatModal.vue | 30 ++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/views/final/comp/RepeatModal.vue b/src/views/final/comp/RepeatModal.vue
index d0ed920..ecb9fd4 100644
--- a/src/views/final/comp/RepeatModal.vue
+++ b/src/views/final/comp/RepeatModal.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup>
 import { reactive, ref, toRefs } from 'vue'
 
-import { repetitionTask } from '@/api/final/index'
+import listDark from 'naive-ui/lib/mention/styles/dark'
+import { getRepeatList, repetitionTask } from '@/api/final/index'
 
 const emit = defineEmits<{
   (e: 'reject', params: any)
@@ -45,17 +46,30 @@ function closeModal() {
   show.value = false
 }
 
-async function reject() {
-  const list = []
-  state.detail.forEach((items) => {
-    items.repeatedTaskList.forEach((item) => {
-      list.push(item)
-    })
+async function query() {
+  const result = await getRepeatList({
+    sortorder: 'asc',
+    pageSize: 300,
+    pageNo: 1,
+    sortname: '',
   })
-  emit('reject', list)
+  const { data } = result
+  // console.log(data)
+  // // const list = []
+  // // data.forEach((items) => {
+  // //   items.repeatedTaskList.forEach((item) => {
+  // //     list.push(item)
+  // //   })
+  // // })
+  // console.log(data)
+  emit('reject', data)
   closeModal()
 }
 
+async function reject() {
+  query()
+}
+
 async function viewRepeat(e: MouseEvent) {
   emit('viewrepeat')
   e.preventDefault()
-- 
2.39.3


From 354e91e0f66090404a03746d16e0a5299015251b Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Wed, 3 Apr 2024 09:00:05 +0800
Subject: [PATCH 131/143] =?UTF-8?q?feat:=20=E7=85=A7=E7=89=87=E5=A2=99?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=B0=81=E8=A3=85=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../worksheet/components/PictureWall.vue      | 58 ++++++++++++-------
 1 file changed, 38 insertions(+), 20 deletions(-)

diff --git a/src/views/worksheet/components/PictureWall.vue b/src/views/worksheet/components/PictureWall.vue
index 564072d..591d8d1 100644
--- a/src/views/worksheet/components/PictureWall.vue
+++ b/src/views/worksheet/components/PictureWall.vue
@@ -1,3 +1,10 @@
+<!-- 使用示例 -->
+<!-- 
+<n-spin :show="loading">
+  <div ref="el" class="scroll"></div>
+  <PictureWall :taskDetailInfo="taskDetailInfo" :loading="loading" :el="el" @toggle="toggleLoading"></PictureWall>
+</n-spin> 
+-->
 <script lang="ts" setup>
 import { audit } from '@/api/task/task';
 import {
@@ -21,8 +28,21 @@ const props = defineProps({
     type: Object,
     default: () => ({}),
   },
+  el: {
+    type: Object as () => HTMLDivElement | null,
+    default: () => (null),
+  },
+  loading: {
+    type: Boolean,
+    default: () => (false),
+  },
 });
-const { taskDetailInfo } = toRefs(props)
+
+const emit = defineEmits<{
+  (e: 'toggle', loading: boolean)
+}>()
+
+const { taskDetailInfo, el, loading } = toRefs(props)
 
 const batch = ref(false); // 批量审批状态
 const selectItems = ref<any[]>([]);
@@ -65,12 +85,9 @@ const selectTask = ref<any>(null);
 const overTask = ref<any>(null);
 const confrimModalRef = ref(null);
 const listData = ref<any[]>([]);
-const loading = ref(false);
-const el = ref<HTMLDivElement | null>(null);
 const selectedSortName = ref('');
 const notPassModalRef = ref(null)
-
-let canloadMore = true;
+const canLoadMore = ref(true);
 
 let processItems: any[] = [];
 
@@ -84,41 +101,44 @@ function reset() {
   taskpagination.pageNo = 0;
   taskpagination.pageSize = 20;
   listData.value.length = 0;
-  loading.value = false;
-  canloadMore = true;
+  emit('toggle', false)
+  canLoadMore.value = true;
 }
 
 async function refreshHandler() {
   reset();
+  console.log('refreshHandler')
   useInfiniteScroll(
     el as any,
     () => {
-
+      console.log(el)
+      console.log(11111111)
       loadMore();
     },
-    { distance: 10, canLoadMore: () => canloadMore }
+    { distance: 10, interval: 1500, canLoadMore: () => canLoadMore.value }
   );
 }
 
 async function loadMore() {
   if (loading.value || el.value == null) return;
-  const more = await featchList();
-  listData.value.push(...more);
+    const more = await fetchList();
+    listData.value.push(...more);
 }
 
-async function featchList() {
-  loading.value = true;
+async function fetchList() {
+  console.log(3333)
+  emit('toggle', true)
   try {
     taskpagination.pageNo += 1;
     const { data, total, pageCount } = await getPictureSimilarityList(
       { ...taskpagination, ...sortBy, checkDuplicateId: workStore.activeId, pictureId: taskDetailInfo.value.id }
     );
     totalCount.value = total;
-    canloadMore = pageCount >= taskpagination.pageNo && pageCount > 0;
+    canLoadMore.value = pageCount >= taskpagination.pageNo && pageCount > 0;
 
     return data;
   } catch (error) {
-    canloadMore = false;
+    canLoadMore.value = false;
     return [];
   }
 }
@@ -130,12 +150,12 @@ const layout = debounce(() => {
 
   _imagesload.on("done", (instance) => {
     if (!el.value) return;
-    loading.value = false;
+    emit('toggle', false)
   });
 
   _imagesload.on("fail", (instance) => {
     message.error("图片错误");
-    loading.value = false;
+    emit('toggle', false)
   });
 }, 300);
 
@@ -149,9 +169,7 @@ watch(
         totalCount.value = 0;
         return;
       }
-      reset();
-      const more = await featchList();
-      listData.value.push(...more);
+      refreshHandler()
     }
   }, { deep: true, immediate: true }
 );
-- 
2.39.3


From 1968b771e06d1c4c4f6792e14270d743c0529857 Mon Sep 17 00:00:00 2001
From: wendong551 <1029218935@qq.com>
Date: Wed, 3 Apr 2024 09:13:24 +0800
Subject: [PATCH 132/143] =?UTF-8?q?fix:=20=E6=A0=B7=E5=BC=8Fbug=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Header/ShortcutModal.vue       |  12 +-
 src/views/final/comp/CustomFilterModalVue.vue | 253 ++++++-------
 src/views/home/aside/comp/AdvanceFilter.vue   |  12 +-
 .../aside/comp/modals/CustomFilterModal.vue   | 138 ++++---
 .../home/aside/comp/modals/FilterModal.vue    | 337 +++++++++---------
 .../home/aside/comp/modals/NewFilterModal.vue | 313 ++++++++--------
 src/views/task/modal/CustomFieldModal.vue     |  13 +-
 src/views/task/modal/CustomSettingModal.vue   | 158 ++++----
 src/views/worksheet/aside/Aside.vue           | 165 ++++-----
 src/views/worksheet/aside/ListItem.vue        |  72 ++--
 .../worksheet/components/PictureInfo.vue      |  59 +--
 .../worksheet/modal/CustomFieldModal.vue      |  31 +-
 12 files changed, 837 insertions(+), 726 deletions(-)

diff --git a/src/layout/components/Header/ShortcutModal.vue b/src/layout/components/Header/ShortcutModal.vue
index f14803d..5bc4e23 100644
--- a/src/layout/components/Header/ShortcutModal.vue
+++ b/src/layout/components/Header/ShortcutModal.vue
@@ -9,6 +9,7 @@ const cardStyle = {
   'width': '800px',
   '--n-padding-bottom': '10px',
   '--n-padding-left': '10px',
+  'padding-bottom':'100px'
 }
 
 function showModal() {
@@ -130,9 +131,9 @@ defineExpose({
             </table>
           </div>
         </div>
-        <n-divider />
+        <!-- <n-divider /> -->
 
-        <template #footer>
+        <!-- <template #footer>
           <div class="wrapper-footer">
             <n-button type="info" @click="closeModal">
               确认
@@ -141,7 +142,7 @@ defineExpose({
               取消
             </n-button>
           </div>
-        </template>
+        </template> -->
       </n-card>
     </n-modal>
   </div>
@@ -253,6 +254,11 @@ defineExpose({
       tr td:first-child{
         text-align: right;
         padding-right: 10px;
+        color: #515457;
+      }
+      tr td{
+        color: #333333;
+
       }
       tr span{
         padding: 0 10px;
diff --git a/src/views/final/comp/CustomFilterModalVue.vue b/src/views/final/comp/CustomFilterModalVue.vue
index 429b986..b8f1a58 100644
--- a/src/views/final/comp/CustomFilterModalVue.vue
+++ b/src/views/final/comp/CustomFilterModalVue.vue
@@ -1,239 +1,250 @@
 <script lang="ts" setup>
-import { setFilter } from "@/api/home/filter";
-import { asideMap } from "@/config/final";
-import { useFinal } from "@/store/modules/final";
-import { debounce, difference } from "lodash-es";
-import { computed, ref, watch } from "vue";
-import { VueDraggable } from "vue-draggable-plus";
-
-const show = ref(false);
-const checkAll = ref(false);
-const selectIds = ref<string[]>([]);
-const finalStore = useFinal();
+import { debounce, difference } from 'lodash-es'
+import { computed, ref, watch } from 'vue'
+import { VueDraggable } from 'vue-draggable-plus'
+import { setFilter } from '@/api/home/filter'
+import { asideMap } from '@/config/final'
+import { useFinal } from '@/store/modules/final'
+
+const show = ref(false)
+const checkAll = ref(false)
+const selectIds = ref<string[]>([])
+const finalStore = useFinal()
 
 function showModal() {
-  show.value = true;
+  show.value = true
 }
 
 function closeModal() {
-  show.value = false;
+  show.value = false
 }
 
 // 左侧隐藏列表
-const offList = ref<any[]>([]);
+const offList = ref<any[]>([])
 // 右侧显示列表
-const onList = ref<any[]>([]);
+const onList = ref<any[]>([])
 
 const allCount = computed(() => {
-  return `全部筛选(共${offList.value.length}个)`;
-});
+  return `全部筛选(共${offList.value.length}个)`
+})
 
 const selectCount = computed(() => {
-  return `已选筛选(共${onList.value.length}个)`;
-});
+  return `已选筛选(共${onList.value.length}个)`
+})
 
 defineExpose({
   showModal,
-});
+})
 
 function generateDefaultList() {
   return Object.keys(asideMap).reduce((acc, key) => {
-    const { label, isDefaultFilter } = asideMap[key];
+    const { label, isDefaultFilter } = asideMap[key]
 
     // 默认开启配置
     if (isDefaultFilter) {
       const config = {
         id: key,
-        name: label || "未配置",
+        name: label || '未配置',
         fix: isDefaultFilter,
         checked: true,
-      };
-      return [...acc, config];
-    } else {
-      return acc;
+      }
+      return [...acc, config]
+    }
+    else {
+      return acc
     }
-  }, []);
+  }, [])
 }
 
 function generatList(customConfig) {
-  const keys = Object.keys(asideMap);
-  let onList: object[] = [];
-  const offList: object[] = [];
-  const showKeys = customConfig.map((key: string) => key.toLowerCase());
+  const keys = Object.keys(asideMap)
+  let onList: object[] = []
+  const offList: object[] = []
+  const showKeys = customConfig.map((key: string) => key.toLowerCase())
 
   for (const key of keys) {
-    if (!key.startsWith("iz") || asideMap[key] === undefined) continue;
+    if (!key.startsWith('iz') || asideMap[key] === undefined)
+      continue
 
-    const name = asideMap[key]?.label;
-    const isDefaultFilter = asideMap[key]?.isDefaultFilter;
+    const name = asideMap[key]?.label
+    const isDefaultFilter = asideMap[key]?.isDefaultFilter
 
     // 不是默认配置
-    const isChecked = asideMap[key].isDefaultFilter || showKeys.includes(key);
+    const isChecked = asideMap[key].isDefaultFilter || showKeys.includes(key)
 
     offList.push({
       id: key,
-      name: name || "未配置",
+      name: name || '未配置',
       fix: isDefaultFilter,
       checked: isChecked,
-    });
+    })
 
-    isChecked && selectIds.value.push(key);
+    isChecked && selectIds.value.push(key)
   }
 
   onList = showKeys.reduce((acc, key) => {
-    const isDefaultFilter = asideMap[key]?.isDefaultFilter;
+    const isDefaultFilter = asideMap[key]?.isDefaultFilter
 
     // 把默认显示的过滤掉(理论上不会出现这种情况)
     if (isDefaultFilter === false) {
       const config = {
         id: key,
-        name: asideMap[key].label || "未配置",
+        name: asideMap[key].label || '未配置',
         fix: asideMap[key].isDefaultFilter,
-      };
-      return [...acc, config];
-    } else {
-      return acc;
+      }
+      return [...acc, config]
+    }
+    else {
+      return acc
     }
-  }, []);
+  }, [])
 
-  const fixedList = generateDefaultList();
-  onList.unshift(...fixedList);
-  return { showList: onList, hideList: offList };
+  const fixedList = generateDefaultList()
+  onList.unshift(...fixedList)
+  return { showList: onList, hideList: offList }
 }
 
 finalStore.$subscribe(() => {
-  const customConfig = finalStore.getCustomConfig;
+  const customConfig = finalStore.getCustomConfig
 
-  if (customConfig === null) return;
+  if (customConfig === null)
+    return
 
-  const { showList, hideList } = generatList(customConfig);
-  onList.value = showList;
-  offList.value = hideList;
-});
+  const { showList, hideList } = generatList(customConfig)
+  onList.value = showList
+  offList.value = hideList
+})
 
 async function handleSumbit(e: MouseEvent) {
-  e.preventDefault();
+  e.preventDefault()
 
   const param = onList.value
-    .filter((item) => !asideMap[item.id].isDefaultFilter)
+    .filter(item => !asideMap[item.id].isDefaultFilter)
     .map((item) => {
-      return item.id;
+      return item.id
     })
-    .join(",");
+    .join(',')
 
-  await setFilter({ searchcount: param, type: 1 });
-  finalStore.fetchCustomConfig();
-  closeModal();
+  await setFilter({ searchcount: param, type: 1 })
+  finalStore.fetchCustomConfig()
+  closeModal()
 }
 
 function onCheckAllChange(value) {
-  const ids: string[] = [];
+  const ids: string[] = []
 
   for (const item of offList.value) {
     if (!item.fix) {
-      item.checked = value;
-      ids.push(item.id);
+      item.checked = value
+      ids.push(item.id)
     }
   }
 
-  selectIds.value = value ? ids : [];
+  selectIds.value = value ? ids : []
 }
 
 function onCheckChange(checked: any, item: any) {
-  const index = selectIds.value.indexOf(item.id);
-
-  item.checked = checked;
-  let currentIndex = offList.value.findIndex((v) => v.id == item.id);
-  offList.value[currentIndex].checked = item.checked;
-  if (index === -1 && checked) selectIds.value.push(item.id);
-  else selectIds.value.splice(index, 1);
+  const index = selectIds.value.indexOf(item.id)
+
+  item.checked = checked
+  const currentIndex = offList.value.findIndex(v => v.id == item.id)
+  offList.value[currentIndex].checked = item.checked
+  if (index === -1 && checked)
+    selectIds.value.push(item.id)
+  else selectIds.value.splice(index, 1)
 }
 
 const showIds = computed(() => {
   return onList.value.map((item) => {
-    return item.id;
-  });
-});
+    return item.id
+  })
+})
 
 watch(
   () => selectIds.value.length,
   (newVal, oldVal) => {
-    if (newVal === oldVal) return;
+    if (newVal === oldVal)
+      return
 
-    const action = newVal > oldVal ? "add" : "remove";
-    const diff =
-      action === "add"
+    const action = newVal > oldVal ? 'add' : 'remove'
+    const diff
+      = action === 'add'
         ? difference(selectIds.value, showIds.value)
-        : difference(showIds.value, selectIds.value);
+        : difference(showIds.value, selectIds.value)
 
-    if (diff.length === 0) return;
+    if (diff.length === 0)
+      return
 
-    if (action === "add") {
+    if (action === 'add') {
       for (const item of offList.value) {
         if (!item.fix && diff.includes(item.id)) {
           onList.value.push({
             id: item.id,
-            name: item.name || "未配置",
+            name: item.name || '未配置',
             fix: item.fix || false,
-          });
+          })
         }
       }
-    } else {
-      const list = onList.value;
+    }
+    else {
+      const list = onList.value
       for (let index = 0; index < list.length; index++) {
-        const item = list[index];
+        const item = list[index]
         if (!item.fix && diff.includes(item.id)) {
-          list.splice(index, 1);
-          index--;
+          list.splice(index, 1)
+          index--
         }
       }
     }
-  }
-);
+  },
+)
 
 watch(
   () => showIds.value.length,
   (newVal, oldVal) => {
-    if (newVal === oldVal) return;
+    if (newVal === oldVal)
+      return
 
-    const diff = difference(selectIds.value, showIds.value);
+    const diff = difference(selectIds.value, showIds.value)
 
-    if (diff.length === 0) return;
+    if (diff.length === 0)
+      return
 
     for (const item of offList.value) {
       if (!item.fix && diff.includes(item.id)) {
-        const index = selectIds.value.indexOf(item.id);
-        item.checked = false;
-        selectIds.value.splice(index, 1);
+        const index = selectIds.value.indexOf(item.id)
+        item.checked = false
+        selectIds.value.splice(index, 1)
       }
     }
-  }
-);
+  },
+)
 
 function clearDragSource() {
   onList.value = onList.value.filter((item) => {
-    return item.fix === true;
-  });
+    return item.fix === true
+  })
 }
 
 function removeHandler(id: string) {
   const index = onList.value.findIndex((item) => {
-    return item.id === id;
-  });
+    return item.id === id
+  })
 
-  if (index !== -1) onList.value.splice(index, 1);
+  if (index !== -1)
+    onList.value.splice(index, 1)
 }
 
-const offKeyword = ref("");
-const onKeyword = ref("");
+const offKeyword = ref('')
+const onKeyword = ref('')
 
 const leftInputHandler = debounce((keyword) => {
-  offKeyword.value = keyword;
-}, 300);
+  offKeyword.value = keyword
+}, 300)
 
 const rightInputHandler = debounce((keyword) => {
-  onKeyword.value = keyword;
-}, 300);
+  onKeyword.value = keyword
+}, 300)
 </script>
 
 <template>
@@ -246,10 +257,10 @@ const rightInputHandler = debounce((keyword) => {
       aria-modal="true"
     >
       <div class="wrapper">
-        <span class="wrapper-title">自定义筛选</span>
+        <span class="wrapper-title" style="color: #333333;">自定义筛选</span>
         <div class="wrapper-bar">
-          <div class="wrapper-info">
-            <span :style="{ 'margin-left': '18px' }">筛选项信息</span>
+          <div class="wrapper-info" style="background-color: #F8F8F8;">
+            <span :style="{ 'margin-left': '18px' ,'color':'#333333'}">筛选项信息</span>
           </div>
         </div>
 
@@ -263,7 +274,7 @@ const rightInputHandler = debounce((keyword) => {
               :bordered="false"
             >
               <div>
-                <n-input placeholder="搜索关键字" @input="leftInputHandler">
+                <n-input placeholder="搜索关键词" @input="leftInputHandler">
                   <template #suffix>
                     <SvgIcon size="14px" name="magnifying-1" color="#999999" />
                   </template>
@@ -313,7 +324,8 @@ const rightInputHandler = debounce((keyword) => {
                 <span class="textbtnStyle" @click="clearDragSource">清空</span>
               </template>
               <div>
-                <n-input placeholder="搜索关键字" @input="rightInputHandler">
+                <!-- j -->
+                <n-input placeholder="搜索关键词" @input="rightInputHandler">
                   <template #suffix>
                     <SvgIcon size="14px" name="magnifying-1" color="#999999" />
                   </template>
@@ -337,8 +349,8 @@ const rightInputHandler = debounce((keyword) => {
                       :class="{ fix: item.fix }"
                       class="cursor-move draggable-li"
                     >
-                    <!-- v-show="!item.fix"  判断是否为固定值 -->
-                      <SvgIcon  name="drag" size="14" />
+                      <!-- v-show="!item.fix"  判断是否为固定值 -->
+                      <SvgIcon name="drag" size="14" />
                       <span class="ml-2">{{ item.name }}</span>
                       <SvgIcon
                         v-if="!item.fix"
@@ -357,7 +369,9 @@ const rightInputHandler = debounce((keyword) => {
       </div>
       <template #footer>
         <div class="wrapper-footer">
-          <n-button type="info" @click="handleSumbit"> 确定 </n-button>
+          <n-button type="info" @click="handleSumbit">
+            确定
+          </n-button>
           <n-button secondary style="margin-left: 15px" @click="closeModal">
             取消
           </n-button>
@@ -414,7 +428,7 @@ const rightInputHandler = debounce((keyword) => {
 .cardstyle {
   width: 620px;
   height: 800px;
-  --n-padding-bottom: 20px;
+  --n-padding-bottom: 16px;
   --n-padding-left: 24px;
   --n-padding-right: 24px;
   --n-padding-top: 20px;
@@ -455,6 +469,7 @@ const rightInputHandler = debounce((keyword) => {
 ::v-deep(.n-card > .n-card-header .n-card-header__main) {
   font-weight: lighter !important;
   font-size: 14px;
+  color: #666666;
 }
 ::v-deep(.n-scrollbar) {
   border-top: none !important;
diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue
index 4c461d5..8fee82e 100644
--- a/src/views/home/aside/comp/AdvanceFilter.vue
+++ b/src/views/home/aside/comp/AdvanceFilter.vue
@@ -323,14 +323,16 @@ const moveEnd = () => {
                   v-if="item.favorite && !item.isDefaultFilter"
                   name="favorite-fill"
                   color="#fd9b0a"
-                  size="18"
+                  width="13"
+                  height="12"
                   style="margin-right: 3px"
                   @click="unFavoriteHandler($event, item)"
                 />
                 <SvgIcon
                   v-else-if="!item.favorite && !item.isDefaultFilter"
                   name="favorite-unfill"
-                  size="18"
+                  width="13"
+                  height="12"
                   style="margin-right: 3px"
                   @click="favoriteHandler($event, item)"
                 />
@@ -357,7 +359,8 @@ const moveEnd = () => {
                     v-if="item.favorite && !item.isDefaultFilter"
                     name="favorite-fill"
                     color="#fd9b0a"
-                    size="18"
+                    width="13"
+                  height="12"
                     fill="#666666"
                     style="cursor: pointer !important; margin-right: 3px"
                     @click="unFavoriteHandler($event, item)"
@@ -365,7 +368,8 @@ const moveEnd = () => {
                   <SvgIcon
                     v-else-if="!item.favorite && !item.isDefaultFilter"
                     name="favorite-unfill"
-                    size="18"
+                    width="13"
+                  height="12"
                     fill="#666666"
                     style="cursor: pointer !important; margin-right: 3px"
                     @click="favoriteHandler($event, item)"
diff --git a/src/views/home/aside/comp/modals/CustomFilterModal.vue b/src/views/home/aside/comp/modals/CustomFilterModal.vue
index 95f15cb..4c89ba0 100644
--- a/src/views/home/aside/comp/modals/CustomFilterModal.vue
+++ b/src/views/home/aside/comp/modals/CustomFilterModal.vue
@@ -1,12 +1,11 @@
 <script lang="ts" setup>
+import { cloneDeep, debounce, difference, isEqual } from 'lodash-es'
+import { computed, defineOptions, onMounted, ref, watch } from 'vue'
+import { VueDraggable } from 'vue-draggable-plus'
 import { getAllfieldList, getfieldList, setFilter } from '@/api/home/filter'
 import { asideMap } from '@/config/aside'
 import { useConfig } from '@/store/modules/asideConfig'
-import { useUser } from "@/store/modules/user"
-import { debounce, difference, cloneDeep, isEqual } from 'lodash-es'
-import { computed, defineOptions, onMounted, ref, watch } from 'vue'
-import { VueDraggable } from 'vue-draggable-plus'
-
+import { useUser } from '@/store/modules/user'
 
 defineOptions({ name: 'CustomFilterModal' })
 
@@ -17,7 +16,6 @@ const selectIds = ref<string[]>([])
 const tempList = ref<string[]>([])
 
 function showModal() {
-
   show.value = true
 
   // 重置左右列表数据
@@ -26,19 +24,19 @@ function showModal() {
 
   if (config == null || customConfig == null)
     return
-  if(tempList.value.length > 0 && isEqual(tempList.value, configStore.getFilterConfig)) {
+  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) {
+  tempList.value = cloneDeep(showList)
+  if (tempList.value.length > 0)
     configStore.setFilterConfig(tempList.value)
-  }
+
   onList.value = showList
   offList.value = hideList
   // 重置全选状态
-  checkAll.value = hideList.every(item => item.checked);
+  checkAll.value = hideList.every(item => item.checked)
   // 重置输入框查询条件
   offKeyword.value = ''
   onKeyword.value = ''
@@ -108,9 +106,8 @@ function generatList(config, customConfig) {
         fix: isDefaultFilter,
         checked: isChecked,
       })
-      if (isChecked && selectIds.value.indexOf(key) === -1) {
+      if (isChecked && !selectIds.value.includes(key))
         isChecked && selectIds.value.push(key)
-      }
     }
   }
 
@@ -134,30 +131,31 @@ function generatList(config, customConfig) {
   const fixedList = generateDefaultList(config)
   offList.unshift(...fixedList)
   onList.unshift(...fixedList)
-  console.log("原始筛选条件customConfig", customConfig);
+  console.log('原始筛选条件customConfig', customConfig)
   // onList按照customConfig排序
-  let tempOnList = cloneDeep(onList);
-  console.log("原始筛选条件tempOnList", tempOnList);
-  
-  let sortKeyList: any = [];
+  const tempOnList = cloneDeep(onList)
+  console.log('原始筛选条件tempOnList', tempOnList)
+
+  const sortKeyList: any = []
   configStore.getFilterConfig.map((item: any) => {
-    sortKeyList.push(item.id);
-  });
-  console.log("原始筛选条件sortKeyList", sortKeyList);
-  let sortList: any = [];
-  if(sortKeyList.length > 0) {
-    sortKeyList.map(key => {
-      let tempItem = tempOnList.find(item => item.id == key);
-      sortList.push(tempItem);
-    });
-  }else {
-    customConfig.map(key => {
-      let tempItem = tempOnList.find(item => item.id == key);
-      sortList.push(tempItem);
-    });
+    sortKeyList.push(item.id)
+  })
+  console.log('原始筛选条件sortKeyList', sortKeyList)
+  const sortList: any = []
+  if (sortKeyList.length > 0) {
+    sortKeyList.map((key) => {
+      const tempItem = tempOnList.find(item => item.id == key)
+      sortList.push(tempItem)
+    })
   }
-  console.log("原始筛选条件sortList", sortList );
-  console.log("原始筛选条件configStore.getFilterConfig", configStore.getFilterConfig, );
+  else {
+    customConfig.map((key) => {
+      const tempItem = tempOnList.find(item => item.id == key)
+      sortList.push(tempItem)
+    })
+  }
+  console.log('原始筛选条件sortList', sortList)
+  console.log('原始筛选条件configStore.getFilterConfig', configStore.getFilterConfig)
   // return { showList: onList, hideList: offList }
   return { showList: sortList, hideList: offList }
 }
@@ -168,17 +166,17 @@ configStore.$subscribe(() => {
 
   if (config == null || customConfig == null)
     return
-  console.log("tempList.value-----------", tempList.value);
-  console.log("configStore.getFilterConfig-----------", configStore.getFilterConfig);
-  if(tempList.value.length > 0 && isEqual(tempList.value, configStore.getFilterConfig)) {
+  console.log('tempList.value-----------', tempList.value)
+  console.log('configStore.getFilterConfig-----------', configStore.getFilterConfig)
+  if (tempList.value.length > 0 && isEqual(tempList.value, configStore.getFilterConfig))
     return
-  }
+
   const { showList, hideList } = generatList(config, customConfig)
-  tempList.value = cloneDeep(showList);
-  console.log("克隆条件", tempList.value);
-  if(tempList.value.length > 0) {
+  tempList.value = cloneDeep(showList)
+  console.log('克隆条件', tempList.value)
+  if (tempList.value.length > 0)
     configStore.setFilterConfig(tempList.value)
-  }
+
   // setTimeout(() => {
   // }, 500);
   onList.value = showList
@@ -193,19 +191,19 @@ async function handleSumbit(e: MouseEvent) {
 
   await setFilter({ searchcount: param, type: 0 })
   const obj = await configStore.fetchCustomConfig()
-  console.log("obj-------------------------------", obj);
-  let tempOnList = cloneDeep(onList.value);
-  console.log("原始筛选条件tempOnList", tempOnList);
-  let sortList: any = [];
-  obj.map(key => {
-    let tempItem = tempOnList.find(item => item.id == key);
-    sortList.push(tempItem);
-  });
-  console.log("configStore.sortList---------------", sortList);
+  console.log('obj-------------------------------', obj)
+  const tempOnList = cloneDeep(onList.value)
+  console.log('原始筛选条件tempOnList', tempOnList)
+  const sortList: any = []
+  obj.map((key) => {
+    const tempItem = tempOnList.find(item => item.id == key)
+    sortList.push(tempItem)
+  })
+  console.log('configStore.sortList---------------', sortList)
   // setTimeout(() => {
-  if(sortList.length > 0) {
+  if (sortList.length > 0)
     configStore.setFilterConfig(sortList)
-  }
+
   // }, 500);
   closeModal()
 }
@@ -232,8 +230,8 @@ function onCheckChange(checked: any, item: any) {
     selectIds.value.push(item.id)
   else
     index !== -1 && selectIds.value.splice(index, 1)
-  
-  checkAll.value = offList.value.every(item => item.checked);
+
+  checkAll.value = offList.value.every(item => item.checked)
 }
 
 const showIds = computed(() => {
@@ -328,23 +326,21 @@ const rightInputHandler = debounce((keyword) => {
 }, 300)
 
 async function getfield() {
-  let res;
+  let res
   res = await getAllfieldList(3)
-  const userStore = useUser();
-  const userInfo = userStore.getUserInfo;
+  const userStore = useUser()
+  const userInfo = userStore.getUserInfo
   res = await getfieldList(3, userInfo.id)
 }
 function onMove(e) {
   // 这里的e表示即将停靠的元素。
-  if (e?.related?.className?.indexOf('fix') !== -1) {
-    return false;
-  }
+  if (e?.related?.className?.indexOf('fix') !== -1)
+    return false
 }
 
 onMounted(() => {
-  getfield();
+  getfield()
 })
-
 </script>
 
 <template>
@@ -373,7 +369,7 @@ onMounted(() => {
                 <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="全选" @update:checked="onCheckAllChange" :indeterminate="!checkAll"/>
+                      <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 }"
@@ -407,12 +403,14 @@ onMounted(() => {
                   </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" >
+                  <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" />
+                      <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)" />
+                      <SvgIcon
+                        v-if="!item.fix" size="16px" style="display:block;margin-left: auto;cursor: pointer;"
+                        name="clear" @click="removeHandler(item.id)"
+                      />
                     </div>
                   </VueDraggable>
                 </n-scrollbar>
diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue
index 95fcbf4..f45a497 100644
--- a/src/views/home/aside/comp/modals/FilterModal.vue
+++ b/src/views/home/aside/comp/modals/FilterModal.vue
@@ -8,116 +8,122 @@ import {
   reactive,
   ref,
   unref,
-} from "vue";
-import { NDataTable } from "naive-ui";
-import type { DataTableColumns, DataTableRowKey } from "naive-ui";
-import type { SortableEvent } from "sortablejs";
-import Sortable from "sortablejs";
-import { debounce } from "lodash-es";
-import Action from "../Action.vue";
-import { deleteCondition, getConditionList, sort } from "@/api/home/filter";
-import type { FilterSearchParam } from "/#/api";
-
-defineOptions({ name: "FilterModal" });
+} from 'vue'
+import { NDataTable } from 'naive-ui'
+import type { DataTableColumns, DataTableRowKey } from 'naive-ui'
+import type { SortableEvent } from 'sortablejs'
+import Sortable from 'sortablejs'
+import { debounce } from 'lodash-es'
+import Action from '../Action.vue'
+import { deleteCondition, getConditionList, sort } from '@/api/home/filter'
+import type { FilterSearchParam } from '/#/api'
+
+defineOptions({ name: 'FilterModal' })
 
 const props = defineProps({
   type: {
     type: Number,
     default: () => 0,
   },
-});
+})
 
 const emit = defineEmits<{
-  (e: "showNewFilter"): void;
-  (e: "editFilter", filter: any): void;
-}>();
+  (e: 'showNewFilter'): void
+  (e: 'editFilter', filter: any): void
+}>()
 
-const show = ref(false);
+const show = ref(false)
 
 const cardStyle = {
-  width: "800px",
-  height: "830px",
-  "--n-padding-bottom": "10px",
-  "--n-padding-left": "10px",
-};
+  'width': '800px',
+  'height': '830px',
+  '--n-padding-bottom': '10px',
+  '--n-padding-left': '10px',
+}
 
 interface RowData {
-  id: string;
-  searchname: string;
-  createby: string;
-  createtime: string;
-  updateby: string;
-  updatetime: string;
+  id: string
+  searchname: string
+  createby: string
+  createtime: string
+  updateby: string
+  updatetime: string
 }
 
-const sortData = (row) => {
-  console.log("sortData", row);
-  if (row.order == "descend") {
+function sortData(row) {
+  console.log('sortData', row)
+  if (row.order == 'descend') {
     tableData.value.sort(
       (a, b) =>
-        new Date(a[row.columnKey]).getTime() - new Date(b[row.columnKey]).getTime()
-    );
-  } else if (row.order == "ascend") {
+        new Date(a[row.columnKey]).getTime() - new Date(b[row.columnKey]).getTime(),
+    )
+  }
+  else if (row.order == 'ascend') {
     tableData.value.sort(
       (a, b) =>
-        new Date(b[row.columnKey]).getTime() - new Date(a[row.columnKey]).getTime()
-    );
-  } else {
+        new Date(b[row.columnKey]).getTime() - new Date(a[row.columnKey]).getTime(),
+    )
+  }
+  else {
     tableData.value.sort(
-      (a, b) => Number((a as any).reorder) - Number((b as any).reorder)
-    );
+      (a, b) => Number((a as any).reorder) - Number((b as any).reorder),
+    )
   }
-};
+}
 
 const columns: DataTableColumns<RowData> = [
   {
-    type: "selection",
+    type: 'selection',
   },
   {
-    title: "操作",
-    key: "action",
+    title: '操作',
+    key: 'action',
     render(row) {
       return h(Action, {
         options: [
-          { label: "编辑", key: 1 },
-          { label: "删除", key: 2 },
+          { label: '编辑', key: 1 },
+          { label: '删除', key: 2 },
         ],
         id: row.id,
         select,
-      });
+      })
     },
   },
+  // j
   {
-    title: "名称",
-    key: "searchname",
+    title: '名称',
+    key: 'searchname',
+    ellipsis: {
+      tooltip: true,
+    },
   },
   {
-    title: "创建者",
-    key: "createby",
+    title: '创建者',
+    key: 'createby',
   },
   {
-    title: "创建时间",
-    key: "createtime",
+    title: '创建时间',
+    key: 'createtime',
     width: 180,
     sorter: (row1, row2) => {
       // tableData.value.sort(
       //   (a, b) => new Date(a?.createtime).getTime() - new Date(b?.createtime).getTime()
       // );
-      return new Date(row1?.createtime).getTime() - new Date(row2?.createtime).getTime();
+      return new Date(row1?.createtime).getTime() - new Date(row2?.createtime).getTime()
     },
   },
   {
-    title: "更新者",
-    key: "updateby",
+    title: '更新者',
+    key: 'updateby',
   },
   {
-    title: "更新时间",
-    key: "updatetime",
+    title: '更新时间',
+    key: 'updatetime',
     width: 180,
   },
-];
-const total = ref(0);
-const loading = ref(true);
+]
+const total = ref(0)
+const loading = ref(true)
 const pagination = reactive({
   page: 1,
   pageCount: 1,
@@ -125,196 +131,198 @@ const pagination = reactive({
   showSizePicker: true,
   pageSizes: [
     {
-      label: "10 每页",
+      label: '10 每页',
       value: 10,
     },
     {
-      label: "15 每页",
+      label: '15 每页',
       value: 15,
     },
     {
-      label: "30 每页",
+      label: '30 每页',
       value: 30,
     },
     {
-      label: "50 每页",
+      label: '50 每页',
       value: 50,
     },
   ],
   showQuickJumper: true,
   prefix: () => `共 ${total.value} 条数据`,
-});
-const tableData = ref<Array<RowData>>([]);
-const keyword = ref("");
+})
+const tableData = ref<Array<RowData>>([])
+const keyword = ref('')
 
 async function query(page: number, pageSize: number) {
   const searchParam: FilterSearchParam = {
-    search_searchname: { value: keyword.value, op: "like", type: "string" },
-  };
-  const result = await getConditionList({ pageNo: page, pageSize }, searchParam, props.type);
-  const { data, pageCount, total: totalCount } = result;
-  tableData.value = data;
-  pagination.page = page;
-  total.value = totalCount;
-  pagination.pageCount = pageCount;
-  loading.value = false;
+    search_searchname: { value: keyword.value, op: 'like', type: 'string' },
+  }
+  const result = await getConditionList({ pageNo: page, pageSize }, searchParam, props.type)
+  const { data, pageCount, total: totalCount } = result
+  tableData.value = data
+  pagination.page = page
+  total.value = totalCount
+  pagination.pageCount = pageCount
+  loading.value = false
 }
 
 function afterLeave() {
-  pagination.page = 1;
-  pagination.pageCount = 1;
-  pagination.pageSize = 10;
+  pagination.page = 1
+  pagination.pageCount = 1
+  pagination.pageSize = 10
 }
 
-const selectionIds = ref<DataTableRowKey[]>([]);
+const selectionIds = ref<DataTableRowKey[]>([])
 
-const rowKey = (row: RowData) => row.id;
+const rowKey = (row: RowData) => row.id
 
 function rowProps(row: RowData) {
   return {
-    "data-id": row.id,
-  };
+    'data-id': row.id,
+  }
 }
 
 function handleCheck(rowKeys: DataTableRowKey[]) {
-  selectionIds.value = rowKeys;
+  selectionIds.value = rowKeys
 }
 
 function select(key: number, id: string) {
   switch (key) {
     case 1:
-      editSelection(id);
-      break;
+      editSelection(id)
+      break
     case 2:
-      deleteSelection(id);
-      break;
+      deleteSelection(id)
+      break
     default:
-      break;
+      break
   }
 }
 
 function editSelection(id) {
-  // eslint-disable-next-line dot-notation
   // const $message = window["$message"];
   // if (selectionIds.value.length === 0 || selectionIds.value.length > 1) {
   //   $message.error("请选中一条过滤");
   //   return;
   // }
-  const selectedId = id;
+  const selectedId = id
   const selectedFilter = tableData.value.find((item: any) => {
-    return item.id === selectedId;
-  });
+    return item.id === selectedId
+  })
 
-  emit("editFilter", selectedFilter);
+  emit('editFilter', selectedFilter)
   // closeModal();
 }
 
-function deleteSelection(id = "") {
-  // eslint-disable-next-line dot-notation
+function deleteSelection(id = '') {
   if (selectionIds.value.length === 0) {
     deleteCondition({ ids: id }).then(() => {
-      query(pagination.page, pagination.pageSize);
-    });
-    return;
+      query(pagination.page, pagination.pageSize)
+    })
+    return
   }
 
-  deleteCondition({ ids: selectionIds.value.join(",") }).then(() => {
-    selectionIds.value = [];
-    query(pagination.page, pagination.pageSize);
-  });
+  deleteCondition({ ids: selectionIds.value.join(',') }).then(() => {
+    selectionIds.value = []
+    query(pagination.page, pagination.pageSize)
+  })
 }
 
 async function handlePageChange(currentPage) {
-  if (loading.value) return;
-  pagination.page = currentPage;
-  const { pageSize } = pagination;
-  await query(currentPage, pageSize);
+  if (loading.value)
+    return
+  pagination.page = currentPage
+  const { pageSize } = pagination
+  await query(currentPage, pageSize)
 }
 
 async function handlePageSizeChange(currentPageSize) {
-  if (loading.value) return;
+  if (loading.value)
+    return
 
-  const { page } = pagination;
-  pagination.pageSize = currentPageSize;
-  await query(page, currentPageSize);
+  const { page } = pagination
+  pagination.pageSize = currentPageSize
+  await query(page, currentPageSize)
 }
 
 function handleClick() {
-  emit("showNewFilter");
+  emit('showNewFilter')
   // show.value = false;
 }
 
-let sortTable: Sortable | null = null;
-const tableRef = ref<InstanceType<typeof NDataTable>>();
+let sortTable: Sortable | null = null
+const tableRef = ref<InstanceType<typeof NDataTable>>()
 
 async function showModal() {
-  show.value = true;
+  show.value = true
 
-  const { page, pageSize } = pagination;
-  await query(page, pageSize);
+  const { page, pageSize } = pagination
+  await query(page, pageSize)
 
   nextTick(() => {
-    if (sortTable !== null) destory();
-
-    const el: HTMLDivElement = tableRef.value?.$el;
-    const tbody: HTMLElement | null = el.querySelector("tbody.n-data-table-tbody")!;
-    if (tbody) sortTable = Sortable.create(tbody, { onEnd, onMove });
-  });
+    if (sortTable !== null)
+      destory()
+
+    const el: HTMLDivElement = tableRef.value?.$el
+    const tbody: HTMLElement | null = el.querySelector('tbody.n-data-table-tbody')!
+    if (tbody)
+      sortTable = Sortable.create(tbody, { onEnd, onMove })
+  })
 }
-let relatedId = "";
-let insertafter = false;
+let relatedId = ''
+let insertafter = false
 
 // TODO: 有bug，需跟后端联调
 function onEnd(event: SortableEvent) {
-  const data = unref(tableData);
-  const oldElem = data[event.oldIndex!];
-  data.splice(event.oldIndex!, 1);
-  data.splice(event.newIndex!, 0, oldElem);
+  const data = unref(tableData)
+  const oldElem = data[event.oldIndex!]
+  data.splice(event.oldIndex!, 1)
+  data.splice(event.newIndex!, 0, oldElem)
 
-  const dragId = oldElem.id;
+  const dragId = oldElem.id
   const index = data.findIndex((item) => {
-    return item.id === relatedId;
-  });
+    return item.id === relatedId
+  })
 
   // 插入到元素后，索引-1；插入到元素前，索引+1
-  const order = insertafter ? index - 1 : index + 1;
+  const order = insertafter ? index - 1 : index + 1
   // console.log('dragid:', dragId, 'order:', order)
-  sort(dragId, order);
+  sort(dragId, order)
 }
 
 function onMove(evt: any) {
-  relatedId = evt.related?.dataset?.id;
-  insertafter = evt.willInsertAfter;
+  relatedId = evt.related?.dataset?.id
+  insertafter = evt.willInsertAfter
   // console.log(`你正在拖动：${evt.dragged.dataset.id},替换了：${evt.related}`, 'insertafter', evt.willInsertAfter)
 }
 
 function destory() {
-  sortTable && sortTable.destroy();
-  sortTable = null;
+  sortTable && sortTable.destroy()
+  sortTable = null
 }
 
 onUnmounted(() => {
-  destory();
-});
+  destory()
+})
 
 function closeModal() {
-  show.value = false;
+  show.value = false
 }
 
 defineExpose({
   showModal,
   query,
-  pagination
-});
+  pagination,
+})
 
 const inputHandler = debounce((word) => {
-  keyword.value = word;
-  query(1, 5);
-}, 300);
+  keyword.value = word
+  query(1, 5)
+}, 300)
 
 const showSearch = computed(() => {
-  return selectionIds.value.length > 0;
-});
+  return selectionIds.value.length > 0
+})
 </script>
 
 <template>
@@ -339,12 +347,11 @@ const showSearch = computed(() => {
               <span
                 :style="{ 'margin-left': '18px', 'font-size': '16px' }"
                 class="wrapper-info-title"
-                >基本信息</span
-              >
+              >基本信息</span>
             </div>
           </div>
 
-          <div class="wrapper-form" v-if="!showSearch">
+          <div v-if="!showSearch" class="wrapper-form">
             <n-input
               :style="{ width: '360px', border: '1px solid #cad2dd' }"
               placeholder="请输入过滤条件名称搜索"
@@ -362,52 +369,50 @@ const showSearch = computed(() => {
             </n-button>
           </div>
 
-          <div class="wrapper-form" v-else>
+          <div v-else class="wrapper-form">
             <div class="del_btn">
               <n-button icon-placement="left" size="medium" @click="deleteSelection">
                 <template #icon>
                   <SvgIcon name="delete-history" size="16" />
                 </template>
-                删除</n-button
-              >
+                删除
+              </n-button>
             </div>
             <div class="msg">
-              <span
-                >已选中
+              <span>已选中
                 <span style="color: #507afd; font-size: 16px">{{
                   selectionIds.length
                 }}</span>
-                项</span
-              >
+                项</span>
               <a @click="selectionIds = []">清空</a>
             </div>
           </div>
 
-
-        
-
           <div class="wrapper-table">
             <NDataTable
               ref="tableRef"
               :max-height="480"
               remote
+              :bordered="false"
               :row-props="rowProps as any"
               :columns="columns"
               :data="tableData"
               :loading="loading"
               :pagination="pagination"
               :row-key="rowKey"
+              :checked-row-keys="selectionIds"
               @update:page="handlePageChange"
               @update-page-size="handlePageSizeChange"
               @update:checked-row-keys="handleCheck"
               @update:sorter="sortData"
-              :checked-row-keys="selectionIds"
             />
           </div>
         </div>
         <template #footer>
           <div class="wrapper-footer">
-            <n-button type="info" @click="closeModal"> 确认 </n-button>
+            <n-button style="background-color: #507AFD;" type="info" @click="closeModal">
+              确定
+            </n-button>
             <n-button secondary style="margin-left: 15px" @click="closeModal">
               取消
             </n-button>
@@ -482,4 +487,12 @@ const showSearch = computed(() => {
 ::v-deep(.n-data-table .n-data-table-th) {
   font-weight: bold !important;
 }
+::v-deep(table thead tr th) {
+    background-color: #FAFAFA !important;
+}
+::v-deep(.n-button--secondary) {
+  background-color: #fff;
+  border: 1px solid #cad2dd !important;
+}
+
 </style>
diff --git a/src/views/home/aside/comp/modals/NewFilterModal.vue b/src/views/home/aside/comp/modals/NewFilterModal.vue
index d1369bc..a046316 100644
--- a/src/views/home/aside/comp/modals/NewFilterModal.vue
+++ b/src/views/home/aside/comp/modals/NewFilterModal.vue
@@ -1,107 +1,107 @@
 <script lang="ts" setup>
-import type { FormInst, FormItemRule, FormRules } from "naive-ui";
-import { computed, defineOptions, onBeforeMount, reactive, ref, unref, watch } from "vue";
-import { asideMap } from "@/config/aside";
-import { useDictionary } from "@/store/modules/dictonary";
-import { useConfig } from "@/store/modules/asideConfig";
-import type { FilterCondition } from "/#/api";
-import { addCondition, updateCondition } from "@/api/home/filter";
-import { formatToDate2, formatToDate3 } from "@/utils/dateUtil";
-
-type Status = "edit" | "new";
-
-const show = ref(false);
-const configStore = useConfig();
-const dicStore = useDictionary();
-const currentStatus = ref<Status>("new");
-let currentEditId: string | null = null;
-const emit = defineEmits(["onOk"]);
-
+import type { FormInst, FormItemRule, FormRules } from 'naive-ui'
+import { computed, defineOptions, onBeforeMount, reactive, ref, unref, watch } from 'vue'
+import { asideMap } from '@/config/aside'
+import { useDictionary } from '@/store/modules/dictonary'
+import { useConfig } from '@/store/modules/asideConfig'
+import type { FilterCondition } from '/#/api'
+import { addCondition, updateCondition } from '@/api/home/filter'
+import { formatToDate2, formatToDate3 } from '@/utils/dateUtil'
+
+type Status = 'edit' | 'new'
+
+const emit = defineEmits(['onOk'])
+const show = ref(false)
+const configStore = useConfig()
+const dicStore = useDictionary()
+const currentStatus = ref<Status>('new')
+let currentEditId: string | null = null
 const modalTitle = computed(() => {
-  return currentStatus.value === "new" ? "新建过滤条件" : "编辑过滤条件";
-});
+  return currentStatus.value === 'new' ? '新建过滤条件' : '编辑过滤条件'
+})
 
 const cardStyle = {
-  width: "800px",
-  "--n-padding-bottom": "10px",
-  "--n-padding-left": "10px",
-};
+  'width': '800px',
+  '--n-padding-bottom': '10px',
+  '--n-padding-left': '10px',
+}
 
 const noBorderInput = {
-  "--n-border": "0px",
-  "--n-border-hover": "0px",
-  "--n-border-pressed": "0px",
-};
+  '--n-border': '0px',
+  '--n-border-hover': '0px',
+  '--n-border-pressed': '0px',
+}
 
 const formItemStyle = {
-  "--n-label-height": "0px",
-  "--n-feedback-height": "8px",
-};
+  '--n-label-height': '0px',
+  '--n-feedback-height': '8px',
+}
 
 interface FormType {
-  name: string | null;
-  logic: string | null;
-  conditions: Condition[];
+  name: string | null
+  logic: string | null
+  conditions: Condition[]
 }
 
 interface Condition {
-  type: string | null;
-  operator: string | null;
-  result: any;
+  type: string | null
+  operator: string | null
+  result: any
 }
 
 interface Option {
-  label: string;
-  value: string;
+  label: string
+  value: string
 }
 
 const rules: FormRules = {
   name: {
     required: true,
-    message: "请输入过滤条件名称",
-    trigger: "blur",
+    message: '请输入过滤条件名称',
+    trigger: 'blur',
   },
   logic: {
     required: true,
-    message: "请选择逻辑关系",
-    trigger: "blur",
+    message: '请选择逻辑关系',
+    trigger: 'blur',
   },
   conditions: {
     required: true,
     validator(rule: FormItemRule, value: Condition[]) {
       for (const item of value) {
-        const { type, operator, result } = item;
+        const { type, operator, result } = item
 
         if (type === null || operator === null || result === null)
-          return new Error("请选择过滤条件");
+          return new Error('请选择过滤条件')
       }
-      return true;
+      return true
     },
-    trigger: ["input", "blur"],
+    trigger: ['input', 'blur'],
   },
-};
+}
 
-const formRef = ref<FormInst | null>(null);
+const formRef = ref<FormInst | null>(null)
 
 const formValue = reactive<FormType>({
   name: null,
-  logic: "where",
+  logic: 'where',
   conditions: [
     {
       type: null,
-      operator: "eq",
+      operator: 'eq',
       result: null,
     },
   ],
-});
+})
 
 function handleSumbit(e: MouseEvent) {
-  e.preventDefault();
+  e.preventDefault()
   formRef.value?.validate((errors) => {
-    if (errors) return;
+    if (errors)
+      return
 
     const list = formValue.conditions.map((item, index) => {
-      const { type, operator, result } = item;
+      const { type, operator, result } = item
 
       return {
         searchfield: type!,
@@ -109,191 +109,195 @@ function handleSumbit(e: MouseEvent) {
         searchvalue: formatValue(type!, result),
         searchRelationType: formValue.logic!,
         orderNum: index + 1,
-      };
-    });
+      }
+    })
 
     const param: FilterCondition = {
       searchname: formValue.name!,
       type: 0,
       ocrUsersearchchildList: list,
-    };
+    }
 
-    if (currentStatus.value === "new") addCondition(param);
-    else updateCondition({ id: currentEditId!, ...param });
-    emit("onOk");
+    if (currentStatus.value === 'new')
+      addCondition(param)
+    else updateCondition({ id: currentEditId!, ...param })
+    emit('onOk')
     setTimeout(() => {
-      closeModal();
-    }, 300);
-  });
+      closeModal()
+    }, 300)
+  })
 }
 
 // 调用接口前转换为服务端格式
 function formatValue(searchfield: string, searchvalue: any) {
-  if (searchfield === "izyear") {
-    const start = formatToDate2(searchvalue[0]);
-    const end = formatToDate2(searchvalue[1]);
-    return `${start}-${end}`;
+  if (searchfield === 'izyear') {
+    const start = formatToDate2(searchvalue[0])
+    const end = formatToDate2(searchvalue[1])
+    return `${start}-${end}`
   }
 
-  if (searchfield === "izsimilarity" && Array.isArray(searchvalue))
-    return searchvalue.join(",");
+  if (searchfield === 'izsimilarity' && Array.isArray(searchvalue))
+    return searchvalue.join(',')
 
-  return searchvalue;
+  return searchvalue
 }
 
 // 编辑前前转换为服务端格式
 function unformatValue(searchfield: string, searchvalue: any) {
   // 2022/01/03-2023/02/04
-  if (searchfield === "izyear") {
-    const dataStrs = searchvalue.split("-");
-    const start = formatToDate3(dataStrs[0]);
-    const end = formatToDate3(dataStrs[1]);
-    return [start, end];
+  if (searchfield === 'izyear') {
+    const dataStrs = searchvalue.split('-')
+    const start = formatToDate3(dataStrs[0])
+    const end = formatToDate3(dataStrs[1])
+    return [start, end]
   }
 
   // 80,90
-  if (searchfield === "izsimilarity") return searchvalue.split(",");
+  if (searchfield === 'izsimilarity')
+    return searchvalue.split(',')
 
-  return searchvalue;
+  return searchvalue
 }
 
 function createCondition() {
   formValue.conditions.push({
     type: null,
-    operator: "eq",
+    operator: 'eq',
     result: null,
-  });
+  })
 }
 
 function removeCondition(index: number) {
-  formValue.conditions.splice(index, 1);
+  formValue.conditions.splice(index, 1)
 }
 
 function formLabel(index: number) {
-  return index === 0 ? "筛选条件" : "";
+  return index === 0 ? '筛选条件' : ''
 }
 
-const typeOptions = ref<Option[]>([]);
+const typeOptions = ref<Option[]>([])
 
 const operatorOptions = [
   {
-    label: "等于",
-    value: "eq",
+    label: '等于',
+    value: 'eq',
   },
   {
-    label: "不等于",
-    value: "notEq",
+    label: '不等于',
+    value: 'notEq',
   },
-];
+]
 
-const logicOptions = ref([]);
+const logicOptions = ref([])
 
 const similarityOptions = [
   {
-    label: "80%-90%",
+    label: '80%-90%',
     value: [80, 90],
   },
   {
-    label: "95%-100%",
+    label: '95%-100%',
     value: [95, 100],
   },
   {
-    label: "100%-100%",
+    label: '100%-100%',
     value: [100, 100],
   },
-];
+]
 
 onBeforeMount(() => {
-  dicStore.fetchRelationTypeList();
-});
+  dicStore.fetchRelationTypeList()
+})
 
 watch(
   () => dicStore.relationTypeList,
   (newval) => {
-    logicOptions.value = newval;
-  }
-);
+    logicOptions.value = newval
+  },
+)
 
 function showModal() {
-  const list = generateAllData(configStore.systemConfig);
-  typeOptions.value = list;
-  show.value = true;
+  const list = generateAllData(configStore.systemConfig)
+  typeOptions.value = list
+  show.value = true
 }
 
 function closeModal() {
-  show.value = false;
+  show.value = false
 }
 
 function generateAllData(config): Option[] {
-  const initVal: Option[] = [];
+  const initVal: Option[] = []
 
   const list = Object.keys(config).reduce((acc, value) => {
-    if (value.startsWith("iz") && asideMap[value]?.inFilterList !== false) {
-      const name = asideMap[value]?.label;
-
-      name &&
-        acc.push({
-          value,
-          label: name || "未配置",
-        });
+    if (value.startsWith('iz') && asideMap[value]?.inFilterList !== false) {
+      const name = asideMap[value]?.label
+
+      name
+      && acc.push({
+        value,
+        label: name || '未配置',
+      })
     }
-    return acc;
-  }, initVal);
+    return acc
+  }, initVal)
 
-  return list;
+  return list
 }
 
 watch(
   () => configStore.systemConfig,
   (newVal) => {
-    if (!newVal) return;
+    if (!newVal)
+      return
 
-    const list = generateAllData(newVal);
-    typeOptions.value = list;
-  }
-);
+    const list = generateAllData(newVal)
+    typeOptions.value = list
+  },
+)
 
 function getOptions(key: string) {
-  if (key === "izsimilarity") return similarityOptions;
+  if (key === 'izsimilarity')
+    return similarityOptions
 
-  const getterName = `get${key}`;
-  const options = unref(dicStore[getterName]);
-  return options || [];
+  const getterName = `get${key}`
+  const options = unref(dicStore[getterName])
+  return options || []
 }
 
 function leaveHandler() {
-  currentStatus.value = "new";
-  currentEditId = null;
+  currentStatus.value = 'new'
+  currentEditId = null
 
-  formValue.name = null;
+  formValue.name = null
   formValue.conditions = [
     {
       type: null,
-      operator: "eq",
+      operator: 'eq',
       result: null,
     },
-  ];
+  ]
 }
 
 function edit(editFilter: any) {
-  currentStatus.value = "edit";
+  currentStatus.value = 'edit'
 
-  const { searchname, ocrUsersearchchildList, id } = editFilter;
-  currentEditId = id;
-  formValue.name = searchname;
+  const { searchname, ocrUsersearchchildList, id } = editFilter
+  currentEditId = id
+  formValue.name = searchname
   formValue.conditions = ocrUsersearchchildList.map((item) => {
     return {
       type: item.searchfield,
       operator: item.searchtype,
       result: unformatValue(item.searchfield, item.searchvalue),
-    };
-  });
+    }
+  })
 }
 
 defineExpose({
   showModal,
   edit,
-});
+})
 </script>
 
 <template>
@@ -315,16 +319,18 @@ defineExpose({
         <div class="wrapper-form">
           <n-form ref="formRef" :model="formValue" :rules="rules">
             <n-form-item path="name" label="标题">
+              <!-- j -->
               <n-input
                 v-model:value="formValue.name"
                 :style="{ width: '780px' }"
+                maxlength="15"
                 @keydown.enter.prevent
               />
             </n-form-item>
-            <n-form-item path="logic" label="逻辑关系" v-show="false">
+            <n-form-item v-show="false" path="logic" label="逻辑关系">
               <n-select
-                filterable
                 v-model:value="formValue.logic"
+                filterable
                 placeholder="请选择逻辑关系"
                 :options="logicOptions"
               />
@@ -337,14 +343,14 @@ defineExpose({
               :label="formLabel(index)"
             >
               <n-select
-                filterable
                 v-model:value="item.type"
+                filterable
                 placeholder="请选择筛选项名称"
                 :options="typeOptions"
               />
               <n-select
-                filterable
                 v-model:value="item.operator"
+                filterable
                 style="margin-left: 8px"
                 placeholder="请选择"
                 :options="operatorOptions"
@@ -358,9 +364,9 @@ defineExpose({
                 />
               </n-space>
               <n-select
-                filterable
                 v-else
                 v-model:value="item.result"
+                filterable
                 style="margin-left: 8px"
                 placeholder="请选择"
                 :options="getOptions(item.type!)"
@@ -371,7 +377,19 @@ defineExpose({
                 @click="removeCondition(index)"
               >
                 <template #icon>
-                  <SvgIcon size="24" name="close" />
+                  <!-- <SvgIcon size="24" name="close" color="#F00"/>
+                   -->
+                   <svg width="24px" height="24px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>清除</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="PrevailCloud-Design-图标集" transform="translate(-3040.000000, -3118.000000)" fill-rule="nonzero">
+            <g id="清除" transform="translate(3040.000000, 3118.000000)">
+                <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="64" height="64"></rect>
+                <path d="M32,4 C16.5619675,4 4,16.5600322 4,32 C4,47.4399678 16.5600322,60 32,60 C47.4380325,60 60,47.4399678 60,32 C60,16.5600322 47.4399678,4 32,4 Z M43.4220132,40.6240021 C44.2020159,41.4079827 44.1999731,42.6720064 43.4180353,43.4520091 C43.0280877,43.8400215 42.5180487,44.0360166 42.0060745,44.0360166 C41.4920576,44.0360166 40.9800834,43.8400214 40.5900283,43.4480311 L31.9900014,34.8219862 L23.3620213,43.3580432 C22.9720737,43.7420776 22.4639699,43.9360301 21.9559737,43.9360301 C21.4400215,43.9360301 20.9260046,43.7379922 20.5340143,43.3420239 C19.7579895,42.5560005 19.7640102,41.2919768 20.5500336,40.5140169 L29.1680151,31.9900013 L20.5819648,23.3759978 C19.8019621,22.5939524 19.8040049,21.3279935 20.5859428,20.5479908 C21.3679882,19.7659454 22.6319043,19.7700309 23.4139498,20.5519687 L32.0119339,29.1759709 L40.639914,20.6400214 C41.4238946,19.8620614 42.6918962,19.8700173 43.467921,20.6560407 C44.2458809,21.4420641 44.2379251,22.708023 43.4519016,23.4840477 L34.8340277,32.0079559 L43.4220132,40.6240021 Z" id="形状" fill="#DDDDDD"></path>
+            </g>
+        </g>
+    </g>
+</svg>
                 </template>
               </n-button>
             </n-form-item>
@@ -384,8 +402,10 @@ defineExpose({
       </div>
       <template #footer>
         <div class="wrapper-footer">
-          <n-button type="info" @click="handleSumbit"> 保存 </n-button>
-          <n-button secondary style="margin-left: 15px" @click="closeModal">
+          <n-button style="background-color: #507AFD;" type="info" @click="handleSumbit">
+            确定
+          </n-button>
+          <n-button secondary style="margin-left: 15px;background-color: #ffffff;border: 1px solid #cad2dd;color: #333333;" @click="closeModal">
             取消
           </n-button>
         </div>
@@ -452,4 +472,11 @@ defineExpose({
     }
   }
 }
+/*j */
+// ::v-deep(.n-input .n-input-wrapper) {
+//  padding-left: 0;
+// }
+::v-deep(.n-input__suffix){
+  margin-right: -8px;
+}
 </style>
diff --git a/src/views/task/modal/CustomFieldModal.vue b/src/views/task/modal/CustomFieldModal.vue
index db84160..7622e52 100644
--- a/src/views/task/modal/CustomFieldModal.vue
+++ b/src/views/task/modal/CustomFieldModal.vue
@@ -27,11 +27,11 @@ const onShowList = ref<any[]>([]);
 const fixShowList = ref<any[]>([]);
 
 const allCount = computed(() => {
-  return `全部筛选(共${offList.value.length - 1}个)`;
+  return `全部字段(共${offList.value.length - 1}个)`;
 });
 
 const selectCount = computed(() => {
-  return `全部筛选(共${onList.value.length}个)`;
+  return `显示字段(共${onList.value.length}个)`;
 });
 
 function generatList() {
@@ -389,7 +389,7 @@ const queryData = (value, type) => {
             >
               <div>
                 <n-input
-                  placeholder="搜索关键字"
+                  placeholder="搜索关键词"
                   @input="(value) => queryData(value, 'off')"
                 >
                   <template #suffix>
@@ -400,7 +400,7 @@ const queryData = (value, type) => {
                   <div class="draggable-li" :class="{ checkAll: indeterminate }">
                     <n-checkbox
                       v-model:checked="checkAll"
-                      label="全部"
+                      label="全选"
                       @update:checked="onCheckAllChange"
                       :indeterminate="indeterminate"
                     />
@@ -438,7 +438,7 @@ const queryData = (value, type) => {
               </template>
               <div>
                 <n-input
-                  placeholder="搜索关键字"
+                  placeholder="搜索关键词"
                   @input="(value) => queryData(value, 'on')"
                 >
                   <template #suffix>
@@ -487,7 +487,7 @@ const queryData = (value, type) => {
       </div>
       <template #footer>
         <div class="wrapper-footer">
-          <n-button type="info" @click="handleSumbit"> 确认 </n-button>
+          <n-button type="info" @click="handleSumbit"> 确定 </n-button>
           <n-button secondary style="margin-left: 15px" @click="getData();closeModal()">
             取消
           </n-button>
@@ -628,5 +628,6 @@ const queryData = (value, type) => {
 }
 ::v-deep(.n-button--default-type) {
   border: 1px solid #cad2dd !important;
+  background-color: #fff;
 }
 </style>
diff --git a/src/views/task/modal/CustomSettingModal.vue b/src/views/task/modal/CustomSettingModal.vue
index 8f0e590..469dea5 100644
--- a/src/views/task/modal/CustomSettingModal.vue
+++ b/src/views/task/modal/CustomSettingModal.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup>
-import { computed, defineEmits, defineProps, onMounted, ref } from "vue";
-import { getAllfieldList, getfieldList, savefield } from "@/api/home/filter";
-import { ReportInfoConfig } from "@/config/workorder";
-import { useUser } from "@/store/modules/user";
+import { computed, defineEmits, defineProps, onMounted, ref } from 'vue'
+import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter'
+import { ReportInfoConfig } from '@/config/workorder'
+import { useUser } from '@/store/modules/user'
 
 const props = defineProps({
   reviewType: {
@@ -10,143 +10,145 @@ const props = defineProps({
     default: () => 3,
     require: true,
   },
-});
-const emit = defineEmits(["onOk"]);
+})
+const emit = defineEmits(['onOk'])
 
 onMounted(async () => {
-  const userStore = useUser();
-  const userInfo = userStore.getUserInfo;
-  let res;
-  res = await getAllfieldList(props.reviewType); // 所有筛选项目
-  const allList = res.data;
-  res = await getfieldList(props.reviewType, userInfo.id); // 当前用户选择的项目
-  const useList = res.data;
+  const userStore = useUser()
+  const userInfo = userStore.getUserInfo
+  let res
+  res = await getAllfieldList(props.reviewType) // 所有筛选项目
+  const allList = res.data
+  res = await getfieldList(props.reviewType, userInfo.id) // 当前用户选择的项目
+  const useList = res.data
   /**
    * name 标题
    * id 键值
    * fix 是否默认
    * checked 是否选中
    */
-  const userFieldFixed = useList.userFieldFixed?.split(",");
-  const userFieldUnFixed = useList.userFieldUnFixed?.split(",");
+  const userFieldFixed = useList.userFieldFixed?.split(',')
+  const userFieldUnFixed = useList.userFieldUnFixed?.split(',')
   allList.map((v) => {
     const item = {
       name: v.fieldDesc,
       id: v.name,
       fix: v.isrequired == 2,
       checked:
-        v.isrequired == 2 ||
-        Boolean(userFieldFixed?.find((v2) => v2 == v.name)) ||
-        Boolean(userFieldUnFixed?.find((v2) => v2 == v.name)),
-    };
-    offList.value.push(item);
-    if(item.checked){
-      selectIds.value.push(item.id);
+        v.isrequired == 2
+        || Boolean(userFieldFixed?.find(v2 => v2 == v.name))
+        || Boolean(userFieldUnFixed?.find(v2 => v2 == v.name)),
     }
-  });
-});
+    offList.value.push(item)
+    if (item.checked)
+      selectIds.value.push(item.id)
+  })
+})
 
-const offList = ref<any[]>([]);
+const offList = ref<any[]>([])
 function generatList() {
-  const keys = Object.keys(ReportInfoConfig);
-  const hideList: object[] = [];
+  const keys = Object.keys(ReportInfoConfig)
+  const hideList: object[] = []
   for (const key of keys) {
-    const name = ReportInfoConfig[key]?.label;
-    const isDefault = ReportInfoConfig[key]?.isDefault;
+    const name = ReportInfoConfig[key]?.label
+    const isDefault = ReportInfoConfig[key]?.isDefault
 
     // 系统配置为Y且不是默认配置
     if (!isDefault) {
       hideList.push({
         id: key,
-        name: name || "未配置",
+        name: name || '未配置',
         fix: isDefault,
         checked: ReportInfoConfig[key].isDefault,
-      });
+      })
     }
   }
 
-  const fixedList = generateDefaultList();
+  const fixedList = generateDefaultList()
 
-  hideList.unshift(...fixedList);
+  hideList.unshift(...fixedList)
 
-  offList.value = hideList;
-  return { hideList };
+  offList.value = hideList
+  return { hideList }
 }
 
 function generateDefaultList() {
   return Object.keys(ReportInfoConfig).reduce((acc, key) => {
-    const { label, isDefault } = ReportInfoConfig[key];
+    const { label, isDefault } = ReportInfoConfig[key]
 
     if (isDefault) {
       const config = {
         id: key,
-        name: label || "未配置",
+        name: label || '未配置',
         fix: true,
         checked: true,
-      };
-      return [...acc, config];
-    } else {
-      return acc;
+      }
+      return [...acc, config]
     }
-  }, []);
+    else {
+      return acc
+    }
+  }, [])
 }
 
-const show = ref(false);
+const show = ref(false)
 const checkAll = computed(() => {
-  return offList.value.length == selectIds.value.length;
-});
+  return offList.value.length == selectIds.value.length
+})
 
 function showModal() {
-  show.value = true;
+  show.value = true
 }
 
 function closeModal() {
-  show.value = false;
+  show.value = false
 }
 async function handleSumbit(e: MouseEvent) {
-  const userStore = useUser();
-  const userInfo = userStore.getUserInfo;
-  let userField = "";
+  const userStore = useUser()
+  const userInfo = userStore.getUserInfo
+  let userField = ''
   offList.value.map((v) => {
-    if (v.checked) userField += `${v.id},`;
-  });
-  userField = userField.slice(0, userField.length - 1);
-  savefield(props.reviewType, userInfo.id, userField);
-  e.preventDefault();
-  closeModal();
-  emit("onOk");
+    if (v.checked)
+      userField += `${v.id},`
+  })
+  userField = userField.slice(0, userField.length - 1)
+  savefield(props.reviewType, userInfo.id, userField)
+  e.preventDefault()
+  closeModal()
+  emit('onOk')
 }
 
 defineExpose({
   showModal,
-});
+})
 
 // generatList();
 
-const selectIds = ref<string[]>([]);
+const selectIds = ref<string[]>([])
 
 function onCheckAllChange(value) {
-  const ids: string[] = [];
+  const ids: string[] = []
 
   for (const item of offList.value) {
     if (!item.fix) {
-      item.checked = value;
-      ids.push(item.id);
+      item.checked = value
+      ids.push(item.id)
     }
   }
-  selectIds.value = value ? ids : [];
+  selectIds.value = value ? ids : []
 }
 
 function onCheckChange(checked: any, item: any) {
-  const index = selectIds.value.indexOf(item.id);
-  item.checked = checked;
-  if (index === -1 && checked) selectIds.value.push(item.id);
-  else selectIds.value.splice(index, 1);
+  const index = selectIds.value.indexOf(item.id)
+  item.checked = checked
+  if (index === -1 && checked)
+    selectIds.value.push(item.id)
+  else selectIds.value.splice(index, 1)
 }
 
 const indeterminate = computed(() => {
-  return selectIds.value.length > 0 && offList.value.length > selectIds.value.length;
-});
+  return selectIds.value.length > 0 && offList.value.length > selectIds.value.length
+})
 </script>
 
 <template>
@@ -171,13 +173,14 @@ const indeterminate = computed(() => {
             >
               <div>
                 <div class="draggable-ul">
-                  <div class="draggable-li" style="background: #f8f8f8">
+                  <!-- j -->
+                  <div class="draggable-li" style="background: #f8f8f8 !important">
                     <n-checkbox
                       v-model:checked="checkAll"
                       label="全选"
-                      @update:checked="onCheckAllChange"
                       :class="{ checkAll: indeterminate }"
                       :indeterminate="indeterminate"
+                      @update:checked="onCheckAllChange"
                     />
                   </div>
                   <div class="content">
@@ -204,8 +207,10 @@ const indeterminate = computed(() => {
       </div>
       <template #footer>
         <div class="wrapper-footer">
-          <n-button type="info" @click="handleSumbit"> 确定 </n-button>
-          <n-button secondary style="margin-left: 15px" @click="closeModal">
+          <n-button style="background-color: #507AFD;" type="info" @click="handleSumbit">
+            确定
+          </n-button>
+          <n-button class="style-btn" secondary style="margin-left: 15px;background-color: #ffffff" @click="closeModal">
             取消
           </n-button>
         </div>
@@ -307,4 +312,11 @@ const indeterminate = computed(() => {
   --n-padding-top: 0px;
   --n-padding-bottom: 12px;
 }
+::v-deep(.wrapper-title){
+  font-weight: 500;
+  color: #333333;
+}
+::v-deep(.style-btn){
+  border: 1px solid #CAD2DD !important;
+}
 </style>
diff --git a/src/views/worksheet/aside/Aside.vue b/src/views/worksheet/aside/Aside.vue
index cc9c9e6..df97b9b 100644
--- a/src/views/worksheet/aside/Aside.vue
+++ b/src/views/worksheet/aside/Aside.vue
@@ -1,36 +1,36 @@
 <script lang="ts" setup>
-import { getAllfieldList, getfieldList } from "@/api/home/filter";
-import { useWindowSizeFn } from "@/hooks/event/useWindowSizeFn";
-import { useUser } from "@/store/modules/user";
-import { useWorkOrder } from "@/store/modules/workOrder";
-import { getViewportOffset } from "@/utils/domUtils";
-import { debounce } from "lodash-es";
+import { debounce } from 'lodash-es'
 import {
-computed,
-defineOptions,
-inject,
-nextTick,
-onMounted,
-ref,
-unref,
-toRaw,
-watch
-} from "vue";
-import CustomFieldModalVue from "../modal/CustomFieldModal.vue";
-import WorkSheetList from "./WorkSheetList.vue";
+  computed,
+  defineOptions,
+  inject,
+  nextTick,
+  onMounted,
+  ref,
+  toRaw,
+  unref,
+  watch,
+} from 'vue'
+import CustomFieldModalVue from '../modal/CustomFieldModal.vue'
+import WorkSheetList from './WorkSheetList.vue'
+import { getAllfieldList, getfieldList } from '@/api/home/filter'
+import { useWindowSizeFn } from '@/hooks/event/useWindowSizeFn'
+import { useUser } from '@/store/modules/user'
+import { useWorkOrder } from '@/store/modules/workOrder'
+import { getViewportOffset } from '@/utils/domUtils'
 
-defineOptions({ name: "AsideContent" });
+defineOptions({ name: 'AsideContent' })
 
-const collapse = ref(false);
-const workStore = useWorkOrder();
-const filterModalRef = ref(null);
-const packageListRef = ref<HTMLDivElement | null>(null);
+const collapse = ref(false)
+const workStore = useWorkOrder()
+const filterModalRef = ref(null)
+const packageListRef = ref<HTMLDivElement | null>(null)
 // 展示字段
-const showFieldList = ref<any[]>([]);
-const reviewType = 1;
-const dicts = ref<any>([]);
+const showFieldList = ref<any[]>([])
+const reviewType = 1
+const dicts = ref<any>([])
 function collapseHandler() {
-  collapse.value = !collapse.value;
+  collapse.value = !collapse.value
 }
 const mousetrap = inject('mousetrap') as any
 mousetrap.bind('[', collapseHandler)
@@ -38,46 +38,46 @@ mousetrap.bind('[', collapseHandler)
 const searchKeyword = ref('')
 
 const asideWidth = computed(() => {
-  return collapse.value ? 0 : 308;
-});
+  return collapse.value ? 0 : 308
+})
 
 const asideStyle = computed(() => {
   return {
     width: `${asideWidth.value}px`,
-  };
-});
+  }
+})
 
 const collapseIcon = computed(() => {
-  return collapse.value ? "expand-cir" : "collapse-cir";
-});
+  return collapse.value ? 'expand-cir' : 'collapse-cir'
+})
 
-const listHeight = ref(700);
+const listHeight = ref(700)
 
 function computeListHeight() {
-  const listEl = document.querySelector(".work-sheet-list")!;
-  const { bottomIncludeBody } = getViewportOffset(listEl);
-  const height = bottomIncludeBody;
-  listHeight.value = height - 25;
+  const listEl = document.querySelector('.work-sheet-list')!
+  const { bottomIncludeBody } = getViewportOffset(listEl)
+  const height = bottomIncludeBody
+  listHeight.value = height - 25
 }
 
 const listStyle = computed(() => {
   return {
     height: `${listHeight.value}px`,
-  };
-});
+  }
+})
 
-useWindowSizeFn(computeListHeight, 280);
+useWindowSizeFn(computeListHeight, 280)
 
 async function getshowFieldList() {
-  showFieldList.value = [];
-  const userStore = useUser();
-  const userInfo = userStore.getUserInfo;
-  let res;
-  res = await getAllfieldList(reviewType); //所有筛选项目
-  const allList = res.data;
-  dicts.value = res.data;
-  res = await getfieldList(reviewType, userInfo.id); //当前用户选择的项目
-  const useList = res.data;
+  showFieldList.value = []
+  const userStore = useUser()
+  const userInfo = userStore.getUserInfo
+  let res
+  res = await getAllfieldList(reviewType) // 所有筛选项目
+  const allList = res.data
+  dicts.value = res.data
+  res = await getfieldList(reviewType, userInfo.id) // 当前用户选择的项目
+  const useList = res.data
   /**
    * name 标题
    * id 键值
@@ -85,72 +85,73 @@ async function getshowFieldList() {
    * checked 是否选中
    */
   if (useList.userFieldFixed) {
-    useList.userFieldFixed?.split(",").map((v) => {
-      let item = allList.find((v2) => v2.name == v);
+    useList.userFieldFixed?.split(',').map((v) => {
+      let item = allList.find(v2 => v2.name == v)
       if (item) {
         item = {
           name: item.fieldDesc,
           id: item.name,
           fix: item.isrequired == 2,
           checked: true,
-        };
-        showFieldList.value.push(item);
+        }
+        showFieldList.value.push(item)
       }
-    });
-  } else {
+    })
+  }
+  else {
     // 若为首次获取 则赋默认值
     allList.map((v) => {
       if (v.isrequired == 2) {
-        let item = {
+        const item = {
           name: v.fieldDesc,
           id: v.name,
           fix: v.isrequired == 2,
           checked: true,
-        };
-        showFieldList.value.push(item);
+        }
+        showFieldList.value.push(item)
       }
-    });
+    })
   }
 }
 
 onMounted(() => {
   nextTick(() => {
-    computeListHeight();
-    getshowFieldList();
-  });
-});
-const asideEnter = ref(false);
+    computeListHeight()
+    getshowFieldList()
+  })
+})
+const asideEnter = ref(false)
 
 const showCollapse = computed(() => {
-  return collapse.value ? true : asideEnter.value;
-});
+  return collapse.value ? true : asideEnter.value
+})
 
 function showFilter() {
-  const modal = unref(filterModalRef)! as any;
-  modal.showModal();
+  const modal = unref(filterModalRef)! as any
+  modal.showModal()
 }
 
 watch(
   () => workStore.immersion,
   () => {
-    collapse.value = true;
-  }
-);
+    collapse.value = true
+  },
+)
 
-const showSearch = ref(false);
+const showSearch = ref(false)
 
 function setShowSearch(value: boolean) {
-  showSearch.value = value;
+  showSearch.value = value
   if (value === false) {
-    (packageListRef.value as any).search("");
+    (packageListRef.value as any).search('')
     searchKeyword.value = ''
   };
 }
 
 const inputHandler = debounce((word) => {
   searchKeyword.value = word;
-  (packageListRef.value as any).search(word);
-}, 500);
+  (packageListRef.value as any).search(word)
+}, 500)
 </script>
 
 <template>
@@ -169,7 +170,8 @@ const inputHandler = debounce((word) => {
       <div v-show="!showSearch" class="warpper">
         <div class="left">
           <svg-icon name="all-worksheet" size="32" />
-          <span style="margin-left: 8px">所有任务包</span>
+          <!-- j -->
+          <span style="margin-left: 8px;color: #333333;">所有任务包</span>
         </div>
         <div class="right">
           <SvgIcon
@@ -188,10 +190,10 @@ const inputHandler = debounce((word) => {
       </div>
       <div v-show="showSearch" class="warpper">
         <n-input
+          v-model:value="searchKeyword"
           style="flex: 1; height: 32px"
           placeholder="请输入你需要搜索的内容"
           @input="inputHandler"
-          v-model:value="searchKeyword"
         >
           <template #suffix>
             <SvgIcon size="14px" name="magnifying-1" />
@@ -208,13 +210,13 @@ const inputHandler = debounce((word) => {
     <WorkSheetList
       ref="packageListRef"
       class="work-sheet-list"
-      :showFieldList="showFieldList"
+      :show-field-list="showFieldList"
       :dicts="dicts"
     />
     <CustomFieldModalVue
       ref="filterModalRef"
       :review-type="1"
-      @onOk="getshowFieldList"
+      @on-ok="getshowFieldList"
     />
   </div>
 </template>
@@ -279,5 +281,4 @@ const inputHandler = debounce((word) => {
     z-index: 10;
   }
 }
-
 </style>
diff --git a/src/views/worksheet/aside/ListItem.vue b/src/views/worksheet/aside/ListItem.vue
index c6febe5..60c9ccc 100644
--- a/src/views/worksheet/aside/ListItem.vue
+++ b/src/views/worksheet/aside/ListItem.vue
@@ -1,11 +1,9 @@
 <script lang="ts" setup>
-import { format } from 'date-fns';
-import { computed, onMounted, ref } from "vue";
-import type { PackageListItem } from "/#/workorder";
-
-defineOptions({ name: "ListItem" });
-const emit = defineEmits(['dismisClick'])
+import { format } from 'date-fns'
+import { computed, onMounted, ref } from 'vue'
+import type { PackageListItem } from '/#/workorder'
 
+defineOptions({ name: 'ListItem' })
 const props = defineProps({
   selected: {
     type: Boolean,
@@ -27,17 +25,20 @@ const props = defineProps({
     type: Array,
     default: () => [],
   },
-});
+})
+
+const emit = defineEmits(['dismisClick'])
+
 const svgName = computed(() => {
-  return props.selected ? "taskpack-select" : "taskpack";
-});
+  return props.selected ? 'taskpack-select' : 'taskpack'
+})
 
 const popconfirmTarget: any = ref(null)
 const popconfirmRef: any = ref(null)
 
 function handleDismissTask() {
   emit('dismisClick', props.mouseOverTask.id)
-  popconfirmRef.value[0]?.setShow(false); // 关闭 popconfirm
+  popconfirmRef.value[0]?.setShow(false) // 关闭 popconfirm
 }
 
 onMounted(async () => {
@@ -45,23 +46,25 @@ onMounted(async () => {
 </script>
 
 <template>
-  <div class="list-item" :class="{ 'list-item-selected': selected }" ref="popconfirmTarget">
+  <div ref="popconfirmTarget" class="list-item" :class="{ 'list-item-selected': selected }">
     <div v-for="(item, index) in showFieldList" :key="index">
       <div v-if="item.id === 'name'" class="list-item-header">
         <div class="id-wrap">
           <SvgIcon :name="svgName" size="28" />
           <span class="list-item-header-name" :class="{ 'list-item-header-selected': selected }">
             <n-ellipsis style="max-width: 180px">
-              {{ listItem.name }}
+              #{{ listItem.name }}
             </n-ellipsis>
             <span class="list-item-header-selected">({{ listItem.pictureCount }})</span>
-            <n-popconfirm id="taskPopconfirmRef" ref="popconfirmRef" :show-icon="false" :show-arrow="false"
-              placement="bottom" trigger="click">
+            <n-popconfirm
+              id="taskPopconfirmRef" ref="popconfirmRef" :show-icon="false" :show-arrow="false"
+              placement="bottom" trigger="click"
+            >
               <template #trigger>
-                <span class="dismiss-task-pack" v-show="mouseOverTask?.id" style="cursor: pointer;">...</span>
+                <span v-show="mouseOverTask?.id" class="dismiss-task-pack" style="cursor: pointer;">...</span>
               </template>
               <template #action>
-                <span @click="handleDismissTask" style="cursor: pointer;">解散任务包</span>
+                <span style="cursor: pointer;" @click="handleDismissTask">解散任务包</span>
               </template>
             </n-popconfirm>
           </span>
@@ -69,21 +72,31 @@ onMounted(async () => {
       </div>
       <ul v-else class="list-item-detail">
         <li v-if="item.id === 'statshisText'">
-          审批状态：<n-ellipsis style="max-width: 170px"><span class="list-item-status" :class="listItem.statshisText === '通过'
-            ? 'list-item-success'
-            : listItem.statshisText === '不通过'
-              ? 'list-item-error'
-              : 'list-item-watting'
-            ">{{ listItem.statshisText }}</span>
-          </n-ellipsis></li>
+          审批状态：<n-ellipsis style="max-width: 170px">
+            <span
+              class="list-item-status" :class="listItem.statshisText === '通过'
+                ? 'list-item-success'
+                : listItem.statshisText === '不通过'
+                  ? 'list-item-error'
+                  : 'list-item-watting'
+              "
+            >{{ listItem.statshisText }}</span>
+          </n-ellipsis>
+        </li>
         <li v-else-if="item.id === 'createdate'">
-          提交时间：<n-ellipsis style="max-width: 170px">{{ listItem.createdate && format(listItem.createdate, "yyyy-MM-dd HH:mm:ss") }}</n-ellipsis>
+          提交时间：<n-ellipsis style="max-width: 170px">
+            {{ listItem.createdate && format(listItem.createdate, "yyyy-MM-dd HH:mm:ss") }}
+          </n-ellipsis>
         </li>
         <li v-else-if="item.id === 'createTime'">
-          生成时间：<n-ellipsis style="max-width: 170px">{{ listItem.createTime && format(listItem.createTime, "yyyy-MM-dd HH:mm:ss") }}</n-ellipsis>
+          生成时间：<n-ellipsis style="max-width: 170px">
+            {{ listItem.createTime && format(listItem.createTime, "yyyy-MM-dd HH:mm:ss") }}
+          </n-ellipsis>
         </li>
         <li v-else class="ellipsis">
-          <span class="label">{{ item.name }}：</span><n-ellipsis style="max-width: 170px">{{ listItem[item.id] }}</n-ellipsis>
+          <span class="label">{{ item.name }}：</span><n-ellipsis style="max-width: 170px">
+            {{ listItem[item.id] }}
+          </n-ellipsis>
         </li>
       </ul>
     </div>
@@ -152,9 +165,9 @@ onMounted(async () => {
       line-height: 22px;
       margin: 0px 0px 8px 8px;
     }
-
+/*j*/
     &-selected {
-      color: #507afd;
+      color: #507afd !important;
     }
   }
 
@@ -185,5 +198,6 @@ onMounted(async () => {
     position: absolute;
     bottom: 0px;
   }
-}</style>
+}
+</style>
 ../types
diff --git a/src/views/worksheet/components/PictureInfo.vue b/src/views/worksheet/components/PictureInfo.vue
index a312527..73b8a54 100644
--- a/src/views/worksheet/components/PictureInfo.vue
+++ b/src/views/worksheet/components/PictureInfo.vue
@@ -1,63 +1,74 @@
 <script setup lang="ts">
-import { fieldMap } from "@/config/workorder";
-import { TASK_STATUS_OBJ } from '@/enums/index';
-import { format } from 'date-fns';
-import { pickBy } from "lodash-es";
-import { computed, defineProps } from "vue";
+import { format } from 'date-fns'
+import { pickBy } from 'lodash-es'
+import { computed, defineProps } from 'vue'
+import { TASK_STATUS_OBJ } from '@/enums/index'
+import { fieldMap } from '@/config/workorder'
 
 const props = defineProps({
   taskDetailInfo: {
     type: Object,
     default: () => ({}),
   },
-});
+})
 
 const propertys = computed(() => {
-  const { ocrPicture } = props.taskDetailInfo;
+  const { ocrPicture } = props.taskDetailInfo
   const v = pickBy(ocrPicture, (value, key: string) => {
-    return key.startsWith("field") && value !== null;
-  });
-  return v;
-});
+    return key.startsWith('field') && value !== null
+  })
+  return v
+})
 </script>
 
 <template>
   <div class="right">
     <n-scrollbar style="max-height: 100%">
-      <n-ellipsis style="max-width: 350px">任务ID：{{ taskDetailInfo.taskname }}</n-ellipsis>
+      <n-ellipsis style="max-width: 350px">
+        任务ID：{{ taskDetailInfo.taskname }}
+      </n-ellipsis>
       <div class="tags">
-        <div class="tag tag-submiting" v-if="taskDetailInfo.historyStates == '1'">待审批</div>
-        <div class="tag tag-submited" v-else-if="taskDetailInfo.historyStates == 2 || taskDetailInfo.workStatus == 3">已审批</div>
-        <div class="tag tag-passed" v-if="taskDetailInfo.historyStates == 2">{{ TASK_STATUS_OBJ[taskDetailInfo.historyStates] }}</div>
-        <div class="tag tag-not-passed" v-else-if="taskDetailInfo.workStatus == 3">{{ TASK_STATUS_OBJ[taskDetailInfo.historyStates] }}</div>
+        <div v-if="taskDetailInfo.historyStates == '1'" class="tag tag-submiting">
+          待审批
+        </div>
+        <div v-else-if="taskDetailInfo.historyStates == 2 || taskDetailInfo.workStatus == 3" class="tag tag-submited">
+          已审批
+        </div>
+        <div v-if="taskDetailInfo.historyStates == 2" class="tag tag-passed">
+          {{ TASK_STATUS_OBJ[taskDetailInfo.historyStates] }}
+        </div>
+        <div v-else-if="taskDetailInfo.workStatus == 3" class="tag tag-not-passed">
+          {{ TASK_STATUS_OBJ[taskDetailInfo.historyStates] }}
+        </div>
       </div>
       <n-divider class="divider-line" />
       <div class="property">
-        <span class="property-name top" style="color: #666666">图片大小</span>
+        <!-- j -->
+        <span class="property-name top" style="color: #999999">图片大小</span>
         <span style="color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo?.imgSize && (taskDetailInfo.pictureInfo.imgSize / 1000).toFixed(2) }}KB</span>
       </div>
       <div class="property">
-        <span class="property-name top" style="color: #666666">图片格式</span>
+        <span class="property-name top" style="color: #999999">图片格式</span>
         <span style="color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo?.imgFormat }}</span>
       </div>
       <div class="property">
-        <span class="property-name top" style="color: #666666">图片尺寸</span>
+        <span class="property-name top" style="color: #999999">图片尺寸</span>
         <span style="color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo?.imgMeasure }}</span>
       </div>
       <div class="property">
-        <span class="property-name top" style="color: #666666">色彩空间</span>
+        <span class="property-name top" style="color: #999999">色彩空间</span>
         <span style="color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo?.imgSpace }}</span>
       </div>
       <div class="property">
-        <span class="property-name top" style="color: #666666">提报人</span>
+        <span class="property-name top" style="color: #999999">提报人</span>
         <span style="color: #333333; font-size: 16px">{{ taskDetailInfo?.upname || "-" }}</span>
       </div>
       <div class="property">
-        <span class="property-name top" style="color: #666666">创建时间</span>
+        <span class="property-name top" style="color: #999999">创建时间</span>
         <span style="color: #333333; font-size: 16px">{{ taskDetailInfo?.pictureInfo?.createTime }}</span>
       </div>
       <div class="property">
-        <span class="property-name top" style="color: #666666">提报时间</span>
+        <span class="property-name top" style="color: #999999">提报时间</span>
         <span style="color: #333333; font-size: 16px">{{ taskDetailInfo?.submitDateTimestamp && format(taskDetailInfo.submitDateTimestamp, 'yyyy-MM-dd HH:mm:ss') || '-' }}</span>
       </div>
       <div v-for="(value, key) in propertys" :key="key" class="property">
@@ -87,7 +98,6 @@ const propertys = computed(() => {
   padding: 24px;
   // background: lime;
 
-
   .task-name {
     display: inline-block;
     width: 100%;
@@ -175,7 +185,6 @@ const propertys = computed(() => {
   }
 }
 
-
 ::v-deep(.n-divider:not(.n-divider--vertical)) {
   margin-top: 12px;
   margin-bottom: 12px;
diff --git a/src/views/worksheet/modal/CustomFieldModal.vue b/src/views/worksheet/modal/CustomFieldModal.vue
index 8c0c80d..7621a20 100644
--- a/src/views/worksheet/modal/CustomFieldModal.vue
+++ b/src/views/worksheet/modal/CustomFieldModal.vue
@@ -24,11 +24,11 @@ const onList = ref<any[]>([]);
 const fixList = ref<any[]>([]);
 
 const allCount = computed(() => {
-  return `全部筛选(共${offList.value.length - 1}个)`;
+  return `全部字段(共${offList.value.length - 1}个)`;
 });
 
 const selectCount = computed(() => {
-  return `全部筛选(共${onList.value.length}个)`;
+  return `显示字段(共${onList.value.length}个)`;
 });
 
 function generatList() {
@@ -322,7 +322,7 @@ const indeterminate = computed(() => {
       aria-modal="true"
     >
       <div class="wrapper">
-        <span class="wrapper-title">自定义任务包字段</span>
+        <span class="wrapper-title" style="color: #333;">自定义任务包字段</span>
         <div class="wrapper-bar">
           <div class="wrapper-info">
             <span :style="{ 'margin-left': '18px' }">字段信息</span>
@@ -338,7 +338,7 @@ const indeterminate = computed(() => {
               :bordered="false"
             >
               <div>
-                <n-input placeholder="搜索关键字">
+                <n-input placeholder="搜索关键词">
                   <template #suffix>
                     <SvgIcon size="14px" name="magnifying-1" />
                   </template>
@@ -347,7 +347,7 @@ const indeterminate = computed(() => {
                   <div class="draggable-li" :class="{ checkAll: indeterminate }">
                     <n-checkbox
                       v-model:checked="checkAll"
-                      label="全部"
+                      label="全选"
                       @update:checked="onCheckAllChange"
                       :indeterminate="indeterminate"
                     />
@@ -381,10 +381,10 @@ const indeterminate = computed(() => {
               :bordered="false"
             >
               <template #header-extra>
-                <span class="textbtnStyle" @click="clearDragSource">清空</span>
+                <span class="textbtnStyle" @click="clearDragSource">恢复默认</span>
               </template>
               <div>
-                <n-input placeholder="搜索关键字">
+                <n-input placeholder="搜索关键词">
                   <template #suffix>
                     <SvgIcon size="14px" name="magnifying-1" />
                   </template>
@@ -396,7 +396,7 @@ const indeterminate = computed(() => {
                     :class="{ fix: item.fix }"
                     class="cursor-move draggable-item"
                   >
-                    <span class="ml-2">{{ item.name }}</span>
+                    <span class="ml-2" style="color: #666;">{{ item.name }}</span>
                   </div>
                 </div>
                 <VueDraggable
@@ -429,7 +429,7 @@ const indeterminate = computed(() => {
       </div>
       <template #footer>
         <div class="wrapper-footer">
-          <n-button type="info" @click="handleSumbit"> 确认 </n-button>
+          <n-button type="info" @click="handleSumbit" style="background-color: #507AFD;"> 确定 </n-button>
           <n-button secondary style="margin-left: 15px" @click="getData();closeModal();">
             取消
           </n-button>
@@ -468,7 +468,7 @@ const indeterminate = computed(() => {
     font-size: 14px;
 
     &:before {
-      background-color: #1980ff;
+      background-color: #507AFD;
       content: "";
       width: 5px;
       border-radius: 2px;
@@ -558,4 +558,15 @@ const indeterminate = computed(() => {
 ::v-deep(.checkAll .n-checkbox-icon svg) {
   display: none !important;
 }
+::v-deep(.n-card-header__main){
+  color: #666 !important;
+}
+::v-deep(.n-button--secondary) {
+  background-color: #fff;
+  border: 1px solid #cad2dd !important;
+}
+::v-deep(.n-button--secondary):hover {
+  background-color: #fff !important;
+  border: 1px solid #cad2dd !important;
+}
 </style>
-- 
2.39.3


From 7c6ba84325da26147d8fac1590afc4d0bdbeae3c Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Wed, 3 Apr 2024 10:53:47 +0800
Subject: [PATCH 133/143] =?UTF-8?q?=E4=BB=BB=E5=8A=A1id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/comp/RepeatTaskTableModal.vue | 4 ++--
 src/views/final/content/Content.vue           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/final/comp/RepeatTaskTableModal.vue b/src/views/final/comp/RepeatTaskTableModal.vue
index 7adf491..951f9d7 100644
--- a/src/views/final/comp/RepeatTaskTableModal.vue
+++ b/src/views/final/comp/RepeatTaskTableModal.vue
@@ -64,12 +64,12 @@ const columns: DataTableColumns<RowData> = [
     title: '任务ID',
     key: 'id',
     fixed: 'left',
-    width: 180,
+    width: 200,
     ellipsis: {
       tooltip: true,
     },
     render(row: any) {
-      return row.fromtaskname
+      return row.pictureid
     },
   },
   {
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index 33e6ed6..101d3ec 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -278,7 +278,7 @@ async function formatColumns() {
             'text-color': '#507AFD',
             'onClick': () => goDetail(row),
           },
-          { default: () => row.fromtaskname },
+          { default: () => row.pictureid },
         )
       },
     }
@@ -570,7 +570,7 @@ function exportHandler() {
       '更新时间',
     ]
     const filterVal = [
-      'id',
+      'pictureid',
       'name',
       'approvalnode',
       'approvalstatus',
-- 
2.39.3


From 00b8a712a6ae50ae8c44d350fc18b4fb142e91f6 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Wed, 3 Apr 2024 11:28:13 +0800
Subject: [PATCH 134/143] =?UTF-8?q?fix:=20=E5=B1=95=E7=A4=BA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=8E=A5=E5=8F=A3=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=AD=97=E6=AE=B5=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/comp/RepeatTaskTableModal.vue |  2 +-
 src/views/final/content/Content.vue           | 12 +++++++-----
 src/views/final/index.vue                     |  3 ++-
 src/views/home/aside/comp/Search.vue          |  1 +
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/views/final/comp/RepeatTaskTableModal.vue b/src/views/final/comp/RepeatTaskTableModal.vue
index 951f9d7..496cb3d 100644
--- a/src/views/final/comp/RepeatTaskTableModal.vue
+++ b/src/views/final/comp/RepeatTaskTableModal.vue
@@ -69,7 +69,7 @@ const columns: DataTableColumns<RowData> = [
       tooltip: true,
     },
     render(row: any) {
-      return row.pictureid
+      return row.fromtaskid
     },
   },
   {
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index 101d3ec..e660239 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -248,9 +248,7 @@ async function getColumns() {
   // #endregion
 
   columnsRef.value.push(actionsColumns as any)
-  console.log(columnsRef.value, 'columnsRef111')
   formatColumns()
-  console.log(columnsRef.value, 'columnsRef222')
 }
 
 async function formatColumns() {
@@ -278,7 +276,7 @@ async function formatColumns() {
             'text-color': '#507AFD',
             'onClick': () => goDetail(row),
           },
-          { default: () => row.pictureid },
+          { default: () => row.fromtaskid },
         )
       },
     }
@@ -463,7 +461,7 @@ const dialog = useDialog()
 const message = useMessage()
 const finalStore = useFinal()
 
-async function query(page: number, pageSize: number, filterId?: any) {
+async function query(page: number, pageSize: number, filterId?: any,taskName?:string) {
   const asideParmas = unref(finalStore.getAsideValue)
   // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
   const params = filterId ? { userSearchId: filterId } : asideParmas
@@ -472,6 +470,7 @@ async function query(page: number, pageSize: number, filterId?: any) {
     pageSize,
     currPage: page,
     sortname: 'states',
+    taskName:taskName,
     ...params,
   })
   const { data, pageCount, totalCount } = result
@@ -801,8 +800,11 @@ async function refreshHandler(searchId?: any) {
 }
 
 function filterTableData(keyword) {
+  pagination.page = 1;
+  pagination.pageSize = 10;
   if (keyword)
-    tableData.value = tableData.value.filter(item => item.id.includes(keyword))
+    // tableData.value = tableData.value.filter(item => item.id.includes(keyword))
+    query(pagination.page, pagination.pageSize,'',keyword)
   else
     query(pagination.page, pagination.pageSize)
 }
diff --git a/src/views/final/index.vue b/src/views/final/index.vue
index f3b3415..f47cf36 100644
--- a/src/views/final/index.vue
+++ b/src/views/final/index.vue
@@ -5,9 +5,10 @@ import Content from './content/Content.vue'
 import ListContent from './content/ListContent.vue'
 
 const showList = ref(false);
-const contentRef = ref(null);
+const contentRef:any = ref(null);
 const inputChange = (keyword)=>{
   contentRef.value.filterTableData(keyword)
+  
 }
 
 </script>
diff --git a/src/views/home/aside/comp/Search.vue b/src/views/home/aside/comp/Search.vue
index df4acad..b0434f6 100644
--- a/src/views/home/aside/comp/Search.vue
+++ b/src/views/home/aside/comp/Search.vue
@@ -54,6 +54,7 @@ function selectHandler(item: SearchEntity) {
 // 模糊搜索
 const searchName = () => {
   configStore.setSearchValue(searchKeyword.value);
+  emit('inputChange',searchKeyword.value);
 }
 
 const close = () => {
-- 
2.39.3


From 0077860210fe7b9c15ef0860ba2f8206308e651c Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Wed, 3 Apr 2024 11:51:57 +0800
Subject: [PATCH 135/143] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=AB=98?=
 =?UTF-8?q?=E7=BA=A7=E7=AD=9B=E9=80=89=E6=90=9C=E7=B4=A2=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=90=8E=E6=8A=A5=E9=94=99bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/asideConfig.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/store/modules/asideConfig.ts b/src/store/modules/asideConfig.ts
index 81bcf4b..4fb75fb 100644
--- a/src/store/modules/asideConfig.ts
+++ b/src/store/modules/asideConfig.ts
@@ -34,7 +34,7 @@ export const useAsideConfigStore = defineStore({
       return this.customConfig
     },
     getAsideValue(): any {
-      return this.asideValue
+      return this.asideValue || {}
     },
     getSearchValue(): any {
       return this.searchValue
-- 
2.39.3


From 6ff6fe4bbe5f3b5933fc29517687e5ff26037dd9 Mon Sep 17 00:00:00 2001
From: wendong551 <1029218935@qq.com>
Date: Wed, 3 Apr 2024 12:01:57 +0800
Subject: [PATCH 136/143] =?UTF-8?q?fix:=20=E4=B8=80=E9=94=AE=E6=9F=A5?=
 =?UTF-8?q?=E9=87=8D=E4=B8=B4=E6=97=B6=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/content/Content.vue            |  2 +-
 .../home/content/modal/CheckingTaskModal.vue  | 22 ++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 6399f37..c7d31f0 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -387,7 +387,7 @@ async function commitHandler(settingParam) {
   modal.showModal();
   createPackage(params).then((res) => {
     if (res.code === "OK") {
-      message.success(res.data);
+      message.success(res.message);
       packageIdRef.value = res.data.id;
       modal.closeModal();
       finishModal.showModal();
diff --git a/src/views/home/content/modal/CheckingTaskModal.vue b/src/views/home/content/modal/CheckingTaskModal.vue
index 88b432b..4bdcbc8 100644
--- a/src/views/home/content/modal/CheckingTaskModal.vue
+++ b/src/views/home/content/modal/CheckingTaskModal.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { defineOptions, ref } from 'vue';
+import { defineOptions, onMounted, ref, onBeforeUnmount } from 'vue';
 import { useRouter } from 'vue-router';
 
 defineOptions({ name: 'ShortcutModal' })
@@ -36,16 +36,27 @@ function cancel() {
   closeModal()
   emit('cancel', true)
 }
-
+const time = ref();
+onMounted(() => {
+ time.value = setInterval(() => {
+//  console.log("00000000-----------");
+ show.value && refresh();
+}, 5000);
+});
+onBeforeUnmount(() => { 
+  clearInterval(time.value);
+ time.value = null;
+});
 defineExpose({
   showModal,
   closeModal
 })
 </script>
 
-<template>
+<template>  
   <div class="removeMask">
-    <n-modal v-model:show="show" :show-mask="false" :mask-closable="false" transform-origin="center" style="position: fixed;right: 0;bottom: 0;">
+    <!-- <n-modal v-model:show="show" :show-mask="false" :mask-closable="false" transform-origin="center" style="position: fixed;right: 0;bottom: 0;"> -->
+      <div v-if="show" style="position: fixed;right: 0;bottom: 0; float: left; z-index: 999;" >
       <n-card :style="cardStyle" :bordered="false" size="huge" role="dialog" aria-modal="true" style="padding: 8px 8px 0 8px;">
         <div class="wrapper">
           <div class="title">查重进度</div>
@@ -63,7 +74,8 @@ defineExpose({
           </div>
         </div>
       </n-card>
-    </n-modal>
+    </div>
+    <!-- </n-modal> -->
   </div>
 </template>
 
-- 
2.39.3


From eeded59b52f8aee6afa849ae13a393ccdf87cc51 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Wed, 3 Apr 2024 15:47:56 +0800
Subject: [PATCH 137/143] =?UTF-8?q?fix:=20=E4=B8=8B=E8=BD=BD=E9=AB=98?=
 =?UTF-8?q?=E6=B8=85=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/content/Content.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index c7d31f0..0c200d6 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -473,13 +473,13 @@ function sortHandler(orderby: "pictureResult" | "fromuptime") {
   refreshHandler();
 }
 async function downloadImage(item) {
-  if (!item.thumburl) {
+  if (!item.imgUrl) {
     message.error("请输入有效的图片链接地址");
     return;
   }
   try {
     // 使用 fetch 发送 GET 请求获取图片
-    const response = await fetch(item.thumburl, {
+    const response = await fetch(item.imgUrl, {
       method: "GET",
       mode: "cors", // 确保跨域请求被正确处理
       cache: "default",
-- 
2.39.3


From c77349eeaba09c603d4b193d4c8edef6315a74a2 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Wed, 3 Apr 2024 16:30:46 +0800
Subject: [PATCH 138/143] =?UTF-8?q?fix:=20=E6=89=BE=E5=9B=9E=E4=B8=A2?=
 =?UTF-8?q?=E5=A4=B1=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/worksheet/aside/Aside.vue | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/views/worksheet/aside/Aside.vue b/src/views/worksheet/aside/Aside.vue
index 85c8e21..db97734 100644
--- a/src/views/worksheet/aside/Aside.vue
+++ b/src/views/worksheet/aside/Aside.vue
@@ -1,16 +1,18 @@
 <script lang="ts" setup>
-import { debounce } from 'lodash-es'
+import { getAllfieldList, getfieldList } from "@/api/home/filter";
+import { useWindowSizeFn } from "@/hooks/event/useWindowSizeFn";
+import { useUser } from "@/store/modules/user";
+import { useWorkOrder } from "@/store/modules/workOrder";
+import { getViewportOffset } from "@/utils/domUtils";
+import { debounce } from 'lodash-es';
 import {
-computed,
-defineOptions,
+computed, defineEmits, defineOptions,
 inject,
 nextTick,
 onMounted,
 ref,
 unref,
-toRaw,
-watch,
-defineEmits
+watch
 } from "vue";
 import CustomFieldModalVue from "../modal/CustomFieldModal.vue";
 import WorkSheetList from "./WorkSheetList.vue";
-- 
2.39.3


From ce2973235bde923753372622ac3d3b4d385ef41f Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Wed, 3 Apr 2024 16:52:16 +0800
Subject: [PATCH 139/143] =?UTF-8?q?=E7=BB=88=E5=AE=A1=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icons/list-mode.svg      |  1 +
 src/views/final/content/Content.vue | 65 +++++++++++++++++++++++------
 2 files changed, 54 insertions(+), 12 deletions(-)
 create mode 100644 src/assets/icons/list-mode.svg

diff --git a/src/assets/icons/list-mode.svg b/src/assets/icons/list-mode.svg
new file mode 100644
index 0000000..bd22c1f
--- /dev/null
+++ b/src/assets/icons/list-mode.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1712133750226" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5038" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M725.328 682.672V640h85.344v42.672h42.656V768h-42.656v42.672h-85.344V768h-42.656v-85.328h42.656zM170.672 256h682.656v85.328H170.672V256z m0 426.672h426.656V768H170.672v-85.328z m0-213.344h682.656v85.344H170.672v-85.344z" p-id="5039" fill="#444444"></path></svg>
\ No newline at end of file
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index e660239..adb3866 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -51,6 +51,8 @@ const izstatusList = ref([])
 const router = useRouter()
 const route = useRoute()
 const reviewType = 0
+const sortorder = ref('asc')
+const sortname = ref('states')
 const actionsColumns = {
   title: '操作',
   key: 'actions',
@@ -384,6 +386,27 @@ async function formatColumns() {
       },
     }
   }
+  index = columnsRef.value.findIndex(v => v.title == '提报人')
+  if (index > -1) {
+    columnsRef.value[index] = {
+      title: '提报人',
+      key: columnsRef.value[index].key,
+      fixed: columnsRef.value[index].fixed || undefined,
+      width: 200,
+      sorter: 'default',
+      renderSorterIcon: ({ order }) => {
+        if (order === false)
+          return h(SvgIcon, { name: 'sort-2' })
+        if (order === 'ascend')
+          return h(SvgIcon, { name: 'sort-1' })
+        if (order === 'descend')
+          return h(SvgIcon, { name: 'sort-3' })
+      },
+      render(row: any) {
+        return row.fromusername
+      },
+    }
+  }
 
   index = columnsRef.value.findIndex(v => v.title == '更新时间')
   if (index > -1) {
@@ -461,16 +484,16 @@ const dialog = useDialog()
 const message = useMessage()
 const finalStore = useFinal()
 
-async function query(page: number, pageSize: number, filterId?: any,taskName?:string) {
+async function query(page: number, pageSize: number, filterId?: any, taskName?: string) {
   const asideParmas = unref(finalStore.getAsideValue)
   // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
   const params = filterId ? { userSearchId: filterId } : asideParmas
   const result = await getFinalList({
-    sortorder: 'asc',
+    sortorder: sortorder.value,
     pageSize,
     currPage: page,
-    sortname: 'states',
-    taskName:taskName,
+    sortname: sortname.value,
+    taskName,
     ...params,
   })
   const { data, pageCount, totalCount } = result
@@ -481,6 +504,23 @@ async function query(page: number, pageSize: number, filterId?: any,taskName?:st
   loading.value = false
 }
 
+async function handleSorterChange(value) {
+  console.log(value)
+  let name = value.columnKey
+  if (name === 'fromuptime')
+    name = 'field11'
+
+  else if (name === 'similarityscore')
+    name = 'similarity_score'
+
+  else if (name === 'fromusername')
+    name = 'fromuserid'
+
+  sortname.value = name
+  sortorder.value = value.order === 'ascend' ? 'asc' : 'desc'
+  refreshHandler()
+}
+
 async function handlePageChange(currentPage) {
   if (loading.value)
     return
@@ -800,11 +840,11 @@ async function refreshHandler(searchId?: any) {
 }
 
 function filterTableData(keyword) {
-  pagination.page = 1;
-  pagination.pageSize = 10;
+  pagination.page = 1
+  pagination.pageSize = 10
   if (keyword)
     // tableData.value = tableData.value.filter(item => item.id.includes(keyword))
-    query(pagination.page, pagination.pageSize,'',keyword)
+    query(pagination.page, pagination.pageSize, '', keyword)
   else
     query(pagination.page, pagination.pageSize)
 }
@@ -818,7 +858,7 @@ defineExpose({
     <div class="wrapper-header">
       <div class="wrapper-header-left">
         <span class="wrapper-header-font">任务管理列表</span>
-        <SvgIcon size="32" name="magnifying" @click="changeContent" />
+        <SvgIcon size="16" name="list-mode" @click="changeContent" />
       </div>
       <div>
         <SvgIcon
@@ -926,6 +966,7 @@ defineExpose({
         @update:page="handlePageChange"
         @update-page-size="handlePageSizeChange"
         @update:checked-row-keys="handleCheck"
+        @update:sorter="handleSorterChange"
       />
     </div>
 
@@ -1038,10 +1079,10 @@ defineExpose({
     }
 
     &-font {
-      font-size: 18px;
-      font-weight: bold;
-      color: #333333;
-      line-height: 25px;
+      font-size: 20px;
+      font-family: PingFang SC, PingFang SC-Medium;
+      font-weight: 600;
+      color: #0d0b22;
       margin-right: 8px;
     }
 
-- 
2.39.3


From d13f61e972bc6f3452bad823fb1107f15235c383 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Wed, 3 Apr 2024 17:04:03 +0800
Subject: [PATCH 140/143] =?UTF-8?q?feat:=20=E9=AB=98=E7=BA=A7=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E5=BC=B9=E7=AA=97=E5=88=97=E8=A1=A8=E4=B8=8E=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=81=94=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/comp/NewFilterModal.vue       |   2 +-
 src/views/home/aside/Aside.vue                | 255 ++++++++------
 src/views/home/aside/comp/AdvanceFilter.vue   |   8 +
 .../home/aside/comp/modals/FilterModal.vue    | 328 ++++++++++--------
 .../home/aside/comp/modals/NewFilterModal.vue |   2 +-
 src/views/task/modal/NewFilterModal.vue       |   2 +-
 src/views/worksheet/aside/Aside.vue           |   7 +-
 7 files changed, 336 insertions(+), 268 deletions(-)

diff --git a/src/views/final/comp/NewFilterModal.vue b/src/views/final/comp/NewFilterModal.vue
index f93a538..6fd919a 100644
--- a/src/views/final/comp/NewFilterModal.vue
+++ b/src/views/final/comp/NewFilterModal.vue
@@ -84,7 +84,7 @@ const formRef = ref<FormInst | null>(null)
 
 const formValue = reactive<FormType>({
   name: null,
-  logic: 'where',
+  logic: 'and',
   conditions: [{
     type: null,
     operator: 'eq',
diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue
index 0928ad9..adfc497 100644
--- a/src/views/home/aside/Aside.vue
+++ b/src/views/home/aside/Aside.vue
@@ -1,109 +1,125 @@
 <script lang="ts" setup>
-import { computed, inject, nextTick, onBeforeMount, onMounted, reactive, ref, shallowRef, unref, watch } from 'vue'
-import { CustomFilterModalVue, FilterModalVue, NewFilterModalVue } from './comp/modals'
-import Search from './comp/Search.vue'
-import AdvanceFilter from './comp/AdvanceFilter.vue'
-import { getViewportOffset } from '@/utils/domUtils'
-import { useWindowSizeFn } from '@/hooks/event/useWindowSizeFn'
-import { useConfig } from '@/store/modules/asideConfig'
-import type { Filter } from '/#/home'
-import type { AsideEntity } from '@/config/aside'
-import { asideMap } from '@/config/aside'
-import type { AsideConfig } from '/#/api'
-import emitter from '@/utils/mitt'
-import { getFilterList } from '@/api/home/main'
-import dayjs from 'dayjs'
-import { cloneDeep, isEqual } from 'lodash-es'
-
-const configStore = useConfig()
+import {
+  computed,
+  inject,
+  nextTick,
+  onBeforeMount,
+  onMounted,
+  reactive,
+  ref,
+  shallowRef,
+  unref,
+  watch,
+} from "vue";
+import { CustomFilterModalVue, FilterModalVue, NewFilterModalVue } from "./comp/modals";
+import Search from "./comp/Search.vue";
+import AdvanceFilter from "./comp/AdvanceFilter.vue";
+import { getViewportOffset } from "@/utils/domUtils";
+import { useWindowSizeFn } from "@/hooks/event/useWindowSizeFn";
+import { useConfig } from "@/store/modules/asideConfig";
+import type { Filter } from "/#/home";
+import type { AsideEntity } from "@/config/aside";
+import { asideMap } from "@/config/aside";
+import type { AsideConfig } from "/#/api";
+import emitter from "@/utils/mitt";
+import { getFilterList } from "@/api/home/main";
+import dayjs from "dayjs";
+import { cloneDeep, isEqual } from "lodash-es";
+
+const configStore = useConfig();
 
 // 所有左侧模块的值
-let asideValue: Record<keyof typeof asideMap, any> = reactive({})
+let asideValue: Record<keyof typeof asideMap, any> = reactive({});
 // 左侧某个模块是否显示: 显示需同时满足系统配置和个人配置
-const asideVisible: Partial<Record<keyof AsideConfig, boolean>> = reactive({})
+const asideVisible: Partial<Record<keyof AsideConfig, boolean>> = reactive({});
 // 当前显示的模块，按照数组顺序显示
-const showItems = shallowRef<{ key: string, config: AsideEntity }[]>([])
+const showItems = shallowRef<{ key: string; config: AsideEntity }[]>([]);
 
 Object.keys(asideMap).forEach((key) => {
-  const entity = asideMap[key]
-  const { defaultValue } = entity
-  asideValue[key] = defaultValue
-})
-
-const filterModalRef:any = ref(null)
-const newFilterModalRef = ref(null)
-const customModalRef = ref(null)
-const customObjRef = ref<any>(null) // 获取高级筛选获取的值
-const customTempObjRef = ref<any>(null) // 获取高级筛选获取的值(作对比)
-const configFilterRef = ref<any>([]) // 获取排序的值
+  const entity = asideMap[key];
+  const { defaultValue } = entity;
+  asideValue[key] = defaultValue;
+});
+
+const filterModalRef: any = ref(null);
+const newFilterModalRef = ref(null);
+const customModalRef = ref(null);
+const customObjRef = ref<any>(null); // 获取高级筛选获取的值
+const customTempObjRef = ref<any>(null); // 获取高级筛选获取的值(作对比)
+const configFilterRef = ref<any>([]); // 获取排序的值
+const AdvanceFilterRef: any = ref(null);
 
 function showModal(modalRef: any) {
-  const modal = unref(modalRef)! as any
-  modal.showModal()
+  const modal = unref(modalRef)! as any;
+  modal.showModal();
 }
 
 onMounted(() => {
   nextTick(() => {
-    computeSlideHeight()
+    computeSlideHeight();
     let tempAsideValue = cloneDeep(asideValue);
     // configStore.setAsideValue(tempAsideValue);
     console.log("asideMap和asideValue", tempAsideValue);
-  })
-})
+  });
+});
 
-const collapse = ref(false)
-const mousetrap = inject('mousetrap') as any
-mousetrap.bind('[', collapseHandler)
+const collapse = ref(false);
+const mousetrap = inject("mousetrap") as any;
+mousetrap.bind("[", collapseHandler);
 
 function collapseHandler() {
-  collapse.value = !collapse.value
+  collapse.value = !collapse.value;
 }
 
 const asideWidth = computed(() => {
-  return collapse.value ? 0 : 308
-})
+  return collapse.value ? 0 : 308;
+});
 
-const asideHeight = ref(500)
+const asideHeight = ref(500);
 const asideStyle = computed(() => {
   return {
     width: `${asideWidth.value}px`,
     height: `${asideHeight.value}px`,
-  }
-})
+  };
+});
 
 const collapseIcon = computed(() => {
-  return collapse.value ? 'expand-cir' : 'collapse-cir'
-})
+  return collapse.value ? "expand-cir" : "collapse-cir";
+});
 
 function computeSlideHeight() {
-  const headEl = document.querySelector('.aside-header')!
-  const { bottomIncludeBody } = getViewportOffset(headEl)
-  const height = bottomIncludeBody
-  asideHeight.value = height - 24
+  const headEl = document.querySelector(".aside-header")!;
+  const { bottomIncludeBody } = getViewportOffset(headEl);
+  const height = bottomIncludeBody;
+  asideHeight.value = height - 24;
 }
 
-useWindowSizeFn(computeSlideHeight, 280)
+useWindowSizeFn(computeSlideHeight, 280);
 
 onBeforeMount(async () => {
-  configStore.fetchConfig()
-  configStore.fetchCustomConfig()
-})
+  configStore.fetchConfig();
+  configStore.fetchCustomConfig();
+});
 
 configStore.$subscribe(() => {
-  const config = configStore.getConfig
-  const customConfig = configStore.getCustomConfig
-  if((configFilterRef.value.length > 0 && isEqual(configFilterRef.value, configStore.getFilterConfig)) && customObjRef.value && isEqual(customObjRef.value, customTempObjRef.value)) {
-    return
+  const config = configStore.getConfig;
+  const customConfig = configStore.getCustomConfig;
+  if (
+    configFilterRef.value.length > 0 &&
+    isEqual(configFilterRef.value, configStore.getFilterConfig) &&
+    customObjRef.value &&
+    isEqual(customObjRef.value, customTempObjRef.value)
+  ) {
+    return;
   }
-  if (config == null || customConfig == null)
-    return
+  if (config == null || customConfig == null) return;
   // console.log("config", config, "customConfig", customConfig);
   /* rao
   const showKeys = [...customConfig].filter(key => !asideMap[key].isDefaultFilter)// 获取customConfig 非isDefaultFilter的选项
   const defaultKeys = Object.keys(asideMap).filter(key => asideMap[key].isDefaultFilter)// 获取asideMap isDefaultFilter的选项
   showKeys.unshift(...defaultKeys)
   */
-  
+
   let sortKeyList: any = [];
   configStore.getFilterConfig.map((item: any) => {
     sortKeyList.push(item.id);
@@ -111,35 +127,37 @@ configStore.$subscribe(() => {
   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'
-  })
-  if(customObjRef.value) {// 赋值
-    Object.keys(customObjRef.value).map(key => {
-      if(asideMap.hasOwnProperty(key)) {
-        const str = key.toLowerCase()
+    if (key.startsWith("iz") && asideMap[key] !== undefined)
+      asideVisible[key] =
+        (showKeys.includes(key) || asideMap[key].isDefaultFilter) && config[key] === "Y";
+  });
+  if (customObjRef.value) {
+    // 赋值
+    Object.keys(customObjRef.value).map((key) => {
+      if (asideMap.hasOwnProperty(key)) {
+        const str = key.toLowerCase();
         // console.log("customObjRef.value[str]1111111111111", customObjRef.value[str]);
-        if(str == "izsimilarity") {
-          if(typeof customObjRef.value[str] == "string") {
-            customObjRef.value[str] = customObjRef.value[str].split(',');
+        if (str == "izsimilarity") {
+          if (typeof customObjRef.value[str] == "string") {
+            customObjRef.value[str] = customObjRef.value[str].split(",");
           }
-          asideValue[key] = customObjRef.value[str];// 赋值
+          asideValue[key] = customObjRef.value[str]; // 赋值
           console.log("相似度2222222222", asideValue[key]);
-        }else if(str == "izyear") {
-          if(typeof customObjRef.value[str] == "string") {
-            let time = customObjRef.value[str].split('-');
-            time[0] = (new Date(time[0])).getTime();
-            time[1] = (new Date(time[1])).getTime();
+        } else if (str == "izyear") {
+          if (typeof customObjRef.value[str] == "string") {
+            let time = customObjRef.value[str].split("-");
+            time[0] = new Date(time[0]).getTime();
+            time[1] = new Date(time[1]).getTime();
             customObjRef.value[str] = time;
           }
-          asideValue[key] = customObjRef.value[str];// 赋值
+          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);
-          asideValue[key] = customObjRef.value[str];// 赋值
-        }else {
+          asideValue[key] = customObjRef.value[str]; // 赋值
+        } else {
           asideValue[key] = null;
         }
         // asideMap[str].defaultValue = customObjRef.value[str];// 赋值
@@ -154,36 +172,35 @@ configStore.$subscribe(() => {
   }
   // console.log("showKeys", showKeys);
   const items = showKeys.reduce((acc, key) => {
-    const { render } = asideMap[key]
+    const { render } = asideMap[key];
 
     if (render !== false) {
-      const str = key.toLowerCase()
+      const str = key.toLowerCase();
 
       const o = {
         key: str,
         config: asideMap[str],
-      }
-      return [...acc, o]
+      };
+      return [...acc, o];
+    } else {
+      return acc;
     }
-    else {
-      return acc
-    }
-  }, [])
+  }, []);
   console.log("showItems=================================", items);
-  showItems.value = items
+  showItems.value = items;
   configFilterRef.value = configStore.getFilterConfig;
-})
+});
 
-const asideEnter = ref(false)
+const asideEnter = ref(false);
 
 const showCollapse = computed(() => {
-  return collapse.value ? true : asideEnter.value
-})
+  return collapse.value ? true : asideEnter.value;
+});
 
-const showSearch = ref(false)
+const showSearch = ref(false);
 
 function setShowSearch(value: boolean) {
-  showSearch.value = value
+  showSearch.value = value;
 }
 const newFilterOk = () => {
   filterModalRef.value.query(
@@ -194,21 +211,21 @@ const newFilterOk = () => {
 
 // 滚动容器，让key对应模块处于可视区域
 function scrollHandler(key: string) {
-  const element = document.querySelector(`#${key}`)
-  element?.scrollIntoView(true)
+  const element = document.querySelector(`#${key}`);
+  element?.scrollIntoView(true);
 }
 
 // 选择某个过滤配置，刷新图片墙 -> 筛选搜索条件
 async function filterHandler(searchId: string) {
   // emitter.emit('filter', searchId)
-  const res = await getFilterList({userSearchId: searchId});
+  const res = await getFilterList({ userSearchId: searchId });
   // console.log("顾虑结果", res);
-  if(res.code == "OK") {
+  if (res.code == "OK") {
     let obj = res.data;
     customObjRef.value = res.data;
     let showKeys: any[] = [];
-    Object.keys(obj).map(key => {
-      if(asideMap.hasOwnProperty(key)) {
+    Object.keys(obj).map((key) => {
+      if (asideMap.hasOwnProperty(key)) {
         showKeys.push(key);
       }
     });
@@ -218,9 +235,9 @@ async function filterHandler(searchId: string) {
 }
 
 function editFilter(filter: any) {
-  const modal = unref(newFilterModalRef)! as any
-  modal.showModal()
-  modal.edit(filter)
+  const modal = unref(newFilterModalRef)! as any;
+  modal.showModal();
+  modal.edit(filter);
 }
 
 function updateComponent(key, e) {
@@ -228,15 +245,26 @@ function updateComponent(key, e) {
   console.log("tempAsideValue跟新值", configStore.getAsideValue, asideValue);
   // let tempAsideValue = configStore.getAsideValue || asideValue;
   let tempobj = cloneDeep(asideValue);
-  console.log(tempobj,'tempobj')
+  console.log(tempobj, "tempobj");
   tempobj[key] = e;
-  console.log(tempobj, 'tempobj After')
+  console.log(tempobj, "tempobj After");
   customObjRef.value = tempobj;
   // asideValue = Object.assign({}, asideValue, tempobj);
   console.log("asideValue跟新值", tempobj);
   configStore.setAsideValue(tempobj);
 }
 
+const handleOk = (item: any) => {
+  console.log("handleOk", item);
+  if (item) {
+    AdvanceFilterRef.value.setCurrentlySelectedAdvanced(item.searchname);
+    filterHandler(item.id);
+  } else {
+    AdvanceFilterRef.value.setCurrentlySelectedAdvanced("高级筛选");
+    filterHandler("");
+  }
+};
+
 // watch(asideValue, (newVal) => {
 //   console.log("asideValue处理后", newVal);
 //   configStore.setAsideValue(newVal)
@@ -271,12 +299,18 @@ function updateComponent(key, e) {
           @update:search="setShowSearch(true)"
           @show-custom="showModal(customModalRef)"
           @show-filter="showModal(filterModalRef)"
+          ref="AdvanceFilterRef"
         />
       </div>
 
       <component
-        :is="item.config.component" v-for="(item, index) in showItems" :id="item.key" :key="item.key" v-model:value="asideValue[item.key]"
-        :label="item.config.label"  @update:value="e=>updateComponent(item.key, e)"
+        :is="item.config.component"
+        v-for="(item, index) in showItems"
+        :id="item.key"
+        :key="item.key"
+        v-model:value="asideValue[item.key]"
+        :label="item.config.label"
+        @update:value="(e) => updateComponent(item.key, e)"
       />
 
       <!-- 过滤列表 -->
@@ -284,6 +318,7 @@ function updateComponent(key, e) {
         ref="filterModalRef"
         @edit-filter="editFilter"
         @show-new-filter="showModal(newFilterModalRef)"
+        @handleOk="handleOk"
       />
       <!-- 新增过滤 -->
       <NewFilterModalVue ref="newFilterModalRef" @onOk="newFilterOk" />
diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue
index 8fee82e..1699974 100644
--- a/src/views/home/aside/comp/AdvanceFilter.vue
+++ b/src/views/home/aside/comp/AdvanceFilter.vue
@@ -253,6 +253,14 @@ const moveEnd = () => {
     sort(v.id, index);
   });
 };
+
+const setCurrentlySelectedAdvanced = (value:string)=>{
+  currentlySelectedAdvanced.value = value;
+}
+
+defineExpose({
+  setCurrentlySelectedAdvanced
+})
 </script>
 
 <template>
diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue
index 800dc4e..0173100 100644
--- a/src/views/home/aside/comp/modals/FilterModal.vue
+++ b/src/views/home/aside/comp/modals/FilterModal.vue
@@ -8,122 +8,123 @@ import {
   reactive,
   ref,
   unref,
-} from 'vue'
-import { NDataTable } from 'naive-ui'
-import type { DataTableColumns, DataTableRowKey } from 'naive-ui'
-import type { SortableEvent } from 'sortablejs'
-import Sortable from 'sortablejs'
-import { debounce } from 'lodash-es'
-import Action from '../Action.vue'
-import { deleteCondition, getConditionList, sort } from '@/api/home/filter'
-import type { FilterSearchParam } from '/#/api'
-
-defineOptions({ name: 'FilterModal' })
+} from "vue";
+import { NDataTable } from "naive-ui";
+import type { DataTableColumns, DataTableRowKey } from "naive-ui";
+import type { SortableEvent } from "sortablejs";
+import Sortable from "sortablejs";
+import { debounce } from "lodash-es";
+import Action from "../Action.vue";
+import { deleteCondition, getConditionList, sort } from "@/api/home/filter";
+import type { FilterSearchParam } from "/#/api";
+import selection from "naive-ui/es/_internal/selection";
+
+defineOptions({ name: "FilterModal" });
+const $message = window["$message"];
 
 const props = defineProps({
   type: {
     type: Number,
     default: () => 0,
   },
-})
+});
 
 const emit = defineEmits<{
-  (e: 'showNewFilter'): void
-  (e: 'editFilter', filter: any): void
-}>()
+  (e: "showNewFilter"): void;
+  (e: "editFilter", filter: any): void;
+  (e: "handleOk", item: any): void;
+}>();
 
-const show = ref(false)
+const show = ref(false);
 
 const cardStyle = {
-  'width': '800px',
-  'height': '830px',
-  '--n-padding-bottom': '10px',
-  '--n-padding-left': '10px',
-}
+  width: "800px",
+  height: "830px",
+  "--n-padding-bottom": "10px",
+  "--n-padding-left": "10px",
+};
 
 interface RowData {
-  id: string
-  searchname: string
-  createby: string
-  createtime: string
-  updateby: string
-  updatetime: string
+  id: string;
+  searchname: string;
+  createby: string;
+  createtime: string;
+  updateby: string;
+  updatetime: string;
 }
 
 function sortData(row) {
-  console.log('sortData', row)
-  if (row.order == 'descend') {
+  console.log("sortData", row);
+  if (row.order == "descend") {
     tableData.value.sort(
       (a, b) =>
-        new Date(a[row.columnKey]).getTime() - new Date(b[row.columnKey]).getTime(),
-    )
-  }
-  else if (row.order == 'ascend') {
+        new Date(a[row.columnKey]).getTime() - new Date(b[row.columnKey]).getTime()
+    );
+  } else if (row.order == "ascend") {
     tableData.value.sort(
       (a, b) =>
-        new Date(b[row.columnKey]).getTime() - new Date(a[row.columnKey]).getTime(),
-    )
-  }
-  else {
+        new Date(b[row.columnKey]).getTime() - new Date(a[row.columnKey]).getTime()
+    );
+  } else {
     tableData.value.sort(
-      (a, b) => Number((a as any).reorder) - Number((b as any).reorder),
-    )
+      (a, b) => Number((a as any).reorder) - Number((b as any).reorder)
+    );
   }
 }
 
 const columns: DataTableColumns<RowData> = [
   {
-    type: 'selection',
+    type: "selection",
   },
   {
-    title: '操作',
-    key: 'action',
+    title: "操作",
+    key: "action",
     render(row) {
       return h(Action, {
         options: [
-          { label: '编辑', key: 1 },
-          { label: '删除', key: 2 },
+          { label: "编辑", key: 1 },
+          { label: "删除", key: 2 },
         ],
         id: row.id,
         select,
-      })
+      });
     },
   },
   // j
   {
-    title: '名称',
-    key: 'searchname',
+    title: "名称",
+    key: "searchname",
     ellipsis: {
       tooltip: true,
     },
   },
   {
-    title: '创建者',
-    key: 'createby',
+    title: "创建者",
+    key: "createby",
   },
   {
-    title: '创建时间',
-    key: 'createtime',
+    title: "创建时间",
+    key: "createtime",
     width: 180,
     sorter: (row1, row2) => {
       // tableData.value.sort(
       //   (a, b) => new Date(a?.createtime).getTime() - new Date(b?.createtime).getTime()
       // );
-      return new Date(row1?.createtime).getTime() - new Date(row2?.createtime).getTime()
+      return new Date(row1?.createtime).getTime() - new Date(row2?.createtime).getTime();
     },
   },
   {
-    title: '更新者',
-    key: 'updateby',
+    title: "更新者",
+    key: "updateby",
   },
   {
-    title: '更新时间',
-    key: 'updatetime',
+    title: "更新时间",
+    key: "updatetime",
     width: 180,
   },
-]
-const total = ref(0)
-const loading = ref(true)
+];
+const total = ref(0);
+const loading = ref(true);
 const pagination = reactive({
   page: 1,
   pageCount: 1,
@@ -131,71 +132,75 @@ const pagination = reactive({
   showSizePicker: true,
   pageSizes: [
     {
-      label: '10 每页',
+      label: "10 每页",
       value: 10,
     },
     {
-      label: '15 每页',
+      label: "15 每页",
       value: 15,
     },
     {
-      label: '30 每页',
+      label: "30 每页",
       value: 30,
     },
     {
-      label: '50 每页',
+      label: "50 每页",
       value: 50,
     },
   ],
   showQuickJumper: true,
   prefix: () => `共 ${total.value} 条数据`,
-})
-const tableData = ref<Array<RowData>>([])
-const keyword = ref('')
+});
+const tableData = ref<Array<RowData>>([]);
+const keyword = ref("");
 
 async function query(page: number, pageSize: number) {
   const searchParam: FilterSearchParam = {
-    search_searchname: { value: keyword.value, op: 'like', type: 'string' },
-  }
-  const result = await getConditionList({ pageNo: page, pageSize }, searchParam, props.type)
-  const { data, pageCount, total: totalCount } = result
-  tableData.value = data
-  pagination.page = page
-  total.value = totalCount
-  pagination.pageCount = pageCount
-  loading.value = false
+    search_searchname: { value: keyword.value, op: "like", type: "string" },
+  };
+  const result = await getConditionList(
+    { pageNo: page, pageSize },
+    searchParam,
+    props.type
+  );
+  const { data, pageCount, total: totalCount } = result;
+  tableData.value = data;
+  pagination.page = page;
+  total.value = totalCount;
+  pagination.pageCount = pageCount;
+  loading.value = false;
 }
 
 function afterLeave() {
-  pagination.page = 1
-  pagination.pageCount = 1
-  pagination.pageSize = 10
+  pagination.page = 1;
+  pagination.pageCount = 1;
+  pagination.pageSize = 10;
 }
 
-const selectionIds = ref<DataTableRowKey[]>([])
+const selectionIds = ref<DataTableRowKey[]>([]);
 
-const rowKey = (row: RowData) => row.id
+const rowKey = (row: RowData) => row.id;
 
 function rowProps(row: RowData) {
   return {
-    'data-id': row.id,
-  }
+    "data-id": row.id,
+  };
 }
 
 function handleCheck(rowKeys: DataTableRowKey[]) {
-  selectionIds.value = rowKeys
+  selectionIds.value = rowKeys;
 }
 
 function select(key: number, id: string) {
   switch (key) {
     case 1:
-      editSelection(id)
-      break
+      editSelection(id);
+      break;
     case 2:
-      deleteSelection(id)
-      break
+      deleteSelection(id);
+      break;
     default:
-      break
+      break;
   }
 }
 
@@ -205,124 +210,137 @@ function editSelection(id) {
   //   $message.error("请选中一条过滤");
   //   return;
   // }
-  const selectedId = id
+  const selectedId = id;
   const selectedFilter = tableData.value.find((item: any) => {
-    return item.id === selectedId
-  })
+    return item.id === selectedId;
+  });
 
-  emit('editFilter', selectedFilter)
+  emit("editFilter", selectedFilter);
   // closeModal();
 }
 
-function deleteSelection(id = '') {
+function deleteSelection(id = "") {
   if (selectionIds.value.length === 0) {
     deleteCondition({ ids: id }).then(() => {
-      query(pagination.page, pagination.pageSize)
-    })
-    return
+      query(pagination.page, pagination.pageSize);
+    });
+    return;
   }
 
-  deleteCondition({ ids: selectionIds.value.join(',') }).then(() => {
-    selectionIds.value = []
-    query(pagination.page, pagination.pageSize)
-  })
+  deleteCondition({ ids: selectionIds.value.join(",") }).then(() => {
+    selectionIds.value = [];
+    query(pagination.page, pagination.pageSize);
+  });
 }
 
 async function handlePageChange(currentPage) {
-  if (loading.value)
-    return
-  pagination.page = currentPage
-  const { pageSize } = pagination
-  await query(currentPage, pageSize)
+  if (loading.value) return;
+  pagination.page = currentPage;
+  const { pageSize } = pagination;
+  await query(currentPage, pageSize);
 }
 
 async function handlePageSizeChange(currentPageSize) {
-  if (loading.value)
-    return
+  if (loading.value) return;
 
-  const { page } = pagination
-  pagination.pageSize = currentPageSize
-  await query(page, currentPageSize)
+  const { page } = pagination;
+  pagination.pageSize = currentPageSize;
+  await query(page, currentPageSize);
 }
 
 function handleClick() {
-  emit('showNewFilter')
+  emit("showNewFilter");
   // show.value = false;
 }
 
-let sortTable: Sortable | null = null
-const tableRef = ref<InstanceType<typeof NDataTable>>()
+let sortTable: Sortable | null = null;
+const tableRef = ref<InstanceType<typeof NDataTable>>();
 
 async function showModal() {
-  show.value = true
+  show.value = true;
 
-  const { page, pageSize } = pagination
-  await query(page, pageSize)
+  const { page, pageSize } = pagination;
+  await query(page, pageSize);
 
   nextTick(() => {
-    if (sortTable !== null)
-      destory()
-
-    const el: HTMLDivElement = tableRef.value?.$el
-    const tbody: HTMLElement | null = el.querySelector('tbody.n-data-table-tbody')!
-    if (tbody)
-      sortTable = Sortable.create(tbody, { onEnd, onMove })
-  })
+    if (sortTable !== null) destory();
+
+    const el: HTMLDivElement = tableRef.value?.$el;
+    const tbody: HTMLElement | null = el.querySelector("tbody.n-data-table-tbody")!;
+    if (tbody) sortTable = Sortable.create(tbody, { onEnd, onMove });
+  });
 }
-let relatedId = ''
-let insertafter = false
+let relatedId = "";
+let insertafter = false;
 
 // TODO: 有bug，需跟后端联调
 function onEnd(event: SortableEvent) {
-  const data = unref(tableData)
-  const oldElem = data[event.oldIndex!]
-  data.splice(event.oldIndex!, 1)
-  data.splice(event.newIndex!, 0, oldElem)
+  const data = unref(tableData);
+  const oldElem = data[event.oldIndex!];
+  data.splice(event.oldIndex!, 1);
+  data.splice(event.newIndex!, 0, oldElem);
 
-  const dragId = oldElem.id
+  const dragId = oldElem.id;
   const index = data.findIndex((item) => {
-    return item.id === relatedId
-  })
+    return item.id === relatedId;
+  });
 
   // 插入到元素后，索引-1；插入到元素前，索引+1
-  const order = insertafter ? index - 1 : index + 1
+  const order = insertafter ? index - 1 : index + 1;
   // console.log('dragid:', dragId, 'order:', order)
-  sort(dragId, order)
+  sort(dragId, order);
 }
 
 function onMove(evt: any) {
-  relatedId = evt.related?.dataset?.id
-  insertafter = evt.willInsertAfter
+  relatedId = evt.related?.dataset?.id;
+  insertafter = evt.willInsertAfter;
   // console.log(`你正在拖动：${evt.dragged.dataset.id},替换了：${evt.related}`, 'insertafter', evt.willInsertAfter)
 }
 
 function destory() {
-  sortTable && sortTable.destroy()
-  sortTable = null
+  sortTable && sortTable.destroy();
+  sortTable = null;
 }
 
 onUnmounted(() => {
-  destory()
-})
+  destory();
+});
 
 function closeModal() {
-  show.value = false
+  selectionIds.value = [];
+  show.value = false;
 }
 
 defineExpose({
   showModal,
   query,
   pagination,
-})
+});
 
 const inputHandler = debounce((word) => {
-  keyword.value = word
-  query(1, 5)
-}, 300)
+  keyword.value = word;
+  query(1, 5);
+}, 300);
 
 const showSearch = computed(() => {
-  return selectionIds.value.length > 0
-})
+  return selectionIds.value.length > 0;
+});
+
+const handleOk = () => {
+  if (selectionIds.value.length > 1) {
+    $message.error("只能选择一条筛选条件");
+    return;
+  }
+  if (selectionIds.value.length == 1) {
+    const selectedId = selectionIds.value[0];
+    let item = tableData.value.find(v=>v.id == selectedId);
+    emit("handleOk", item);
+  }
+  if (selectionIds.value.length == 0) {
+    emit("handleOk", "");
+  }
+  closeModal();
+};
 </script>
 
 <template>
@@ -348,7 +366,8 @@ const showSearch = computed(() => {
               <span
                 :style="{ 'margin-left': '18px', 'font-size': '16px' }"
                 class="wrapper-info-title"
-              >基本信息</span>
+                >基本信息</span
+              >
             </div>
           </div>
 
@@ -380,11 +399,13 @@ const showSearch = computed(() => {
               </n-button>
             </div>
             <div class="msg">
-              <span>已选中
+              <span
+                >已选中
                 <span style="color: #507afd; font-size: 16px">{{
                   selectionIds.length
                 }}</span>
-                项</span>
+                项</span
+              >
               <a @click="selectionIds = []">清空</a>
             </div>
           </div>
@@ -411,7 +432,7 @@ const showSearch = computed(() => {
         </div>
         <template #footer>
           <div class="wrapper-footer">
-            <n-button style="background-color: #507AFD;" type="info" @click="closeModal">
+            <n-button style="background-color: #507afd" type="info" @click="handleOk">
               确定
             </n-button>
             <n-button secondary style="margin-left: 15px" @click="closeModal">
@@ -489,11 +510,10 @@ const showSearch = computed(() => {
   font-weight: bold !important;
 }
 ::v-deep(table thead tr th) {
-    background-color: #FAFAFA !important;
+  background-color: #fafafa !important;
 }
 ::v-deep(.n-button--secondary) {
   background-color: #fff;
   border: 1px solid #cad2dd !important;
 }
-
 </style>
diff --git a/src/views/home/aside/comp/modals/NewFilterModal.vue b/src/views/home/aside/comp/modals/NewFilterModal.vue
index 2a76bc0..5404e7d 100644
--- a/src/views/home/aside/comp/modals/NewFilterModal.vue
+++ b/src/views/home/aside/comp/modals/NewFilterModal.vue
@@ -84,7 +84,7 @@ const formRef = ref<FormInst | null>(null)
 
 const formValue = reactive<FormType>({
   name: null,
-  logic: 'where',
+  logic: 'and',
   conditions: [
     {
       type: null,
diff --git a/src/views/task/modal/NewFilterModal.vue b/src/views/task/modal/NewFilterModal.vue
index 5bac79d..b873ad7 100644
--- a/src/views/task/modal/NewFilterModal.vue
+++ b/src/views/task/modal/NewFilterModal.vue
@@ -85,7 +85,7 @@ const formRef = ref<FormInst | null>(null);
 
 const formValue = reactive<FormType>({
   name: null,
-  logic: "where",
+  logic: "and",
   conditions: [
     {
       type: null,
diff --git a/src/views/worksheet/aside/Aside.vue b/src/views/worksheet/aside/Aside.vue
index 85c8e21..be318d6 100644
--- a/src/views/worksheet/aside/Aside.vue
+++ b/src/views/worksheet/aside/Aside.vue
@@ -1,5 +1,10 @@
 <script lang="ts" setup>
-import { debounce } from 'lodash-es'
+import { getAllfieldList, getfieldList } from "@/api/home/filter";
+import { useWindowSizeFn } from "@/hooks/event/useWindowSizeFn";
+import { useUser } from "@/store/modules/user";
+import { useWorkOrder } from "@/store/modules/workOrder";
+import { getViewportOffset } from "@/utils/domUtils";
+import { debounce } from "lodash-es";
 import {
 computed,
 defineOptions,
-- 
2.39.3


From 409528f0c54b0b9f883e6c9aa7a72c11c2a54942 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Wed, 3 Apr 2024 17:13:13 +0800
Subject: [PATCH 141/143] =?UTF-8?q?fix:=20=E5=88=9B=E5=BB=BA=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6=E6=97=B6=EF=BC=8C=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E9=A1=B9=E5=90=8E=E9=9D=A2=E7=9A=84=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E5=86=85=E5=AE=B9=E8=A6=81=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/comp/NewFilterModal.vue             | 1 +
 src/views/home/aside/comp/modals/NewFilterModal.vue | 1 +
 src/views/task/modal/NewFilterModal.vue             | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/views/final/comp/NewFilterModal.vue b/src/views/final/comp/NewFilterModal.vue
index 6fd919a..c95016b 100644
--- a/src/views/final/comp/NewFilterModal.vue
+++ b/src/views/final/comp/NewFilterModal.vue
@@ -278,6 +278,7 @@ defineExpose({
             >
               <n-select filterable
                 v-model:value="item.type" placeholder="请选择筛选项名称" :options="typeOptions"
+                @change="item.result = ''"
               />
               <n-select filterable
                 v-model:value="item.operator" style="margin-left: 8px;" placeholder="请选择"
diff --git a/src/views/home/aside/comp/modals/NewFilterModal.vue b/src/views/home/aside/comp/modals/NewFilterModal.vue
index 5404e7d..b0185e4 100644
--- a/src/views/home/aside/comp/modals/NewFilterModal.vue
+++ b/src/views/home/aside/comp/modals/NewFilterModal.vue
@@ -344,6 +344,7 @@ defineExpose({
                 filterable
                 placeholder="请选择筛选项名称"
                 :options="typeOptions"
+                @change="item.result = ''"
               />
               <n-select
                 v-model:value="item.operator"
diff --git a/src/views/task/modal/NewFilterModal.vue b/src/views/task/modal/NewFilterModal.vue
index b873ad7..bc7a681 100644
--- a/src/views/task/modal/NewFilterModal.vue
+++ b/src/views/task/modal/NewFilterModal.vue
@@ -307,6 +307,7 @@ defineExpose({
                 v-model:value="item.type"
                 placeholder="请选择筛选项名称"
                 :options="typeOptions"
+                @change="item.result = ''"
               />
               <n-select
                 filterable
-- 
2.39.3


From bad0992510b5fc19afd51203a5e9ca24baea2b5d Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Wed, 3 Apr 2024 19:26:13 +0800
Subject: [PATCH 142/143] =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=BA=BF=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/content/History.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/task/content/History.vue b/src/views/task/content/History.vue
index 9461c27..2453949 100644
--- a/src/views/task/content/History.vue
+++ b/src/views/task/content/History.vue
@@ -93,7 +93,7 @@ onMounted(() => {
             </div>
           </template>
         </n-timeline-item>
-        <n-timeline-item color="#507AFD">
+        <n-timeline-item color="#507AFD" class="second">
           <template #icon>
             <div class="point-empty" />
           </template>
@@ -145,6 +145,11 @@ onMounted(() => {
 <style lang="less" scoped>
   ::v-deep(.n-timeline-item-timeline__line) {
     width: 1px!important;
+    height: 56px!important;
+  }
+
+  ::v-deep(.second .n-timeline-item-timeline) {
+    top: 18px!important;
   }
 
   .card{
-- 
2.39.3


From 869095f1921a8943df7a7fb8449fe38c9b2356e5 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Wed, 3 Apr 2024 22:11:28 +0800
Subject: [PATCH 143/143] =?UTF-8?q?feat:=20=E4=B8=80=E9=94=AE=E6=9F=A5?=
 =?UTF-8?q?=E9=87=8D=E5=A2=9E=E5=8A=A0=E6=8F=90=E6=8A=A5=E4=BA=BAupUserNam?=
 =?UTF-8?q?e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/content/Content.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index 0c200d6..4d0d2cf 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -282,6 +282,9 @@ const gridHeight = computed(() => {
 
 async function oneCheck() {
   const asideVal = cloneDeep(configStore.getAsideValue);
+  asideVal.upUserName = searchValue.value;
+  console.log('searchValue', asideVal, searchValue.value)
+  
   if (asideVal.izyear && asideVal.izyear.length == 2) {
     asideVal.izyear =
       dayjs(asideVal.izyear[0]).format("YYYY/MM/DD") +
-- 
2.39.3