src/assets/icons/modal_reImg.svg

@@ -1,58 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>编组 33</title>
+<svg width="64px" height="76px" viewBox="0 0 64 76" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 55</title>
     <defs>
-        <rect id="path-1" x="0" y="0" width="32" height="32"></rect>
+        <rect id="path-1" x="0" y="0" width="42.6099724" height="42.6666667"></rect>
         <linearGradient x1="103.941749%" y1="-9.86447236%" x2="15.6759798%" y2="100%" id="linearGradient-3">
             <stop stop-color="#94B3FF" offset="0%"></stop>
             <stop stop-color="#3955FF" offset="100%"></stop>
         </linearGradient>
-        <path d="M4.81965071,11.9835294 C4.81965071,18.6007843 10.107091,23.964183 16.6334651,23.964183 C23.1570041,23.964183 28.4444444,18.6007843 28.4444444,11.9835294 C28.4444444,5.36339869 23.1570041,0 16.6334651,0 C10.107091,0 4.81965071,5.36339869 4.81965071,11.9835294 Z" id="path-4"></path>
+        <path d="M6.42620094,15.9780392 C6.42620094,24.8010458 13.4761214,31.952244 22.1779535,31.952244 C30.8760055,31.952244 37.9259259,24.8010458 37.9259259,15.9780392 C37.9259259,7.15119826 30.8760055,0 22.1779535,0 C13.4761214,0 6.42620094,7.15119826 6.42620094,15.9780392 Z" id="path-4"></path>
         <filter x="0.0%" y="0.0%" width="100.0%" height="100.0%" filterUnits="objectBoundingBox" id="filter-5">
             <feOffset dx="0" dy="0" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
             <feColorMatrix values="0 0 0 0 0.328065454   0 0 0 0 0.41948512   0 0 0 0 1  0 0 0 1 0" type="matrix" in="shadowOffsetOuter1"></feColorMatrix>
         </filter>
-        <rect id="path-6" x="0" y="0" width="28.3508865" height="28.7581699"></rect>
-        <path d="M2.26807092,15.4345098 C2.26807092,22.0517647 7.55551126,27.4151634 14.0818853,27.4151634 C20.6054243,27.4151634 25.8928647,22.0517647 25.8928647,15.4345098 C25.8928647,8.81437908 20.6054243,3.45098039 14.0818853,3.45098039 C7.55551126,3.45098039 2.26807092,8.81437908 2.26807092,15.4345098 Z" id="path-8"></path>
+        <rect id="path-6" x="0" y="0" width="37.801182" height="38.3442266"></rect>
+        <path d="M3.02409456,20.5793464 C3.02409456,29.4023529 10.074015,36.5535512 18.7758471,36.5535512 C27.4738991,36.5535512 34.5238195,29.4023529 34.5238195,20.5793464 C34.5238195,11.7525054 27.4738991,4.60130719 18.7758471,4.60130719 C10.074015,4.60130719 3.02409456,11.7525054 3.02409456,20.5793464 Z" id="path-8"></path>
         <linearGradient x1="50.4938081%" y1="35.9999974%" x2="0%" y2="114.811198%" id="linearGradient-9">
             <stop stop-color="#FFFFFF" offset="0%"></stop>
             <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
         </linearGradient>
         <filter x="-338.5%" y="-333.7%" width="776.9%" height="767.3%" filterUnits="objectBoundingBox" id="filter-10">
-            <feGaussianBlur stdDeviation="5.75725631" in="SourceGraphic"></feGaussianBlur>
+            <feGaussianBlur stdDeviation="7.67634174" in="SourceGraphic"></feGaussianBlur>
         </filter>
     </defs>
