fix:全局样式问题调整

patches/naive-ui+2.38.1.patch

@@ -22,7 +22,7 @@ index 3aacec9..a63ab54 100644
 +            class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--error flex`
 +          }, [h('img', {
 +            style: { width: '1rem', height: '1rem' },
-+            src: 'http://47.93.59.251/api/upload/ocr/1713246379185_c.png'
++           src: '/src/assets/icons/notice.svg'
 +          }), feedbackNodes]) : mergedValidationStatus === 'success' ? h("div", {
              key: "controlled-success",
              class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--success`
@@ -179,7 +179,7 @@ index 4f47aad..6dae078 100644
                              const feedbackNodes = children || feedback ? ((0, vue_1.h)("div", { key: "__feedback__", class: `${mergedClsPrefix}-form-item-feedback__line` }, children || feedback)) : this.renderExplains.length ? ((_a = this.renderExplains) === null || _a === void 0 ? void 0 : _a.map(({ key, render }) => ((0, vue_1.h)("div", { key: key, class: `${mergedClsPrefix}-form-item-feedback__line` }, render())))) : null;
 -                            return feedbackNodes ? (mergedValidationStatus === 'warning' ? ((0, vue_1.h)("div", { key: "controlled-warning", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--warning` }, feedbackNodes)) : mergedValidationStatus === 'error' ? ((0, vue_1.h)("div", { key: "controlled-error", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--error` }, feedbackNodes)) : mergedValidationStatus === 'success' ? ((0, vue_1.h)("div", { key: "controlled-success", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--success` }, feedbackNodes)) : ((0, vue_1.h)("div", { key: "controlled-default", class: `${mergedClsPrefix}-form-item-feedback` }, feedbackNodes))) : null;
 +                            return feedbackNodes ? (mergedValidationStatus === 'warning' ? ((0, vue_1.h)("div", { key: "controlled-warning", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--warning` }, feedbackNodes)) : mergedValidationStatus === 'error' ? ((0, vue_1.h)("div", { key: "controlled-error", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--error flex` }, [h('img', {
-+                                style: { width: '1rem', height: '1rem' },src: 'http://47.93.59.251/api/upload/ocr/1711419313955_c.png'
++                                style: { width: '1rem', height: '1rem' },src: '/src/assets/icons/notice.svg'
 +                            }), feedbackNodes])) : mergedValidationStatus === 'success' ? ((0, vue_1.h)("div", { key: "controlled-success", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--success` }, feedbackNodes)) : ((0, vue_1.h)("div", { key: "controlled-default", class: `${mergedClsPrefix}-form-item-feedback` }, feedbackNodes))) : null;
                          });
                      }

src/assets/icons/notice.svg

@@ -0,0 +1,19 @@
+<?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(-664.000000, -6389.000000)">
+            <g id="警示" transform="translate(664.000000, 6389.000000)">
+                <mask id="mask-2" fill="white">
+                    <use xlink:href="#path-1"></use>
+                </mask>
+                <g id="蒙版"></g>
+                <path d="M32,4 C47.463973,4 60,16.536027 60,32 C60,47.463973 47.463973,60 32,60 C16.536027,60 4,47.463973 4,32 C4,16.536027 16.536027,4 32,4 Z M32,9 C19.2974508,9 9,19.2974508 9,32 C9,44.7025492 19.2974508,55 32,55 C44.7025492,55 55,44.7025492 55,32 C55,19.2974508 44.7025492,9 32,9 Z" id="形状结合" fill="#FF4E4F" mask="url(#mask-2)"></path>
+                <path d="M32,41.8150625 C33.5403559,41.8150625 34.7890611,43.0637676 34.7890611,44.6041236 C34.7890611,46.1444795 33.5403559,47.3931847 32,47.3931847 C30.4596441,47.3931847 29.2109389,46.1444795 29.2109389,44.6041236 C29.2109389,43.0637676 30.4596441,41.8150625 32,41.8150625 Z M33,16.6068153 C33.5522847,16.6068153 34,17.0545306 34,17.6068153 L34,36.7882606 C34,37.3405453 33.5522847,37.7882606 33,37.7882606 L31,37.7882606 C30.4477153,37.7882606 30,37.3405453 30,36.7882606 L30,17.6068153 C30,17.0545306 30.4477153,16.6068153 31,16.6068153 L33,16.6068153 Z" id="形状结合备份" fill="#FF4E4F" mask="url(#mask-2)"></path>
+            </g>
+        </g>
+    </g>
+</svg>

src/config/final.ts

@@ -1,6 +1,5 @@
-import type { AsideEntity } from './aside'
-import { IzApprovalStatus, IzCustomlevel, IzCustomname, IzCustomtype, IzProductVue, IzProjectVue, IzProjecttype, IzShowAll, IzStatus, IzVisitcity, IzfirmVue, IztaskrromVue, IzvisitproVue, PictureDownloadVue, PlanVue, ReportUserVue, TimeVue } from '@/views/home/aside/comp/items'
 import { defineAsyncComponent } from "vue"
+import type { AsideEntity } from './aside'
 
 export interface RowData {
   id: string
@@ -114,7 +113,7 @@ export const asideMap: Recordable<AsideEntity> = {
   izyear: {
     label: '提报时间',
     defaultValue: null,
-    isDefaultFilter: false,
+    isDefaultFilter: true,
     key: 'izyear',
     // component: TimeVue,
     component: defineAsyncComponent(() => import("@/views/home/aside/comp/items/Time.vue")),

src/layout/components/Header/RecycleModal.vue

@@ -723,7 +723,7 @@ watch(() => pagination.pageNo, (newVal, oldVal) => {
               </div>
             </div>
 
-            <div ref="el" class="scroll" :style="{ height: maxHeight }">
+            <div ref="el" class="scroll" :style="{ height: maxHeight,marginTop:'16px' }">
               <!-- <n-scrollbar :on-scroll="scrollHandler"> -->
               <div ref="masonryRef" class="grid">
                 <div
@@ -956,7 +956,7 @@ watch(() => pagination.pageNo, (newVal, oldVal) => {
         left: 16px;
         bottom: 16px;
         background: linear-gradient(180deg,rgba(6,0,0,0.01),rgba(0, 0, 0, 0.44) 100%);
-
+       border-radius: 0 0 7px 7px;
         .time-item {
           display: flex;
           align-items: center;

src/views/home/aside/comp/AdvanceFilter.vue

@@ -434,7 +434,7 @@ defineExpose({
   z-index: 10;
   background: #ffffff;
   left: 0;
-
+  top:0;
   &-left {
     display: flex;
     align-items: center;

src/views/home/aside/comp/modals/FilterModal.vue

@@ -610,4 +610,16 @@ function handleOk() {
 ::v-deep(.n-input .n-input__input-el) {
   height: 24px;
 }
+::v-deep(.n-dropdown){
+  width: 76px;
+height: 84px;
+background: #ffffff;
+box-shadow: 0px 2px 8px 0px rgba(0,0,0,0.15); 
+>div{
+  text-align: center;
+  height: 50%;
+  color: #666666;
+  border-bottom: 1px solid #eeeeee;
+}
+}
 </style>

src/views/worksheet/index.vue

@@ -41,4 +41,7 @@ const ApprovalOver = (packageId) => {
   box-sizing: border-box;
   width: 100%;
 }
+:deep(.ip_box){
+  z-index: 10;
+}
 </style>