From 8b9e13fc122b110eb18194e5bbb23e70ce731e8b Mon Sep 17 00:00:00 2001
From: lihui_ocr <lihui1@qq.com>
Date: Fri, 31 May 2024 08:13:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Search/Search.vue                    |  8 +++++---
 src/layout/components/Header/ShortcutModal.vue      |  2 +-
 src/layout/components/Header/index.vue              |  9 +++++++--
 src/views/final/comp/CustomFilterModalVue.vue       |  6 +++---
 src/views/final/comp/CustomTabelModal.vue           |  6 +++---
 src/views/final/comp/FilterModal.vue                |  2 +-
 src/views/final/comp/NewFilterModal.vue             | 13 ++-----------
 src/views/final/content/ListContent.vue             |  2 +-
 src/views/home/aside/comp/AdvanceFilter.vue         |  6 +++---
 src/views/home/aside/comp/Search.vue                |  4 ++--
 .../home/aside/comp/modals/CustomFilterModal.vue    |  4 ++--
 src/views/home/aside/comp/modals/FilterModal.vue    |  2 +-
 src/views/home/aside/comp/modals/NewFilterModal.vue | 12 +-----------
 src/views/message/content/List.vue                  |  4 +++-
 src/views/task/aside/Aside.vue                      |  4 ++--
 src/views/task/modal/CustomFieldModal.vue           |  4 ++--
 src/views/task/modal/NewFilterModal.vue             | 12 +-----------
 src/views/worksheet/aside/Aside.vue                 |  6 +++---
 src/views/worksheet/modal/CustomFieldModal.vue      |  4 ++--
 19 files changed, 45 insertions(+), 65 deletions(-)