-    <g id="-index备份" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="index_1.0备份-21" transform="translate(-836.000000, -367.000000)">
-            <g id="编组-8备份-2" transform="translate(473.000000, 206.000000)">
-                <g id="画板-8" transform="translate(28.881832, 57.745953)">
-                    <g id="画板-4" transform="translate(236.118168, 103.254047)">
-                        <g id="编组-54备份" transform="translate(98.000000, 0.000000)">
-                            <g id="编组-26" transform="translate(0.063866, 1.000000)">
-                                <path d="M48,24 C48,37.2548455 37.2548455,48 24,48 C10.7451553,48 0,37.2548455 0,24 C0,10.7451553 10.7451553,0 24,0 C37.2548455,0 48,10.7451553 48,24 C48,24 48,24 48,24 Z" id="Ellipse-930" fill="#E9EEFF" fill-rule="nonzero"></path>
-                                <g id="Group-1" transform="translate(7.936134, 8.000000)">
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="无法上传iconfont" transform="translate(-960.000000, -1491.000000)">
+            <g id="编组-55" transform="translate(960.000000, 1491.000000)">
+                <path d="M64,32 C64,49.6731274 49.6921898,64 32.0425773,64 C14.3929658,64 0.0851545203,49.6731274 0.0851545203,32 C0.0851545203,14.3268738 14.3929658,0 32.0425773,0 C49.6921898,0 64,14.3268738 64,32 C64,32 64,32 64,32 Z" id="Ellipse-930" fill="#E9EEFF" fill-rule="nonzero"></path>
+                <g id="Frame-4273186251">
+                    <rect fill-rule="nonzero" x="0" y="0" width="58.5887121" height="58.6666667"></rect>
+                    <g id="Group-194756" transform="translate(18.641863, 18.666667)"></g>
+                </g>
+                <g id="Group-1" transform="translate(10.652493, 10.666667)">
                     <mask id="mask-2" fill="white">
                         <use xlink:href="#path-1"></use>
                     </mask>
                     <g id="蒙版"></g>
-                                    <g transform="translate(0.888889, 1.777778)">
+                    <g transform="translate(1.185185, 2.370370)">
                         <g id="路径">
                             <use fill="black" fill-opacity="1" filter="url(#filter-5)" xlink:href="#path-4"></use>
                             <use fill="url(#linearGradient-3)" fill-rule="evenodd" xlink:href="#path-4"></use>
                         </g>
-                                        <g id="user-person-profile-block-account-circle-svgrepo-com-1" transform="translate(0.000000, 0.575163)">
+                        <g id="user-person-profile-block-account-circle-svgrepo-com-1" transform="translate(0.000000, 0.766885)">
                             <mask id="mask-7" fill="white">
                                 <use xlink:href="#path-6"></use>
                             </mask>
                             <g id="路径"></g>
