From 8ccf5d6d3b2ec6b4e2acf5e4b34b49a6a8eed25b Mon Sep 17 00:00:00 2001
From: hui <770260999@qq.com>
Date: Fri, 15 Mar 2024 19:14:38 +0800
Subject: [PATCH] =?UTF-8?q?=E2=80=9C=E6=9C=80=E8=BF=91=E8=AE=BF=E9=97=AE?=
 =?UTF-8?q?=E2=80=9D=E6=98=BE=E9=9A=90=E3=80=81=E4=B8=8E=E4=B8=BB=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E8=81=94=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/assets/iconfont/demo_index.html  |  52 +++++++++++++++++-
 ruoyi-ui/src/assets/iconfont/iconfont.css     |  14 ++++-
 ruoyi-ui/src/assets/iconfont/iconfont.js      |   2 +-
 ruoyi-ui/src/assets/iconfont/iconfont.json    |  14 +++++
 ruoyi-ui/src/assets/iconfont/iconfont.ttf     | Bin 1948 -> 2320 bytes
 ruoyi-ui/src/assets/iconfont/iconfont.woff    | Bin 1276 -> 1544 bytes
 ruoyi-ui/src/assets/iconfont/iconfont.woff2   | Bin 868 -> 1104 bytes
 ruoyi-ui/src/store/modules/menu.js            |   9 ++-
 .../components/HeaderMenu/CustomMenu.vue      |   1 -
 .../components/HeaderMenu/UserArea.vue        |  24 +++++++-
 .../components/HeaderMenu/index.vue           |   3 +-
 .../components/RecentPages/index.vue          |  16 +++---
 ruoyi-ui/src/views/JiHeExpressway/index.vue   |  24 ++++++--
 13 files changed, 134 insertions(+), 25 deletions(-)

diff --git a/ruoyi-ui/src/assets/iconfont/demo_index.html b/ruoyi-ui/src/assets/iconfont/demo_index.html
index 3a7479e4..d9124f98 100644
--- a/ruoyi-ui/src/assets/iconfont/demo_index.html
+++ b/ruoyi-ui/src/assets/iconfont/demo_index.html
@@ -54,6 +54,18 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe601;</span>
+                <div class="name">卡片未激活</div>
+                <div class="code-name">&amp;#xe601;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe600;</span>
+                <div class="name">卡片</div>
+                <div class="code-name">&amp;#xe600;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe622;</span>
                 <div class="name">左</div>
@@ -90,9 +102,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1710383734701') format('woff2'),
-       url('iconfont.woff?t=1710383734701') format('woff'),
-       url('iconfont.ttf?t=1710383734701') format('truetype');
+  src: url('iconfont.woff2?t=1710497244093') format('woff2'),
+       url('iconfont.woff?t=1710497244093') format('woff'),
+       url('iconfont.ttf?t=1710497244093') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -118,6 +130,24 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-menu"></span>
+            <div class="name">
+              卡片未激活
+            </div>
+            <div class="code-name">.icon-menu
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-menuactive"></span>
+            <div class="name">
+              卡片
+            </div>
+            <div class="code-name">.icon-menuactive
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-left"></span>
             <div class="name">
@@ -172,6 +202,22 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-menu"></use>
+                </svg>
+                <div class="name">卡片未激活</div>
+                <div class="code-name">#icon-menu</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-menuactive"></use>
+                </svg>
+                <div class="name">卡片</div>
+                <div class="code-name">#icon-menuactive</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-left"></use>
diff --git a/ruoyi-ui/src/assets/iconfont/iconfont.css b/ruoyi-ui/src/assets/iconfont/iconfont.css
index cf6b330a..e2eed8db 100644
--- a/ruoyi-ui/src/assets/iconfont/iconfont.css
+++ b/ruoyi-ui/src/assets/iconfont/iconfont.css
@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4466169 */
-  src: url('iconfont.woff2?t=1710383734701') format('woff2'),
-       url('iconfont.woff?t=1710383734701') format('woff'),
-       url('iconfont.ttf?t=1710383734701') format('truetype');
+  src: url('iconfont.woff2?t=1710497244093') format('woff2'),
+       url('iconfont.woff?t=1710497244093') format('woff'),
+       url('iconfont.ttf?t=1710497244093') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-menu:before {
+  content: "\e601";
+}
+
+.icon-menuactive:before {
+  content: "\e600";
+}
+
 .icon-left:before {
   content: "\e622";
 }