diff --git a/src/components/Search/Search.vue b/src/components/Search/Search.vue
index 71f6546..0b531d2 100644
--- a/src/components/Search/Search.vue
+++ b/src/components/Search/Search.vue
@@ -118,9 +118,9 @@ onMounted(() => {
       >
         <template #prefix>
           <SvgIcon
-            name="magnifying-1"
-            width="21"
-            height="20"
+            name="magnifying-1-color999"
+            width="16"
+            height="16"
             style="margin: 10px 0 10px 4px"
           />
         </template>
@@ -179,6 +179,7 @@ onMounted(() => {
 
 <style lang="less" scoped>
 .input_wrap {
+
   // width: 60%;
   width: 808px;
   position: absolute;
@@ -292,4 +293,5 @@ onMounted(() => {
 .highlight {
   color: #507afd;
 }
+
 </style>
diff --git a/src/layout/components/Header/ShortcutModal.vue b/src/layout/components/Header/ShortcutModal.vue
index af841fc..277cf95 100644
--- a/src/layout/components/Header/ShortcutModal.vue
+++ b/src/layout/components/Header/ShortcutModal.vue
@@ -121,7 +121,7 @@ defineExpose({
           </div>
           <n-divider style="margin: 24px 24px 32px 24px; color: #d9d9d9" />
           <div class="title" style="margin-top: -16.5px">
-            任务审批/任务终审/AI工单明细动作
+            图检审批/任务审批/任务终审明细动作
           </div>
           <div class="wrapper-request">
             <table style="margin-left: 73px; width: 290px">
diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue
index 955fbc7..b6d0c12 100644
--- a/src/layout/components/Header/index.vue
+++ b/src/layout/components/Header/index.vue
@@ -66,7 +66,7 @@ export default defineComponent({
     // 图标列表mm
     const iconList = ref([
       {
-        icon: 'magnifying-1',
+        icon: 'magnifying-1-color999',
         handle: searchHandler,
       },
       {
@@ -342,12 +342,17 @@ height: 36px;" @click="closeModal">
   <RecycleModal ref="recycleModalRef" />
   <QuillModal ref="quillModalRef" />
   <ShortcutModal ref="shortcutModal" />
-  <SearchModal ref="SearchModalRef" />
+  <div class="ssss"><SearchModal ref="SearchModalRef" /></div>
    <TishiDialog  ref="tishiModalRef"  :label="'您确定要退出登录吗'" @tishiok="tishiok"/>
   
 </template>
 
 <style lang="less" scoped>
+.ssss{
+  ::v-deep .n-modal-mask{
+   background-color:transparent !important;
+  }
+}
 .layout-header {
   display: flex;
   justify-content: space-between;
diff --git a/src/views/final/comp/CustomFilterModalVue.vue b/src/views/final/comp/CustomFilterModalVue.vue
index 9464d44..479e279 100644
--- a/src/views/final/comp/CustomFilterModalVue.vue
+++ b/src/views/final/comp/CustomFilterModalVue.vue
@@ -413,7 +413,7 @@ onMounted(() => {
               <div class="input_wrap">
                 <n-input placeholder="搜索关键词" @input="leftInputHandler">
                   <template #suffix>
-                    <SvgIcon size="14px" name="magnifying-1-color999" />
+                    <SvgIcon size="16" name="magnifying-1-color999-color999" />
                   </template>
                 </n-input>
                 <n-scrollbar
@@ -464,7 +464,7 @@ onMounted(() => {
               <div class="input_wrap">
                 <n-input placeholder="搜索关键词" @input="rightInputHandler">
                   <template #suffix>
-                    <SvgIcon size="14px" name="magnifying-1-color999" />
+                    <SvgIcon size="16" name="magnifying-1-color999-color999" />
                   </template>
                 </n-input>
                 <n-scrollbar
@@ -484,7 +484,7 @@ onMounted(() => {
                       :draggable="true"
                       class="cursor-move draggable-li"
                     >
-                      <SvgIcon name="drag" size="24" />
+                      <SvgIcon name="drag" size="14" />
                       <span class="ml-2">{{ item.name }}</span>
                       <SvgIcon
                         v-if="!item.fix"
diff --git a/src/views/final/comp/CustomTabelModal.vue b/src/views/final/comp/CustomTabelModal.vue
index 6505e9b..7c8ef85 100644
--- a/src/views/final/comp/CustomTabelModal.vue
+++ b/src/views/final/comp/CustomTabelModal.vue
@@ -328,7 +328,7 @@ const indeterminate = computed(() => {
               <div class="left">
                 <n-input placeholder="搜索关键字">
                   <template #suffix>
-                    <SvgIcon size="14px" name="magnifying-1" color="#999999" />
+                    <SvgIcon size="16" name="magnifying-1-color999" color="#999999" />
                   </template>
                 </n-input>
                 <div class="draggable-ul left-wrap">
@@ -374,7 +374,7 @@ const indeterminate = computed(() => {
               <div style="height:477px;  border: 1px solid #cad2dd !important;; overflow:auto">
                 <n-input placeholder="搜索关键字">
                   <template #suffix>
-                    <SvgIcon size="14px" name="magnifying-1" />
+                    <SvgIcon size="16" name="magnifying-1-color999" />
                   </template>
                 </n-input>
                 <div class="drag-wrapper">
@@ -452,7 +452,7 @@ const indeterminate = computed(() => {
           <n-button  style="background-color: #507afd;width: 72px;height: 38px;" type="info" @click="handleSumbit">
             确定
           </n-button>
-          <n-button secondary  style="margin-left: 15px ;width: 72px;height: 38px;" @click="closeModal">
+          <n-button secondary  style="margin-left: 15px ;width: 72px;height: 38px;background:#ffffff" @click="closeModal">
             取消
           </n-button>
         </div>
diff --git a/src/views/final/comp/FilterModal.vue b/src/views/final/comp/FilterModal.vue
index ad07e98..98b66d6 100644
--- a/src/views/final/comp/FilterModal.vue
+++ b/src/views/final/comp/FilterModal.vue
@@ -392,7 +392,7 @@ function handleOk() {
               @input="inputHandler"
             >
               <template #suffix>
-                <SvgIcon size="14px" name="magnifying-1" />
+                <SvgIcon size="16" name="magnifying-1-color999" />
               </template>
             </n-input>
             <NButton type="info" @click="handleClick">
diff --git a/src/views/final/comp/NewFilterModal.vue b/src/views/final/comp/NewFilterModal.vue
index 39edb56..b69c114 100644
--- a/src/views/final/comp/NewFilterModal.vue
+++ b/src/views/final/comp/NewFilterModal.vue
@@ -67,17 +67,8 @@ const rules: FormRules = {
     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'],
+   // required: true,
+  
   },
 }
 
diff --git a/src/views/final/content/ListContent.vue b/src/views/final/content/ListContent.vue
index 19ad01e..b49cc29 100644
--- a/src/views/final/content/ListContent.vue
+++ b/src/views/final/content/ListContent.vue
@@ -699,7 +699,7 @@ defineExpose({
       <div class="checking">—</div>全选
    </div>
       <div style="width: 3vw">
-        <!-- <SvgIcon name="magnifying-1" size="18" style="margin-right: 8px" />
+        <!-- <SvgIcon name="magnifying-1-color999" size="18" style="margin-right: 8px" />
         <SvgIcon
           style="cursor: pointer"
           size="18"
diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue
index 0c9d662..b554a8e 100644
--- a/src/views/home/aside/comp/AdvanceFilter.vue
+++ b/src/views/home/aside/comp/AdvanceFilter.vue
@@ -344,7 +344,7 @@ defineExpose({
                   @input="inputHandler"
                 >
                   <template #prefix>
-                    <SvgIcon size="14px" name="magnifying-1" />
+                    <SvgIcon size="16" name="magnifying-1-color999" />
                   </template>
                   <template #suffix>
                     <SvgIcon
@@ -450,8 +450,8 @@ defineExpose({
     <div class="wrapper-right">
       <SvgIcon
         style="display: block; cursor: pointer"
-        size="18"
-        name="magnifying-1"
+        size="16"
+        name="magnifying-1-color999"
         @click="emit('update:search')"
       />
 
diff --git a/src/views/home/aside/comp/Search.vue b/src/views/home/aside/comp/Search.vue
index 3fe67d5..0b0efc8 100644
--- a/src/views/home/aside/comp/Search.vue
+++ b/src/views/home/aside/comp/Search.vue
@@ -117,8 +117,8 @@ onMounted(() => {
         >
           <template #suffix>
             <SvgIcon
-              size="14px"
-              name="magnifying-1"
+              size="16"
+              name="magnifying-1-color999"
               style="cursor: pointer"
               @click="searchName"
             />
diff --git a/src/views/home/aside/comp/modals/CustomFilterModal.vue b/src/views/home/aside/comp/modals/CustomFilterModal.vue
index 0f6922b..71243a3 100644
--- a/src/views/home/aside/comp/modals/CustomFilterModal.vue
+++ b/src/views/home/aside/comp/modals/CustomFilterModal.vue
@@ -370,7 +370,7 @@ onMounted(() => {
               <div class="input_wrap">
                 <n-input placeholder="搜索关键词" @input="leftInputHandler">
                   <template #suffix>
-                    <SvgIcon size="14px" name="magnifying-1-color999" />
+                    <SvgIcon size="16" name="magnifying-1-color999-color999" />
                   </template>
                 </n-input>
                 <n-scrollbar
@@ -421,7 +421,7 @@ onMounted(() => {
               <div class="input_wrap">
                 <n-input placeholder="搜索关键词" @input="rightInputHandler">
                   <template #suffix>
-                    <SvgIcon size="14px" name="magnifying-1-color999" />
+                    <SvgIcon size="16" name="magnifying-1-color999-color999" />
                   </template>
                 </n-input>
                 <n-scrollbar
diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue
index 551c645..67af09d 100644
--- a/src/views/home/aside/comp/modals/FilterModal.vue
+++ b/src/views/home/aside/comp/modals/FilterModal.vue
@@ -432,7 +432,7 @@ function handleOk() {
               @input="inputHandler"
             >
               <template #suffix>
-                <SvgIcon size="14px" name="magnifying-1" />
+                <SvgIcon size="16" name="magnifying-1-color999" />
               </template>
             </n-input>
             <n-button type="info" @click="handleClick">
diff --git a/src/views/home/aside/comp/modals/NewFilterModal.vue b/src/views/home/aside/comp/modals/NewFilterModal.vue
index ddab4c3..2592691 100644
--- a/src/views/home/aside/comp/modals/NewFilterModal.vue
+++ b/src/views/home/aside/comp/modals/NewFilterModal.vue
@@ -69,17 +69,7 @@ const rules: FormRules = {
     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'],
+  
   },
 }
 
diff --git a/src/views/message/content/List.vue b/src/views/message/content/List.vue
index 4b2e0ac..dcf587a 100644
--- a/src/views/message/content/List.vue
+++ b/src/views/message/content/List.vue
@@ -231,7 +231,9 @@ console.log(tabList)
   box-sizing: border-box;
   background: #fff;
   border-radius: 3px;
-  height: calc(100vh - 88px);
+  height: calc(100vh - 80px);
+  margin-left: 16px;
+  margin-right: 16px;
   position: relative;
 
   .header {
diff --git a/src/views/task/aside/Aside.vue b/src/views/task/aside/Aside.vue
index 7a89552..1056127 100644
--- a/src/views/task/aside/Aside.vue
+++ b/src/views/task/aside/Aside.vue
@@ -261,7 +261,7 @@ function handleOk(item: any) {
           <SvgIcon
             style="cursor: pointer; margin-left: 10px"
             size="18"
-            name="magnifying-1"
+            name="magnifying-1-color999"
             @click="setShowSearch(true)"
           />
           <SvgIcon
@@ -294,7 +294,7 @@ function handleOk(item: any) {
           @input="inputHandler"
         >
           <template #suffix>
-            <SvgIcon size="14px" name="magnifying-1" />
+            <SvgIcon size="16" name="magnifying-1-color999" />
           </template>
         </n-input>
         <SvgIcon
diff --git a/src/views/task/modal/CustomFieldModal.vue b/src/views/task/modal/CustomFieldModal.vue
index ccd1087..ba6fb5e 100644
--- a/src/views/task/modal/CustomFieldModal.vue
+++ b/src/views/task/modal/CustomFieldModal.vue
@@ -383,7 +383,7 @@ const moreThanSix = computed(() => {
                   @input="(value) => queryData(value, 'off')"
                 >
                   <template #suffix>
-                    <SvgIcon size="14px" name="magnifying-1" />
+                    <SvgIcon size="16" name="magnifying-1-color999" />
                   </template>
                 </n-input>
                 <div class="draggable-ul">
@@ -432,7 +432,7 @@ const moreThanSix = computed(() => {
                   @input="(value) => queryData(value, 'on')"
                 >
                   <template #suffix>
-                    <SvgIcon size="14px" name="magnifying-1" />
+                    <SvgIcon size="16" name="magnifying-1-color999" />
                   </template>
                 </n-input>
                 <div class="draggable-title">
diff --git a/src/views/task/modal/NewFilterModal.vue b/src/views/task/modal/NewFilterModal.vue
index a6ae62f..a30033b 100644
--- a/src/views/task/modal/NewFilterModal.vue
+++ b/src/views/task/modal/NewFilterModal.vue
@@ -66,17 +66,7 @@ const rules: FormRules = {
     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'],
+   
   },
 }
 
diff --git a/src/views/worksheet/aside/Aside.vue b/src/views/worksheet/aside/Aside.vue
index e974633..271f1cd 100644
--- a/src/views/worksheet/aside/Aside.vue
+++ b/src/views/worksheet/aside/Aside.vue
@@ -209,8 +209,8 @@ if (searchContent) {
         <div class="right">
           <SvgIcon
             style="cursor: pointer; margin-left: 10px"
-            size="18"
-            name="magnifying-1"
+            size="16"
+            name="magnifying-1-color999"
             @click="setShowSearch(true)"
           />
 
@@ -231,7 +231,7 @@ if (searchContent) {
           @input="inputHandler"
         >
           <template #suffix>
-            <SvgIcon size="14px" name="magnifying-1" />
+            <SvgIcon size="16" name="magnifying-1-color999" />
           </template>
         </n-input>
         <SvgIcon
diff --git a/src/views/worksheet/modal/CustomFieldModal.vue b/src/views/worksheet/modal/CustomFieldModal.vue
index 45e9cac..80f6e4d 100644
--- a/src/views/worksheet/modal/CustomFieldModal.vue
+++ b/src/views/worksheet/modal/CustomFieldModal.vue
@@ -353,7 +353,7 @@ const indeterminate = computed(() => {
               <div class="left">
                 <n-input v-model:value="searchKey" placeholder="搜索关键词">
                   <template #suffix>
-                    <SvgIcon size="14px" name="magnifying-1" />
+                    <SvgIcon size="16" name="magnifying-1-color999" />
                   </template>
                 </n-input>
                 <div class="draggable-ul">
@@ -400,7 +400,7 @@ const indeterminate = computed(() => {
               <div class="overstyle">
                 <n-input v-model:value="searchFixVal" placeholder="搜索关键词">
                   <template #suffix>
-                    <SvgIcon size="14px" name="magnifying-1" />
+                    <SvgIcon size="16" name="magnifying-1-color999" />
                   </template>
                 </n-input>
                 <div class="titletwo">系统默认</div>
-- 
2.39.3