-                                            <path id="路径" d="M14.0818853,3.20098039 C20.7447477,3.20098039 26.1428647,8.67755358 26.1428647,15.4345098 C26.1428647,22.189044 20.7443,27.6651634 14.0818853,27.6651634 C7.41708336,27.6651634 2.01807092,22.1894977 2.01807092,15.4345098 C2.01807092,8.6770998 7.41663558,3.20098039 14.0818853,3.20098039 Z M14.0818853,3.70098039 C7.69438694,3.70098039 2.51807092,8.95165837 2.51807092,15.4345098 C2.51807092,21.9149209 7.69481587,27.1651634 14.0818853,27.1651634 C20.4665486,27.1651634 25.6428647,21.9144854 25.6428647,15.4345098 C25.6428647,8.9520939 20.4669775,3.70098039 14.0818853,3.70098039 Z" fill="#FFFFFF" fill-rule="nonzero"></path>
-                                            <path d="M11.3638777,13.9269889 C11.5944007,13.9269889 11.7907721,14.0082723 11.9529919,14.1708392 C12.1152118,14.333406 12.1963217,14.5301975 12.1963217,14.7612135 C12.1963217,14.9836734 12.1152118,15.1783258 11.9529919,15.3451707 C11.7907721,15.5120157 11.5944007,15.5954381 11.3638777,15.5954381 C11.1333548,15.5954381 10.9369834,15.5120157 10.7747636,15.3451707 C10.6125437,15.1783258 10.5314338,14.9836734 10.5314338,14.7612135 C10.5314338,14.5301975 10.6125437,14.333406 10.7747636,14.1708392 C10.9369834,14.0082723 11.1333548,13.9269889 11.3638777,13.9269889 Z M17.8185202,9.13982315 C18.1941872,9.13982315 18.5271648,9.20613331 18.817453,9.33875363 C19.1077411,9.47137395 19.3532054,9.64249695 19.5538457,9.85212262 C19.7544861,10.0617483 19.908168,10.2991814 20.0148916,10.5644221 C20.1216152,10.8296627 20.174977,11.0906253 20.174977,11.3473098 L20.174977,17.9055986 C20.174977,18.10239 20.1301531,18.2949034 20.0405053,18.4831387 C19.9508575,18.671374 19.8313271,18.8424969 19.681914,18.9965076 C19.532501,19.1505183 19.3617433,19.2745825 19.1696408,19.3687002 C18.9775384,19.4628178 18.7790325,19.5098766 18.5741232,19.5098766 L18.5741232,12.3355451 C18.5741232,12.1130852 18.5314338,11.9055986 18.4460549,11.7130852 C18.360676,11.5205718 18.2454146,11.3515879 18.1002705,11.2061333 C17.9551264,11.0606788 17.7865031,10.9451707 17.5944007,10.8596092 C17.4022982,10.7740478 17.1952545,10.731267 16.9732694,10.731267 L9.77583079,10.731267 C9.77583079,10.5430317 9.81852022,10.3547964 9.90389909,10.1665611 C9.98927796,9.97832582 10.1045394,9.80720283 10.2496835,9.65319214 C10.3948276,9.49918144 10.5655853,9.37511727 10.7619567,9.28099962 C10.9583281,9.18688197 11.1675064,9.13982315 11.3894914,9.13982315 L17.8185202,9.13982315 L17.8185202,9.13982315 Z M16.704326,11.5398232 C17.0885309,11.5398232 17.3617433,11.644636 17.5239631,11.8542617 C17.686183,12.0638873 17.7672929,12.3441012 17.7672929,12.6949034 L17.7672929,20.2542617 C17.7672929,20.4681654 17.6776451,20.6692349 17.4983495,20.8574702 C17.3190538,21.0457055 17.0927998,21.1398232 16.8195875,21.1398232 L9.05864829,21.1398232 C8.82812535,21.1398232 8.62321606,21.0457055 8.44392044,20.8574702 C8.26462481,20.6692349 8.174977,20.4424969 8.174977,20.1772563 L8.174977,12.4767215 C8.174977,12.2029248 8.24968351,11.9783258 8.39909653,11.8029248 C8.54850955,11.6275237 8.74701542,11.5398232 8.99461414,11.5398232 L16.704326,11.5398232 Z M16.1792459,13.4906253 C16.1792459,13.3965076 16.1493633,13.3195023 16.0895981,13.2596092 C16.0298329,13.1997162 15.9529919,13.1697697 15.8590752,13.1697697 L10.0831947,13.1697697 C9.98927796,13.1697697 9.91243698,13.1997162 9.85267177,13.2596092 C9.79290656,13.3195023 9.76302396,13.3965076 9.76302396,13.4906253 L9.76302396,16.3526574 C9.83986494,16.446775 9.91030251,16.5515879 9.97433666,16.6670959 C10.0383708,16.7826039 10.1173463,16.8916948 10.211263,16.9943686 C10.3051798,17.0970424 10.4289791,17.1847429 10.5826611,17.2574702 C10.7363431,17.3301975 10.9497902,17.3665611 11.2230026,17.3665611 C11.6242833,17.3665611 11.9508575,17.30239 12.2027251,17.1740478 C12.4545928,17.0457055 12.6765779,16.8831387 12.8686803,16.6863472 C13.0607828,16.4895558 13.2400784,16.2777911 13.4065672,16.0510531 C13.573056,15.8243151 13.7715618,15.6104114 14.0020848,15.4093419 C14.2326077,15.2082723 14.5186269,15.0371494 14.8601424,14.8959729 C15.2016579,14.7547964 15.6413591,14.675652 16.1792459,14.6585397 L16.1792459,13.4906253 L16.1792459,13.4906253 Z" id="形状" fill="url(#linearGradient-9)" fill-rule="nonzero" mask="url(#mask-7)"></path>
-                                        </g>
-                                        <path d="M15.5929876,24.1568627 C14.1839485,24.1568627 13.0414078,25.315817 13.0414078,26.745098 C13.0414078,28.1743791 14.1839485,29.3333333 15.5929876,29.3333333 C17.0020266,29.3333333 18.1445674,28.1743791 18.1445674,26.745098 C18.1445674,25.315817 17.0020266,24.1568627 15.5929876,24.1568627 Z" id="路径" fill="#8B9CFF" filter="url(#filter-10)"></path>
-                                    </g>
-                                </g>
-                            </g>
+                            <path id="路径" d="M18.7758471,4.26797386 C27.6596636,4.26797386 34.8571529,11.5700714 34.8571529,20.5793464 C34.8571529,29.585392 27.6590667,36.8868845 18.7758471,36.8868845 C9.88944448,36.8868845 2.69076123,29.5859969 2.69076123,20.5793464 C2.69076123,11.5694664 9.88884744,4.26797386 18.7758471,4.26797386 Z M18.7758471,4.93464052 C10.2591826,4.93464052 3.3574279,11.9355445 3.3574279,20.5793464 C3.3574279,29.2198945 10.2597545,36.2202179 18.7758471,36.2202179 C27.2887315,36.2202179 34.1904862,29.2193139 34.1904862,20.5793464 C34.1904862,11.9361252 27.2893033,4.93464052 18.7758471,4.93464052 Z" fill="#FFFFFF" fill-rule="nonzero"></path>
+                            <path d="M15.151837,18.5693186 C15.4592009,18.5693186 15.7210295,18.6776965 15.9373226,18.8944523 C16.1536157,19.1112081 16.2617623,19.3735966 16.2617623,19.681618 C16.2617623,19.9782312 16.1536157,20.2377678 15.9373226,20.4602277 C15.7210295,20.6826876 15.4592009,20.7939175 15.151837,20.7939175 C14.8444731,20.7939175 14.5826445,20.6826876 14.3663514,20.4602277 C14.1500583,20.2377678 14.0419117,19.9782312 14.0419117,19.681618 C14.0419117,19.3735966 14.1500583,19.1112081 14.3663514,18.8944523 C14.5826445,18.6776965 14.8444731,18.5693186 15.151837,18.5693186 Z M23.758027,12.1864309 C24.2589163,12.1864309 24.7028864,12.2748444 25.0899373,12.4516715 C25.4769882,12.6284986 25.8042739,12.8566626 26.0717943,13.1361635 C26.3393148,13.4156644 26.544224,13.7322419 26.6865222,14.0858961 C26.8288203,14.4395503 26.8999693,14.7875004 26.8999693,15.1297464 L26.8999693,23.8741314 C26.8999693,24.13652 26.8402041,24.3932045 26.7206737,24.6441849 C26.6011433,24.8951653 26.4417694,25.1233293 26.242552,25.3286769 C26.0433347,25.5340245 25.8156577,25.6994433 25.5595211,25.8249335 C25.3033845,25.9504237 25.03871,26.0131688 24.7654976,26.0131688 L24.7654976,16.4473934 C24.7654976,16.1507802 24.7085784,15.8741314 24.5947399,15.6174469 C24.4809014,15.3607624 24.3272194,15.1354505 24.133694,14.9415111 C23.9401686,14.7475717 23.7153375,14.593561 23.4592009,14.479479 C23.2030643,14.365397 22.927006,14.308356 22.6310259,14.308356 L13.0344411,14.308356 C13.0344411,14.0573756 13.0913603,13.8063952 13.2051988,13.5554148 C13.3190373,13.3044344 13.4727192,13.0762704 13.6662447,12.8709228 C13.8597701,12.6655753 14.0874471,12.5001564 14.3492756,12.3746662 C14.6111042,12.249176 14.8900085,12.1864309 15.1859885,12.1864309 L23.758027,12.1864309 L23.758027,12.1864309 Z M22.2724346,15.3864309 C22.7847079,15.3864309 23.148991,15.5261813 23.3652842,15.8056822 C23.5815773,16.0851831 23.6897239,16.4588016 23.6897239,16.9265378 L23.6897239,27.0056822 C23.6897239,27.2908872 23.5701935,27.5589799 23.3311326,27.8099603 C23.0920718,28.0609407 22.7903998,28.1864309 22.4261166,28.1864309 L12.0781977,28.1864309 C11.7708338,28.1864309 11.4976214,28.0609407 11.2585606,27.8099603 C11.0194998,27.5589799 10.8999693,27.2566626 10.8999693,26.9030084 L10.8999693,16.6356287 C10.8999693,16.2705663 10.999578,15.9711011 11.1987954,15.737233 C11.3980127,15.5033649 11.6626872,15.3864309 11.9928189,15.3864309 L22.2724346,15.3864309 Z M21.5723279,17.9875004 C21.5723279,17.8620102 21.5324845,17.7593364 21.4527975,17.679479 C21.3731106,17.5996216 21.2706559,17.5596929 21.1454336,17.5596929 L13.4442596,17.5596929 C13.3190373,17.5596929 13.2165826,17.5996216 13.1368957,17.679479 C13.0572088,17.7593364 13.0173653,17.8620102 13.0173653,17.9875004 L13.0173653,21.8035432 C13.1198199,21.9290334 13.2137367,22.0687838 13.2991155,22.2227945 C13.3844944,22.3768052 13.489795,22.5222597 13.6150174,22.6591581 C13.7402397,22.7960565 13.9053055,22.9129906 14.1102148,23.0099603 C14.3151241,23.10693 14.5997203,23.1554148 14.9640035,23.1554148 C15.4990444,23.1554148 15.9344766,23.0698533 16.2703002,22.8987303 C16.6061237,22.7276073 16.9021038,22.5108515 17.1582404,22.248463 C17.414377,21.9860744 17.6534379,21.7037214 17.8754229,21.4014041 C18.097408,21.0990868 18.3620825,20.8138818 18.6694464,20.5457892 C18.9768103,20.2776965 19.3581693,20.0495325 19.8135232,19.8612972 C20.2688772,19.6730619 20.8551454,19.567536 21.5723279,19.5447196 L21.5723279,17.9875004 L21.5723279,17.9875004 Z" id="形状" fill="url(#linearGradient-9)" fill-rule="nonzero" mask="url(#mask-7)"></path>
                         </g>