diff --git a/ruoyi-ui/src/assets/iconfont/iconfont.js b/ruoyi-ui/src/assets/iconfont/iconfont.js
index c20d4ec5..7ab8aed4 100644
--- a/ruoyi-ui/src/assets/iconfont/iconfont.js
+++ b/ruoyi-ui/src/assets/iconfont/iconfont.js
@@ -1 +1 @@
-window._iconfont_svg_string_4466169='<svg><symbol id="icon-left" viewBox="0 0 1024 1024"><path d="M268.9 488.3L681.6 75.6C688.2 69 697.3 65 707.4 65c20.2 0 36.5 16.3 36.5 36.5 0 10.1-4.1 19.2-10.7 25.8l-391 391 378.5 378.5c6 6.2 9.7 14.7 9.7 24.1 0 19.2-15.5 34.7-34.7 34.7-9.4 0-17.9-3.7-24.1-9.7L279.2 553.4c-4.7-4.8-8.1-11.1-9.3-18 0.7 4.9-0.3 5.5-1 4.4-6.6-6.6-10.7-15.7-10.7-25.8 0.1-10 4.1-19.1 10.7-25.7z m0 0"  ></path></symbol><symbol id="icon-right" viewBox="0 0 1024 1024"><path d="M755.1 535.7L342.4 948.4C335.8 955 326.70000001 959 316.60000001 959c-20.2 0-36.5-16.3-36.50000001-36.5 0-10.1 4.1-19.2 10.7-25.8l391-391-378.49999999-378.5c-6-6.2-9.7-14.7-9.70000001-24.1 0-19.2 15.5-34.7 34.7-34.7 9.4 0 17.9 3.7 24.1 9.7L744.8 470.6c4.7 4.8 8.1 11.1 9.30000001 18-0.7-4.9 0.3-5.5 0.99999999-4.4 6.6 6.6 10.69999999 15.7 10.7 25.8-0.1 10-4.1 19.1-10.7 25.7z m0 0"  ></path></symbol><symbol id="icon-recent" viewBox="0 0 1024 1024"><path d="M504 1024C225.6 1024 0 798.4 0 520S225.6 16 504 16s504 225.6 504 504-225.6 504-504 504z m0-939.2C264 84.8 68.8 280 68.8 520c0 240.8 195.2 436 436 436s436-195.2 436-436c-0.8-240-196-435.2-436.8-435.2z"  ></path><path d="M452 572.8V221.6h71.2v280h237.6v71.2H452z"  ></path></symbol></svg>',function(n){var t=(t=document.getElementsByTagName("script"))[t.length-1],e=t.getAttribute("data-injectcss"),t=t.getAttribute("data-disable-injectsvg");if(!t){var o,i,c,d,s,a=function(t,e){e.parentNode.insertBefore(t,e)};if(e&&!n.__iconfont__svg__cssinject__){n.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(t){console&&console.log(t)}}o=function(){var t,e=document.createElement("div");e.innerHTML=n._iconfont_svg_string_4466169,(e=e.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",e=e,(t=document.body).firstChild?a(e,t.firstChild):t.appendChild(e))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(o,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),o()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(c=o,d=n.document,s=!1,r(),d.onreadystatechange=function(){"complete"==d.readyState&&(d.onreadystatechange=null,l())})}function l(){s||(s=!0,c())}function r(){try{d.documentElement.doScroll("left")}catch(t){return void setTimeout(r,50)}l()}}(window);
\ No newline at end of file
+window._iconfont_svg_string_4466169='<svg><symbol id="icon-menu" viewBox="0 0 1024 1024"><path d="M512 747.52c-10.24 0-20.48-5.12-30.72-10.24l-414.72-256C51.2 476.16 40.96 460.8 40.96 445.44s10.24-30.72 25.6-40.96l414.72-256c15.36-10.24 40.96-10.24 56.32 0l414.72 256c15.36 10.24 25.6 25.6 25.6 40.96s-5.12 30.72-20.48 40.96l-414.72 256c-10.24 5.12-20.48 5.12-30.72 5.12zM117.76 445.44l394.24 240.64 394.24-240.64L512 204.8 117.76 445.44z m-20.48-10.24z"  ></path><path d="M512 936.96c-15.36 0-30.72-5.12-46.08-15.36l-378.88-230.4c-15.36-10.24-20.48-25.6-10.24-40.96s25.6-20.48 40.96-10.24L496.64 870.4c10.24 5.12 20.48 5.12 30.72 0l378.88-230.4c15.36-10.24 35.84-5.12 40.96 10.24s5.12 35.84-10.24 40.96L558.08 921.6c-15.36 10.24-30.72 15.36-46.08 15.36z"  ></path></symbol><symbol id="icon-menuactive" viewBox="0 0 1024 1024"><path d="M51.2 404.48c-10.24-5.12-10.24-15.36 0-25.6L501.76 102.4h20.48L972.8 378.88c10.24 5.12 10.24 20.48 0 25.6l-450.56 276.48c-5.12 5.12-15.36 5.12-20.48 0L51.2 404.48z" fill="#2c2c2c" ></path><path d="M512 906.24c-20.48 0-40.96-5.12-56.32-15.36l-378.88-230.4c-25.6-15.36-30.72-46.08-20.48-71.68 15.36-25.6 46.08-30.72 71.68-15.36l378.88 230.4h10.24l378.88-230.4c25.6-15.36 56.32-5.12 71.68 15.36 15.36 25.6 5.12 56.32-15.36 71.68l-378.88 230.4c-20.48 10.24-40.96 15.36-61.44 15.36z" fill="#2c2c2c" ></path></symbol><symbol id="icon-left" viewBox="0 0 1024 1024"><path d="M268.9 488.3L681.6 75.6C688.2 69 697.3 65 707.4 65c20.2 0 36.5 16.3 36.5 36.5 0 10.1-4.1 19.2-10.7 25.8l-391 391 378.5 378.5c6 6.2 9.7 14.7 9.7 24.1 0 19.2-15.5 34.7-34.7 34.7-9.4 0-17.9-3.7-24.1-9.7L279.2 553.4c-4.7-4.8-8.1-11.1-9.3-18 0.7 4.9-0.3 5.5-1 4.4-6.6-6.6-10.7-15.7-10.7-25.8 0.1-10 4.1-19.1 10.7-25.7z m0 0"  ></path></symbol><symbol id="icon-right" viewBox="0 0 1024 1024"><path d="M755.1 535.7L342.4 948.4C335.8 955 326.70000001 959 316.60000001 959c-20.2 0-36.5-16.3-36.50000001-36.5 0-10.1 4.1-19.2 10.7-25.8l391-391-378.49999999-378.5c-6-6.2-9.7-14.7-9.70000001-24.1 0-19.2 15.5-34.7 34.7-34.7 9.4 0 17.9 3.7 24.1 9.7L744.8 470.6c4.7 4.8 8.1 11.1 9.30000001 18-0.7-4.9 0.3-5.5 0.99999999-4.4 6.6 6.6 10.69999999 15.7 10.7 25.8-0.1 10-4.1 19.1-10.7 25.7z m0 0"  ></path></symbol><symbol id="icon-recent" viewBox="0 0 1024 1024"><path d="M504 1024C225.6 1024 0 798.4 0 520S225.6 16 504 16s504 225.6 504 504-225.6 504-504 504z m0-939.2C264 84.8 68.8 280 68.8 520c0 240.8 195.2 436 436 436s436-195.2 436-436c-0.8-240-196-435.2-436.8-435.2z"  ></path><path d="M452 572.8V221.6h71.2v280h237.6v71.2H452z"  ></path></symbol></svg>',function(n){var t=(t=document.getElementsByTagName("script"))[t.length-1],e=t.getAttribute("data-injectcss"),t=t.getAttribute("data-disable-injectsvg");if(!t){var c,o,i,l,d,s=function(t,e){e.parentNode.insertBefore(t,e)};if(e&&!n.__iconfont__svg__cssinject__){n.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(t){console&&console.log(t)}}c=function(){var t,e=document.createElement("div");e.innerHTML=n._iconfont_svg_string_4466169,(e=e.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",e=e,(t=document.body).firstChild?s(e,t.firstChild):t.appendChild(e))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(c,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),c()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(i=c,l=n.document,d=!1,m(),l.onreadystatechange=function(){"complete"==l.readyState&&(l.onreadystatechange=null,a())})}function a(){d||(d=!0,i())}function m(){try{l.documentElement.doScroll("left")}catch(t){return void setTimeout(m,50)}a()}}(window);
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/iconfont/iconfont.json b/ruoyi-ui/src/assets/iconfont/iconfont.json
index c86ae2dd..dc465b08 100644
--- a/ruoyi-ui/src/assets/iconfont/iconfont.json
+++ b/ruoyi-ui/src/assets/iconfont/iconfont.json
@@ -5,6 +5,20 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "39573034",
+      "name": "卡片未激活",
+      "font_class": "menu",
+      "unicode": "e601",
+      "unicode_decimal": 58881
+    },
+    {
+      "icon_id": "39573028",
+      "name": "卡片",
+      "font_class": "menuactive",
+      "unicode": "e600",
+      "unicode_decimal": 58880
+    },
     {
       "icon_id": "8483536",
       "name": "左",
diff --git a/ruoyi-ui/src/assets/iconfont/iconfont.ttf b/ruoyi-ui/src/assets/iconfont/iconfont.ttf
index aeb0acc85210c5eca1e6c5c679b988e2a0bfdd16..8805888eda517183ebe6196d48096403927a72f1 100644
GIT binary patch
delta 798
zcmYLFL1+^}6#aj9Gdu2XvnAbR6D_5Urm12pn38~05%eTNiwgE2*lpZ4g`|x&mTC_1
zQY^(oB_2dX4}upjf*url5bD8$^dN`_L8{^|Vh=5}H`(=1a`40Z^XLEfX5P$Wb2YZw
z*NC6%1;Bd%Fj1^H)z@op#{ndTdT*x7x2E3BNxuN(kJMW(xz4rhh0W*0-6Z5o)KI_4
zcd1?@94b|6i%BX-yG1Eko+~=i1TK?a%%c@&v5FR)rn#W?&N>yhyYtz|O8|C>E|{*)
z-Kcfk{@M?~h2Y}-wS#9EAeDsQnGavCnj?FllR1hXsf{cD*YJ)4@^#vCkVKb4=ok!x
z(oEwEgysegHFxpA<#KBRFa>g}I!dcX^fD-Lf;7B+hKF9-9}7bO52zXyRV$F@no!V9
zNZJVL09n(K{x++U+AvzI^KCLsN#BNW=8-D_akH0hgU$edv<<=c$J!9*QjEhxcn{ln
zmTKyRU*u2HE?AI+6bu4n(penB;d}w}$8GGvM%+@7VPp^^n9gQ~@D$pSL?M&!L8eBS
z1X?_pG@?-hpBQ~2MQN`GlemH_!9w8RQ`-)f4AvPpux^@IH&Xi)Jy^0I=m?5sCpdzt
zhQJegcSi^ekL~Pidx2*9Jf39SYjEyyHJOrqQ@E!$hkNp8c|UXjy|=4>xPUoK2#@Kk
z-7;7Z4s)4&!cGW>IaS4V3)fXOIH?$l)<<@_G;R!7Sl6%~J7Va1XRy?RTXK|RJoux;
zWJ=0+)7J;AE`#g7PmI`M!#7_&l7GrMh7!uC(1$QoL8-X2H#L!*Vr^!@Rm$#EEiykd
OU8=Epx9HB+$o4;0MWluR

delta 430
zcmYLFJxD@P7(MshtA+)dEe=6uf{Qps5f}*#K@B=e1o^P1Pw=<iU{ft^4Tg<QIo1$G
zn`_i$QxFXi1-Ud<Lj-o7FX)4F&v(A>eD}NDW}xkBPVddHh5&I0Ae$@ewY&R;Tk0R;
zxKP^7Uz}7TfNWD|Ohey_rizdBJ`-~$3!W!=z`RRD%(B(+GokmLhrd+K>3Bef^G#}R
zS#Q+DIFjrKsY4aLY)tw)iE}`G09v6|-LbB27Ow%%1`SI`-I-+t!IWtBqAQ!e#3x1-
z3&2Y-@b%AweFa&k9)V_88TOpQEMzMzPDQxY6Y-YPCf2gU4zLb6%wl9O?OD3xoN<!{
zw6}0SJs1Gwl+6smo_omB-Xh$cx+an=j1k}}C!{^(z+TW#Ip7-f(+>U~8RO@iU4E-q
dIi-Xqq)@^IRWkCHYr9x5E%&yOGb$FZ{RIdbRbK!A

diff --git a/ruoyi-ui/src/assets/iconfont/iconfont.woff b/ruoyi-ui/src/assets/iconfont/iconfont.woff
index 8c0d050ad488afa38b0ba4280d0a04f38753b8f1..b7d6b12f8cfb492faa2cfc58424aa78aaf901e57 100644
GIT binary patch
delta 1061
zcmeyv*})@H?(gQtz{mguY#a>SAevKPqKIw1sFy-=Zejrg17inJEFVbk*s^D5M0!qT
z8j$^ifq{t`h&vACGd;~nO-x~6VEzMCrw_zt>Ol{dWdH>k7+7?Gd>J5CVZX=Ro{?Kp
z0TlB9^7(*RLIOzS<R^pFML@;)m=YK}auX{GEP#R;KtXvRR$vriaL7x{O$CYp9mD7V
zv^ZU0vCW2p{NfS@2G$cmH9#?jVBV_RYLht_)0qryCKoaa*JtPRY^<2`cH(K?!wLc}
z_m2rghOK%qhbzWeC8pJXrSz$SwDMRtHrp-ne9Qrju6tY=e<$tm3)Owa9ess+_ovY3
zjECK3A1~E(3jD5-@+yDdLe0y0z2Wo!eC_&OoPKq#_oeekY~^)7*3Y#4__I=Fiu}1=
z@dAd5Ik6MZXJ1Z`I6l8#J%5(@+1cBoXFthZTB37d3D?>UQ(8((D{jjhw%youZuRt&
zFH)x)-B~AR^W*Wl`qnd>*&S`FBiX|?u6Xcr?s;j+CeMn>xKB?$|J_r0fMv(8BX$z@
z2b---7I0tSOMa7Rf7amcgd0xxA7>;k>}KV8T*kjWP^@Xq+-(;gv7Tl)9<E%!J*MpA
z(%tK(8@+9ndZ;;Xm2;_lyywcabz2|pwpbfd@XD-fS%C4+5QQ1@cyd_Itv|r$vbls+
z>|UJS{&<b$M%(}HN{zqq<wI5TS#5{uj{ElCa4%!_5@5QrsIHBZEy}Pb_1*N$gG=VJ
z8C_`Nd|vVHq2=>eeJ^L7v$}aj=JwkPi_-dnsJ&0QHZDrjjoGlNci*q1FiG8K&rija
z?3tzetT=1My^><ax&P1YNGU(q&alAaf5)Nj6o;P@M}2#?264t)WbX@bx6rNfb+>)S
z#?^TK!_E)aWlEQ%`CTsmz$vb_H=}dT?`r`$6=%0PJrXf|^;(gosAE!5k9^jeofV7H
zW_dTvss9~ddm+YVp|argN9%U>>^PotQto2O?g<PchjvW2&P#TC5q3^jd3(eO-Mou7
zDH|p(jg&fCviWL?>Bo=X58ithdF7=``tIuY|EIFI|9*V%+O>o||4WUecqXno`Fd{t
z@&Did>fV&TyK_d5dHdnBA5#|Y4=vrZT(A5A|6b?rO~7=JT%VAVkihV0`YQEx$3Ne$
zNqvx($k6CM>3NdCm;Y>HY|oq&rZ+cos&FwlT5_!fX#lCu`*Ht(z~Ms-Ob(MKGKy|s
zWN_zU$_L6NCL|;rY+_{0V2}hRbr6VPn89#_;RB-!159s1vO!`(A_JqE!ZRi(wl>cH
z33kj3d@+ono4c8P7)^U8c21l*v326qiM<o&HmaJNuAjo~qM|lEW!lnBPnIm3x<M>;
XS^AU>qD$45KbvY`z`*d;mZuQ_Yc0Q;

delta 791
zcmeC+`NJtv?(gQtz{mguEPoidK{WfEi6XZ3=3WZPxrqe~42&H>u~;BI<@{C46X`jX
zX+ZW1AeIK=h)s*~R5DT%Qy3VSS%B*Ff!IvlKl4@wP!K3)0_4j8u?qV==GKhdk_w<$
z0FciI!~z09A}2o?q%Hx-<O1Ux3=z4B6$KVR!5pA~JP<1|3Nkq4CFZ6A#d?62IxsLW
zr3);!*-(&QTmp3W8K4?HAhzFn-1g{X4#spQP20(ZjKcN#y*!sI=DeM-k+;EshvmGd
zN8^kpslbiyD^|{!*CTk3Gx@`%pHIru6POm=aADeQXfr+Pb#2PK+NA6AQk8A8ZKIiY
z?hw7KTkhU8<>%%vl{L{{>UsZc-^#OR{qu$oOq1sc&H!3kF(>xiL9fFO0&EXvu1WJ0
zYjxW6QgO?K!+H8u^&VbMmlf{)5?IP{Y+2l1jiuA$ye95zV6SDY<vO_e{6%M75&d~#
z<;t!TcK$IizRwfEa6kXrtU1m6G6xQtJd-P(P+g`HctT+5i?oUs|GeAjSzX4*xnoP+
zbyIlcKTQ0Y8}57c5O1ycdrj*Ly<*Id_eFJyRA2Ag@_50EWrYnk8V2<j%GdaZN{LU;
zN{r#X@^0%cBR##sw3ynw_d;*ao$R~gAnd2WXwmZ|^Y3HHv{`vq-x&tYcDb@_oA`%@
z<B_wLI=xcrT{7{<4^v6r@I{veS3i95SKlx1c<R0P&!7HSyz312m6cU;InVz;uT!ox
zoIHEg8&TKwYs}KZO+PxVW&gmuP^aE^12A}!6H*cq7#?vxzjF8S&)j`R1)B{T4k&Xj
z%;)%3&&<tStT^HH!2>KptPH|_oJ}zGc|YzS5IB5@fyrUgL`KmK3=HmEOu0a_5)%><
z91k%tY+w)shCK-AFhnq{0YwAYo`gh$#Dp{kMm2?JOitWvZT}POm>Kx^8G|;rv-mKo
rwodGvICEm_#Ho#{>ZWU3wrUvLE^b+?VQOi*zNL|o!AqR2hJgV9%%&#J

diff --git a/ruoyi-ui/src/assets/iconfont/iconfont.woff2 b/ruoyi-ui/src/assets/iconfont/iconfont.woff2
index b83646df95d35c10e94dbb287589684c81ee3d9e..bc67ac38daf001d413d1d5ba735c50b056852f0e 100644
GIT binary patch
delta 1091
zcmV-J1ibs?2G9r?cTYw#00961000C~01E&B000RP000C8kr*C-I0}UbgdYJm0we<%
z3l0DTAO(bH2U8o?2N4yV1<8I$k}~m_mq$?$Us&@LGDskS0ssI203wLr?|-w$zF}g?
znrR}DG(8ekt60NBp^|8XE~3rj_5XjZ?P8L*{*cBR=28929r5$#ttO;V!uAP?5NXtH
zR1$>7{Ojd^*R9uoiNYu;X`PG*Xk$l!TQ>-Q+&lh_^XzNmS<7*(MPqLKU|kweU}G(d
zu*(xj%zDTsY(~`r^%>6y3|eK~*yi}uG%%u9+|~f5n2@vveRlM!D~mzDtydJJ(64IL
zrA1s-N$1iA;7a}e_{lr^Notntvj13I8F=soobS)i9YlVArEC#!ctS<SvI{dtPi;RY
zx1nXm4T=KAdJW#YU*b!g%{f2nI)=a<3UA8VZ!rDKBMDhmh$hJ#26nS><%?YKC<Q1}
zE9M}b%-4Nd6&3qY_yMWg0jq}N9uS`aahbhHDSIAYV%&)F6XL<i<J)1xzJy4HX$GYv
zRIivo0cUN0i|`f2r6on>LM=@s;KsWNC}iCtel8I<sKkN*>6YOU{dDCFA=895Wmk;V
zB9$J6ZU!nVNvOo(hJ|88zk;X_LHZk{t=dxQN=ZduC`0wi33@QBw}-zN$v8U7P&o7W
z7)8?$4^b%X;K15*KCRS3=@TuQDduW$(&<@wJ`L%AaD&N=f5pSr;YVdr&sG=ysmJrC
zyD=cR<39Pox40jk4qsb&&)HPkd)!pd>G^p+eQInxklS<CV9if8BAC<F%`Bzbsz~q|
zwszp%Y+AlEsa4(?JUG*2zpF8Inj`)moSguzYqx1si&%?#Y^<ke($sg_jfsg0<B8<1
zxfJ|=s+3ImKUkUPaAWt5*yT9fZ6T-9Ajq)&ox_)4+SCbIM_I56S~?VLZi35Meo3GS
z`Nakq*d>Gj{9Io)-8Bfo_4(sA!@mP3L3gaNmtJb}Yd*}z<OR${jwH`w{&Hvp%8$AE
zZ}J__=dX+kN3Q<u#}@Em^41+XI;a4e!q+T+AoKqeii1SV61r(c)I2W}Xx0rp5`O^E
zKOx2#--l9;B?k!oBY_1;pQ(`bn}ZbM5~zl(fu`Rk7_`*h>LFv5vM2*iEbs;pMyVkg
z;XY)ed?JN7f@*>vXh!*mK?h=SyCDlg?+_%z2-O#nE^<Fpaoz0+f_5rt$$tT=BJ>J>
z*K(%O1LUARW>lTPWA=qlMJD#m(~zcxD5;2{*$SD<W!v^eFR^ryHFgk?7#M=mCq%SD
z&M&cf{COuJ(3X;jh+J4n#d)lI!DVp>$bmd3HNBADm5zXiF`tj}kwQk;53P`<p@L9~
z2gN{RmT*I$w9IB$K2>g=UYWhc9WW>&*{em093^VB=u?g(Z_gEXNX=0P6DfS2q$mh^
JilC8mqXC_}1Zn^P

delta 853
zcmV-b1FHPc2;>GBcTYw#00961000AI01E&B000M^0009Rkr*C-6bgb^f=K~30we<v
z3km=PAO(bH2R|FY2FRY8JPA~Yib5gHRzd-1v3P)A_ush~d?PL0&{QEN=6MSs)F0ZW
zz6oxQ?|;`c1LBNbyG;?`!B2WC=Q3ss_&gai2c*bN5<L%DMRnDH0Kvrn{%X7z_}8tT
zEdX>L7dGL7HEBS93)peo7GaYo5QwEPyw+trBcRg?*=#oyS2iNg3j#NxQ1;BuKvEwr
zC{#esLPVC4uLWh-rCE4_3gTVcOFRzVAAVXDoQaCWJZa0RA{iY&&U&g%%|Ft6&2%jo
z9#J4+$;NEqNV8`jyC}1SozANM_Lf0PSr8`;wf_n58i}TVE4Tc|OCq6U)^>w6FeO(d
zbr=F)YZww=Yx5$$$mkjsjzQi~YPvXz(rB=*4H+pZ-MoJ=<$nU!oBfr*QyZgA6ZonX
zbV**jcjy~WlVtkQYQV|$kyb0<W#fNzW!K%Eji$f9N2_jc(Ns4#u915?Jkyk%Y4vJR
z3!(L!wx+Is*rogR-tJD+hNy#E3nL@T(`%;R-dQ4{_O@msXZ)fyQ~poV&cyckm3#5~
z5<9PLp>JHdm+sz~cwI5gQ9ZgUr;BN6$I|8ZbfC>*s+{owYlYOfBm>Y}x}4uN4bl(3
z9^M@MS;7LL{rH@61A6f<W#*)xWc^d$(Ol0j>G4{B_qTS-;6t$QKZM#c>gGf0bN2-P
zi}pZA)~rRzxk};4{&j8*JMK@_X~k)01_nJ$p&RO4OHdn1AgWA3Qk#WkY7rE=tb$T)
zJ#<>EXmyt%7Is4Jz&x`Af_?`O^?C<MzY{D|_fQ!11f_nz&}mob*{;jHAQdnWILKHW
z#)@QrHW6FT1FrQz`wapsOEv>j6~uA!vK9G!37CM5F+&}oDV!5bnAwPnxzoU4Fk=fd
z_kqMUI?gTW+U2LJUZRoAMpS?S0uIP9(J)LQF*6|^JI{VzJwWv{5U`F|bB0kV;EpBJ
zNa}!<XiS~jZe$nL04fE?5g5Tp&Il_OT)?0-X3Q{4^`JgL!fEIRq%6{DEjH3sqgh^O
fe7!x;$-Fa%7*fcgkS_q?4i^=w<Bk_W0ux6FUipOX

diff --git a/ruoyi-ui/src/store/modules/menu.js b/ruoyi-ui/src/store/modules/menu.js
index 5b0124cd..3563e991 100644
--- a/ruoyi-ui/src/store/modules/menu.js
+++ b/ruoyi-ui/src/store/modules/menu.js
@@ -1,5 +1,6 @@
 const state = {
-  recentPages: []
+  recentPages: [],
+  isRecentOpen:false,
   }
   
   const mutations = {
@@ -21,6 +22,12 @@ const state = {
       }
 
     },
+    openRecent(state){
+      state.isRecentOpen = true;
+    },
+    closeRecent(state){
+      state.isRecentOpen = false;
+    },
     removeRecent(state, item) {
       let i = state.recentPages.findIndex(unit => unit.path == item.path);
       state.recentPages.splice(i, 1);
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue
index 47d5ba07..0f6271d5 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue
@@ -65,7 +65,6 @@ export default {
   watch: {
     $route:{
       handler(newV){
-        console.log(newV , "匡扶汉室的xiaohandler");
         this.activeIndex = newV.meta.menuId
       },
       immediate: true
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/UserArea.vue b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/UserArea.vue
index 3d5216ac..5b24cb5b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/UserArea.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/UserArea.vue
@@ -1,6 +1,10 @@
 <template>
   <div class="operations">
     <div class="opCon">
+       <div class="menu_recent" @click="onSwitchRecent">
+        <i class="iconfont icon-menuactive" v-if="menu.isRecentOpen"></i>
+          <i class="iconfont icon-menu" v-else></i>
+        </div>
       <el-dropdown class="userBox">
         <span class="user">
           <img
@@ -21,9 +25,9 @@
           </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
-      <div class="config">
+      <!-- <div class="config">
         <img class="icon" src="@/assets/jihe/images/user/set.png" alt="" />
-      </div>
+      </div> -->
       <div class="logout" @click="logout">
         <img class="icon" src="@/assets/jihe/images/user/out.png" alt="" />
       </div>
@@ -32,7 +36,7 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex";
+import { mapGetters, mapState, mapMutations } from "vuex";
 import Breadcrumb from "@/components/Breadcrumb";
 import Hamburger from "@/components/Hamburger";
 import Screenfull from "@/components/Screenfull";
@@ -84,6 +88,7 @@ export default {
   },
   computed: {
     ...mapGetters(["sidebar", "avatar", "device"]),
+    ...mapState(["menu"]),
     setting: {
       get() {
         return this.$store.state.settings.showSettings;
@@ -107,6 +112,14 @@ export default {
     },
   },
   methods: {
+    ...mapMutations("menu", ["openRecent", "closeRecent"]),
+    onSwitchRecent(){
+      if(this.menu.isRecentOpen){
+        this.closeRecent();
+      }else{
+        this.openRecent();
+      }
+    },
     toggleSideBar() {
       this.$store.dispatch("app/toggleSideBar");
     },
@@ -140,6 +153,11 @@ export default {
     height: 16px;
     justify-content: space-between;
     align-items: center;
+    .menu_recent{
+      .iconfont{
+        font-size: 16px;
+      }
+    }
     .icon {
       height: 16px;
       width: 16px;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/index.vue
index 1d305fba..594610b3 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/index.vue
@@ -26,7 +26,6 @@ import CustomMenu from "./CustomMenu.vue";
 import Clock from "./Clock.vue";
 import UserArea from './UserArea.vue'
 import RecentPages from "../RecentPages/index.vue";
-
 export default {
   name: "HeaderMenu",
   data() {
@@ -56,6 +55,8 @@ export default {
     });
     // this.changeMenu(this.menuLeft[0]);
   },
+  computed:{
+  },
   mounted(){
     // this.activeIndex = "l_2-0-3";
     // console.log(this.activeIndex);
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/RecentPages/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/RecentPages/index.vue
index 89987bd0..ee129fc0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/RecentPages/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/RecentPages/index.vue
@@ -1,12 +1,12 @@
 <template>
 <div class="recent_pages">
-    <h4><i class="iconfont icon-recent"></i>最近使用:</h4>
+    <h4><i class="iconfont icon-recent"></i>最近访问:</h4>
     <div class="history_buttons">
         <div class="btn_left" @click="onLeft" :class="{'disabled' : startIndex <= 0 }"><i class="iconfont icon-left"></i></div>
         <div class="list_box" ref="box">
             <div class="list" :style="btnListStyle" ref="btnlist">
                 <div class="unit" :class="isActive(item) ? 'active' : ''" v-for="item,index in recentPages" ref="unit">
-                    <p class="btn_main" @click="onClickItem(item)" :key="item.path" :style="{width:item.title.length*140+'px'}">
+                    <p class="btn_main" @click="onClickItem(item)" :key="item.path" :style="{width:item.title.length*14+'px'}">
                         {{item.title}}
                     </p>
                     <p class="btn_close" @click="onRemoveItem(item)">
@@ -50,7 +50,6 @@ export default{
                         this.widthBox = this.$refs["box"].offsetWidth;
                         this.widthTotal = this.$refs["btnlist"].offsetWidth;
                         let temp = 0;
-                        console.log(newV , "recentPagessssssssssssssss");
                         newV.forEach((item,index)=>{
                             let unitW = this.$refs["unit"][index].offsetWidth;
                             temp += unitW;
@@ -65,11 +64,12 @@ export default{
                             // console.log(this.startIndex, "startIndexstartIndex")
                             // console.log(this.lastIndex, "lastIndexlastIndex")
                         })
-
-                        if (this.currentIndex >= this.lastIndex) {
-                            this.moveByRight(this.currentIndex);
-                        } else if (this.currentIndex <= this.startIndex) {
-                            this.moveByLeft(this.currentIndex);
+                        if(this.widthTotal > this.widthBox){
+                            if (this.currentIndex >= this.lastIndex) {
+                                this.moveByRight(this.currentIndex);
+                            } else if (this.currentIndex <= this.startIndex) {
+                                this.moveByLeft(this.currentIndex);
+                            }
                         }
 
                 })
diff --git a/ruoyi-ui/src/views/JiHeExpressway/index.vue b/ruoyi-ui/src/views/JiHeExpressway/index.vue
index ca30043b..307c38e5 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/index.vue
@@ -14,7 +14,7 @@
 import HeaderMenu from "./components/HeaderMenu/index.vue";
 import Adaptation from "./components/Adaptation.vue";
 import getBoardBaseData from '@/common/getBoardBaseData'
-
+import { mapState } from "vuex";
 export default {
   name: "ji_ze_gao_su",
   components: {
@@ -33,7 +33,21 @@ export default {
       },
     };
   },
+  watch:{
+    isRecentOpen:{
+      handler(newV){
+        if(newV){
+            this.header.originH = 100;
+          }else{
+            this.header.originH = 68;
+        }
+        this.calcHeaderScale();
+      },
+      immediate:true
+    }
+  },
   computed:{
+    ...mapState("menu",["isRecentOpen"]),
     headerStyle(){
       return {
         width : `${this.header.originW}px`,
@@ -61,9 +75,9 @@ export default {
       this.header.scale = winW / this.header.originW;
       this.headerHeight = this.header.scale * this.header.originH;
     },
-    handleChange(activeMenu) {
-      this.$route.path != activeMenu.path && this.$router.push(activeMenu.path);
-    }
+    // handleChange(activeMenu) {
+    //   this.$route.path != activeMenu.path && this.$router.push(activeMenu.path);
+    // }
   }
 };
 </script>
@@ -94,6 +108,8 @@ export default {
     position: fixed;
     transform-origin: left top;
     left: 0; top:0; z-index: 1000;
+    overflow: hidden;
+    transition: all ease-out 0.3s;
   }
 
   .content {