From dbc9d8b458ea186c4e4ddcdb60b64d39d009790a Mon Sep 17 00:00:00 2001
From: Xubx <1827135378@qq.com>
Date: Tue, 4 Mar 2025 15:47:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=90=84=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                          |   2 +-
 index.html                                    |   2 +-
 logo.png                                      | Bin 0 -> 5404 bytes
 src/assets/images/logo-red.png                | Bin 0 -> 16608 bytes
 src/assets/images/logo.png                    | Bin 7519 -> 5404 bytes
 src/components/Application/src/AppLogo.vue    | 146 ++--
 src/components/Scrollbar/src/Scrollbar.vue    | 346 +++++----
 .../header/components/user-dropdown/index.vue | 399 +++++-----
 src/layouts/default/header/index.vue          | 406 +++++-----
 src/settings/projectSetting.ts                |   6 +-
 src/views/cees/student.vue                    |  13 -
 src/views/dashboard/Analysis/index.vue        |  25 +-
 src/views/sys/login/LoginForm.vue             | 218 +++---
 src/views/sys/login/TokenLoginPage.vue        | 377 ++++-----
 src/views/system/loginmini/MiniLogin.vue      | 718 ++++++++----------
 15 files changed, 1304 insertions(+), 1354 deletions(-)
 create mode 100644 logo.png
 create mode 100644 src/assets/images/logo-red.png
 delete mode 100644 src/views/cees/student.vue

diff --git a/.env b/.env
index 5ad279d..dd9322d 100644
--- a/.env
+++ b/.env
@@ -2,7 +2,7 @@
 VITE_PORT = 3100
 
 #  网站标题
-VITE_GLOB_APP_TITLE = JeecgBoot 企业级低代码平台
+VITE_GLOB_APP_TITLE = 哈尔滨师范大学评阅人员管理系统
 
 # 简称，用于配置文件名字 不要出现空格、数字开头等特殊字符
 VITE_GLOB_APP_SHORT_NAME = JeecgBootAdmin
diff --git a/index.html b/index.html
index ef61a19..6423195 100644
--- a/index.html
+++ b/index.html
@@ -157,7 +157,7 @@
       </style>
       <div class="app-loading">
         <div class="app-loading-wrap">
-          <img src="/resource/img/logo.png" class="app-loading-logo" alt="Logo" />
+          <!--<img src="/logo.png" class="app-loading-logo" alt="Logo" />-->
           <div class="app-loading-dots">
             <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
           </div>
diff --git a/logo.png b/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..cbc50d2e90f52bc16aad55eddf36e38271637389
GIT binary patch
literal 5404
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
E0catU00000

literal 0
HcmV?d00001

diff --git a/src/assets/images/logo-red.png b/src/assets/images/logo-red.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6d14e2ffcd8f6a5540d4766e1d7639b64287568
GIT binary patch
literal 16608
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

literal 0
HcmV?d00001

diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png
index 8072ced742bd19a66596899cad918338ef71df40..cbc50d2e90f52bc16aad55eddf36e38271637389 100644
GIT binary patch
literal 5404
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
E0catU00000