+                        <path d="M20.7906501,32.2091503 C18.9119314,32.2091503 17.3885437,33.7544227 17.3885437,35.6601307 C17.3885437,37.5658388 18.9119314,39.1111111 20.7906501,39.1111111 C22.6693689,39.1111111 24.1927565,37.5658388 24.1927565,35.6601307 C24.1927565,33.7544227 22.6693689,32.2091503 20.7906501,32.2091503 Z" id="路径" fill="#8B9CFF" filter="url(#filter-10)"></path>
                     </g>
                 </g>
             </g>

src/components/Search/Search.vue

@@ -181,7 +181,7 @@ onMounted(() => {
   // width: 60%;
   width: 808px;
   position: absolute;
-  top: 190px;
+  top: 100px;
   left:0;
   right: 0;
   box-shadow: none !important;

src/views/final/aside/Aside.vue

@@ -361,6 +361,7 @@ useKeydown('s', () => setShowSearch(true))
           @close="setShowSearch(false)"
           @input-change="inputChange"
           @show-search="setShowSearch(true)"
+           :toolipvalue="'请输入任务id、任务名称、提报人'"
         />
         <!-- 高级筛选 -->
         <AdvanceFilter

src/views/final/comp/RepeatModal.vue

@@ -111,7 +111,7 @@ defineExpose({
                 <span>{{ item.content }}</span>
               </n-gi>
               <n-gi span="3">
-                <span style="color:#8b8d8f;">任务重复数量</span>
+                <span style="color:#8b8d8f;">任务重复数量:</span>
               </n-gi>
               <n-gi span="8">
                 <span>共<span class="count">{{ item.count }}</span>条</span>
@@ -150,9 +150,11 @@ defineExpose({
     }
   }
   .wrapper-header {
-    padding-top: 40px;
-    margin-top: 80px;
+    margin-top: 53px;
     text-align: center;
+    font-size: 16px;
+    padding-top: 40px;
+    margin-bottom: 16px;
     .wrapper-title {
       text-align: center;
       font-size: 16px;
@@ -288,7 +290,7 @@ defineExpose({
   .total {
     color: #6684fa;
     font-weight: bold;
-    font-size: 22px;
+    font-size: 30px;
     margin: 0px 5px
   }
 

src/views/final/content/Content.vue

@@ -955,6 +955,7 @@ defineExpose({
     </div>
   
     <div class="wrapper-settings">
+    <div class="sltedtext">已选<span style="width:20px;margin-left:10px;margin-right:10px;color:#507AFD">{{checkedRowKeys.length}}</span>项</div>
       <SvgIcon
         style="cursor: pointer"
         size="18"
@@ -962,7 +963,7 @@ defineExpose({
         @click="showModal(customTabelRef)"
       />
     </div>
-    <div class="sltedtext">已选<span style="width:20px;margin-left:10px;margin-right:10px;color:#507AFD">{{checkedRowKeys.length}}</span>项</div>
+   
     <div class="wrapper-content">
       <NDataTable
         id="table"
@@ -1045,7 +1046,7 @@ defineExpose({
   padding: 0px 24px 24px 24px;
 .sltedtext{
   position: absolute;
-  top:250px;
+    left: 437px;
   color:#202020
 }
   &-header {

src/views/home/aside/Aside.vue

@@ -94,7 +94,7 @@ function computeSlideHeight() {
   const headEl = document.querySelector('.aside-header')!
   const { bottomIncludeBody } = getViewportOffset(headEl)
   const height = bottomIncludeBody
-  asideHeight.value = height - 24
+  asideHeight.value = height - 16
 }
 
 useWindowSizeFn(computeSlideHeight, 280)
@@ -314,6 +314,7 @@ useKeydown('s', () => setShowSearch(true))
           v-show="showSearch"
           @select="scrollHandler"
           @close="setShowSearch(false)"
+           :toolipvalue="'请输入提报人搜索'"
         />
         <!-- 高级筛选 -->
         <AdvanceFilter

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

@@ -411,17 +411,14 @@ defineExpose({
       </n-popover>
     </div>
     <div class="wrapper-right">
-     <n-tooltip trigger="hover">
-      <template #trigger>
+   
       <SvgIcon
         style="display: block; cursor: pointer"
         size="18"
         name="magnifying-1"
         @click="emit('update:search')"
       />
-      </template>
-       <span>{{toolipvalue}} </span>
-    </n-tooltip>
+   
       <SvgIcon
         style="display: block; cursor: pointer; margin-left: 10px"
         size="18"

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

@@ -7,6 +7,14 @@ import type { SearchEntity } from '/#/home'
 import { useConfig } from '@/store/modules/asideConfig'
 import { useFinal } from '@/store/modules/final'
 
+const props = defineProps({
+  
+  toolipvalue:{
+      type: String,
+    default: "",
+    required: true,
+  }
+})
 defineOptions({ name: 'Search' })
 
 const emit = defineEmits<{
@@ -104,7 +112,7 @@ onMounted(() => {
         <n-input
           v-model:value="searchKeyword"
           style="width: 260px; height: 32px"
-          placeholder="请输入你需要搜索的内容"
+          :placeholder="toolipvalue"
           @input="inputHandler"
         >
           <template #suffix>

src/views/home/content/Content.vue

@@ -117,6 +117,7 @@ async function inittask() {
  checkingTaskModal.showModal()
  loadref.value=false
   }
+    checkTaskStatus.value = res.data.status // 1.执行中 2.执行完毕
    }
 } 
 // const layout = debounce(() => {
@@ -547,6 +548,7 @@ onMounted(() => {
 
 onUnmounted(() => {
   emitter.off('filter', refreshHandler)
+      clearInterval(timer.value)
 })
 
 watch(timeRange, () => {

src/views/home/content/modal/CheckingTaskModal.vue

@@ -33,6 +33,7 @@ function refresh() {
 function cancel() {
   closeModal();
   emit("cancel", true);
+  isFold.value=false
 }
 const time = ref();
 onMounted(() => {

src/views/home/content/modal/LoginSuccessModal.vue

@@ -55,23 +55,23 @@ defineExpose({
       <div class="wrapper-content">
         <div class="flex_box">
           <div class="item">
-            <SvgIcon name="task_count" width="55" height="55" />
+            <SvgIcon name="task_count" width="48" height="48" />
             <div class="num_box">{{ toolsData?.total || 0 }}</div>
             <div class="title_box">任务总数</div>
           </div>
           <div class="item">
-            <SvgIcon name="task_wait" width="55" height="55" />
+            <SvgIcon name="task_wait" width="48" height="48" />
             <div class="num_box">{{ toolsData?.treat || 0 }}</div>
             <div class="title_box">待审批</div>
           </div>
           <div class="item">
-            <SvgIcon name="task_over" width="55" height="55" />
+            <SvgIcon name="task_over" width="48" height="48" />
             <div class="num_box">{{ toolsData?.approvedCount || 0 }}</div>
             <div class="title_box">已审批</div>
           </div>
           <div class="item">
             <SvgIcon name="modal_reImg" width="48" height="48" />
-            <div class="num_box" style="margin-top: 9px;">{{ toolsData?.repeat }}</div>
+            <div class="num_box" >{{ toolsData?.repeat }}</div>
             <div class="title_box">重复图片</div>
           </div>
         </div>
@@ -110,7 +110,7 @@ defineExpose({
       text-align: center;
       font-size: 16px;
       font-family: PingFang SC, PingFang SC-Semibold;
-      font-weight: 600;
+      font-weight: 850;
       text-align: center;
       color: #333333;
       line-height: 22px;
@@ -118,7 +118,7 @@ defineExpose({
     .wrapper-mark {
       font-size: 13px;
       font-family: HarmonyOS Sans SC, HarmonyOS Sans SC-Regular;
-      font-weight: 400;
+      font-weight: 550;
       text-align: center;
       color: #666666;
       line-height: 18px;
@@ -152,6 +152,7 @@ defineExpose({
           text-align: center;
           color: #202020;
           line-height: 16px;
+          margin-top: 6px;
         }
       }
     }
@@ -211,11 +212,11 @@ defineExpose({
 
       margin: 20px auto 0;
       position: relative;
-      bottom: -30px;
+      bottom: -35px;
       left: 20px;
 
-      font-size: 20px;
-      font-weight: 400;
+      font-size: 22px;
+      font-weight: 550;
       font-family: YouSheBiaoTiHei, YouSheBiaoTiHei-Regular;
       text-align: center;
       color: #ffffff;

src/views/task/aside/Aside.vue

@@ -288,7 +288,7 @@ function handleOk(item: any) {
         <n-input
           v-model:value="search"
           style="flex: 1; height: 32px"
-          placeholder="请输入你需要搜索的内容"
+          placeholder="请输入任务id、任务名称、提报人"
           @input="inputHandler"
         >
           <template #suffix>

src/views/task/content/Content.vue

@@ -40,6 +40,7 @@ import { useKeydown } from '@/hooks/event/useKeydown'
 import CheckingTaskModal from '@/views/home/content/modal/CheckingTaskModal.vue'
 import {getLastCheckNox,removeCheckDuplicate,getCheckDuplicateStatus,getCheckDuplicateStatusx} from "@/api/home/main"
 
+const timer = ref()
 const emit = defineEmits(['setAsideItemName'])
 const HeaderStore=useDataHeaderStore()
 const router = useRouter()
@@ -124,12 +125,21 @@ const fullscreenStylestwo = computed<any>(() => ({
 async function init() { 
   let result = await getLastCheckNox()
   if(result.data){
+ 
+ let resx=await getCheckDuplicateStatusx({checkDuplicateNo:result.data})
+if(resx.data.status==1){
+        timer.value = setInterval(async() => {
   let res=await getCheckDuplicateStatusx({checkDuplicateNo:result.data})
-if(res.data.status==1){
-  const checkingTaskModal = checkingTaskModalRef.value as any
-  checkingTaskModal.showModal()
+if(res.data.status!=1){
+   if (res.data.status === 2)
+               { message.success('任务执行完毕，正在刷新数据...')
+              
+              }else{ message.error('查询异常')
+             
               }
+                 clearInterval(timer.value)
   }
+   }, 1000)}}
 } 
 onMounted(() => {
   if (route.query.id) {
@@ -276,15 +286,11 @@ function approvalHandler(items?: any) {
     },
   })
 }
-// function approvalHandlerx(item?: any) {
-//   console.log(item);
-//   alert(1);
-// }
+
 function singleRejectHandlex(item?: any) {
-  console.log(item)
   const modal = unref(notPassModalRef)! as any
 
-  modal.showModal([item])
+  modal.showModal(item)
 }
 function rejectHandler(items?: any) {
   console.log(items)
@@ -467,7 +473,7 @@ onUnmounted(() => {
   taskStore.reset()
   window.removeEventListener('keydown', onEsc)
   window.removeEventListener('scroll', checkBottom)
-
+  clearInterval(timer.value)
 })
 
 function immersionHandler() {

src/views/worksheet/aside/Aside.vue

@@ -207,17 +207,14 @@ if (searchContent) {
           <span style="margin-left: 8px; color: #333333">所有任务包</span>
         </div>
         <div class="right">
-           <n-tooltip trigger="hover">
-           <template #trigger>
+          
           <SvgIcon
             style="cursor: pointer; margin-left: 10px"
             size="18"
             name="magnifying-1"
             @click="setShowSearch(true)"
           />
-           </template>
-          <span>请输入任务包名称</span>
-           </n-tooltip>
+         
           <SvgIcon
             style="cursor: pointer; margin-left: 10px"
             size="18"
@@ -231,7 +228,7 @@ if (searchContent) {
           ref="searchInputRef"
           v-model:value="searchKeyword"
           style="flex: 1; height: 32px"
-          placeholder="请输入你需要搜索的内容"
+          placeholder="请输入任务包名称"
           @input="inputHandler"
         >
           <template #suffix>

src/views/worksheet/content/Content.vue

@@ -81,6 +81,7 @@ const sortBy: SimilarityPictureSortParam = {
   orderType: 'desc',
   orderName: 'similarityScore',
 }
+const timer = ref()
 const workStore = useWorkOrder()
 const selectTask = ref<any>(null)
 const overTask = ref<any>(null)
@@ -382,16 +383,26 @@ useKeydown('left', backHandler)
 async function init() { 
   let result = await getLastCheckNox()
   if(result.data){
+ 
+ let resx=await getCheckDuplicateStatusx({checkDuplicateNo:result.data})
+if(resx.data.status==1){
+        timer.value = setInterval(async() => {
   let res=await getCheckDuplicateStatusx({checkDuplicateNo:result.data})
-if(res.data.status==1){
-  const checkingTaskModal = checkingTaskModalRef.value as any
-  checkingTaskModal.showModal()
+if(res.data.status!=1){
+   if (res.data.status === 2)
+               { message.success('任务执行完毕，正在刷新数据...')
+              
+              }else{ message.error('查询异常')
+             
               }
+                 clearInterval(timer.value)
   }
+   }, 1000)}}
 } 
 onUnmounted(() => {
   workStore.reset()
   document.removeEventListener('keydown', onEsc)
+    clearInterval(timer.value)
 })
 onMounted(() => {
   document.addEventListener('keydown', onEsc)
@@ -996,7 +1007,7 @@ defineExpose({
               />
             </div>
           </div>
-          <n-back-top :listen-to="wrapperListRef" :bottom="80" :visibility-height="10">
+          <n-back-top :listen-to="wrapperListRef" :bottom="70" :visibility-height="10">
             <svg-icon
               name="top"
               style="
@@ -1004,6 +1015,7 @@ defineExpose({
                 left: 50%;
                 top: 50%;
                 transform: translate(-50%, -50%);
+                    z-index: 10;
               "
             />
           </n-back-top>
@@ -1537,5 +1549,9 @@ defineExpose({
   margin-top: 12px;
   margin-bottom: 12px;
 }
-
+</style>
+<style >
+.n-back-top{
+  z-index: 5 !important;
+}
 </style>

src/views/worksheet/index.vue

@@ -48,6 +48,6 @@ function ApprovalOver(packageId) {
 }
 :deep(.ip_box){
   z-index: 10;
-  bottom: 220px;
+  bottom: 120px;
 }
 </style>

src/views/worksheet/modal/ApprovalModal.vue

@@ -142,6 +142,9 @@ defineExpose({
       <div class="wrapper-content">
         <div class="item">
           <div class="imgwrapper" />
+          <div class="back1">1</div>
+           <div class="back2">2</div>
+
           <div class="content">
             <div class="task_id">{{ detail.packageName }}</div>
             <div class="tag_box">
@@ -238,16 +241,36 @@ defineExpose({
       display: flex;
       flex-flow: row nowrap;
       align-items: center;
+      position: relative;
     }
 
     .imgwrapper {
       width: 138px;
       height: 80px;
       margin-right: 23px;
-      border-radius: 8px;
+      border-radius: 6px;
       background-image: url("../../../assets/images/test.png");
       background-repeat: no-repeat;
       background-size: cover;
+      z-index: 5;
+    }
+       .back1{
+        position: absolute;
+        width: 139px;
+         height: 72px;
+        background: #cacbd0;
+        border-radius: 6px;
+        top:4px;
+        z-index: 4
+      }
+       .back2{
+        position: absolute;
+        width: 139px;
+        height: 60px;
+        background: #e3e4e7; 
+        border-radius: 6px;
+        top:10px;
+        left: 3.5px
       }
     .content {
       .task_id {
@@ -315,9 +338,9 @@ defineExpose({
       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-size: 18px;
       font-family: YouSheBiaoTiHei, YouSheBiaoTiHei-Regular;
-      font-weight: Regular;
+      font-weight: 550;
       text-align: left;
       color: #ffffff;
       line-height: 26px;