literal 7519
zcmcgx_cvV8w^w6CFlwSt^fF2$M2iwe?`4c`f*^VsC4^w2i#kM$7SRS{qIZ)JOhicZ
zl0@{H5Cp-y`M$N@`v=~7Kb&>%x%;!v-FNSEK6{^g5{wPCXs@zgB_Sc9)zQ{4B_Sb&
z{%fEsz?0A?&r!gI+E?2ufP{pG@n0hyUx@fiLc+zMqoHOVQm|9#mCR)s`t+-x9#e(N
zB*vY?ZK#fE?qrN7=yHL_J=mto)S?P+GEr?FHO*35S?O$cwUqe*m4>R$O^z{oH4!Vb
zL=v?bhz5=OaNg_M3HphPG2Phakf`vqkZ0GeU4xl|s&f^CgLmgo<Xl%j<OZxNr{3rc
z^A8`LuYbQ6I%)}yEg>QK)2qBFK=P9kO-Zu&6i3p_0cIr$At#WL_^2XCzR`kcNIFT8
zq)+ccpd>%9{9l5M`)G<dKm1~E>!UY3qaiVVN5hi}L&3?~^fbuqD|gipBy9G7lKM!g
zolP`8^5-dxdMsZ7(Lnl-_8ldrg~S+#8x~%OW?9(t-31J#p5tNT%u$8E<;qRajegRA
zE&ccn28bXVbl{=Qw=rgn!##S!xAC``En07P@@IK;YI=jwNV%PQQhoV39`=F^Rqh0b
zXAqP?&*i5L8vc2%D2bc;GINo6gQA1U<gv*#?I1#QmCISGS-QoGgt{Zf-DI!=1@OrE
zj65cj3D2I6xh_Wz^qtPW_xUkcWj|rFdd4)y^49cu6wa}FI>OCYRRhkitw}DBZkpa2
z^e4O((B62UmCc_v^G808O~j>NrkecYQ=H?Y=?JNhHVc@!LyiOw>0yPBLhrc1tooF5
zdnr>?5*R~=L8Io;pVWR-rioHqXuNRAhXE7w)2o?cX91hD7rjq~i40)Y-!E%}>FLnv
zxN+0rL=hv~FcdhO4+33RQS{dhau&3H#u`hRAu7so(cN3|j&=~KcF7h*6&zrO%qU8{
ztQ<zt5&=9Isa8LupeQGyD4l=Zpugjm`3f%9<;~olQ0fX9i00Jb3m0_Mh$YFx*1qD;
zt3Y}}bi^Aznr95=nx;%k?Da7?P7<V=&&=bwZ>pUWe%8vcrCGM?mWGA7J5*P+Yn;HW
zA^np}-~LSAOFVgH{5(~sTH970MZmVkUhY7Pvc1(1-)L=olKEb*KaCgDJ?2DF9jqc)
zG~ne+vpN}jdji9ojA+UW93L@V&KuEQ-2DErJp~4n@t`oPH6E`(fsDHDd2s~E(?i|g
z8WbN9ki(#2m+}_cBcC=ZkRhWEJi8;nE2Z4JrJPN>#b2zW%dFQvOm@h3chi7b<wjPw
zu24A(eY8oTDCI$7P?U!`8_5w4tC>zbXi9IUmE`db=z0OejiFlT(4xNWfz9444>yjF
z0u-(@e@FVFDfU->vqjy#$US9?vI%}acQaCG58Jm;bnG&`zv*oBnN9L?gJZX=cj!|#
zgg_Qd9ak3ZWb*vVU8V5vd1(A==_e(PhN00BE?eD*WJgjor6K+#uWzOSM&xr}XB60w
zc`a$4=z;H$;~1qS7lS~3pN}X~1xU~ON^(rBGYS&M3%ZT1T}^`yY+SGCg=frCA)~_3
zj4;dFZ6+y#V|U_late=R`;oQ}f_)Z<&_B(9r<wEX*)@pnyQ0aD0(B;tVihTq@(lF-
zro|$iw-!nB&znF5vX<$DvYMqz%^WWIv<Oa`CF_~TRDgt%K;}CAcS5c`Pm-f+t~0>b
z^f2PC1IHR+^#Falfg{F{uBOv4u=Mxl<Xk$O1F$ykJO5bqSO;w7jMk+}RK-G6;#`ET
ztSD~$l>D{giz~<|CeLnv99T<z!er#{s*kx)%UvV-Qh8gUEPtcWrAIG|ixSq-qfEf8
zt$ja*B_=9Y(?=|6{rPG~Ea_Ke9d091n2s$1uy~a?rZWc%SeOOM(DS_e@paZ}q&r>U
z$AccF7n!Qv+~TMN%PwZgn4ybq!6>L6STbIjo98{tV8X1PuQZD6cIq3}g*n<ii}|-S
zy5DW@ufLR%pAmfW&=C=$>3Di<MZK)=&oaSwp~Q}yudo;5OsJXpp>cczh0H}fB56l|
zy0=l*n&Cb1PGn?6Yi~1XYd@9ra~S7g6qzt3QmsPiGHFPyf^ulf)^CER%Y(mn-l_Ks
zw`<VW$TD94DX!SYzqH2GPll(<tlkXLd*2VELPwA$k%z8lOP%npt;CFn@`?<Kt$Z;F
zEg;Mzn)MU6(8x{uY91;i+f$SK>&a`85mG{D%UgbD3i;dR5p>L(l}d)+A3kA6MQ<v^
zd55e=pT7JpMasY$sKsnIaidF5OS!|uP=^ciUL?8q&L(>3lCmFFx}pH8Azj85E0z{A
zvnMaQ9Ozo7W*!H8=8p*4-*D!dye^9d(X=}Wy<C@n_0T+1f+xw>oZD6FW<BQoj2$J&
zE8%vH5N#N8@%$f+%X)X{>xPn5Rc4AwVBV)EDwKVdVLGomL)K$s0cMIV3=v8BRVipE
z%Wf!IC{sTRKkd1`LJ-}Q>YU(2Q!apqe=aXen`FW6v!m|hoK+HQ4NH00qj1F>yhyei
zxmy~xD1W57UsaJcZQH-$Iwjkd;|UtOB4!olwy|@f$>YVWfU!5Tp2=#i25vGZ60@|0
zwtVjgs)Jbr@82;J8O%&%4y@4^?-Q}!y)F94GDDx;3m|=OklC9r7QEScd;tn5Yx{~;
zzaRUQy#H-7SDWmqsb!+rc}JCioI&>4x~~5p#rHEDPs`;$(U#bLSZEgTVbfn&k)ho}
z!%+91H4AP*pyU9p-hIW3ePJG$!QrQ)Mp33vUi`37>g1l=ksQa}h;1?;(!hJC(~~U9
zyqT6v*>W?3Hj@+ddc>cfNmHC5)m&{atJGT0%0FgWt{%@fMY;4$Rb?K34cOG5*E{*a
z+5U@ZJH~~~AMuGxali7TtaJ&`MB8vzY=m>TGj3hTt)*e)fsfY8iiaE6SM)bIso5r?
zMBg<r@bu6Rr~+!~xLAixg);B{B~eBz4%Bcz>S(}-$u5@yc=vqZ2|<S1rOp4*{eI>+
zYCjg#XprtJvlc_m3=zM=o?rD6z9H2}VEB;?G=5A@L3B2|RWo8(wJ=30*(mJFTOc-B
z`Q7Znxv}ZmQSpJLWesjM+kTHU{Mk{4JC~exeX^>EZ)E8>iJe8Q+*anYGJ@4XD6g6J
zZ;vnXU6%*?j9xUW07KZSD9F9^^u2rAPvy$0oq_%zXub;OUXO9t$BlD`&R+g8R)Ey5
zO{LP6c8>BrJ9aX&J@r@Yy1eB)Aq%1@C^fYn56?bDx3Vi4`WG%<%Hi>(1hO^bjBL4^
zb+imt(>=q=md$`6{MO?cj6=?ml9gsog-f9f@@<!5*Xw>!<Ea4B(_#EI7C+~?a<4jG
zEMIuEiphLxCQX&~_>$bNSHjVnT#jhqkkVnD-pF0o`MxyNQuOon;fEusMh+oz3NNo&
zp{N*GL;4QOV%A?AyWRZNIexyG@{?s!hqo?(ad77R@`LlII^ZK%5?Wbd%joeZQ==ZW
zIuPO*>T^#n%fyb+y9)bJfgby|aH@)p%4l4#UL6mYhQpss-d}lLPMA?OFJ`F>^Q_x8
z-5VKg={<8rY2-s)68x63LM^PY)SNv>*KtuG1&;y-kSBni3r*RUyo-I1m`w@`8+J&j
zcZ+=jvGhKr4@m#AW0Xu?ZC$C(ok9_QLWf*#AVE_)KAkIyhskGTS-%u7(vtkjphC9{
z)Q^wSmP^J>zAUp3o))|gdqGbiGyZneQ~yCd*Li1ubX#!cCXg+Jza7=Td!SI28z<dg
zLR2BHBUypWsV(<d`J;LY{{%n1jA5}^XpS)9K7tLXe8jaz-<xV{nFt;jhkZ)8bp@!h
zzOPqv4uYyjl+4ZI>--^clwGUqIf^6d6RR~UmT&lG0^)JSmYnAu+55(VRq!!^%#lNC
zG^KsO@~;J@FWROnp~6XidPuX0LiY9;N(l64B46s>YKdm_I8oi|!_zx%iCp?LK=hTg
zE`s!p7ne)epW?0peNHXzxe;}7VIRKFG7mfQ0;y>nv%m^#gE@B&j6;9B>F;>-^n#EK
z8i-HS39nc^R!a8QM|(Ov=;mYIK%lsf-z5iZxQf1GMxX6EQiEu){(pRyyv%kt&ui>^
z%vv7(R(^biK<2@DvDJDu)s3|sB$?PNWkh10;(7)3;IsRRMbB`$stCttZyn+*L|Z$j
zr&(UaSdbCO#L!467LJ=G_iSlMxjYr1D;6e4MseLIx4B>)Bs`+WEeyohi2|BQt8KX#
zqkftQ7Qh^JZRxfw<Zta@92uH2$X8y$-<6#r0QV0^^_d_o!WQhT%WMrS3o-QT4#nr%
z1F!C0o>3609~8~CP(Aq`X*k%AkiOS(KVT|Ud3yqkjJg-jwz4Hy0VCJ}70Zz^L-yA#
zlKkGRE0kc?Y3DNkfbNY2BSxf%Djm%>!_n>3@^Fkg0Of_^G%Gs%6c;D{p4NkrRX_!-
z;M-9%)K`@V7)iBO$lM1i;ROLY1A0dDO3I6}KkUr2mxX}|&n*E%*sV1VIM6We{sRwq
zk1v!$ujc#LgeBsb)ew$6N%)^Py@FPzHW;h_;lDFqTiDV{<*1$4G6KY@xRo&}m7GJV
zOI>m_<$2$zI}=C`xI1#>hI8}J%K)B8`Sjz-Ld;Qnz6OFF_lFJJ5L997jvT|WT=V{t
z(-n`q1C(#a8-AAlI};#1D!`97Q!%k#=`z6RImSpPm8n}fqrC0oXinDY@(sZV2}f@;
z6?8c@11qAuA>eeP+!<}m^iL}e6ARM&cjq1!YRCkY+&LL==Y`r0BBSgQ{Sgw5$HrHi
zVRb;hZteSxVwquW1NK7L@qr<E3D0rkp=AR+6`U4ub2%lliLoHJ`P;HVhHpKoJQSxF
z2<{IYX?j4Htrm~#z4sbYbT~3KCV&ODcpXyoVw>J|^1j#Y0q02A(GXL-vNq@@fy&u}
zP?uBIdP{c*J(iaiNL3TQb?85`PcbqnDZBFqpsneO`cUYhaT2IT5Qxm@SlnNQB^u-e
z1@iDkOp?E;#&e<3pQ?CH{>|rDtR$-S4u6&mwe#dpr^jzw7JKmp?GP-tpYN^g&(Ye@
z>XQuDqrpCyyb!PJRF1+>g+`po3zlpZoVY(ZIQu=PZF1S`%!F5^dRk<`u*l<Yr3Kaw
z87%qr_c^wx3(H!QbO~LgAmVL0iQQol#)*d5U=_Zo@S|^g!yAXkM0}HFsTZ=XaP&Tc
zRu%C)z}IBeG}>C~@l$oFPO|j!oNgU>efQ{WPSpbE^En1iJ%3=KbMotCr}9r2*0~zN
z$1Y*%lm6om&(ObwXQ+L?7C%h$^&uhnlcYGeu?@J$w68jxvdTvslG3Q}DzD+#gYFh}
z=8Mo8s3N#NNm(r>hg+o#8_vGqGrzmR{YPd>l)f3}4I<#t-<?D6X+B_o@+*cqYG#9R
za+~$gF)$q+rVfVdHReI<)tj(O-X)kY>WXF?jbPkO5D@~;SV0+QT7;jk&pCf@JG0>)
z+9WDL&m}||;D8o6R*1M|ELc;3Up{G-gsL1^fog7o^kVe!f1TGBIz{ieV6tGNTi7Hc
z*K71;jTI58@(2TJLKQ;Dq=-LJ0i#`=?;OfC&Nw`%qvoixzuhrgDES*tb#7+(w%B{8
z>hAkc12+-|IO!OB2mkm_pLFlrRxnFum!=N$_bzrUFRH$af9ASFLKsd9Jj?DXOjxjm
zXJ}+DfQXlEaG2D6HxjhWP_?C9&m9ZADH!pH%>C}~yXtCa7m}kuBR^l0?9MC;T~%xR
zaGRzFP2}J1>~faj^6s4-dp`yw8wpZ?pXuIS(9**|Z4Gl_2yK)LcbOM*MkTq_2AoX_
zp5)%8UvU-5z%Xl>RFfs4Q3oAM;r3#}g%VD)R)>bIxBR@6&f!7sQly00vW`vzuEh4B
z46~QwnYvc6%Y65H!`0Ed5NB0H*n(P%P}FM?1f1`IKD?~RsOgB45aMvGtW&kk``sIa
zmU&l1{lts-Na;a-&&fUUE?Hp3NPvi75K$=68IyD8dY2M>>`ojct>3;oJBV^9gHs&>
zbr8<9Ftl=M#8_JT6RkH`^9(&d3lz|Sv*WRn@)wehL-SR(RxVm}<p@U>d}74Q&>3=Z
zZK7`u?kz*_aQcYrViZn43U@T^yP`QDoSE1tQ8VV!Z8Ht0tML%rOYlmkjm91M`mDFX
ztXA}y#hIoXaxP1nb~5wTf^kz2?7ewLxCMo|fY^i*yt(#4RBj<+D`IizOFt(x=AZP$
zaRW8AUnW2sm4dn6qH?((x75}5;Zy&3fp>czFzG-Z^mmmJkH!q$bC-vzi#sZXYfN$*
zY$sdxGL!81dp*Lcy0;M-PT(L;13%w}?>*%PW7h{YavOzeOlC@i_GB}2P8z}#Bf7+Y
zZYu^m*h!HvOv<e(ddy^F_uJz_cdoa%csuo6tkq8@cfr9ixPgt=Hq-i$ev}@?>#oeV
zi!zr?k<M=KKDn}00Z9M}o|Fp`N~<2`wGouZ4~dyEzwkbbs;UjSFaNa^It$yex5{w3
zftGpRMgJn#&6PjxQ50K-#s1k}qYIt)bHZnS>ArWb5p)~6nIn5=i*m7|Y3yVk7VsZa
zrk`{Aa#!x`*y+1VT_fZ<mrrO(ZqylMxf1s;y0zP|=5yoQdAg7{^?w}S)|C{6if|1g
z*{&cB#$V!ed5b5VF=p@?__JQqg}42d;gx+6Rwfin4)(eyk9Q-`F6?Lw@`(uDj}dyU
z7I8659n$pmn?;;)&|8Juv=#E(D<R?Bw?6c==ktDc0>hObmO&NA48@~Fnk37;M!xQ^
z$uRvq&on>f{k}*B65|OVj3)%$p@fUpcv=~rl`?o)G&Y43wSF5-`$d#>|05?-G)5g?
z;&9+y;@#+E2+^D~olbmhKZWx&!V-EO{CXt&So@-y5)8jJQi|Oz<vMTP45EEs&-7-k
zu_LzM;n8IW8dUR7e7MGj;@HX33}W(fzv_t%-*1x`jWBom@+ne;#om&~IXjF4f+d^G
zS&F=QD3spLu)};+-?gjcHTHK$tli){I&bfm1#&Q4{;^56&6r_%Z`SOTk4MC=Bt|G}
zc29POfsgt)TNSZ_6~6S?uy1tIf}e~Yewcq>6CBujs@%5p*_317av=t%t3AmI*RtBx
zR6Oyj8kQD=V~&pNFl|P{%Wss1_1w386LHpLNDH%<nGFIpN;At%^}IEm(q=n*7}yCG
zqh5r4Q8dvMua7@&<)60!fNA_+M^`5CY&+UzZWXrh8GQ7SjI+$+d8ex#3W52>-dgAn
z{yx;`@_`V>nI1P+VMWXl?V#xANxL{@yFB!sU9^H#>Q(WlIOZEk`2EsCcCt5YJHkZM
z^4iCM`L#vv-&@1(B6*I1&Btbe%t`sjTCvPj4-I%V-aOPkZ&b$OVz9R8aQXN8zfdut
z%e6UODE;dubF7)Wzeu074wM#p+OU(E74}-sPTJ25*QT;7B~KV=x3+)?<B%ILD=%X8
zj+<8bc>z8apIDcx>U`Kdnxa$V<KWA<D;|xz(|UR#H{3p2iJeUj+IKd4bKY8+i`7Jx
zZP3-UJn3#pXJvpVL7;ZAZ+~;t!W65?#=r=7n;Cp(bG0)@XmY>#fjig5{k>OBeIR59
z1Zq&HEIbvh%4(Aogm=j}IJThR6>lmRC2p=MFv0j#e!le&sPL(@im$W2f}Hr)M&)cp
zCco#|m?>)JEoLMeiXR6fteCUE<c1E7bmi?n#r=Z`r1f*d6x&>M@uDFYPRGU<e|^^f
zcHPnH(0WHos3r#NB?Pb>yK4cqHSp|YWs5WwO~IS7mExCeS^843fM01tb}vHm-U`&Z
zX%##Vn#EY8L(kMQe|%JBKu=_;8Xii_x`St`3^#6Ic9ix$h0R=Rk6~3s(1sq_`Az+N
zxu~J&LYQDixSa9spGSbUlor$!fi1bxnV}W%3)ssJUQJfTwxh44xo`wCfOkZm(l4m#
zL7-;WI%0q6o==t*c1p*L8M**IdyT)UVQ(9JVqo#W>j^b-h78HJH0Qb`<1AFGsW>A|
zPS!9xnMBu9vI!9bTpkmCX5S_pRUpf@Lm@F-4Z({sdYha{Moh)rZ7N97T(gXp1reo2
zJMX=u<ncM0GKUP?sbiX%DKcy<%g;M|>OWl^pR08Fh{#t`K%;Qh-*Q`qsvvIyg<jKI
zRcR`Qx>$_C?V_q0B^R|28kSs7akIQ>nH`zBFqPS%$=lpJ&P4vTZoG@=jz{Am!J=nz
z{Mvs|)=L{L!!p!M;!#ryDM9-e5zXhF%>c}6<z9XC8oR-bg|^)l8?mA8o&Sa}Z?wF#
z8Pnj4<3M$PDJL^wM%aEahgW;KYXrU2vUE+TYbQlEeK7NRu0?m9UqF095>=%N%pATn
zQLC!NTlLuL+QhZ?^Twh*SLvF<s%u<PIOxwW`Hb!fo^k>;=DC{`lcmyyY=8XFhXpx4
zE?I6x**}I0D3Df5Rbk5y(w;YJs6ieG&5C5X7(}f!7l|g7*8HTD{5tRk%eKvmc1ahy
z{=Os53pEv3R(Rjag~&WR>Lq5@eE2HI$KeYL|JdR!5K-Ew`_|&Z_mH$jExq=nAWx!b
zBDVRjB8U9u)t7<alwWhBCrFJh48v`w?>|21siSy+6~_!3YRH~%8y7m8f1(A$wZgY(
zI}RE@q6GhkZ}8g(jOlAVs|z-$$4?U83fSHRz4e`Si1`@WPxYfVd-UCL32&Nbt}sZ$
z!m)HJq6Eu-@PZeAo;4VJIabrMI)BPo7A>KMULpDVw-$k@PtN!iRfpX#g$#*oA>d06
zfzPm<Xb|zH_X+NU4n&M`uwjy7JRJ-CP~ceW3Kc75@;!Z=)jb79%D=m7-;tjjDc3Eg
z<zgW>X1?#j;s;EdP!5TNcWp3VFfUZA%|+fm=EhE~4Aa*VYO4u59CkdS9jbmu`cKd0
zW<Qa8$EkTRz8F~iak=M}obfH+XqPp_#^Cnv1Rj&sWLVtU+f+;qZMaP?FGjD5;FdbO
zHR4vI7CiO}%fE5;@h7g%IIHalRXQU1<Zd$4uK+)9BA-=P$VjLa?Dn)n0`_kdP^zyg
zGe~YFd{iq)-JAbc2$Y&aYvMgp6FS#-yLWOj*tVe$k3i@ZkvL@*pFYk6kLGmj=4ykk
z2FtI=oPw9ZsIR9P1*mVzs!Zq=`8Z`Jo)Cs7Cl9wYY%(yI=e<{bLo~yfEefq260aA>
z#6hqxeYaeHWLA{19lRNs;#j4|J{9(1F#w}HdumdgCB^(LUdG@a4|o;ny~8B7ChzSU
ztMXT+Sgh^C>EBR=MXDn1tu&9mzrA`r#*HqgQL-jp81L`4^&?;#JgWkRkIMgj7NYR3
zYI%4^B9YYU$(}>O^b4QBRuR`LN6cs$80U#;XL0Z?`DN5=&%78{d}6kRWI&$5r5eI)
zIQ_koyEp~orMxmh*nV)+w9`|^`I-0E-%oL>&+7&j2GV<3gUaf!LW!cAyD-JbI*mx)
zstpQcA4Q7_LoipW&>U7Hl3Q;oL6e-%3U*Ly&7W8-Avh%(P@xKDt<2E&lwh1bzR-#A
zI%AXPjBv0Y|4GT|wQ+rD-FknGWtjp7fx3O@>qj^TTulvlR>yhgKc{@Su5154r+@!@
g*!U+Z{;!HMEkh{m?@wjm#FRt_W~fnj-!b~X00$cqH2?qr

diff --git a/src/components/Application/src/AppLogo.vue b/src/components/Application/src/AppLogo.vue
index a2cf732..2908c0b 100644
--- a/src/components/Application/src/AppLogo.vue
+++ b/src/components/Application/src/AppLogo.vue
@@ -4,89 +4,93 @@
 -->
 <template>
   <div class="anticon" :class="getAppLogoClass" @click="goHome">
-    <img src="../../../assets/images/logo.png" />
-    <div class="ml-2 truncate md:opacity-100" :class="getTitleClass" v-show="showTitle">
-      {{ title }}
+    <img style="width: 100%;" src="../../../assets/images/logo-red.png" />
+    <div style="display: flex;" class="ml-2 truncate md:opacity-100" :class="getTitleClass" v-show="showTitle">
+      <!-- {{ title }} -->
+      <!-- <span>英语四六级综合管理平台</span> -->
     </div>
   </div>
 </template>
 <script lang="ts" setup>
-  import { computed, unref } from 'vue';
-  import { useGlobSetting } from '/@/hooks/setting';
-  import { useGo } from '/@/hooks/web/usePage';
-  import { useMenuSetting } from '/@/hooks/setting/useMenuSetting';
-  import { useDesign } from '/@/hooks/web/useDesign';
-  import { PageEnum } from '/@/enums/pageEnum';
-  import { useUserStore } from '/@/store/modules/user';
+import { computed, unref } from 'vue';
+import { useGlobSetting } from '/@/hooks/setting';
+import { useGo } from '/@/hooks/web/usePage';
+import { useMenuSetting } from '/@/hooks/setting/useMenuSetting';
+import { useDesign } from '/@/hooks/web/useDesign';
+import { PageEnum } from '/@/enums/pageEnum';
+import { useUserStore } from '/@/store/modules/user';
 
-  const props = defineProps({
-    /**
-     * The theme of the current parent component
-     */
-    theme: { type: String, validator: (v: string) => ['light', 'dark'].includes(v) },
-    /**
-     * Whether to show title
-     */
-    showTitle: { type: Boolean, default: true },
-    /**
-     * The title is also displayed when the menu is collapsed
-     */
-    alwaysShowTitle: { type: Boolean },
-  });
+const props = defineProps({
+  /**
+   * The theme of the current parent component
+   */
+  theme: { type: String, validator: (v: string) => ['light', 'dark'].includes(v) },
+  /**
+   * Whether to show title
+   */
+  showTitle: { type: Boolean, default: true },
+  /**
+   * The title is also displayed when the menu is collapsed
+   */
+  alwaysShowTitle: { type: Boolean },
+});
 
-  const { prefixCls } = useDesign('app-logo');
-  const { getCollapsedShowTitle } = useMenuSetting();
-  const userStore = useUserStore();
-  const { title } = useGlobSetting();
-  const go = useGo();
+const { prefixCls } = useDesign('app-logo');
+const { getCollapsedShowTitle } = useMenuSetting();
+const userStore = useUserStore();
+const { title } = useGlobSetting();
+const go = useGo();
 
-  const getAppLogoClass = computed(() => [prefixCls, props.theme, { 'collapsed-show-title': unref(getCollapsedShowTitle) }]);
+const getAppLogoClass = computed(() => [prefixCls, props.theme, { 'collapsed-show-title': unref(getCollapsedShowTitle) }]);
 
-  const getTitleClass = computed(() => [
-    `${prefixCls}__title`,
-    {
-      'xs:opacity-0': !props.alwaysShowTitle,
-    },
-  ]);
+const getTitleClass = computed(() => [
+  `${prefixCls}__title`,
+  {
+    'xs:opacity-0': !props.alwaysShowTitle,
+  },
+]);
 
-  function goHome() {
-    go(userStore.getUserInfo.homePath || PageEnum.BASE_HOME);
-  }
+function goHome() {
+  go(userStore.getUserInfo.homePath || PageEnum.BASE_HOME);
+}
 </script>
 <style lang="less" scoped>
-  @prefix-cls: ~'@{namespace}-app-logo';
+@prefix-cls: ~'@{namespace}-app-logo';
 
-  .@{prefix-cls} {
-    display: flex;
-    align-items: center;
-    padding-left: 7px;
-    cursor: pointer;
-    transition: all 0.2s ease;
-    //左侧菜单模式和左侧菜单混合模式加渐变背景色
-    &.jeecg-layout-mix-sider-logo,&.jeecg-layout-menu-logo{
-      background:@sider-logo-bg-color;
-    }
-    // &.light {
-    //   border-bottom: 1px solid @border-color-base;
-    // }
+.@{prefix-cls} {
+  display: flex;
+  align-items: center;
+  padding-left: 7px;
+  cursor: pointer;
+  transition: all 0.2s ease;
 
-    &.collapsed-show-title {
-      padding-left: 20px;
-    }
-
-    &.light &__title {
-      color: @primary-color;
-    }
-
-    &.dark &__title {
-      color: @white;
-    }
-
-    &__title {
-      font-size: 16px;
-      font-weight: 700;
-      transition: all 0.5s;
-      line-height: normal;
-    }
+  //左侧菜单模式和左侧菜单混合模式加渐变背景色
+  &.jeecg-layout-mix-sider-logo,
+  &.jeecg-layout-menu-logo {
+    background: @sider-logo-bg-color;
   }
+
+  // &.light {
+  //   border-bottom: 1px solid @border-color-base;
+  // }
+
+  &.collapsed-show-title {
+    padding-left: 20px;
+  }
+
+  &.light &__title {
+    color: @primary-color;
+  }
+
+  &.dark &__title {
+    color: @white;
+  }
+
+  &__title {
+    font-size: 16px;
+    font-weight: 700;
+    transition: all 0.5s;
+    line-height: normal;
+  }
+}
 </style>
diff --git a/src/components/Scrollbar/src/Scrollbar.vue b/src/components/Scrollbar/src/Scrollbar.vue
index 3ea4a02..d1d3de5 100644
--- a/src/components/Scrollbar/src/Scrollbar.vue
+++ b/src/components/Scrollbar/src/Scrollbar.vue
@@ -1,6 +1,20 @@
 <template>
   <div class="scrollbar">
-    <div ref="wrap" :class="[wrapClass, 'scrollbar__wrap', native ? '' : 'scrollbar__wrap--hidden-default']" :style="style" @scroll="handleScroll">
+    <div ref="wrap" :class="[wrapClass, 'scrollbar__wrap', native ? '' : 'scrollbar__wrap--hidden-default']"
+      :style="style" @scroll="handleScroll">
+      <div style="display: flex; justify-content: center; align-items: center">
+        <span style="
+            font-size: 18px;
+            font-weight: 700;
+            transition: all 0.5s;
+            line-height: normal;
+            padding: 5px;
+          ">
+          评阅人员管理系统
+        </span>
+
+      </div>
+
       <component :is="tag" ref="resize" :class="['scrollbar__view', viewClass]" :style="viewStyle">
         <slot></slot>
       </component>
@@ -12,182 +26,182 @@
   </div>
 </template>
 <script lang="ts">
-  import { addResizeListener, removeResizeListener } from '/@/utils/event';
-  import componentSetting from '/@/settings/componentSetting';
-  const { scrollbar } = componentSetting;
-  import { toObject } from './util';
-  import { defineComponent, ref, onMounted, onBeforeUnmount, nextTick, provide, computed, unref } from 'vue';
-  import Bar from './bar';
+import { addResizeListener, removeResizeListener } from '/@/utils/event';
+import componentSetting from '/@/settings/componentSetting';
+const { scrollbar } = componentSetting;
+import { toObject } from './util';
+import { defineComponent, ref, onMounted, onBeforeUnmount, nextTick, provide, computed, unref } from 'vue';
+import Bar from './bar';
 
-  export default defineComponent({
-    name: 'Scrollbar',
-    // inheritAttrs: false,
-    components: { Bar },
-    props: {
-      native: {
-        type: Boolean,
-        default: scrollbar?.native ?? false,
-      },
-      wrapStyle: {
-        type: [String, Array],
-        default: '',
-      },
-      wrapClass: {
-        type: [String, Array],
-        default: '',
-      },
-      viewClass: {
-        type: [String, Array],
-        default: '',
-      },
-      viewStyle: {
-        type: [String, Array],
-        default: '',
-      },
-      noresize: Boolean, // 如果 container 尺寸不会发生变化，最好设置它可以优化性能
-      tag: {
-        type: String,
-        default: 'div',
-      },
+export default defineComponent({
+  name: 'Scrollbar',
+  // inheritAttrs: false,
+  components: { Bar },
+  props: {
+    native: {
+      type: Boolean,
+      default: scrollbar?.native ?? false,
     },
-    setup(props) {
-      const sizeWidth = ref('0');
-      const sizeHeight = ref('0');
-      const moveX = ref(0);
-      const moveY = ref(0);
-      const wrap = ref();
-      const resize = ref();
-
-      provide('scroll-bar-wrap', wrap);
-
-      const style = computed(() => {
-        if (Array.isArray(props.wrapStyle)) {
-          return toObject(props.wrapStyle);
-        }
-        return props.wrapStyle;
-      });
-
-      const handleScroll = () => {
-        if (!props.native) {
-          moveY.value = (unref(wrap).scrollTop * 100) / unref(wrap).clientHeight;
-          moveX.value = (unref(wrap).scrollLeft * 100) / unref(wrap).clientWidth;
-        }
-      };
-
-      const update = () => {
-        if (!unref(wrap)) return;
-
-        const heightPercentage = (unref(wrap).clientHeight * 100) / unref(wrap).scrollHeight;
-        const widthPercentage = (unref(wrap).clientWidth * 100) / unref(wrap).scrollWidth;
-
-        sizeHeight.value = heightPercentage < 100 ? heightPercentage + '%' : '';
-        sizeWidth.value = widthPercentage < 100 ? widthPercentage + '%' : '';
-      };
-
-      onMounted(() => {
-        if (props.native) return;
-        nextTick(update);
-        if (!props.noresize) {
-          addResizeListener(unref(resize), update);
-          addResizeListener(unref(wrap), update);
-          addEventListener('resize', update);
-        }
-      });
-
-      onBeforeUnmount(() => {
-        if (props.native) return;
-        if (!props.noresize) {
-          removeResizeListener(unref(resize), update);
-          removeResizeListener(unref(wrap), update);
-          removeEventListener('resize', update);
-        }
-      });
-
-      return {
-        moveX,
-        moveY,
-        sizeWidth,
-        sizeHeight,
-        style,
-        wrap,
-        resize,
-        update,
-        handleScroll,
-      };
+    wrapStyle: {
+      type: [String, Array],
+      default: '',
     },
-  });
+    wrapClass: {
+      type: [String, Array],
+      default: '',
+    },
+    viewClass: {
+      type: [String, Array],
+      default: '',
+    },
+    viewStyle: {
+      type: [String, Array],
+      default: '',
+    },
+    noresize: Boolean, // 如果 container 尺寸不会发生变化，最好设置它可以优化性能
+    tag: {
+      type: String,
+      default: 'div',
+    },
+  },
+  setup(props) {
+    const sizeWidth = ref('0');
+    const sizeHeight = ref('0');
+    const moveX = ref(0);
+    const moveY = ref(0);
+    const wrap = ref();
+    const resize = ref();
+
+    provide('scroll-bar-wrap', wrap);
+
+    const style = computed(() => {
+      if (Array.isArray(props.wrapStyle)) {
+        return toObject(props.wrapStyle);
+      }
+      return props.wrapStyle;
+    });
+
+    const handleScroll = () => {
+      if (!props.native) {
+        moveY.value = (unref(wrap).scrollTop * 100) / unref(wrap).clientHeight;
+        moveX.value = (unref(wrap).scrollLeft * 100) / unref(wrap).clientWidth;
+      }
+    };
+
+    const update = () => {
+      if (!unref(wrap)) return;
+
+      const heightPercentage = (unref(wrap).clientHeight * 100) / unref(wrap).scrollHeight;
+      const widthPercentage = (unref(wrap).clientWidth * 100) / unref(wrap).scrollWidth;
+
+      sizeHeight.value = heightPercentage < 100 ? heightPercentage + '%' : '';
+      sizeWidth.value = widthPercentage < 100 ? widthPercentage + '%' : '';
+    };
+
+    onMounted(() => {
+      if (props.native) return;
+      nextTick(update);
+      if (!props.noresize) {
+        addResizeListener(unref(resize), update);
+        addResizeListener(unref(wrap), update);
+        addEventListener('resize', update);
+      }
+    });
+
+    onBeforeUnmount(() => {
+      if (props.native) return;
+      if (!props.noresize) {
+        removeResizeListener(unref(resize), update);
+        removeResizeListener(unref(wrap), update);
+        removeEventListener('resize', update);
+      }
+    });
+
+    return {
+      moveX,
+      moveY,
+      sizeWidth,
+      sizeHeight,
+      style,
+      wrap,
+      resize,
+      update,
+      handleScroll,
+    };
+  },
+});
 </script>
 <style lang="less">
-  .scrollbar {
-    position: relative;
+.scrollbar {
+  position: relative;
+  height: 100%;
+  overflow: hidden;
+
+  &__wrap {
     height: 100%;
-    overflow: hidden;
+    overflow: auto;
 
-    &__wrap {
-      height: 100%;
-      overflow: auto;
+    &--hidden-default {
+      scrollbar-width: none;
 
-      &--hidden-default {
-        scrollbar-width: none;
-
-        &::-webkit-scrollbar {
-          display: none;
-          width: 0;
-          height: 0;
-          opacity: 0;
-        }
-      }
-    }
-
-    &__thumb {
-      position: relative;
-      display: block;
-      width: 0;
-      height: 0;
-      cursor: pointer;
-      background-color: rgba(144, 147, 153, 0.3);
-      border-radius: inherit;
-      transition: 0.3s background-color;
-
-      &:hover {
-        background-color: rgba(144, 147, 153, 0.5);
-      }
-    }
-
-    &__bar {
-      position: absolute;
-      right: 2px;
-      bottom: 2px;
-      z-index: 1;
-      border-radius: 4px;
-      opacity: 0;
-      -webkit-transition: opacity 80ms ease;
-      transition: opacity 80ms ease;
-
-      &.is-vertical {
-        top: 2px;
-        width: 6px;
-
-        & > div {
-          width: 100%;
-        }
-      }
-
-      &.is-horizontal {
-        left: 2px;
-        height: 6px;
-
-        & > div {
-          height: 100%;
-        }
+      &::-webkit-scrollbar {
+        display: none;
+        width: 0;
+        height: 0;
+        opacity: 0;
       }
     }
   }
 
-  .scrollbar:active > .scrollbar__bar,
-  .scrollbar:focus > .scrollbar__bar,
-  .scrollbar:hover > .scrollbar__bar {
-    opacity: 1;
-    transition: opacity 340ms ease-out;
+  &__thumb {
+    position: relative;
+    display: block;
+    width: 0;
+    height: 0;
+    cursor: pointer;
+    background-color: rgba(144, 147, 153, 0.3);
+    border-radius: inherit;
+    transition: 0.3s background-color;
+
+    &:hover {
+      background-color: rgba(144, 147, 153, 0.5);
+    }
   }
+
+  &__bar {
+    position: absolute;
+    right: 2px;
+    bottom: 2px;
+    z-index: 1;
+    border-radius: 4px;
+    opacity: 0;
+    -webkit-transition: opacity 80ms ease;
+    transition: opacity 80ms ease;
+
+    &.is-vertical {
+      top: 2px;
+      width: 6px;
+
+      &>div {
+        width: 100%;
+      }
+    }
+
+    &.is-horizontal {
+      left: 2px;
+      height: 6px;
+
+      &>div {
+        height: 100%;
+      }
+    }
+  }
+}
+
+.scrollbar:active>.scrollbar__bar,
+.scrollbar:focus>.scrollbar__bar,
+.scrollbar:hover>.scrollbar__bar {
+  opacity: 1;
+  transition: opacity 340ms ease-out;
+}
 </style>
diff --git a/src/layouts/default/header/components/user-dropdown/index.vue b/src/layouts/default/header/components/user-dropdown/index.vue
index ee988f1..d97735f 100644
--- a/src/layouts/default/header/components/user-dropdown/index.vue
+++ b/src/layouts/default/header/components/user-dropdown/index.vue
@@ -11,12 +11,8 @@
 
     <template #overlay>
       <Menu @click="handleMenuClick">
-        <MenuItem key="doc" :text="t('layout.header.dropdownItemDoc')" icon="ion:document-text-outline" v-if="getShowDoc" />
-        <MenuDivider v-if="getShowDoc" />
-        <MenuItem key="account" :text="t('layout.header.dropdownItemSwitchAccount')" icon="ant-design:setting-outlined" />
-        <MenuItem key="password" :text="t('layout.header.dropdownItemSwitchPassword')" icon="ant-design:edit-outlined" />
-        <MenuItem key="depart" :text="t('layout.header.dropdownItemSwitchDepart')" icon="ant-design:cluster-outlined" />
-        <MenuItem key="cache" :text="t('layout.header.dropdownItemRefreshCache')" icon="ion:sync-outline" />
+        <MenuItem key="password" :text="t('layout.header.dropdownItemSwitchPassword')"
+          icon="ant-design:edit-outlined" />
         <!-- <MenuItem
             v-if="getUseLockPage"
             key="lock"
@@ -32,220 +28,221 @@
   <UpdatePassword v-if="passwordVisible" ref="updatePasswordRef" />
 </template>
 <script lang="ts">
-  // components
-  import { Dropdown, Menu } from 'ant-design-vue';
+// components
+import { Dropdown, Menu } from 'ant-design-vue';
 
-  import { defineComponent, computed, ref } from 'vue';
+import { defineComponent, computed, ref } from 'vue';
 
-  import { SITE_URL } from '/@/settings/siteSetting';
+import { SITE_URL } from '/@/settings/siteSetting';
 
-  import { useUserStore } from '/@/store/modules/user';
-  import { useHeaderSetting } from '/@/hooks/setting/useHeaderSetting';
-  import { useI18n } from '/@/hooks/web/useI18n';
-  import { useDesign } from '/@/hooks/web/useDesign';
-  import { useModal } from '/@/components/Modal';
-  import { useMessage } from '/src/hooks/web/useMessage';
-  import { useGo } from '/@/hooks/web/usePage';
-  import headerImg from '/@/assets/images/header.jpg';
-  import { propTypes } from '/@/utils/propTypes';
-  import { openWindow } from '/@/utils';
+import { useUserStore } from '/@/store/modules/user';
+import { useHeaderSetting } from '/@/hooks/setting/useHeaderSetting';
+import { useI18n } from '/@/hooks/web/useI18n';
+import { useDesign } from '/@/hooks/web/useDesign';
+import { useModal } from '/@/components/Modal';
+import { useMessage } from '/src/hooks/web/useMessage';
+import { useGo } from '/@/hooks/web/usePage';
+import headerImg from '/@/assets/images/header.jpg';
+import { propTypes } from '/@/utils/propTypes';
+import { openWindow } from '/@/utils';
 
-  import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent';
+import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent';
 
-  import { refreshCache, queryAllDictItems } from '/@/views/system/dict/dict.api';
-  import { DB_DICT_DATA_KEY } from '/src/enums/cacheEnum';
-  import { removeAuthCache, setAuthCache } from '/src/utils/auth';
-  import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
-  import { getRefPromise } from '/@/utils/index';
+import { refreshCache, queryAllDictItems } from '/@/views/system/dict/dict.api';
+import { DB_DICT_DATA_KEY } from '/src/enums/cacheEnum';
+import { removeAuthCache, setAuthCache } from '/src/utils/auth';
+import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
+import { getRefPromise } from '/@/utils/index';
 
-  type MenuEvent = 'logout' | 'doc' | 'lock' | 'cache' | 'depart';
-  const { createMessage } = useMessage();
-  export default defineComponent({
-    name: 'UserDropdown',
-    components: {
-      Dropdown,
-      Menu,
-      MenuItem: createAsyncComponent(() => import('./DropMenuItem.vue')),
-      MenuDivider: Menu.Divider,
-      LockAction: createAsyncComponent(() => import('../lock/LockModal.vue')),
-      DepartSelect: createAsyncComponent(() => import('./DepartSelect.vue')),
-      UpdatePassword: createAsyncComponent(() => import('./UpdatePassword.vue')),
-    },
-    props: {
-      theme: propTypes.oneOf(['dark', 'light']),
-    },
-    setup() {
-      const { prefixCls } = useDesign('header-user-dropdown');
-      const { t } = useI18n();
-      const { getShowDoc, getUseLockPage } = useHeaderSetting();
-      const userStore = useUserStore();
-      const go = useGo();
-      const passwordVisible = ref(false);
-      const lockActionVisible = ref(false);
-      const lockActionRef = ref(null);
+type MenuEvent = 'logout' | 'doc' | 'lock' | 'cache' | 'depart';
+const { createMessage } = useMessage();
+export default defineComponent({
+  name: 'UserDropdown',
+  components: {
+    Dropdown,
+    Menu,
+    MenuItem: createAsyncComponent(() => import('./DropMenuItem.vue')),
+    MenuDivider: Menu.Divider,
+    LockAction: createAsyncComponent(() => import('../lock/LockModal.vue')),
+    DepartSelect: createAsyncComponent(() => import('./DepartSelect.vue')),
+    UpdatePassword: createAsyncComponent(() => import('./UpdatePassword.vue')),
+  },
+  props: {
+    theme: propTypes.oneOf(['dark', 'light']),
+  },
+  setup() {
+    const { prefixCls } = useDesign('header-user-dropdown');
+    const { t } = useI18n();
+    const { getShowDoc, getUseLockPage } = useHeaderSetting();
+    const userStore = useUserStore();
+    const go = useGo();
+    const passwordVisible = ref(false);
+    const lockActionVisible = ref(false);
+    const lockActionRef = ref(null);
 
-      const getUserInfo = computed(() => {
-        const { realname = '', avatar, desc } = userStore.getUserInfo || {};
-        return { realname, avatar: avatar || headerImg, desc };
-      });
+    const getUserInfo = computed(() => {
+      const { realname = '', avatar, desc } = userStore.getUserInfo || {};
+      return { realname, avatar: avatar || headerImg, desc };
+    });
 
-      const getAvatarUrl = computed(() => {
-        let { avatar } = getUserInfo.value;
-        if (avatar == headerImg) {
-          return avatar;
-        } else {
-          return getFileAccessHttpUrl(avatar);
-        }
-      });
-
-      const [register, { openModal }] = useModal();
-      /**
-       * 多部门弹窗逻辑
-       */
-      const loginSelectRef = ref();
-      // update-begin--author:liaozhiyang---date:20230901---for：【QQYUN-6333】空路由问题—首次访问资源太大
-      async function handleLock() {
-        await getRefPromise(lockActionRef);
-        openModal(true);
-      }
-      // update-end--author:liaozhiyang---date:20230901---for：【QQYUN-6333】空路由问题—首次访问资源太大
-      //  login out
-      function handleLoginOut() {
-        userStore.confirmLoginOut();
+    const getAvatarUrl = computed(() => {
+      let { avatar } = getUserInfo.value;
+      if (avatar == headerImg) {
+        return avatar;
+      } else {
+        return getFileAccessHttpUrl(avatar);
       }
+    });
 
-      // open doc
-      function openDoc() {
-        openWindow(SITE_URL);
-      }
+    const [register, { openModal }] = useModal();
+    /**
+     * 多部门弹窗逻辑
+     */
+    const loginSelectRef = ref();
+    // update-begin--author:liaozhiyang---date:20230901---for：【QQYUN-6333】空路由问题—首次访问资源太大
+    async function handleLock() {
+      await getRefPromise(lockActionRef);
+      openModal(true);
+    }
+    // update-end--author:liaozhiyang---date:20230901---for：【QQYUN-6333】空路由问题—首次访问资源太大
+    //  login out
+    function handleLoginOut() {
+      userStore.confirmLoginOut();
+    }
 
-      // 清除缓存
-      async function clearCache() {
-        const result = await refreshCache();
-        if (result.success) {
-          const res = await queryAllDictItems();
-          removeAuthCache(DB_DICT_DATA_KEY);
-          setAuthCache(DB_DICT_DATA_KEY, res.result);
-          // update-begin--author:liaozhiyang---date:20240124---for：【QQYUN-7970】国际化
-          createMessage.success(t('layout.header.refreshCacheComplete'));
-          // update-end--author:liaozhiyang---date:20240124---for：【QQYUN-7970】国际化
-        } else {
-          // update-begin--author:liaozhiyang---date:20240124---for：【QQYUN-7970】国际化
-          createMessage.error(t('layout.header.refreshCacheFailure'));
-          // update-end--author:liaozhiyang---date:20240124---for：【QQYUN-7970】国际化
-        }
-      }
-      // 切换部门
-      function updateCurrentDepart() {
-        loginSelectRef.value.show();
-      }
-      // 修改密码
-      const updatePasswordRef = ref();
-      // update-begin--author:liaozhiyang---date:20230901---for：【QQYUN-6333】空路由问题—首次访问资源太大
-      async function updatePassword() {
-        passwordVisible.value = true;
-        await getRefPromise(updatePasswordRef);
-        updatePasswordRef.value.show(userStore.getUserInfo.username);
-      }
-      // update-end--author:liaozhiyang---date:20230901---for：【QQYUN-6333】空路由问题—首次访问资源太大
-      function handleMenuClick(e: { key: MenuEvent }) {
-        switch (e.key) {
-          case 'logout':
-            handleLoginOut();
-            break;
-          case 'doc':
-            openDoc();
-            break;
-          case 'lock':
-            handleLock();
-            break;
-          case 'cache':
-            clearCache();
-            break;
-          case 'depart':
-            updateCurrentDepart();
-            break;
-          case 'password':
-            updatePassword();
-            break;
-          case 'account':
-            //update-begin---author:wangshuai ---date:20221125  for：进入用户设置页面------------
-            go(`/system/usersetting`);
-            //update-end---author:wangshuai ---date:20221125  for：进入用户设置页面--------------
-            break;
-        }
-      }
+    // open doc
+    function openDoc() {
+      openWindow(SITE_URL);
+    }
 
-      return {
-        prefixCls,
-        t,
-        getUserInfo,
-        getAvatarUrl,
-        handleMenuClick,
-        getShowDoc,
-        register,
-        getUseLockPage,
-        loginSelectRef,
-        updatePasswordRef,
-        passwordVisible,
-        lockActionVisible,
-      };
-    },
-  });
+    // 清除缓存
+    async function clearCache() {
+      const result = await refreshCache();
+      if (result.success) {
+        const res = await queryAllDictItems();
+        removeAuthCache(DB_DICT_DATA_KEY);
+        setAuthCache(DB_DICT_DATA_KEY, res.result);
+        // update-begin--author:liaozhiyang---date:20240124---for：【QQYUN-7970】国际化
+        createMessage.success(t('layout.header.refreshCacheComplete'));
+        // update-end--author:liaozhiyang---date:20240124---for：【QQYUN-7970】国际化
+      } else {
+        // update-begin--author:liaozhiyang---date:20240124---for：【QQYUN-7970】国际化
+        createMessage.error(t('layout.header.refreshCacheFailure'));
+        // update-end--author:liaozhiyang---date:20240124---for：【QQYUN-7970】国际化
+      }
+    }
+    // 切换部门
+    function updateCurrentDepart() {
+      loginSelectRef.value.show();
+    }
+    // 修改密码
+    const updatePasswordRef = ref();
+    // update-begin--author:liaozhiyang---date:20230901---for：【QQYUN-6333】空路由问题—首次访问资源太大
+    async function updatePassword() {
+      passwordVisible.value = true;
+      await getRefPromise(updatePasswordRef);
+      updatePasswordRef.value.show(userStore.getUserInfo.username);
+    }
+    // update-end--author:liaozhiyang---date:20230901---for：【QQYUN-6333】空路由问题—首次访问资源太大
+    function handleMenuClick(e: { key: MenuEvent }) {
+      switch (e.key) {
+        case 'logout':
+          handleLoginOut();
+          break;
+        case 'doc':
+          openDoc();
+          break;
+        case 'lock':
+          handleLock();
+          break;
+        case 'cache':
+          clearCache();
+          break;
+        case 'depart':
+          updateCurrentDepart();
+          break;
+        case 'password':
+          updatePassword();
+          break;
+        case 'account':
+          //update-begin---author:wangshuai ---date:20221125  for：进入用户设置页面------------
+          go(`/system/usersetting`);
+          //update-end---author:wangshuai ---date:20221125  for：进入用户设置页面--------------
+          break;
+      }
+    }
+
+    return {
+      prefixCls,
+      t,
+      getUserInfo,
+      getAvatarUrl,
+      handleMenuClick,
+      getShowDoc,
+      register,
+      getUseLockPage,
+      loginSelectRef,
+      updatePasswordRef,
+      passwordVisible,
+      lockActionVisible,
+    };
+  },
+});
 </script>
 <style lang="less">
-  @prefix-cls: ~'@{namespace}-header-user-dropdown';
+@prefix-cls: ~'@{namespace}-header-user-dropdown';
 
-  .@{prefix-cls} {
-    height: @header-height;
-    padding: 0 0 0 10px;
-    padding-right: 10px;
-    overflow: hidden;
-    font-size: 12px;
-    cursor: pointer;
-    align-items: center;
+.@{prefix-cls} {
+  height: @header-height;
+  padding: 0 0 0 10px;
+  padding-right: 10px;
+  overflow: hidden;
+  font-size: 12px;
+  cursor: pointer;
+  align-items: center;
 
-    img {
-      width: 24px;
-      height: 24px;
-      margin-right: 12px;
-    }
+  img {
+    width: 24px;
+    height: 24px;
+    margin-right: 12px;
+  }
 
-    &__header {
-      border-radius: 50%;
-    }
+  &__header {
+    border-radius: 50%;
+  }
 
-    &__name {
-      font-size: 14px;
-    }
+  &__name {
+    font-size: 14px;
+  }
 
-    &--dark {
-      &:hover {
-        background-color: @header-dark-bg-hover-color;
-      }
-    }
-
-    &--light {
-      &:hover {
-        background-color: @header-light-bg-hover-color;
-      }
-
-      .@{prefix-cls}__name {
-        color: @text-color-base;
-      }
-
-      .@{prefix-cls}__desc {
-        color: @header-light-desc-color;
-      }
-    }
-
-    &-dropdown-overlay {
-      // update-begin--author:liaozhiyang---date:20231226---for：【QQYUN-7512】顶部账号划过首次弹出时位置会变更一下
-      width: 160px;
-      // update-end--author:liaozhiyang---date:20231226---for：【QQYUN-7512】顶部账号划过首次弹出时位置会变更一下
-      .ant-dropdown-menu-item {
-        min-width: 160px;
-      }
+  &--dark {
+    &:hover {
+      background-color: @header-dark-bg-hover-color;
     }
   }
+
+  &--light {
+    &:hover {
+      background-color: @header-light-bg-hover-color;
+    }
+
+    .@{prefix-cls}__name {
+      color: @text-color-base;
+    }
+
+    .@{prefix-cls}__desc {
+      color: @header-light-desc-color;
+    }
+  }
+
+  &-dropdown-overlay {
+    // update-begin--author:liaozhiyang---date:20231226---for：【QQYUN-7512】顶部账号划过首次弹出时位置会变更一下
+    width: 160px;
+
+    // update-end--author:liaozhiyang---date:20231226---for：【QQYUN-7512】顶部账号划过首次弹出时位置会变更一下
+    .ant-dropdown-menu-item {
+      min-width: 160px;
+    }
+  }
+}
 </style>
diff --git a/src/layouts/default/header/index.vue b/src/layouts/default/header/index.vue
index 67e4995..3f7b643 100644
--- a/src/layouts/default/header/index.vue
+++ b/src/layouts/default/header/index.vue
@@ -3,15 +3,11 @@
     <!-- left start -->
     <div :class="`${prefixCls}-left`">
       <!-- logo -->
-      <AppLogo v-if="getShowHeaderLogo || getIsMobile" :class="`${prefixCls}-logo`" :theme="getHeaderTheme" :style="getLogoWidth" />
-      <LayoutTrigger
-        v-if="(getShowContent && getShowHeaderTrigger && !getSplit && !getIsMixSidebar) || getIsMobile"
-        :theme="getHeaderTheme"
-        :sider="false"
-      />
+      <AppLogo v-if="getShowHeaderLogo || getIsMobile" :class="`${prefixCls}-logo`" :theme="getHeaderTheme"
+        :style="getLogoWidth" />
+      <LayoutTrigger v-if="(getShowContent && getShowHeaderTrigger && !getSplit && !getIsMixSidebar) || getIsMobile"
+        :theme="getHeaderTheme" :sider="false" />
       <LayoutBreadcrumb v-if="getShowContent && getShowBread" :theme="getHeaderTheme" />
-      <!-- 欢迎语 -->
-      <span v-if="getShowContent && getShowBreadTitle && !getIsMobile" :class="[prefixCls, `${prefixCls}--${getHeaderTheme}`,'headerIntroductionClass']"> {{t('layout.header.welcomeIn')}} {{ title }} </span>
     </div>
     <!-- left end -->
 
@@ -23,236 +19,228 @@
 
     <!-- action  -->
     <div :class="`${prefixCls}-action`">
-      <AppSearch :class="`${prefixCls}-action__item `" v-if="getShowSearch" />
-
       <ErrorAction v-if="getUseErrorHandle" :class="`${prefixCls}-action__item error-action`" />
-
-      <Notify v-if="getShowNotice" :class="`${prefixCls}-action__item notify-item`" />
-
       <FullScreen v-if="getShowFullScreen" :class="`${prefixCls}-action__item fullscreen-item`" />
-
-      <LockScreen v-if="getUseLockPage" />
-
-      <AppLocalePicker v-if="getShowLocalePicker" :reload="true" :showText="false" :class="`${prefixCls}-action__item`" />
-
       <UserDropDown :theme="getHeaderTheme" />
 
       <SettingDrawer v-if="getShowSetting" :class="`${prefixCls}-action__item`" />
-      <!-- ai助手 -->
-      <Aide></Aide>
     </div>
+
   </Header>
   <LoginSelect ref="loginSelectRef" @success="loginSelectOk"></LoginSelect>
 </template>
 <script lang="ts">
-  import { defineComponent, unref, computed, ref, onMounted, toRaw } from 'vue';
-  import { useGlobSetting } from '/@/hooks/setting';
-  import { propTypes } from '/@/utils/propTypes';
+import { defineComponent, unref, computed, ref, onMounted, toRaw } from 'vue';
+import { useGlobSetting } from '/@/hooks/setting';
+import { propTypes } from '/@/utils/propTypes';
 
-  import { Layout } from 'ant-design-vue';
-  import { AppLogo } from '/@/components/Application';
-  import LayoutMenu from '../menu/index.vue';
-  import LayoutTrigger from '../trigger/index.vue';
+import { Layout } from 'ant-design-vue';
+import { AppLogo } from '/@/components/Application';
+import LayoutMenu from '../menu/index.vue';
+import LayoutTrigger from '../trigger/index.vue';
 
-  import { AppSearch } from '/@/components/Application';
+import { AppSearch } from '/@/components/Application';
 
-  import { useHeaderSetting } from '/@/hooks/setting/useHeaderSetting';
-  import { useMenuSetting } from '/@/hooks/setting/useMenuSetting';
-  import { useRootSetting } from '/@/hooks/setting/useRootSetting';
+import { useHeaderSetting } from '/@/hooks/setting/useHeaderSetting';
+import { useMenuSetting } from '/@/hooks/setting/useMenuSetting';
+import { useRootSetting } from '/@/hooks/setting/useRootSetting';
 
-  import { MenuModeEnum, MenuSplitTyeEnum } from '/@/enums/menuEnum';
-  import { SettingButtonPositionEnum } from '/@/enums/appEnum';
-  import { AppLocalePicker } from '/@/components/Application';
+import { MenuModeEnum, MenuSplitTyeEnum } from '/@/enums/menuEnum';
+import { SettingButtonPositionEnum } from '/@/enums/appEnum';
+import { AppLocalePicker } from '/@/components/Application';
 
-  import { UserDropDown, LayoutBreadcrumb, FullScreen, Notify, ErrorAction, LockScreen } from './components';
-  import { useAppInject } from '/@/hooks/web/useAppInject';
-  import { useDesign } from '/@/hooks/web/useDesign';
+import { UserDropDown, LayoutBreadcrumb, FullScreen, Notify, ErrorAction, LockScreen } from './components';
+import { useAppInject } from '/@/hooks/web/useAppInject';
+import { useDesign } from '/@/hooks/web/useDesign';
 
-  import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent';
-  import { useLocale } from '/@/locales/useLocale';
+import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent';
+import { useLocale } from '/@/locales/useLocale';
 
-  import LoginSelect from '/@/views/sys/login/LoginSelect.vue';
-  import { useUserStore } from '/@/store/modules/user';
-  import { useI18n } from '/@/hooks/web/useI18n';
-  import Aide from "@/views/dashboard/ai/components/aide/index.vue"
-  const { t } = useI18n();
+import LoginSelect from '/@/views/sys/login/LoginSelect.vue';
+import { useUserStore } from '/@/store/modules/user';
+import { useI18n } from '/@/hooks/web/useI18n';
+import Aide from "@/views/dashboard/ai/components/aide/index.vue"
+const { t } = useI18n();
 
-  export default defineComponent({
-    name: 'LayoutHeader',
-    components: {
-      Header: Layout.Header,
-      AppLogo,
-      LayoutTrigger,
-      LayoutBreadcrumb,
-      LayoutMenu,
-      UserDropDown,
-      AppLocalePicker,
-      FullScreen,
-      Notify,
-      AppSearch,
-      ErrorAction,
-      LockScreen,
-      LoginSelect,
-      SettingDrawer: createAsyncComponent(() => import('/@/layouts/default/setting/index.vue'), {
-        loading: true,
-      }),
-      Aide
-    },
-    props: {
-      fixed: propTypes.bool,
-    },
-    setup(props) {
-      const { prefixCls } = useDesign('layout-header');
-      const userStore = useUserStore();
-      const { getShowTopMenu, getShowHeaderTrigger, getSplit, getIsMixMode, getMenuWidth, getIsMixSidebar } = useMenuSetting();
-      const { getUseErrorHandle, getShowSettingButton, getSettingButtonPosition } = useRootSetting();
-      const { title } = useGlobSetting();
+export default defineComponent({
+  name: 'LayoutHeader',
+  components: {
+    Header: Layout.Header,
+    AppLogo,
+    LayoutTrigger,
+    LayoutBreadcrumb,
+    LayoutMenu,
+    UserDropDown,
+    AppLocalePicker,
+    FullScreen,
+    Notify,
+    AppSearch,
+    ErrorAction,
+    LockScreen,
+    LoginSelect,
+    SettingDrawer: createAsyncComponent(() => import('/@/layouts/default/setting/index.vue'), {
+      loading: true,
+    }),
+    Aide
+  },
+  props: {
+    fixed: propTypes.bool,
+  },
+  setup(props) {
+    const { prefixCls } = useDesign('layout-header');
+    const userStore = useUserStore();
+    const { getShowTopMenu, getShowHeaderTrigger, getSplit, getIsMixMode, getMenuWidth, getIsMixSidebar } = useMenuSetting();
+    const { getUseErrorHandle, getShowSettingButton, getSettingButtonPosition } = useRootSetting();
+    const { title } = useGlobSetting();
 
-      const {
-        getHeaderTheme,
-        getShowFullScreen,
-        getShowNotice,
-        getShowContent,
-        getShowBread,
-        getShowHeaderLogo,
-        getShowHeader,
-        getShowSearch,
-        getUseLockPage,
-        getShowBreadTitle,
-      } = useHeaderSetting();
+    const {
+      getHeaderTheme,
+      getShowFullScreen,
+      getShowNotice,
+      getShowContent,
+      getShowBread,
+      getShowHeaderLogo,
+      getShowHeader,
+      getShowSearch,
+      getUseLockPage,
+      getShowBreadTitle,
+    } = useHeaderSetting();
 
-      const { getShowLocalePicker } = useLocale();
+    const { getShowLocalePicker } = useLocale();
 
-      const { getIsMobile } = useAppInject();
+    const { getIsMobile } = useAppInject();
 
-      const getHeaderClass = computed(() => {
-        const theme = unref(getHeaderTheme);
-        return [
-          prefixCls,
-          {
-            [`${prefixCls}--fixed`]: props.fixed,
-            [`${prefixCls}--mobile`]: unref(getIsMobile),
-            [`${prefixCls}--${theme}`]: theme,
-          },
-        ];
-      });
-
-      const getShowSetting = computed(() => {
-        if (!unref(getShowSettingButton)) {
-          return false;
-        }
-        const settingButtonPosition = unref(getSettingButtonPosition);
-
-        if (settingButtonPosition === SettingButtonPositionEnum.AUTO) {
-          return unref(getShowHeader);
-        }
-        return settingButtonPosition === SettingButtonPositionEnum.HEADER;
-      });
-
-      const getLogoWidth = computed(() => {
-        if (!unref(getIsMixMode) || unref(getIsMobile)) {
-          return {};
-        }
-        const width = unref(getMenuWidth) < 180 ? 180 : unref(getMenuWidth);
-        return { width: `${width}px` };
-      });
-
-      const getSplitType = computed(() => {
-        return unref(getSplit) ? MenuSplitTyeEnum.TOP : MenuSplitTyeEnum.NONE;
-      });
-
-      const getMenuMode = computed(() => {
-        return unref(getSplit) ? MenuModeEnum.HORIZONTAL : null;
-      });
-
-      /**
-       * 首页多租户部门弹窗逻辑
-       */
-      const loginSelectRef = ref();
-
-      function showLoginSelect() {
-        //update-begin---author:liusq  Date:20220101  for：判断登录进来是否需要弹窗选择租户----
-        //判断是否是登陆进来
-        const loginInfo = toRaw(userStore.getLoginInfo) || {};
-        if (!!loginInfo.isLogin) {
-          loginSelectRef.value.show(loginInfo);
-        }
-        //update-end---author:liusq  Date:20220101  for：判断登录进来是否需要弹窗选择租户----
-      }
-
-      function loginSelectOk() {
-        console.log('成功。。。。。');
-      }
-
-      onMounted(() => {
-        showLoginSelect();
-      });
-
-      return {
+    const getHeaderClass = computed(() => {
+      const theme = unref(getHeaderTheme);
+      return [
         prefixCls,
-        getHeaderClass,
-        getShowHeaderLogo,
-        getHeaderTheme,
-        getShowHeaderTrigger,
-        getIsMobile,
-        getShowBreadTitle,
-        getShowBread,
-        getShowContent,
-        getSplitType,
-        getSplit,
-        getMenuMode,
-        getShowTopMenu,
-        getShowLocalePicker,
-        getShowFullScreen,
-        getShowNotice,
-        getUseErrorHandle,
-        getLogoWidth,
-        getIsMixSidebar,
-        getShowSettingButton,
-        getShowSetting,
-        getShowSearch,
-        getUseLockPage,
-        loginSelectOk,
-        loginSelectRef,
-        title,
-        t
-      };
-    },
-  });
+        {
+          [`${prefixCls}--fixed`]: props.fixed,
+          [`${prefixCls}--mobile`]: unref(getIsMobile),
+          [`${prefixCls}--${theme}`]: theme,
+        },
+      ];
+    });
+
+    const getShowSetting = computed(() => {
+      if (!unref(getShowSettingButton)) {
+        return false;
+      }
+      const settingButtonPosition = unref(getSettingButtonPosition);
+
+      if (settingButtonPosition === SettingButtonPositionEnum.AUTO) {
+        return unref(getShowHeader);
+      }
+      return settingButtonPosition === SettingButtonPositionEnum.HEADER;
+    });
+
+    const getLogoWidth = computed(() => {
+      if (!unref(getIsMixMode) || unref(getIsMobile)) {
+        return {};
+      }
+      const width = unref(getMenuWidth) < 180 ? 180 : unref(getMenuWidth);
+      return { width: `${width}px` };
+    });
+
+    const getSplitType = computed(() => {
+      return unref(getSplit) ? MenuSplitTyeEnum.TOP : MenuSplitTyeEnum.NONE;
+    });
+
+    const getMenuMode = computed(() => {
+      return unref(getSplit) ? MenuModeEnum.HORIZONTAL : null;
+    });
+
+    /**
+     * 首页多租户部门弹窗逻辑
+     */
+    const loginSelectRef = ref();
+
+    function showLoginSelect() {
+      //update-begin---author:liusq  Date:20220101  for：判断登录进来是否需要弹窗选择租户----
+      //判断是否是登陆进来
+      const loginInfo = toRaw(userStore.getLoginInfo) || {};
+      if (!!loginInfo.isLogin) {
+        loginSelectRef.value.show(loginInfo);
+      }
+      //update-end---author:liusq  Date:20220101  for：判断登录进来是否需要弹窗选择租户----
+    }
+
+    function loginSelectOk() {
+      console.log('成功。。。。。');
+    }
+
+    onMounted(() => {
+      showLoginSelect();
+    });
+
+    return {
+      prefixCls,
+      getHeaderClass,
+      getShowHeaderLogo,
+      getHeaderTheme,
+      getShowHeaderTrigger,
+      getIsMobile,
+      getShowBreadTitle,
+      getShowBread,
+      getShowContent,
+      getSplitType,
+      getSplit,
+      getMenuMode,
+      getShowTopMenu,
+      getShowLocalePicker,
+      getShowFullScreen,
+      getShowNotice,
+      getUseErrorHandle,
+      getLogoWidth,
+      getIsMixSidebar,
+      getShowSettingButton,
+      getShowSetting,
+      getShowSearch,
+      getUseLockPage,
+      loginSelectOk,
+      loginSelectRef,
+      title,
+      t
+    };
+  },
+});
 </script>
 <style lang="less">
-  @import './index.less';
-  //update-begin---author:scott ---date:2022-09-30  for：默认隐藏顶部菜单面包屑-----------
-  //顶部欢迎语展示样式
-  @prefix-cls: ~'@{namespace}-layout-header';
-  
-  .ant-layout .@{prefix-cls} {
-    display: flex;
-    padding: 0 8px;
-    height: 48px;
-    align-items: center;
-    
+@import './index.less';
+//update-begin---author:scott ---date:2022-09-30  for：默认隐藏顶部菜单面包屑-----------
+//顶部欢迎语展示样式
+@prefix-cls: ~'@{namespace}-layout-header';
+
+.ant-layout .@{prefix-cls} {
+  display: flex;
+  padding: 0 8px;
+  height: 48px;
+  align-items: center;
+
+  .headerIntroductionClass {
+    margin-right: 4px;
+    margin-bottom: 2px;
+    border-bottom: 0px;
+    border-left: 0px;
+  }
+
+  &--light {
     .headerIntroductionClass {
-      margin-right: 4px;
-      margin-bottom: 2px;
-      border-bottom: 0px;
-      border-left: 0px;
+      color: @breadcrumb-item-normal-color;
     }
-    
-    &--light {
-      .headerIntroductionClass {
-        color: @breadcrumb-item-normal-color;
-      }
+  }
+
+  &--dark {
+    .headerIntroductionClass {
+      color: rgba(255, 255, 255, 0.6);
     }
 
-    &--dark {
-      .headerIntroductionClass {
-        color: rgba(255, 255, 255, 0.6);
-      }
-      .anticon, .truncate {
-        color: rgba(255, 255, 255, 0.8);
-      }
+    .anticon,
+    .truncate {
+      color: rgba(255, 255, 255, 0.8);
     }
-    //update-end---author:scott ---date::2022-09-30  for：默认隐藏顶部菜单面包屑--------------
   }
+
+  //update-end---author:scott ---date::2022-09-30  for：默认隐藏顶部菜单面包屑--------------
+}
 </style>
diff --git a/src/settings/projectSetting.ts b/src/settings/projectSetting.ts
index 1c3c942..092cced 100644
--- a/src/settings/projectSetting.ts
+++ b/src/settings/projectSetting.ts
@@ -65,13 +65,13 @@ const setting: ProjectConfig = {
   // 头部配置
   headerSetting: {
     // 背景色
-    bgColor: HEADER_PRESET_BG_COLOR_LIST[0],
+    bgColor: HEADER_PRESET_BG_COLOR_LIST[5],
     // 固定头部
     fixed: true,
     // 是否显示顶部
     show: true,
     // 主题
-    theme: ThemeEnum.LIGHT,
+    theme: ThemeEnum.DARK,
     // 开启锁屏功能
     useLockPage: true,
     // 显示全屏按钮
@@ -87,7 +87,7 @@ const setting: ProjectConfig = {
   // 菜单配置
   menuSetting: {
     // 背景色
-    bgColor: SIDE_BAR_BG_COLOR_LIST[0],
+    bgColor: SIDE_BAR_BG_COLOR_LIST[3],
     // 是否固定住左侧菜单
     fixed: true,
     // 菜单折叠
diff --git a/src/views/cees/student.vue b/src/views/cees/student.vue
deleted file mode 100644
index 199fb21..0000000
--- a/src/views/cees/student.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-<template>
-  <div>
-    <h1>学生信息</h1>
-  </div>
-</template>
-
-<script>
-export default {
-
-}
-</script>
-
-<style></style>
\ No newline at end of file
diff --git a/src/views/dashboard/Analysis/index.vue b/src/views/dashboard/Analysis/index.vue
index 5ee4e92..3eda701 100644
--- a/src/views/dashboard/Analysis/index.vue
+++ b/src/views/dashboard/Analysis/index.vue
@@ -1,5 +1,8 @@
 <template>
-  <IndexDef v-if="indexStyle === 0"></IndexDef>
+  <div class="mod-home">
+    <h3>欢迎使用评阅人员管理系统</h3>
+  </div>
+  <!--<IndexDef v-if="indexStyle === 0"></IndexDef>
   <IndexChart v-if="indexStyle === 1"></IndexChart>
   <IndexBdc v-if="indexStyle == 2"></IndexBdc>
   <IndexTask v-if="indexStyle == 3"></IndexTask>
@@ -11,14 +14,20 @@
       <a-radio :value="2">业务统计</a-radio>
       <a-radio :value="3">我的任务</a-radio>
     </a-radio-group>
-  </div>
+  </div>-->
 </template>
 <script lang="ts" setup>
-  import { ref } from 'vue';
-  import IndexDef from './homePage/IndexDef.vue';
-  import IndexChart from './homePage/IndexChart.vue';
-  import IndexBdc from './homePage/IndexBdc.vue';
-  import IndexTask from './homePage/IndexTask.vue';
+//import { ref } from 'vue';
+//import IndexDef from './homePage/IndexDef.vue';
+//import IndexChart from './homePage/IndexChart.vue';
+//import IndexBdc from './homePage/IndexBdc.vue';
+//import IndexTask from './homePage/IndexTask.vue';
 
-  const indexStyle = ref(0);
+//const indexStyle = ref(0);
 </script>
+<style>
+.mod-home {
+  line-height: 2.5;
+  text-align: center;
+}
+</style>
diff --git a/src/views/sys/login/LoginForm.vue b/src/views/sys/login/LoginForm.vue
index 1bb1cb7..801dcc2 100644
--- a/src/views/sys/login/LoginForm.vue
+++ b/src/views/sys/login/LoginForm.vue
@@ -1,29 +1,30 @@
 <template>
   <LoginFormTitle v-show="getShow" class="enter-x" />
-  <Form class="p-4 enter-x" :model="formData" :rules="getFormRules" ref="formRef" v-show="getShow" @keypress.enter="handleLogin">
+  <Form class="p-4 enter-x" :model="formData" :rules="getFormRules" ref="formRef" v-show="getShow"
+    @keypress.enter="handleLogin">
     <FormItem name="account" class="enter-x">
-      <Input size="large" v-model:value="formData.account" :placeholder="t('sys.login.userName')" class="fix-auto-fill" />
+      <Input size="large" v-model:value="formData.account" :placeholder="t('sys.login.userName')"
+        class="fix-auto-fill" />
     </FormItem>
     <FormItem name="password" class="enter-x">
-      <InputPassword size="large" visibilityToggle v-model:value="formData.password" :placeholder="t('sys.login.password')" />
+      <InputPassword size="large" visibilityToggle v-model:value="formData.password"
+        :placeholder="t('sys.login.password')" />
     </FormItem>
 
     <!--验证码-->
     <ARow class="enter-x">
       <ACol :span="12">
         <FormItem name="inputCode" class="enter-x">
-          <Input size="large" v-model:value="formData.inputCode" :placeholder="t('sys.login.inputCode')" style="min-width: 100px" />
+          <Input size="large" v-model:value="formData.inputCode" :placeholder="t('sys.login.inputCode')"
+            style="min-width: 100px" />
         </FormItem>
       </ACol>
       <ACol :span="8">
         <FormItem :style="{ 'text-align': 'right', 'margin-left': '20px' }" class="enter-x">
-          <img
-            v-if="randCodeData.requestCodeSuccess"
-            style="margin-top: 2px; max-width: initial"
-            :src="randCodeData.randCodeImage"
-            @click="handleChangeCheckCode"
-          />
-          <img v-else style="margin-top: 2px; max-width: initial" src="../../../assets/images/checkcode.png" @click="handleChangeCheckCode" />
+          <img v-if="randCodeData.requestCodeSuccess" style="margin-top: 2px; max-width: initial"
+            :src="randCodeData.randCodeImage" @click="handleChangeCheckCode" />
+          <img v-else style="margin-top: 2px; max-width: initial" src="../../../assets/images/checkcode.png"
+            @click="handleChangeCheckCode" />
         </FormItem>
       </ACol>
     </ARow>
@@ -76,121 +77,128 @@
     <Divider class="enter-x">{{ t('sys.login.otherSignIn') }}</Divider>
 
     <div class="flex justify-evenly enter-x" :class="`${prefixCls}-sign-in-way`">
-      <a @click="onThirdLogin('github')" title="github"><GithubFilled /></a>
-      <a @click="onThirdLogin('wechat_enterprise')" title="企业微信"> <icon-font class="item-icon" type="icon-qiyeweixin3" /></a>
-      <a @click="onThirdLogin('dingtalk')" title="钉钉"><DingtalkCircleFilled /></a>
-      <a @click="onThirdLogin('wechat_open')" title="微信"><WechatFilled /></a>
+      <a @click="onThirdLogin('github')" title="github">
+        <GithubFilled />
+      </a>
+      <a @click="onThirdLogin('wechat_enterprise')" title="企业微信"> <icon-font class="item-icon"
+          type="icon-qiyeweixin3" /></a>
+      <a @click="onThirdLogin('dingtalk')" title="钉钉">
+        <DingtalkCircleFilled />
+      </a>
+      <a @click="onThirdLogin('wechat_open')" title="微信">
+        <WechatFilled />
+      </a>
     </div>
   </Form>
   <!-- 第三方登录相关弹框 -->
   <ThirdModal ref="thirdModalRef"></ThirdModal>
 </template>
 <script lang="ts" setup>
-  import { reactive, ref, toRaw, unref, computed, onMounted } from 'vue';
+import { reactive, ref, toRaw, unref, computed, onMounted } from 'vue';
 
-  import { Checkbox, Form, Input, Row, Col, Button, Divider } from 'ant-design-vue';
-  import { GithubFilled, WechatFilled, DingtalkCircleFilled, createFromIconfontCN } from '@ant-design/icons-vue';
-  import LoginFormTitle from './LoginFormTitle.vue';
-  import ThirdModal from './ThirdModal.vue';
-  import { useI18n } from '/@/hooks/web/useI18n';
-  import { useMessage } from '/@/hooks/web/useMessage';
+import { Checkbox, Form, Input, Row, Col, Button, Divider } from 'ant-design-vue';
+import { GithubFilled, WechatFilled, DingtalkCircleFilled, createFromIconfontCN } from '@ant-design/icons-vue';
+import LoginFormTitle from './LoginFormTitle.vue';
+import ThirdModal from './ThirdModal.vue';
+import { useI18n } from '/@/hooks/web/useI18n';
+import { useMessage } from '/@/hooks/web/useMessage';
 
-  import { useUserStore } from '/@/store/modules/user';
-  import { LoginStateEnum, useLoginState, useFormRules, useFormValid } from './useLogin';
-  import { useDesign } from '/@/hooks/web/useDesign';
-  import { getCodeInfo } from '/@/api/sys/user';
-  //import { onKeyStroke } from '@vueuse/core';
+import { useUserStore } from '/@/store/modules/user';
+import { LoginStateEnum, useLoginState, useFormRules, useFormValid } from './useLogin';
+import { useDesign } from '/@/hooks/web/useDesign';
+import { getCodeInfo } from '/@/api/sys/user';
+//import { onKeyStroke } from '@vueuse/core';
 
-  const ACol = Col;
-  const ARow = Row;
-  const FormItem = Form.Item;
-  const InputPassword = Input.Password;
-  const IconFont = createFromIconfontCN({
-    scriptUrl: '//at.alicdn.com/t/font_2316098_umqusozousr.js',
-  });
-  const { t } = useI18n();
-  const { notification, createErrorModal } = useMessage();
-  const { prefixCls } = useDesign('login');
-  const userStore = useUserStore();
+const ACol = Col;
+const ARow = Row;
+const FormItem = Form.Item;
+const InputPassword = Input.Password;
+const IconFont = createFromIconfontCN({
+  scriptUrl: '//at.alicdn.com/t/font_2316098_umqusozousr.js',
+});
+const { t } = useI18n();
+const { notification, createErrorModal } = useMessage();
+const { prefixCls } = useDesign('login');
+const userStore = useUserStore();
 
-  const { setLoginState, getLoginState } = useLoginState();
-  const { getFormRules } = useFormRules();
+const { setLoginState, getLoginState } = useLoginState();
+const { getFormRules } = useFormRules();
 
-  const formRef = ref();
-  const thirdModalRef = ref();
-  const loading = ref(false);
-  const rememberMe = ref(false);
+const formRef = ref();
+const thirdModalRef = ref();
+const loading = ref(false);
+const rememberMe = ref(false);
 
-  const formData = reactive({
-    account: 'admin',
-    password: '123456',
-    inputCode: '',
-  });
-  const randCodeData = reactive({
-    randCodeImage: '',
-    requestCodeSuccess: false,
-    checkKey: null,
-  });
+const formData = reactive({
+  account: 'admin',
+  password: '123456',
+  inputCode: '',
+});
+const randCodeData = reactive({
+  randCodeImage: '',
+  requestCodeSuccess: false,
+  checkKey: null,
+});
 
-  const { validForm } = useFormValid(formRef);
+const { validForm } = useFormValid(formRef);
 
-  //onKeyStroke('Enter', handleLogin);
+//onKeyStroke('Enter', handleLogin);
 
-  const getShow = computed(() => unref(getLoginState) === LoginStateEnum.LOGIN);
+const getShow = computed(() => unref(getLoginState) === LoginStateEnum.LOGIN);
 
-  async function handleLogin() {
-    const data = await validForm();
-    if (!data) return;
-    try {
-      loading.value = true;
-      const { userInfo } = await userStore.login(
-        toRaw({
-          password: data.password,
-          username: data.account,
-          captcha: data.inputCode,
-          checkKey: randCodeData.checkKey,
-          mode: 'none', //不要默认的错误提示
-        })
-      );
-      if (userInfo) {
-        notification.success({
-          message: t('sys.login.loginSuccessTitle'),
-          description: `${t('sys.login.loginSuccessDesc')}: ${userInfo.realname}`,
-          duration: 3,
-        });
-      }
-    } catch (error) {
-      notification.error({
-        message: t('sys.api.errorTip'),
-        description: error.message || t('sys.api.networkExceptionMsg'),
+async function handleLogin() {
+  const data = await validForm();
+  if (!data) return;
+  try {
+    loading.value = true;
+    const { userInfo } = await userStore.login(
+      toRaw({
+        password: data.password,
+        username: data.account,
+        captcha: data.inputCode,
+        checkKey: randCodeData.checkKey,
+        mode: 'none', //不要默认的错误提示
+      })
+    );
+    if (userInfo) {
+      notification.success({
+        message: t('sys.login.loginSuccessTitle'),
+        description: `${t('sys.login.loginSuccessDesc')}: ${userInfo.realname}`,
         duration: 3,
       });
-      loading.value = false;
-
-      //update-begin-author:taoyan date:2022-5-3 for: issues/41 登录页面，当输入验证码错误时，验证码图片要刷新一下，而不是保持旧的验证码图片不变
-      handleChangeCheckCode();
-      //update-end-author:taoyan date:2022-5-3 for: issues/41 登录页面，当输入验证码错误时，验证码图片要刷新一下，而不是保持旧的验证码图片不变
     }
-  }
-  function handleChangeCheckCode() {
-    formData.inputCode = '';
-    //TODO 兼容mock和接口，暂时这样处理
-    randCodeData.checkKey = 1629428467008; //new Date().getTime();
-    getCodeInfo(randCodeData.checkKey).then((res) => {
-      randCodeData.randCodeImage = res;
-      randCodeData.requestCodeSuccess = true;
+  } catch (error) {
+    notification.error({
+      message: t('sys.api.errorTip'),
+      description: error.message || t('sys.api.networkExceptionMsg'),
+      duration: 3,
     });
-  }
+    loading.value = false;
 
-  /**
-   * 第三方登录
-   * @param type
-   */
-  function onThirdLogin(type) {
-    thirdModalRef.value.onThirdLogin(type);
-  }
-  //初始化验证码
-  onMounted(() => {
+    //update-begin-author:taoyan date:2022-5-3 for: issues/41 登录页面，当输入验证码错误时，验证码图片要刷新一下，而不是保持旧的验证码图片不变
     handleChangeCheckCode();
+    //update-end-author:taoyan date:2022-5-3 for: issues/41 登录页面，当输入验证码错误时，验证码图片要刷新一下，而不是保持旧的验证码图片不变
+  }
+}
+function handleChangeCheckCode() {
+  formData.inputCode = '';
+  //TODO 兼容mock和接口，暂时这样处理
+  randCodeData.checkKey = 1629428467008; //new Date().getTime();
+  getCodeInfo(randCodeData.checkKey).then((res) => {
+    randCodeData.randCodeImage = res;
+    randCodeData.requestCodeSuccess = true;
   });
+}
+
+/**
+ * 第三方登录
+ * @param type
+ */
+function onThirdLogin(type) {
+  thirdModalRef.value.onThirdLogin(type);
+}
+//初始化验证码
+onMounted(() => {
+  handleChangeCheckCode();
+});
 </script>
diff --git a/src/views/sys/login/TokenLoginPage.vue b/src/views/sys/login/TokenLoginPage.vue
index c11e204..490b41a 100644
--- a/src/views/sys/login/TokenLoginPage.vue
+++ b/src/views/sys/login/TokenLoginPage.vue
@@ -1,218 +1,221 @@
 <template>
-    <div class="app-loading">
-        <div class="app-loading-wrap">
-            <img src="/resource/img/logo.png" class="app-loading-logo" alt="Logo">
-            <div class="app-loading-dots">
-                <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
-            </div>
-            <div class="app-loading-title">JeecgBoot 企业级低代码平台</div>
-        </div>
+  <div class="app-loading">
+    <div class="app-loading-wrap">
+      <!--<img src="/resource/img/logo.png" class="app-loading-logo" alt="Logo">-->
+      <div class="app-loading-dots">
+        <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
+      </div>
+      <div class="app-loading-title">哈尔滨师范大学</div>
+      <div class="app-loading-title">评阅人员管理系统</div>
     </div>
+  </div>
 </template>
 
 
 <script lang="ts">
-  /**
-   * 地址中携带token，跳转至此页面进行登录操作
-   */
-  import { useRoute, useRouter } from 'vue-router';
-  import { useMessage } from '/@/hooks/web/useMessage';
-  import { useUserStore } from '/@/store/modules/user';
-  import { useI18n } from '/@/hooks/web/useI18n';
-  
-  export default {
-    name: "TokenLogin",
-    setup(){
-      const route = useRoute();
-      let router = useRouter();
-      const {createMessage, notification} = useMessage()
-      const {t} = useI18n();
-      const routeQuery:any = route.query;
-      if(!routeQuery){
-        createMessage.warning('参数无效')
-      }
-     
-      const token = routeQuery['loginToken'];
-      if(!token){
-        createMessage.warning('token无效')
-      }
-      const userStore = useUserStore();
-      userStore.ThirdLogin({ token, thirdType:'email', goHome: false }).then(res => {
-        console.log("res====>doThirdLogin",res)
-        if(res && res.userInfo){
-          requestSuccess(res)
-        }else{
-          requestFailed(res)
-        }
-      });
+/**
+ * 地址中携带token，跳转至此页面进行登录操作
+ */
+import { useRoute, useRouter } from 'vue-router';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { useUserStore } from '/@/store/modules/user';
+import { useI18n } from '/@/hooks/web/useI18n';
 
-      function requestFailed (err) {
+export default {
+  name: "TokenLogin",
+  setup() {
+    const route = useRoute();
+    let router = useRouter();
+    const { createMessage, notification } = useMessage()
+    const { t } = useI18n();
+    const routeQuery: any = route.query;
+    if (!routeQuery) {
+      createMessage.warning('参数无效')
+    }
+
+    const token = routeQuery['loginToken'];
+    if (!token) {
+      createMessage.warning('token无效')
+    }
+    const userStore = useUserStore();
+    userStore.ThirdLogin({ token, thirdType: 'email', goHome: false }).then(res => {
+      console.log("res====>doThirdLogin", res)
+      if (res && res.userInfo) {
+        requestSuccess(res)
+      } else {
+        requestFailed(res)
+      }
+    });
+
+    function requestFailed(err) {
+      notification.error({
+        message: '登录失败',
+        description: ((err.response || {}).data || {}).message || err.message || "请求出现错误，请稍后再试",
+        duration: 4,
+      });
+    }
+
+    function requestSuccess(res) {
+      let info = routeQuery.info;
+      if (info) {
+        let query = JSON.parse(info);
+
+        //update-begin-author:taoyan date:2023-4-27 for: QQYUN-4882【简流】节点消息通知 邮箱 点击办理跳到了应用首页
+        let path = '';
+        if (query.isLowApp === 1) {
+          path = '/myapps/personalOffice/myTodo'
+        } else {
+          let taskId = query.taskId;
+          path = '/task/handle/' + taskId
+        }
+        //update-end-author:taoyan date:2023-4-27 for: QQYUN-4882【简流】节点消息通知 邮箱 点击办理跳到了应用首页
+
+        router.replace({ path, query });
+        notification.success({
+          message: t('sys.login.loginSuccessTitle'),
+          description: `${t('sys.login.loginSuccessDesc')}: ${res.userInfo.realname}`,
+          duration: 3,
+        });
+      } else {
         notification.error({
-          message: '登录失败',
-          description: ((err.response || {}).data || {}).message || err.message || "请求出现错误，请稍后再试",
+          message: '参数失效',
+          description: "页面跳转参数丢失，请查看日志",
           duration: 4,
         });
       }
-      
-      function requestSuccess(res){
-        let info = routeQuery.info;
-        if(info){
-          let query = JSON.parse(info);
-          
-          //update-begin-author:taoyan date:2023-4-27 for: QQYUN-4882【简流】节点消息通知 邮箱 点击办理跳到了应用首页
-          let path = '';
-          if(query.isLowApp === 1){
-            path = '/myapps/personalOffice/myTodo'
-          }else{
-            let taskId = query.taskId;
-            path = '/task/handle/' + taskId
-          }
-          //update-end-author:taoyan date:2023-4-27 for: QQYUN-4882【简流】节点消息通知 邮箱 点击办理跳到了应用首页
-          
-          router.replace({ path, query });
-          notification.success({
-            message: t('sys.login.loginSuccessTitle'),
-            description: `${t('sys.login.loginSuccessDesc')}: ${res.userInfo.realname}`,
-            duration: 3,
-          });
-        }else{
-          notification.error({
-            message: '参数失效',
-            description: "页面跳转参数丢失，请查看日志",
-            duration: 4,
-          });
-        }
-      }
     }
   }
+}
 </script>
 
 <style scoped>
+html[data-theme='dark'] .app-loading {
+  background-color: #2c344a;
+}
 
-    html[data-theme='dark'] .app-loading {
-        background-color: #2c344a;
-    }
+html[data-theme='dark'] .app-loading .app-loading-title {
+  color: rgba(255, 255, 255, 0.85);
+}
 
-    html[data-theme='dark'] .app-loading .app-loading-title {
-        color: rgba(255, 255, 255, 0.85);
-    }
+.app-loading {
+  display: flex;
+  width: 100%;
+  height: 100%;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+  background-color: #f4f7f9;
+}
 
-    .app-loading {
-        display: flex;
-        width: 100%;
-        height: 100%;
-        justify-content: center;
-        align-items: center;
-        flex-direction: column;
-        background-color: #f4f7f9;
-    }
+.app-loading .app-loading-wrap {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  display: flex;
+  -webkit-transform: translate3d(-50%, -50%, 0);
+  transform: translate3d(-50%, -50%, 0);
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+}
 
-    .app-loading .app-loading-wrap {
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        display: flex;
-        -webkit-transform: translate3d(-50%, -50%, 0);
-        transform: translate3d(-50%, -50%, 0);
-        justify-content: center;
-        align-items: center;
-        flex-direction: column;
-    }
+.app-loading .dots {
+  display: flex;
+  padding: 98px;
+  justify-content: center;
+  align-items: center;
+}
 
-    .app-loading .dots {
-        display: flex;
-        padding: 98px;
-        justify-content: center;
-        align-items: center;
-    }
+.app-loading .app-loading-title {
+  display: flex;
+  margin-top: 30px;
+  font-size: 30px;
+  color: rgba(0, 0, 0, 0.85);
+  justify-content: center;
+  align-items: center;
+}
 
-    .app-loading .app-loading-title {
-        display: flex;
-        margin-top: 30px;
-        font-size: 30px;
-        color: rgba(0, 0, 0, 0.85);
-        justify-content: center;
-        align-items: center;
-    }
+.app-loading .app-loading-logo {
+  display: block;
+  width: 90px;
+  margin: 0 auto;
+  margin-bottom: 20px;
+}
 
-    .app-loading .app-loading-logo {
-        display: block;
-        width: 90px;
-        margin: 0 auto;
-        margin-bottom: 20px;
-    }
+.dot {
+  position: relative;
+  display: inline-block;
+  width: 48px;
+  height: 48px;
+  margin-top: 30px;
+  font-size: 32px;
+  transform: rotate(45deg);
+  box-sizing: border-box;
+  animation: antRotate 1.2s infinite linear;
+}
 
-    .dot {
-        position: relative;
-        display: inline-block;
-        width: 48px;
-        height: 48px;
-        margin-top: 30px;
-        font-size: 32px;
-        transform: rotate(45deg);
-        box-sizing: border-box;
-        animation: antRotate 1.2s infinite linear;
-    }
+.dot i {
+  position: absolute;
+  display: block;
+  width: 20px;
+  height: 20px;
+  background-color: #0065cc;
+  border-radius: 100%;
+  opacity: 0.3;
+  transform: scale(0.75);
+  animation: antSpinMove 1s infinite linear alternate;
+  transform-origin: 50% 50%;
+}
 
-    .dot i {
-        position: absolute;
-        display: block;
-        width: 20px;
-        height: 20px;
-        background-color: #0065cc;
-        border-radius: 100%;
-        opacity: 0.3;
-        transform: scale(0.75);
-        animation: antSpinMove 1s infinite linear alternate;
-        transform-origin: 50% 50%;
-    }
+.dot i:nth-child(1) {
+  top: 0;
+  left: 0;
+}
 
-    .dot i:nth-child(1) {
-        top: 0;
-        left: 0;
-    }
+.dot i:nth-child(2) {
+  top: 0;
+  right: 0;
+  -webkit-animation-delay: 0.4s;
+  animation-delay: 0.4s;
+}
 
-    .dot i:nth-child(2) {
-        top: 0;
-        right: 0;
-        -webkit-animation-delay: 0.4s;
-        animation-delay: 0.4s;
-    }
+.dot i:nth-child(3) {
+  right: 0;
+  bottom: 0;
+  -webkit-animation-delay: 0.8s;
+  animation-delay: 0.8s;
+}
 
-    .dot i:nth-child(3) {
-        right: 0;
-        bottom: 0;
-        -webkit-animation-delay: 0.8s;
-        animation-delay: 0.8s;
-    }
+.dot i:nth-child(4) {
+  bottom: 0;
+  left: 0;
+  -webkit-animation-delay: 1.2s;
+  animation-delay: 1.2s;
+}
 
-    .dot i:nth-child(4) {
-        bottom: 0;
-        left: 0;
-        -webkit-animation-delay: 1.2s;
-        animation-delay: 1.2s;
-    }
-    @keyframes antRotate {
-        to {
-            -webkit-transform: rotate(405deg);
-            transform: rotate(405deg);
-        }
-    }
-    @-webkit-keyframes antRotate {
-        to {
-            -webkit-transform: rotate(405deg);
-            transform: rotate(405deg);
-        }
-    }
-    @keyframes antSpinMove {
-        to {
-            opacity: 1;
-        }
-    }
-    @-webkit-keyframes antSpinMove {
-        to {
-            opacity: 1;
-        }
-    }
+@keyframes antRotate {
+  to {
+    -webkit-transform: rotate(405deg);
+    transform: rotate(405deg);
+  }
+}
 
+@-webkit-keyframes antRotate {
+  to {
+    -webkit-transform: rotate(405deg);
+    transform: rotate(405deg);
+  }
+}
+
+@keyframes antSpinMove {
+  to {
+    opacity: 1;
+  }
+}
+
+@-webkit-keyframes antSpinMove {
+  to {
+    opacity: 1;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/system/loginmini/MiniLogin.vue b/src/views/system/loginmini/MiniLogin.vue
index c42fbf7..ae2477d 100644
--- a/src/views/system/loginmini/MiniLogin.vue
+++ b/src/views/system/loginmini/MiniLogin.vue
@@ -1,86 +1,65 @@
 <template>
   <div :class="prefixCls" class="login-background-img">
-    <AppLocalePicker class="absolute top-4 right-4 enter-x xl:text-gray-600" :showText="false"/>
+    <AppLocalePicker class="absolute top-4 right-4 enter-x xl:text-gray-600" :showText="false" />
     <AppDarkModeToggle class="absolute top-3 right-7 enter-x" />
-    <div class="aui-logo" v-if="!getIsMobile">
-      <div>
-        <h3>
-          <img :src="logoImg" alt="jeecg" />
-        </h3>
-      </div>
-    </div>
-    <div v-else class="aui-phone-logo">
-      <img :src="logoImg" alt="jeecg" />
-    </div>
     <div v-show="type === 'login'">
       <div class="aui-content">
         <div class="aui-container">
           <div class="aui-form">
             <div class="aui-image">
               <div class="aui-image-text">
-                <img :src="adTextImg" />
+                <div>
+                  <span class="introduce-text1">哈尔滨师范大学</span>
+                  <br>
+                  <span class="introduce-text">评阅人员管理系统</span>
+                  <br>
+                  <br>
+                  <!--<span class="introduce-text" style="font-size: 18px;">深入分析 多维展示</span>-->
+                </div>
               </div>
             </div>
             <div class="aui-formBox">
               <div class="aui-formWell">
                 <div class="aui-flex aui-form-nav investment_title">
-                  <div class="aui-flex-box" :class="activeIndex === 'accountLogin' ? 'activeNav on' : ''" @click="loginClick('accountLogin')"
-                    >{{ t('sys.login.signInFormTitle') }}
-                  </div>
-                  <div class="aui-flex-box" :class="activeIndex === 'phoneLogin' ? 'activeNav on' : ''" @click="loginClick('phoneLogin')"
-                    >{{ t('sys.login.mobileSignInFormTitle') }}
+                  <div class="aui-flex-box" :class="activeIndex === 'accountLogin' ? 'activeNav on' : ''"
+                    @click="loginClick('accountLogin')">{{ t('sys.login.signInFormTitle') }}
                   </div>
                 </div>
-                <div class="aui-form-box" style="height: 180px">
-                  <a-form ref="loginRef" :model="formData" v-if="activeIndex === 'accountLogin'" @keyup.enter.native="loginHandleClick">
+                <div class="aui-form-box" style="height: 140px">
+                  <a-form ref="loginRef" :model="formData" v-if="activeIndex === 'accountLogin'"
+                    @keyup.enter.native="loginHandleClick">
                     <div class="aui-account">
                       <div class="aui-inputClear">
                         <i class="icon icon-code"></i>
                         <a-form-item>
-                          <a-input class="fix-auto-fill" :placeholder="t('sys.login.userName')" v-model:value="formData.username" />
+                          <a-input class="fix-auto-fill" :placeholder="t('sys.login.userName')"
+                            v-model:value="formData.username" />
                         </a-form-item>
                       </div>
                       <div class="aui-inputClear">
                         <i class="icon icon-password"></i>
                         <a-form-item>
-                          <a-input class="fix-auto-fill" type="password" :placeholder="t('sys.login.password')" v-model:value="formData.password" />
+                          <a-input class="fix-auto-fill" type="password" :placeholder="t('sys.login.password')"
+                            v-model:value="formData.password" />
                         </a-form-item>
                       </div>
-                      <div class="aui-inputClear">
-                        <i class="icon icon-code"></i>
-                        <a-form-item>
-                          <a-input class="fix-auto-fill" type="text" :placeholder="t('sys.login.inputCode')" v-model:value="formData.inputCode" />
-                        </a-form-item>
-                        <div class="aui-code">
-                          <img v-if="randCodeData.requestCodeSuccess" :src="randCodeData.randCodeImage" @click="handleChangeCheckCode" />
-                          <img v-else style="margin-top: 2px; max-width: initial" :src="codeImg" @click="handleChangeCheckCode" />
-                        </div>
-                      </div>
-                      <div class="aui-flex">
-                        <div class="aui-flex-box">
-                          <div class="aui-choice">
-                            <a-input class="fix-auto-fill" type="checkbox" v-model:value="rememberMe" />
-                            <span style="margin-left: 5px">{{ t('sys.login.rememberMe') }}</span>
-                          </div>
-                        </div>
-                        <div class="aui-forget">
-                          <a @click="forgetHandelClick"> {{ t('sys.login.forgetPassword') }}</a>
-                        </div>
-                      </div>
                     </div>
                   </a-form>
                   <a-form v-else ref="phoneFormRef" :model="phoneFormData" @keyup.enter.native="loginHandleClick">
                     <div class="aui-account phone">
                       <div class="aui-inputClear phoneClear">
-                        <a-input class="fix-auto-fill" :placeholder="t('sys.login.mobile')" v-model:value="phoneFormData.mobile" />
+                        <a-input class="fix-auto-fill" :placeholder="t('sys.login.mobile')"
+                          v-model:value="phoneFormData.mobile" />
                       </div>
                       <div class="aui-inputClear">
-                        <a-input class="fix-auto-fill" :maxlength="6" :placeholder="t('sys.login.smsCode')" v-model:value="phoneFormData.smscode" />
+                        <a-input class="fix-auto-fill" :maxlength="6" :placeholder="t('sys.login.smsCode')"
+                          v-model:value="phoneFormData.smscode" />
                         <div v-if="showInterval" class="aui-code" @click="getLoginCode">
                           <a>{{ t('component.countdown.normalText') }}</a>
                         </div>
                         <div v-else class="aui-code">
-                          <span class="aui-get-code code-shape">{{ t('component.countdown.sendText', [unref(timeRuning)]) }}</span>
+                          <span class="aui-get-code code-shape">{{ t('component.countdown.sendText',
+                            [unref(timeRuning)]) }}</span>
                         </div>
                       </div>
                     </div>
@@ -92,42 +71,11 @@
                       {{ t('sys.login.loginButton') }}</a-button>
                   </div>
                   <div class="aui-flex">
-                    <a class="aui-linek-code aui-flex-box" @click="codeHandleClick">{{ t('sys.login.qrSignInFormTitle') }}</a>
-                  </div>
-                  <div class="aui-flex">
-                    <a class="aui-linek-code aui-flex-box" @click="registerHandleClick">{{ t('sys.login.registerButton') }}</a>
+                    <a class="aui-linek-code aui-flex-box" @click="registerHandleClick">{{ t('sys.login.registerButton')
+                      }}</a>
                   </div>
                 </div>
               </div>
-              <a-form @keyup.enter.native="loginHandleClick">
-                <div class="aui-flex aui-third-text">
-                  <div class="aui-flex-box aui-third-border">
-                    <span>{{ t('sys.login.otherSignIn') }}</span>
-                  </div>
-                </div>
-                <div class="aui-flex" :class="`${prefixCls}-sign-in-way`">
-                  <div class="aui-flex-box">
-                    <div class="aui-third-login">
-                      <a title="github" @click="onThirdLogin('github')"><GithubFilled /></a>
-                    </div>
-                  </div>
-                  <div class="aui-flex-box">
-                    <div class="aui-third-login">
-                      <a title="企业微信" @click="onThirdLogin('wechat_enterprise')"><icon-font class="item-icon" type="icon-qiyeweixin3" /></a>
-                    </div>
-                  </div>
-                  <div class="aui-flex-box">
-                    <div class="aui-third-login">
-                      <a title="钉钉" @click="onThirdLogin('dingtalk')"><DingtalkCircleFilled /></a>
-                    </div>
-                  </div>
-                  <div class="aui-flex-box">
-                    <div class="aui-third-login">
-                      <a title="微信" @click="onThirdLogin('wechat_open')"><WechatFilled /></a>
-                    </div>
-                  </div>
-                </div>
-              </a-form>
             </div>
           </div>
         </div>
@@ -147,331 +95,310 @@
   </div>
 </template>
 <script lang="ts" setup name="login-mini">
-  import { getCaptcha, getCodeInfo } from '/@/api/sys/user';
-  import { computed, onMounted, reactive, ref, toRaw, unref } from 'vue';
-  import codeImg from '/@/assets/images/checkcode.png';
-  import { Rule } from '/@/components/Form';
-  import { useUserStore } from '/@/store/modules/user';
-  import { useMessage } from '/@/hooks/web/useMessage';
-  import { useI18n } from '/@/hooks/web/useI18n';
-  import { SmsEnum } from '/@/views/sys/login/useLogin';
-  import ThirdModal from '/@/views/sys/login/ThirdModal.vue';
-  import MiniForgotpad from './MiniForgotpad.vue';
-  import MiniRegister from './MiniRegister.vue';
-  import MiniCodelogin from './MiniCodelogin.vue';
-  import logoImg from '/@/assets/loginmini/icon/jeecg_logo.png';
-  import adTextImg from '/@/assets/loginmini/icon/jeecg_ad_text.png';
-  import { AppLocalePicker, AppDarkModeToggle } from '/@/components/Application';
-  import { useLocaleStore } from '/@/store/modules/locale';
-  import { useDesign } from "/@/hooks/web/useDesign";
-  import { useAppInject } from "/@/hooks/web/useAppInject";
-  import { GithubFilled, WechatFilled, DingtalkCircleFilled, createFromIconfontCN } from '@ant-design/icons-vue';
+import { getCaptcha, getCodeInfo } from '/@/api/sys/user';
+import { onMounted, reactive, ref, toRaw, unref } from 'vue';
+import { useUserStore } from '/@/store/modules/user';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { useI18n } from '/@/hooks/web/useI18n';
+import { SmsEnum } from '/@/views/sys/login/useLogin';
+import ThirdModal from '/@/views/sys/login/ThirdModal.vue';
+import MiniForgotpad from './MiniForgotpad.vue';
+import MiniRegister from './MiniRegister.vue';
+import MiniCodelogin from './MiniCodelogin.vue';
+import adTextImg from '/@/assets/loginmini/icon/jeecg_ad_text.png';
+import { AppLocalePicker, AppDarkModeToggle } from '/@/components/Application';
+import { useLocaleStore } from '/@/store/modules/locale';
+import { useDesign } from "/@/hooks/web/useDesign";
+import { useAppInject } from "/@/hooks/web/useAppInject";
 
-  const IconFont = createFromIconfontCN({
-    scriptUrl: '//at.alicdn.com/t/font_2316098_umqusozousr.js',
-  });
-  const { prefixCls } = useDesign('mini-login');
-  const { notification, createMessage } = useMessage();
-  const userStore = useUserStore();
-  const { t } = useI18n();
-  const localeStore = useLocaleStore();
-  const showLocale = localeStore.getShowPicker;
-  const randCodeData = reactive<any>({
-    randCodeImage: '',
-    requestCodeSuccess: false,
-    checkKey: null,
-  });
-  const rememberMe = ref<string>('0');
-  //手机号登录还是账号登录
-  const activeIndex = ref<string>('accountLogin');
-  const type = ref<string>('login');
-  //账号登录表单字段
-  const formData = reactive<any>({
-    inputCode: '',
-    username: 'admin',
-    password: '123456',
-  });
-  //手机登录表单字段
-  const phoneFormData = reactive<any>({
-    mobile: '',
-    smscode: '',
-  });
-  const loginRef = ref();
-  //第三方登录弹窗
-  const thirdModalRef = ref();
-  //扫码登录
-  const codeRef = ref();
-  //是否显示获取验证码
-  const showInterval = ref<boolean>(true);
-  //60s
-  const timeRuning = ref<number>(60);
-  //定时器
-  const timer = ref<any>(null);
-  //忘记密码
-  const forgotRef = ref();
-  //注册
-  const registerRef = ref();
-  const loginLoading = ref<boolean>(false);
-  const { getIsMobile } = useAppInject();
+const { prefixCls } = useDesign('mini-login');
+const { notification, createMessage } = useMessage();
+const userStore = useUserStore();
+const { t } = useI18n();
+const localeStore = useLocaleStore();
+const randCodeData = reactive<any>({
+  randCodeImage: '',
+  requestCodeSuccess: false,
+  checkKey: null,
+});
+//手机号登录还是账号登录
+const activeIndex = ref<string>('accountLogin');
+const type = ref<string>('login');
+//账号登录表单字段
+const formData = reactive<any>({
+  inputCode: '',
+  username: 'admin',
+  password: '123456',
+});
+//手机登录表单字段
+const phoneFormData = reactive<any>({
+  mobile: '',
+  smscode: '',
+});
+const loginRef = ref();
+//第三方登录弹窗
+const thirdModalRef = ref();
+//扫码登录
+const codeRef = ref();
+//是否显示获取验证码
+const showInterval = ref<boolean>(true);
+//60s
+const timeRuning = ref<number>(60);
+//定时器
+const timer = ref<any>(null);
+//忘记密码
+const forgotRef = ref();
+//注册
+const registerRef = ref();
+const loginLoading = ref<boolean>(false);
+const { getIsMobile } = useAppInject();
 
-  defineProps({
-    sessionTimeout: {
-      type: Boolean,
-    },
+
+/**
+ * 获取验证码
+ */
+function handleChangeCheckCode() {
+  formData.inputCode = '';
+
+  randCodeData.checkKey = 1629428467008;
+  getCodeInfo(randCodeData.checkKey).then((res) => {
+    randCodeData.randCodeImage = res;
+    randCodeData.requestCodeSuccess = true;
   });
+}
 
-  /**
-   * 获取验证码
-   */
-  function handleChangeCheckCode() {
-    formData.inputCode = '';
+/**
+ * 切换登录方式
+ */
+function loginClick(type) {
+  activeIndex.value = type;
+}
 
-    randCodeData.checkKey = 1629428467008;
-    getCodeInfo(randCodeData.checkKey).then((res) => {
-      randCodeData.randCodeImage = res;
-      randCodeData.requestCodeSuccess = true;
-    });
+/**
+ * 账号或者手机登录
+ */
+async function loginHandleClick() {
+  if (unref(activeIndex) === 'accountLogin') {
+    accountLogin();
+  } else {
+    //手机号登录
+    phoneLogin();
   }
+}
 
-  /**
-   * 切换登录方式
-   */
-  function loginClick(type) {
-    activeIndex.value = type;
+async function accountLogin() {
+  if (!formData.username) {
+    createMessage.warn(t('sys.login.accountPlaceholder'));
+    return;
   }
-
-  /**
-   * 账号或者手机登录
-   */
-  async function loginHandleClick() {
-    if (unref(activeIndex) === 'accountLogin') {
-      accountLogin();
-    } else {
-      //手机号登录
-      phoneLogin();
-    }
+  if (!formData.password) {
+    createMessage.warn(t('sys.login.passwordPlaceholder'));
+    return;
   }
-
-  async function accountLogin() {
-    if (!formData.username) {
-      createMessage.warn(t('sys.login.accountPlaceholder'));
-      return;
-    }
-    if (!formData.password) {
-      createMessage.warn(t('sys.login.passwordPlaceholder'));
-      return;
-    }
-    try {
-      loginLoading.value = true;
-      const { userInfo } = await userStore.login(
-        toRaw({
-          password: formData.password,
-          username: formData.username,
-          captcha: formData.inputCode,
-          checkKey: randCodeData.checkKey,
-          mode: 'none', //不要默认的错误提示
-        })
-      );
-      if (userInfo) {
-        notification.success({
-          message: t('sys.login.loginSuccessTitle'),
-          description: `${t('sys.login.loginSuccessDesc')}: ${userInfo.realname}`,
-          duration: 3,
-        });
-      }
-    } catch (error) {
-      notification.error({
-        message: t('sys.api.errorTip'),
-        description: error.message || t('sys.login.networkExceptionMsg'),
-        duration: 3,
-      });
-      handleChangeCheckCode();
-    } finally {
-      loginLoading.value = false;
-    }
-  }
-
-  /**
-   * 手机号登录
-   */
-  async function phoneLogin() {
-    if (!phoneFormData.mobile) {
-      createMessage.warn(t('sys.login.mobilePlaceholder'));
-      return;
-    }
-    if (!phoneFormData.smscode) {
-      createMessage.warn(t('sys.login.smsPlaceholder'));
-      return;
-    }
-    try {
-      loginLoading.value = true;
-      const { userInfo }: any = await userStore.phoneLogin({
-        mobile: phoneFormData.mobile,
-        captcha: phoneFormData.smscode,
+  try {
+    loginLoading.value = true;
+    const { userInfo } = await userStore.login(
+      toRaw({
+        password: formData.password,
+        username: formData.username,
+        captcha: formData.inputCode,
+        checkKey: randCodeData.checkKey,
         mode: 'none', //不要默认的错误提示
-      });
-      if (userInfo) {
-        notification.success({
-          message: t('sys.login.loginSuccessTitle'),
-          description: `${t('sys.login.loginSuccessDesc')}: ${userInfo.realname}`,
-          duration: 3,
-        });
-      }
-    } catch (error) {
-      notification.error({
-        message: t('sys.api.errorTip'),
-        description: error.message || t('sys.login.networkExceptionMsg'),
+      })
+    );
+    if (userInfo) {
+      notification.success({
+        message: t('sys.login.loginSuccessTitle'),
+        description: `${t('sys.login.loginSuccessDesc')}: ${userInfo.realname}`,
         duration: 3,
       });
-    } finally {
-      loginLoading.value = false;
     }
-  }
-
-  /**
-   * 获取手机验证码
-   */
-  async function getLoginCode() {
-    if (!phoneFormData.mobile) {
-      createMessage.warn(t('sys.login.mobilePlaceholder'));
-      return;
-    }
-    const result = await getCaptcha({ mobile: phoneFormData.mobile, smsmode: SmsEnum.FORGET_PASSWORD });
-    if (result) {
-      const TIME_COUNT = 60;
-      if (!unref(timer)) {
-        timeRuning.value = TIME_COUNT;
-        showInterval.value = false;
-        timer.value = setInterval(() => {
-          if (unref(timeRuning) > 0 && unref(timeRuning) <= TIME_COUNT) {
-            timeRuning.value = timeRuning.value - 1;
-          } else {
-            showInterval.value = true;
-            clearInterval(unref(timer));
-            timer.value = null;
-          }
-        }, 1000);
-      }
-    }
-  }
-
-  /**
-   * 第三方登录
-   * @param type
-   */
-  function onThirdLogin(type) {
-    thirdModalRef.value.onThirdLogin(type);
-  }
-
-  /**
-   * 忘记密码
-   */
-  function forgetHandelClick() {
-    type.value = 'forgot';
-    setTimeout(() => {
-      forgotRef.value.initForm();
-    }, 300);
-  }
-
-  /**
-   * 返回登录页面
-   */
-  function goBack() {
-    activeIndex.value = 'accountLogin';
-    type.value = 'login';
-  }
-
-  /**
-   * 忘记密码/注册账号回调事件
-   * @param value
-   */
-  function handleSuccess(value) {
-    Object.assign(formData, value);
-    Object.assign(phoneFormData, { mobile: "", smscode: "" });
-    type.value = 'login';
-    activeIndex.value = 'accountLogin';
+  } catch (error) {
+    notification.error({
+      message: t('sys.api.errorTip'),
+      description: error.message || t('sys.login.networkExceptionMsg'),
+      duration: 3,
+    });
     handleChangeCheckCode();
+  } finally {
+    loginLoading.value = false;
   }
+}
 
-  /**
-   * 注册
-   */
-  function registerHandleClick() {
-    type.value = 'register';
-    setTimeout(() => {
-      registerRef.value.initForm();
-    }, 300);
+/**
+ * 手机号登录
+ */
+async function phoneLogin() {
+  if (!phoneFormData.mobile) {
+    createMessage.warn(t('sys.login.mobilePlaceholder'));
+    return;
   }
-
-  /**
-   * 注册
-   */
-  function codeHandleClick() {
-    type.value = 'codeLogin';
-    setTimeout(() => {
-      codeRef.value.initFrom();
-    }, 300);
+  if (!phoneFormData.smscode) {
+    createMessage.warn(t('sys.login.smsPlaceholder'));
+    return;
   }
+  try {
+    loginLoading.value = true;
+    const { userInfo }: any = await userStore.phoneLogin({
+      mobile: phoneFormData.mobile,
+      captcha: phoneFormData.smscode,
+      mode: 'none', //不要默认的错误提示
+    });
+    if (userInfo) {
+      notification.success({
+        message: t('sys.login.loginSuccessTitle'),
+        description: `${t('sys.login.loginSuccessDesc')}: ${userInfo.realname}`,
+        duration: 3,
+      });
+    }
+  } catch (error) {
+    notification.error({
+      message: t('sys.api.errorTip'),
+      description: error.message || t('sys.login.networkExceptionMsg'),
+      duration: 3,
+    });
+  } finally {
+    loginLoading.value = false;
+  }
+}
 
-  onMounted(() => {
-    //加载验证码
-    handleChangeCheckCode();
-  });
+/**
+ * 获取手机验证码
+ */
+async function getLoginCode() {
+  if (!phoneFormData.mobile) {
+    createMessage.warn(t('sys.login.mobilePlaceholder'));
+    return;
+  }
+  const result = await getCaptcha({ mobile: phoneFormData.mobile, smsmode: SmsEnum.FORGET_PASSWORD });
+  if (result) {
+    const TIME_COUNT = 60;
+    if (!unref(timer)) {
+      timeRuning.value = TIME_COUNT;
+      showInterval.value = false;
+      timer.value = setInterval(() => {
+        if (unref(timeRuning) > 0 && unref(timeRuning) <= TIME_COUNT) {
+          timeRuning.value = timeRuning.value - 1;
+        } else {
+          showInterval.value = true;
+          clearInterval(unref(timer));
+          timer.value = null;
+        }
+      }, 1000);
+    }
+  }
+}
+
+
+
+/**
+ * 返回登录页面
+ */
+function goBack() {
+  activeIndex.value = 'accountLogin';
+  type.value = 'login';
+}
+
+/**
+ * 忘记密码/注册账号回调事件
+ * @param value
+ */
+function handleSuccess(value) {
+  Object.assign(formData, value);
+  Object.assign(phoneFormData, { mobile: "", smscode: "" });
+  type.value = 'login';
+  activeIndex.value = 'accountLogin';
+  handleChangeCheckCode();
+}
+
+/**
+ * 注册
+ */
+function registerHandleClick() {
+  type.value = 'register';
+  setTimeout(() => {
+    registerRef.value.initForm();
+  }, 300);
+}
+
+
+onMounted(() => {
+  //加载验证码
+  handleChangeCheckCode();
+});
 </script>
-
 <style lang="less" scoped>
-  @import '/@/assets/loginmini/style/home.less';
-  @import '/@/assets/loginmini/style/base.less';
+@import '/@/assets/loginmini/style/home.less';
+@import '/@/assets/loginmini/style/base.less';
 
-  :deep(.ant-input:focus) {
-    box-shadow: none;
-  }
-  .aui-get-code {
-    float: right;
-    position: relative;
-    z-index: 3;
-    background: #ffffff;
-    color: #1573e9;
-    border-radius: 100px;
-    padding: 5px 16px;
-    margin: 7px;
-    border: 1px solid #1573e9;
-    top: 12px;
-  }
+// 介绍文字
+.introduce-text1 {
+  font-size: 30px;
+  color: #fff;
+  font-weight: bold;
+  transform: translate(-50%, -50%);
+}
 
-  .aui-get-code:hover {
-    color: #1573e9;
-  }
+.introduce-text {
+  font-size: 40px;
+  color: #fff;
+  font-weight: bold;
+  transform: translate(-50%, -50%);
+}
 
-  .code-shape {
-    border-color: #dadada !important;
-    color: #aaa !important;
-  }
+:deep(.ant-input:focus) {
+  box-shadow: none;
+}
 
-  :deep(.jeecg-dark-switch){
-    position:absolute;
-    margin-right: 10px;
-  }
-  .aui-link-login{
-    height: 42px;
-    padding: 10px 15px;
-    font-size: 14px;
-    border-radius: 8px;
-    margin-top: 15px;
-    margin-bottom: 8px;
-    flex: 1;
-    color: #fff;
-  }
-  .aui-phone-logo{
-    position: absolute;
-    margin-left: 10px;
-    width: 60px;
-    top:2px;
-    z-index: 4;
-  }
-  .top-3{
-    top: 0.45rem;
-  }
+.aui-get-code {
+  float: right;
+  position: relative;
+  z-index: 3;
+  background: #ffffff;
+  color: #1573e9;
+  border-radius: 100px;
+  padding: 5px 16px;
+  margin: 7px;
+  border: 1px solid #1573e9;
+  top: 12px;
+}
+
+.aui-get-code:hover {
+  color: #1573e9;
+}
+
+.code-shape {
+  border-color: #dadada !important;
+  color: #aaa !important;
+}
+
+:deep(.jeecg-dark-switch) {
+  position: absolute;
+  margin-right: 10px;
+}
+
+.aui-link-login {
+  height: 42px;
+  padding: 10px 15px;
+  font-size: 14px;
+  border-radius: 8px;
+  margin-top: 15px;
+  margin-bottom: 8px;
+  flex: 1;
+  color: #fff;
+}
+
+.aui-phone-logo {
+  position: absolute;
+  margin-left: 10px;
+  width: 60px;
+  top: 2px;
+  z-index: 4;
+}
+
+.top-3 {
+  top: 0.45rem;
+}
 </style>
 
 <style lang="less">
@@ -486,9 +413,11 @@ html[data-theme='dark'] {
     &::before {
       background-image: url(/@/assets/svg/login-bg-dark.svg);
     }
-    .aui-inputClear{
+
+    .aui-inputClear {
       background-color: #232a3b !important;
     }
+
     .ant-input,
     .ant-input-password {
       background-color: #232a3b !important;
@@ -505,30 +434,39 @@ html[data-theme='dark'] {
     .app-iconify {
       color: #fff !important;
     }
-    .aui-inputClear input,.aui-input-line input,.aui-choice{
+
+    .aui-inputClear input,
+    .aui-input-line input,
+    .aui-choice {
       color: #c9d1d9 !important;
     }
 
-    .aui-formBox{
+    .aui-formBox {
       background-color: @dark-bg !important;
     }
-    .aui-third-text span{
+
+    .aui-third-text span {
       background-color: @dark-bg !important;
     }
-    .aui-form-nav .aui-flex-box{
+
+    .aui-form-nav .aui-flex-box {
       color: #c9d1d9 !important;
     }
 
-    .aui-formButton .aui-linek-code{
-      background:  @dark-bg !important;
+    .aui-formButton .aui-linek-code {
+      background: @dark-bg !important;
       color: white !important;
     }
-    .aui-code-line{
+
+    .aui-code-line {
       border-left: none !important;
     }
-    .ant-checkbox-inner,.aui-success h3{
+
+    .ant-checkbox-inner,
+    .aui-success h3 {
       border-color: #c9d1d9;
     }
+
     //update-begin---author:wangshuai ---date:20230828  for：【QQYUN-6363】这个样式代码有问题，不在里面，导致表达式有问题------------
     &-sign-in-way {
       .anticon {
@@ -541,6 +479,7 @@ html[data-theme='dark'] {
         }
       }
     }
+
     //update-end---author:wangshuai ---date:20230828  for：【QQYUN-6363】这个样式代码有问题，不在里面，导致表达式有问题------------
   }
 
@@ -549,12 +488,13 @@ html[data-theme='dark'] {
     -webkit-text-fill-color: #c9d1d9 !important;
     box-shadow: inherit !important;
   }
-  
+
   .ant-divider-inner-text {
     font-size: 12px !important;
     color: @text-color-secondary !important;
   }
-  .aui-third-login a{
+
+  .aui-third-login a {
     background: transparent;
   }
 }