From 782a3b308872e60ae74d2c54ba044efe928766e0 Mon Sep 17 00:00:00 2001
From: tangw <czlis@tangw>
Date: Wed, 26 Nov 2025 20:01:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=95=8C=E9=9D=A2=E9=87=8D?=
 =?UTF-8?q?=E5=81=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/login.js                              |  16 +-
 src/assets/images/logo_new.png                | Bin 0 -> 12411 bytes
 src/layout/components/Navbar.vue              | 264 +++++++----
 src/layout/components/Navbarold.vue           | 191 ++++++++
 src/store/modules/user.js                     |  10 +-
 .../liswork/work/components/labresult.vue     |   1 +
 src/views/login.vue                           | 424 ++++++++++++-----
 src/views/logincopy.vue                       | 448 ++++++++++++++++++
 8 files changed, 1140 insertions(+), 214 deletions(-)
 create mode 100644 src/assets/images/logo_new.png
 create mode 100644 src/layout/components/Navbarold.vue
 create mode 100644 src/views/logincopy.vue

diff --git a/src/api/login.js b/src/api/login.js
index c1a9d19..97c0dfa 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -1,12 +1,13 @@
 import request from '@/utils/request'
 
 // 登录方法
-export function login(username, password, code, uuid) {
+export function login(username, password, code, uuid,loginParam) {
   const data = {
     username,
     password,
     code,
-    uuid
+    uuid,
+    loginParam
   }
   return request({
     url: '/login',
@@ -28,6 +29,17 @@ export function loginAnonymous(data) {
   })
 }
 
+export function getLocalconfig(data) {
+  return request({
+    url: '/getLocalconfig',
+    headers: {
+      isToken: false
+    },
+    method: 'get',
+    params: data,
+    timeout: 20000
+  })
+}
 // 注册方法
 export function register(data) {
   return request({
diff --git a/src/assets/images/logo_new.png b/src/assets/images/logo_new.png
new file mode 100644
index 0000000000000000000000000000000000000000..74849a249cf3623f514a75a52f36040ce1f20853
GIT binary patch
literal 12411
zcmV->Foe&EP)<h;3K|Lk000e1NJLTq006!K0024&1^@s7c~aBG00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91zMumD1ONa40RR91IsgCw0BSEs(*OW3<w-<ARCodHeF=bFMV0ocyS>+Y
zRsvZ_dI<r-o}@d02w_nPOF$%`Y$J*y0s{joiUULkH*|Ew0sK`EX8<8Af<}-rNP>ZE
zBtS^ml5}TJ$e#4_`rWPm@6@|>`@ZhiTM|S`s{6jGI(4e*)Twh%?R5nu&0F#iDk7N#
zQKi_F=kKM*i1Am;Zy@mv@NZO)7jC4cU?VMd*Tgt`;1F?~2AQMW4T)Sh)x&N)rxe9_
zX63lcOw+oLgeavj`~#6Vjtp@qh2By!?4u-k#|vq_hH#QH{8g?5E0K5>3GMdr1knR`
z6Wshf(-^bOG{iJ_#oRI(hE49udFQz+=ME<sTuy>K*K>-5G+#qFr%oh=%u)85hm4t8
zl!tA2mF*+gMFu|npRI^X5tq6Lj$8?jvkb~0{?6>lbSl`fBY2T~1Z`~@LIL3YoGP7`
zT~)Wlt{(rzHh=9SvAeqNcUD#1ME2V?b+c*MnCg70UTT#}hL~dJJ(t9%kS-`Sbt1~{
zJEnqmEZUU^>%^0v!K>bORTm!El11WNFH_3;brQEn;QS04<iUBd_VOLzwAwPzV#-hu
zuc&7>9c#DYa9A%*F7jH)6r>W|&LzyOQPKoIzYnLT<4l~96Qm)`>M#sevN$?56M!HC
z5{Bt6f5kv}=q`tt!lZ`QjWlSJETIe%Y{s(-x$x73rxE_f$o*8~zj6dR^yt1Ex%Is{
z^+;S*ypX~5?uvPq>+fdvN}V_jolrz%;5}Fte2-egZ|0<iDF;DJHA|A2MkdXOX04&m
zlnhsy^zz4`(dMn{4Q>gx&|iOO()#74$RNkEvn)X&-iJiuc6Hrc<e^w#SJl4cRMo!0
zdD@k=*TdiTPE?K0Fg)fhy^#F|+4B496_520O7W?(HXM$TXGS|jX&^1~^1umC?oDRE
zVCPrl7(1Z2b|Bjwfb1Ykem;R)z_|>{rSrr&LSgDwgGH#0E)CaFh-Z{pIE^kN@4LYK
z%wLr@^;ar2KL;+1j~``&=zt%<LI5DhWEdw?o&C4`NPiz+TLBv63&`>`l`RvfI1C>X
z&crIBBf_<t3&d`&3E^y^PuK^k`1)tiF(r0sy1`qyAP>&(zG{*pyi|4VbyA3(?uz*j
zIW^-JyS{k=^hhJEU$D)o84uifF`X)I5FTtB;)h07+-a#a-h;@rGB+b)n5#iVxFS-!
z69r(RRag`!$PA<>nj~FV8fQlDFKLz~wJ+zC719jDAE2TB1~=ArP3<gi#ezvHe-t07
z=y<}hjRvv}h{7bB!j@^Q{8;;H-9!!Z->2&KZ}DQVvK5pwVT!|?VdR$3X{MbkV77G^
z3fD}ZE+3*Yf3$Hs^i^Lp_e7VJXd)uIlx0!Xag}&sTj;$vxJ!gYbH=HzeN0ICN+6A4
ze#88)YPeN3aiS3JUF`QVJEzcw_qOUVyL!S)p$P8|0(T)bytX=50~~rnftT^w=4YWf
zCM#JFv$-^EQ9-6rLBB^YhHF5HPv#Z6r2M2DLjJE^HSRa)xy%=SFdIeW0>lROJ{pWK
zf<phV7zl@7KWC0pRac36*_tGtaSR!bLU-u9rbu7N{hvY{BYG9G#3Gaw6BaKm`>~A_
zHoxo8)nhx=qnzmnX$luWLS|Ocz%Da3C`-ek(?3Mhk@zigFg4NoE@@IPF4qp-Mu(es
zc8U7|26iMq+23lPu~MTTnr*FCkKem~So<t`<Ig946|{rIkSS?cPq6%R&q#Az5zl@O
zG<~YGpqBprrj7Vb@+ivCn|UNK!Tf?U(VElxh0QC7c!thMpPv^u@?b>b3d69&Fq~+Z
z=A7L4DTEHsHAc?J6QR?Qn1G(o$YLiA2EvVT*mQ5@yo;fIc9UtA`Js1%MPia0$gj|<
zg_}5Do66LLCy8Q0b?eI-h#RwHIJ=qqes~@|w5^;j>%Ti$0H>yI8HnVX<ho)bph6#(
z2K_SUMMJdw74*Q-vcgud>hZqYDhJWJc{|W1EOfK2N6@-Aa_?Yu?MY~R22f=k3M?r{
z{08Y$3!>^)RuigaToD|FD>v5$9uC)bX^MwqZ8ZrGyyf`OgcG_0qh%-#_E#*Jt%5uI
zu~JM8GB6II(o}06S`ap2?1|byD7}GU#qQ8l10f!-s0Z=XI3E5yTf^B-JZj_&+{bpu
zEhcB^rW&i6tNa)><8LBqE)}MAni7>fit;>`W4jr&sw**kAL{sGt5aPkt?KcA1s0eS
zw9>k{i4Ok~2)F9rfFLd7TDCQJHHUS$4QXfrgHU~OoJ;m>c%MglFFd)yglVCJ%v@$}
z!e;KroP|4tbeY8r^PqJ$qo9AJv(T;RUuu(CitI3G@u{G`cPeY&>RUCY0@De<OVR~-
zehNdYAKTTn4-)aHr_BI17elKT@UkyxgKAez3h&Zo?8^~9T5JbVOBLa2qC`ANM!JYT
zQ7mXOI$rBrPN$}pR%ihm&p~9_x$g9)-D4=LxZg}yRNSVM*S1wP?hL$~o13JC%tS2v
z93Be#5mZWlIFF&h={Ci|fl{s#LJY$wdL?_?%v6&`lpilcc_p;a{I*CROCQ~a1lMnN
z^r078GwLNqg{Xd^7M;*5p{LM6V-aGpxu}@g-@*9x3ul^@V-K;V^*7AxoR~!Li!$#x
z%|-ns36nM~;ukbFo@;%c?68~~!tF5-j#TBUvjXWf%Fy}`FKqSNX@>}P9w_qAo6I8`
z9`zmoN69_=;kL!4bZ+S*QOwRP&WBS=m}#i>X^=_Q8*LgXfzYk9Bk`|hzl}P*U1g<+
zMV@-l!o+GA+g55bo$U<jHkS_wp(F8}(QEEocmWSqL@QzeQ@TImHWvoE1{@#Cjt|Qe
zCcY3g4f4xWO!q03S}44yFja0KyR?9+L|sp#eH8J!XTF5KTSu$G^gWXjW;VZ>te99~
zv73#8kw?-vf{qsLv|<kBqyF19^VdpDzk~H!T6@Bc98<w;IM}WI$}Rw73Vith)j412
zN%9{hoX(lQN=^sUr*>Ibt`vS)pR%nPt=#x&FX`;(H$a6)adoATv59<V7@aD7g!I-3
z8Zjb8))A6cJQq#ca94C{t{;?_+T%L+2#UT(r{-}qafQO$r-1}&YEtA66|`zrvM-PP
zr-BYnCpIyxBlDL@hp>nM26ZG{k&PeS-{JH$OsN(4^C}>!6waFQG%h<BFAo<mVWRKk
zUqzoRc>tl^np9=o&C)P_9LivZFI%pnY$~vd%q#t-)_dvXQLRO9tUFj_uxw$vp=VpO
zFrilMX2L4kuyCzTyrlA|LDH`<eapKN6Kr>)82@U!COWCDvSsz6O&Clq!kFY}3cRDO
zAgxA?En;_u*1WkRHEQfA8CXlP2D!}(!&9g@v)*hj`E(Ejb7<|Nl{{03GF{~Q{vkY!
z<vi`0@%IW6*N9dc+1APAkk#_zVEO;4MpZEiu%xcm%+u1VnW~tGK!)o&E`-Z@#JKF{
zIGhJR>_)#?()~1}`Ac+8$#_6JH^Yt}jLGNkptfG{>ld7>5%JpmNVy+h0tuq^shY7<
zq_m!qfq$)6zwlm-r|ss3rSG#Fli9nN3?bx>mbEYE%~k?zk)3|qw}D~cMRALHZ3<<z
zU&8xkdH&`Rv}%=-cohG)Dop=C{W`Y2kw!*+Y*xpS$uVDIO{<<3qxm~dO}8=?jH4LE
zHXKP9M^-8YK#jxU3MYZ9@FHAxb2xYX*eG25u&p0XlT8@b(bJhGYR(R$OZya_WL*2&
z22ok}Fu3(ajNfi`8y0+zqgs`9pYV;$>y#d~)6TA&kGEo|m%)gn-6(=_dtrPxXdOWH
z`K!Q~gT5B!f7~($J?hh{3z44hRE;^>^-_}7zOq!M&yzf!*G}^38V<{;ombWtQNJNA
z@yJ6<ux1MTwUj2Aovaj%8#558t9WcD+;HY93_u-6<8hdFW7I{Vc`1FisJqb*(U>td
zZKgx<)_GtuORZ0nCRwzusG~klt&y~hSNGbPsnG2Ux7g6x9LA;08Li8$BBnMn%ZXO3
z&}|D~JZ4=r5cBmFP(2NC`lB&mZyspmwF6A+wld6a&&syxeC|>%!JZ0_j))n+*~QFe
zX5rDQhQri@ABCfBhI0T+GOj8PR(Yhngf1w1l%^rS(YvSNJ-$s%F{-pwEKb+MM8%PG
zQN@Y~(v1}lH8mcWD<VRJ@@#I;6h(Q^55|+sE9s6TKbh$(nJdu1{FXv+naS4-RHOpH
zHeMy34<OfV!m7^mSdN)Vf$<iF?nbQfzaLL$PI}Rzi;t|Mbn($-28SZ%8oHv-FOu2O
z&$dsb-5%mKHqr?PW5){(qJJsDTre-kb#Hi89o6`A&~+DL{0i&aY0z}CS3mD^#O{~|
zPcM=2SIoK$Kpw9^8V>QATF-XMiXU|wTRy|<h27=qRE>MctzURqcX*f;I^7`SA+#ei
zK*-5p-W`(68xYU-R?Z*WCi%&fX6)=sr6pU*^Z$$;0l%h6#lKGm$L{G^9I~1&zy$U8
zsU%%ZF4`QWcA_%tqO+~lmSOvp@gBo;Q!zQtr^rVWsp5c?6n&j8D9<&RaVA|m!2E~2
z`URI^d(V?5nGax1aWGhZN~g>R$1#unWh|GEL%vF+AWW7gTfa;7uS1`7ZJZ-cJPLc8
zmbkl{%4y58rmnHU<?6Z@$n(A~Z0ixw^=&r@-*#;CUaV42$nWjwl+IC&Tt|KRKbUep
zr1eQknV+P9-wZH2UITy%bfUWCy;)o=&2VNu2eB<Z3rxNgZx`HPJimzP)D|*ZM^P?c
z0D57hv{Th}HzTWESfMC24Dun>C0(Q-y`q-K?ADSi!SwkGPlm^!J2M>Abjo~tMBNRT
zKfBi5-gG?P4x?!F#6yF!y43;sR|NHo{?u81knqzv43)qYRcqT~9B5@NP+*anF_VUS
zLUY}hAt@8os8vfd<0xjrR!oM68P2en>Fr=D9598$xTp~${1csDehz&5ong7_+CX8^
zPUloe^=_>EqYA+=t}~WoewdTWP9&rK%;e6DFha6|3HvMKnJt=4ov|n%{wCJ*N_!b6
zKLxHUNtLt}{d4X&?boJf%-<l3(F<9Lao)ju%`JW#45Zc^OvM2EnY~W$pE!Y@F~31R
zk1~E@uga<QydId@m`KaeNE$7=?J?|CzW>0HyVv=v<OyW&1>>3NymG`(yrTfHOn5NH
z5>NgE^X3C5t!v5W-3$Y0Csv&bcS*Y<FYanG(}Bp9z>k)E4(H}0Ft4UD;+O2(-%J<G
zM?Y{4%?0Cnx74SZ9(OmvQU${gGha8e%8eh>Y$DefLgUe!+RseqYNwvA0@HfNc+E(q
zUch8!gOjnJVeHorBJh?m4tE3epZx#Z&-kv2TUhcp%Th3EH+GE{4%eIl|6*05-CPmu
zPO29TQ!|$Ea5x)<mvbVWTj=DJ+KL=OdT#Ly=8CM14OBcM8NFLP*|w|z{ducO2rsnS
z#aS!7PQvrjU}S?vOu{16mN1^tWT;vNYrpEnD`PoWN8)(4@k)9Xj5%J#Z~w!LRLsPW
zVy5=9&5UI@+?uh<4UdMg9lH~7!rBgnBk9!Qb-?JE8B*KdPSMlCG$*R|1L;cXV^d`F
z<@Tt)zZPM5d7O}%#u3<26&^<Q^VKv$8b`rG!^pKaQ8>mQxhTGOITmZ)5hkV}BxVvd
zoag78GQ%--y@nAnZSemvo$)0#*@%K6nRmVH?h~nEpzFBVt>{!d>#kgIfu;jH_OJ_0
zzU-}-e_BVi^Le_VAmf=~EK|G~qE!Z~5r(n);GPWcL`|v|)w=;)#nbWGk0;)#8l@S?
zG&aP|g0E+$Url+c$XFtTF;)b@xo%NYX&88?gwl8n67LpgcHLmLiXr?E7>QcJYM+0P
zW;|!o+GpUyrjSEzUhI%^BleK(Kw5{H89CH#u$~0NdCxvad{C!lhTbqRUI~a@HGU43
z1i$2m@>+N2t}?@ul_K<>pmoc3szR_Z<~X9f37E(3{9era7{O-fCvBK;aeVL!B;=%8
zxf3vkGjkbF;o?W(CSmMGL=~QdGcNn1I7HR-Z1bITR>{8u+NH7k54ZqH4#qO#4Vd1Y
z!N{ohmvp3ESYw5I2OTzHh!dLkA&WP?`taX$xUv`hu?0(wYM&hTfU1&Zn=>2Qrj>P*
zC;b)~;?0CHEoNLuqfQzuykI<te>$w6e;;77bqn^<6Xnw`DNQ5B9gH`FOPXieB%jX?
zw9>nZ8H~cDXesB-ueuS{usrEUx?0L(Jj7Qx9G4&V>ogfZdK5m~Z1Z``fWAS0+*J$A
zu1zS9<C=q1F75(RI6=4&;ei*lp3>dfw9eAO+jSLA)o$a*_WfrWFYSAWqeV0WDV~5A
z#CKv0<6K_Dbu4oeKfsDN&$lsuE!_czS16_{hC~c!sfIJhEI8CAclIY>szTsb%!SQ*
zUsXng$MF@6;gOs3&~BZF$_Klo1M?}h(goDcj1fw;Pu!5kh|X}Z4fTGgjze76J)Ks)
zo>K*#A$I}C=K5c_vLej~o4s_Cnj)4WSj{{)L^nOcP(I~0XG?gqK0nAtsT|HO$NYLZ
z9E`wn9vGr@al{yAiiT-@o~#JX^q6@F<X(=FYQ$yS7@ysoZi4CT&%=rRL+HrH2N9!F
zlO=CD80%xI`}^3SKZp^_4zKM`!^fV*ZY-)#1!t}d0)Hy4S-gm0dv2g|cs~&D$%)o~
zvnyV$hrZv0?H1S5@Ck9}#2zt@7suPwIgaD1#e3e$9&KmWbmWi%`5VO)lwG|*Y%>!z
zV>CS3edI6=XML`5Ib{`wKoyQ3t{gV)+k!m5#%DYvV5iQY>9U9}5>U$p3{Jm=mE%sw
zF_GsT3-d(P<0*?n?v53%au1s@5pUk3oS$hqkDGei26`-Rt9ul!S-7k~ik*V6&~+ou
z5!|Q{kVfdar}z!xrL3qMh213ej*Xok$RC1`qkZ@Zvw*u+;bQ}~vXeg%Of&yoFzi$%
znJkUWG{rz|!^3_J<8Wr2W}b!vtkO{N@xyR7oTjqz!%iKp-1yOW+ONWmR=NnSP#4B;
zSojixi_yofAZy1EO8KiHncV0Jcf_O;;vEN^mNx8O^Bj)_Iv7{<tES*>LGS1G-!KAJ
zp<bh!$+=ZAoetX#Q5q}e?}iQ;0GyOV>qoj<`mLj#vtsq;)=aLTzMFOFRGw~7R8IXH
zSsZyO31+!WK@+u-3#HA8^P?CFhgJ=YmxO7YBwWGpqr<pz;&3?FZ>Ay`5_7=^Mo|^X
zHXhEyK+hluZ=_2r?uPFpYjQe&q{z}v|0JcVw2s%k8LlIK;+_jQq+v?uvmYFb-R##7
z$KyxG3E!h&S2>-7#a=Tr0*u}nw*fj$u52%y*-OSJU+ttDnHMy<au*ER=fDI#7>OrL
zA^_0&tuwG?`|MbqfDbu09Lf#9mj2k!4j6%SG5RATO1~MZIt*}@5v%Mtt%tBID(N!1
zsC-T?0)8Labta`so>Tq+wd8XRh^<f;L!j#ms)smk<Zy7W3kIN{^y=qdo~o)FiBlbu
z11aD1SI>X3J+AT(9yiQR(@ZqhFQE_dv@OIGyxnO}$p5DLh1@MIXmA4Qd5pHoKp$_G
zLU$1}0a7l;7R2icMqnV$-8&_z>s`aRw<wb-4^rvp-1-H_AVe`OuO^@pK85Wfe5Aan
zO?OAATEBDq!3;JnNtw(WNM|Mr{5NvEHL%|&+u9QEH2&H4Ln$T3Qd*3{<XK;82^*NE
z*fa)nY2)@2sA2p2bac5(#r^tF*p#75ihIO(3|@}I?#}bE6?Qs$H+SJmo1s{pd>L<W
zBoT2=vBNGh{v9QF2gNx8qEe5s&urTgONB?Hk!h#Q$5xL|aw1OEgm1dLcRom4-`*G}
zTF^1ga7v!L8;bo{92|WiuuFzOC6r>L>{ie7j-u6zHs&*bEJ*nCu4AaIWI2W<sAOg|
zD%p24P#<f+_xmX8JxqtBcM;>p23b6m8A3996_te7(9_KW5QJlAh_CcH^8)VTa3~y?
zsA#<BCun?@Dx4E(Fn531v`(kb4!Ahy?*7*?j60C?!BT|R<Lz32>^fz-PR%>$&>OAy
z*E|7gFdZRY$NbG**h_=UV6bzpGjr&~zP97t4S_^`g~wSHW#dG7Ejj~IVAOm?;lbOq
z&<&5f*)dXI22nSX8IA=HxKaHYwcwT@n0)3l<V<YQd!gk&@m66&Q}_g#?mhJJqBR`U
z!Tf4xB@M7|qN40|s_hOPq|I3PN!seI0l+psOVcrW^};`6RDT|JK@3%0T1GaljdW3;
z9y6YE2?KeTFvamgm>bbT_XB7U!@Dx6t*cK*ZcEYId*3$03&D`NaBuUL&nvt!j1yZk
zX9pzha(1SwYFC65&JF8d{So`SG=5Q*tk6MM|4xjkj)v;J6{>3(6+s2VbYwn5PcQx|
ze)%bEo@$v&<;K101Tr7_<A#8ljp3d$+=)^W4<Ez1o!}tVe>bYhGOp!oh7=sKgopu^
z$urs2TZ6u28EWAK&kw$D1=bqVG!N@4jqLITGo0%2SAssih^Lk5#9#@X^huEXS=>G7
z)ZntKpL#O9+alwnaKyM%{8bBQcZ!TcIVm|CZ~t<rV+&=)Jzv3G2+9l{M-^Rry0xFn
zUO=;31L`ZLV}IrV+@1u9MG=w@r^pYh9Q=3wMByfo9r__nE?v@X{_PMj+-XJZiP#VM
zhT~XwqrGp$ZBnP8V!LiLq}p4z4h{8cu%6W^=GYsV+QMeQNoAOLTNi}#-Eif?yD>$4
zu_45jm`;AH{n6n>0wE4=*W$?irIwf82D-k6z5QI-H<==L_Mr0&6RD`P{KHFM!^w>*
zwM~%2Sfbe|8$YTS#Qw;w{BU!)9=IuYgrnTZ-jwgq`DI4{y7y-ERBXv!h%MP|1EqqA
zj=_y<ixPY7N1aqg@4nnv5cdNFcF+75(H}2O)niUPzd2*(vC)i;ZNPK|B<&82=g8=`
zm6jYvABXhqhlUkI*XE$~2JEMFJE#_2ZJpV9scNLC#@OO{5L13{e`P$gr+em)#$d;$
z&!CZvbU9*aea<PgH!STP3}70pY_1IXD(*=9P6yQe2%tr>`ywySeh1sSzl<J>rKT6O
zPEV>EPDRg#awVWclc)1@xCjtSFqW8%!C03QXWbL^&yCS@=J&Lm*e_2jXe{2A$%rxr
z4RH$ZmzMjUrm}DGa<`{#hcL_qHP6v7bpH;R{h9;&PVjNol^SRQy37wl=!dnfm3@f(
z<=2fL){yMr2F^qimJR-jgO1nG5n>gG95DMI2lkEN^HPjO(;!$kLcVYo@Izvx7Ie;D
z3p+Ra8XnW7ioG0twy)CR;twAZwFk2O5IL}Sg3l-AHsBH-m+nCq;#_R({QDR!z*?YL
zvf0i3ST;)NbIw@k*`Z$s4&s?VfouJI|1sQ*aMS*LLL=hTer4^s;PdXb^)v}x8eEMM
zZM6EJSQp82EW}ES1K0r`5x{WuK+?O!;o@UKNCpd_{l7_LKAii*KPa{xNVjti?3v&<
zU^B76&6$#J?mX$e2uTX7*5ZY_ELy-hE2Yib3A%zIEQzOZqYQMKyyh>=ddg;RColb2
zy!_0#2h2y31HBV`z7S>w)nf39dp+nVHD$K9Y)J~a7DSd*EwtJ$gva=7*eZmlU>XN@
z<SdBGbF`+}f{iQBP-*r?I<{=HO8daiN0I|Q7kr+zsmHcSn;wARq+%i36SgFUR0(?|
zlq{H9IJK>XSNZY7Ha|KI&R@fn9eLPd!+6@w{wO$SYfm1WH+C+=?ysBhjg7x>ln>U7
zv5SUSgIp&(-W1}bP{<>&l3xPKcB2_uY6^c&Hq*R_*1xk&(J^9DAIHv|j&dD`RyWCo
zf@B81cq{N5|AJ#OdAA`mvOV&|<BT9UMH;d%^6Hr^1S0FEyg$-AWp5V`^9~B^)+v(g
zgRz+3d3<aaz-@nv1KRci)z|OpKxj=}xh=hs6j&!?*6nz#R~&*}_t=XSti>^<zj>y3
znO4qiKs;WZz<T*;$H|tQhaCw=fNbnd3f^>gwLDws?j3Vv?b&8vj={bKTbki=T<P>D
zYFx0b@Rkvkdg5oT?1!n!-{Rv1=k#g-tL2JqmNac^VO0JoA6<n>t<T~7=rBgru=aQy
zrqk7U+E#INL;$rjnJ(ihKUbh}6p8RLn%VL{lybjKAM50DJ&v=7hPO0^QeKZuT9=?U
z`{RNpq$Jm3Yw#izZ8^lSA3hv|Es*wYPP*@6s;vEiYi|ETNsvk5PWMXe&Z)&3d9no9
z87tFxX^w;tW8V^=Kax8QGrS#p!MMa7j6uOb95p)zC(Z^drtrP@f+|t|Y9Ob<5PVGw
zhXIK;L2z<;8DYlCrsnvx#qgZcLvUK>OW@}*m@GhlQDV0uHbQh<x4|Y4v5PX+OGuYr
z5JitQy!JH1Ht&J=Fnr#~01Hs`a6U+X6B`8rEZU96MP`>{!;>Sc>;BjC{abj4AJIUE
zWXpxvqI4dTgAx{xQ%Uhllsk@<S56$7IU99(71G3)g2Z1^6~-&sM%v!B;ODwFbr6Ur
zP?*8p3cVI6&YIo4lE_BGRdL(<0aW3U&G^acWVepT4i<PF&hR)a5l_LRz$8w4H==aN
zn{kw45q+^0^()jYkEB2CzK+f=e~&}<g|UZ^IRSUD-VVW@k`vzW&!K00*IzRq+e`CG
zM8rpnXK}8%eO%47;(d6296cPM41d5vNCTVa1aH`b=!MUEBD{rGzRKr6RH<^9ZNJ&&
z^SMRKYt>RUb=P7u9e;Xis0@uJVTM0&o6-F%cq3+ATVh}ug!UOvdUw#uZcbi}n3Q&m
zmRqoQ0^hEX<#<6|Y&!f>;G5HF-GWRqQRT+52U@9)LKG|qaPYYhwYj=O)CkZaUgv_(
zbMvb(H=oAbyw7icJEN0gTRr$;p=39kq;Rrd;Y5yjz?y*TczHHFxutfFm`J0L8@QZ5
z8=Z!xLBljWNoRXl(oY`t2Ghr}XZu;2(fCa|r|fY~YOhSq@dHI*oev>7391juRxHM@
z+n)z(=FcgZ?yRmiE~;j~wdi)}sH>q>2Oy0NkioCJP1&d04zd<ZxiFBYsFU3uT!D<O
z(yXPsF%msBagJj+Ra8~SEr*U{<0X96rSK>EDp=duHHw1t)hzUkh3kXA88kONiLOdV
zq32xNZpH3M1L_i0cB)OzACNEaPt^G`E_P1iI6ZfV+L?}m&jnwO=FY(dl{TFfYk4gY
zNukwlPE-pS<K^MPlLw0^&^RhA!eK<^k8qM{GDwH%7M}fV*w(n(uk9p_3I^mj9R@_E
z{mY=!=3w7P({DaN&orM&jjjI{Ulyw4_Qv)t6IH`ql2k-UD^9oX(Y_h%)*X*Cg0~^P
z$*5d>e>Qm7b%SZNZt;rVkhHIG!NOgjV<iL{-IOR*lV2RM5q!(_&jFS}X{jMRgIUf7
zyM~)^L3OeQa{)d1g_xtI+l4c_Z=pNGCve&XpRWzz7Ep$Rz@s)e(#;qA7uB|d$q@QS
zAxOo1^>$835MNWN$<qbXcC48hH;Simxd0lb+z}1~HM~7;9EWij2}a{;I|t3dRXF2D
zc*@Ui2CyAH%7dTe3y}<q&~y0kC_jGq6Vg&#fxW7u>8YK!(FJ|-x(GViZtYd!wxCMP
zMvs0X5}g1-YSFd0fQB6N9<5)puG{#GfCCzi<6Z+Te**@U2jQNGWm0Bu@ahfpp%;5S
zN@JfR@g;@0#3RT~>+X=bUo77;Gq~DbSm&UAQs~^@8l>qpki<6##4kvKL>5|IGYK#|
zIViv<wZ*MeKaabCc_z9he-wZigS448!RM}xN#8>9x2f+Zb2iC`<HUYA*v&s0)?RQG
zJPK#jZgDjZM}&zirOCBh!<8RDZ0j)Pjy!pAcp@-IkK^RQ;7QW2@DlM<82q>%AM^cn
z_}1q=^u&&@(}jJXR%!O?XOS1w)3d>daZQ$Cd<(}3PQ!_YYt5pf&&lfXZ{VQIA{?C9
z0bSJx`5lD;+_5=TC4c1x<}V!SA1_VsTc}4|zs!d$aAmrX%Y<+)acXcmZ@UW!L=Y~^
zhT$W*L1C{5?JY8&hB?hKoeHW!SEro`Jz8&C#&5GL=hoAkb9Q70kGaAs3a-Pb_g0j5
zxMP?LaCRK6g})$_<_a7D#?3l30!2I#W35Bch`fvL;TQdtB@5amo%8bN7J6aY1fO>w
zo5AVoK5(vR77YEcgWde21w`8sI3G8{=Q#RdJT}_THhZ*2*6HbR4rZhM8joQyu1X|<
z!+|h`a21@xB8N^_!<8MSr_*N`8%{3@Qkh#geB_GJxR78b4yiWfkb3ni@!^iykdBvd
zhH?<*GfsyHe;RWy<M9$;>P`LO46EFLvOa+iwLj|n_Iw(IOZInInC>KQzE>*Ja@mf_
zD|1W=rtl1W+#;aPPngBHIY-E|FPL2tA=c!D*p79LMzTxVb3`Fyx)GaH#9GXnl=E3w
z7<Atts7d}SOdO;!jkiNzG98Q<@?aU|zl%mpy4w~_$3W>`jP4|M^cqueUI2Y^%<F{c
z0t!A8>VMaB?dNFi%Y08uNIS-avdG+wiKbP+OUuyQOb(yf?`ZH+ZAFxNyihn(Yi!Ee
zxuctHZwa5p9POWojGsYbebtPNuJHCkqJ==&_)+27M&=40+1kxCDLn8{*$jYb@76G7
zBap+D8$X(%x*BvCBe7dQDndKI3ge&1=(4f5V7vsb&JS~pPz*kf<-CmRF0Q7_2fnM5
zJ7E8FaiC4`HQkFF2jZjU_u}OEh3cc{437l^4lOWRE_7JZui|tf;2rRy40Jlm3y;Rr
zLZ{&odK|9t;`ll)ik7357k-|Co|uWFsyi`rh7YZU=b-sS{}Q7a{Y8xS>1uz{=4-+N
z|9@#%zi(k%!=7k*PVIpC2jD<Q!Dpgg#bJ`ry9`VCzeF>EQ$LXqbC?#yf&!<74tN}{
zaXDTde&lHnW50&!I9kiceob=1RydJg#fMwqR(LOaAHMo=2b%0;s+<zhbX)@wT0Ext
z0(=;20)?@XnEEAGKoi<M_y%3RC;fWPuya#9e9R%9Wq&gC!(D+WeokFrrP1-xBI~u)
zJODlvtFQ}b^@0W+)EnEWs=Wl&G0bnZpQgU{dfL2&XiGXvBk-Z3%yu(As=poGnssw|
zfLyTa&~2XlL8QjMB~U23f(l2G2rso=oVaBLlH__}{6bKCxXG3Su0}Pz<=4-f1(cX(
zt7`liBJ?jre+`4}-1p#;NpwyecYTJnehh=F-(vCyUz~~t+p%!Kq1+M8Y$XMqbJ2b+
zyb)@ym@J&=?(z54)Fv_bd8Vbc1yf;iCt$l^?*=aJX%fwN8li17fb&v5G&iQe40AV@
zO)!OpX)Gb}0YUY#VGx?ad~UFl{GF@lqG5&ShMB(mw+yCY>tgi%MxaB9Ic32YxRip9
z3KS0gR+DY4Vc-rGKfIYf->06V?Nc*+?D4i~d<|)i#<L4^;j{3SpI@faG!nvoX&4%F
z4B?mHzJLjs#r?IvYTj(%X-@Wp6oJoYV^JzRQ%G|I)^ktC?9|)X8Zny%27^nSp}?}M
zpa!f!4ZxuCa2(RP(`|0qqjdnxqMU#<ug3IZnNm2s2+Ci@Ch$}mI5r<PVg(f-2K#Th
zLCJsPMUU^|>Pdl;IQGc#GmXHXk*&|%o2sc8hMQ7nL5<y#n;Q~ebESK}E$o4~&ZNv=
zx$PA!3SeB)emXOm;zjBk8nf^P`Xi~yy&FNFk2OEDJ;{3Q=RUA90I<+wO&-4xWPH+|
z#M^)^fhK;FOy>=9Gn=7tn@MC^sANZmPOU6FmpyHoL8W)}qx6;|sbA_?3{o%<GETt!
z%0OgLg7k6lCBPCk53H~(ZSYZQWFE@*$S?mk!heUSqq%=e8KsIoj+f~s1UjJ4#r0Rr
zlqQUCuunf+j;X?B<fNXY%S(8gZJ!!@#P~XCgx^40)He*np9WO=JT6|g?3R+x;XdMr
z1H#-l^V7sYPb-i;p<w9Lv=OXc&TU#?&>7fLQ;u&}l~|!sj%BGqs7PK{cq}Wtr;2QA
zWZ)UMgL!+Lqqkz-YasKQm{eRS?U*gR)-b~Lg4=L=)Ea~((@#oL9IYFNVO5SfLkR10
zkjZ01VGgt_i^qhm^5?>V)(^!MxY%Miictxn{~q|*h$*76G^F@^Y^7II##&Ol&WGps
zspT99!GqAS(1MUHK7F3WMQMS%1@p1%A$<569Byh2#4A)&yoC6Uww{`4xY)CL=SXsl
zqscZ;MJsa(1iK1dEleDMFKWSx?L>mw&9*K@JU7n(^=!v=@Y8Xd)dQ4~D`;~|mim}w
z)W38rZj|{N^7t4K4b{?c(mG8{Q-Fro(G=f8=cH$H&<A1c5hsk7hIKP2<r$P&;NP)m
z(T>IbtVfK{S|g3%Gf<ebjnH@YM&mn`b(ccPUWZwuO|B8%WlEzD3VkV>M%?>sz7K6*
z4pFp1TpEq7YnuaCzK-q=&!E8Hb5nNMm;u?qx(54qCZf)uOqit*MTwh!4Xg`E+}=eY
z#$1W6r$OJ#E^nI6cU|{9rw9{QrrBl1Ga!k7<jr{43df3M6!PQmm*Mp?ZiP0RVq4ak
zSl;`B+tfUTHs`+h+BTipRj#=YF+WW+cUP0NaXFIMK>bszXf*n0y*0l<*P(dlnN)0F
zfS0Eh0#*%OZIOptz4EqOuoQytC{@m|AV)?EyB1V#SQIS6QE(`g5Yv7s@ntG<@Z~+s
zkPR<KlIRBV*Z*{tGA>^Y#5O+$c12p^ca(O&PG^;&TlK*iY<PuEm;52nrO?J3OexL<
z4NZ9KRzNneWs6%d++>{8kG&^Hx()LmqGOKvz0+LuuoD_rLzg@yP4iyGT6A+{5N<<5
zd8Q$ZGi2!AO6w$V$<`d|agL4eEyC0x{YM-DyDlxPAz*fPX&A~kO%a~z2jaHC+V))j
z2UO!2y>yh8;6+NK`ftW&ye5?EW>n=*R6T}jO4Pu8<zIpFybQ&Bnu?p^ouNGwd`-?7
z<vc?&OMAPudHMMFO#>+vo`LSoHTaI)I9#Ta!me8gCHSfY6sh>=<**XSqb4cDiJUl&
z*6fU;(tv~GYXMPk{BX_kOTog<4;#kkN5^HGjfszaTh?;S`rJ<El|F%&yVn(;OQ<)$
zxqUGpu_+i*{O4d+<MURvs1>2O5Snr!E_}QMo76;Vb<@=#8l}<1_9l-ASK>qJEX)D|
zVFVR2V3imx?_&=z#uFtdGq*h8VkvWI&kS!F&XkV|$-l!4X(EQO_j{iGW4@8j8aAfd
za;$sIu-{K*W$k}@E`)JCz86c2dcE4rV+nM7uXMBF7s=eZg0HelA2zWn3|us9qTFk2
zev}Rx_zWF6FhehI`LSKxdao@H`WKH%e#5QHUU0G#zD#@3q6sG+j>WJmDP?_;EE|hG
z+%QBEmt<+uolH){m5m>^lQ6B}HH_mb9Q<hEk71FcGdRB;hT(&WFQa9+nkJ_)d-HcP
z{p!k{if{@Rjn0GW@5h3T3dv%X@-L{pXYqbd#<xc<MR%tKU6bEuCB`ca^E)id_lR0(
zUq^<wfj`4A(A$8V^17l}6&;GVAIu1Uif`F+KfTv4ere6e2D+hp9avrAhv9>mO<9U`
zB8`)vl4oP+po=hbcvcvM4+ZwFnfs;%7-O3?)>(MrE(9YnQK1c9<`5g@cDVP_&fLz?
zeIxj+*=M+;s3N=rT5}5S!Ysyxr#ja*I~LT)5&MC{ZWd@Z%AIq@+Fj%7FzwgcKN(NI
z7zzeNjjQ9va1`I9ZD=j-r)=4@POpWJNI77AbU3j0g3m(#dbWl<<7sI3BXin4!5|hk
z&P59!2WfXw(3M6;fDY3dn*B*U<u3r!>8kkniSeR<JU_?BW6)dZLw}W~R6NI62h9G%
zfxQ=e&8uaZLn&+D4}m%(Hw%LR7A`hQ=ps*-0u3A;r!zcGFAj_FbsV;}wvS;E4#!h4
zwC1LT^#T8J40gUnXAIi2t^=oc!2Hv4VBZNov*0z^2Pa{^O+IE)go*6{kkIx*%6JS*
zYH<x?$z<VF0vg%fc4eZp+Q(CA;78|=PBfYxoLZ1;G4=Xiw7BGFG>r#x2h9G+fqg6Z
znuF7)n>2RnP<+dL3|4$GPsuX~Flx9IjhT`|Cl)^_VkM*s-cBAhuC_TXZIUpaDM}jc
tHKdO(%x$F-Ybl*t%Jb6)%zn;+{||57t@xefX8QmD002ovPDHLkV1m)&2E70P

literal 0
HcmV?d00001

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 3db2202..117fb57 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,54 +1,67 @@
 <template>
   <div class="navbar">
-    <hamburger id="hamburger-container" :is-active="appStore.sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
-    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!settingsStore.topNav" />
-    <top-nav id="topmenu-container" class="topmenu-container" v-if="settingsStore.topNav" />
+    <!-- 侧边栏折叠按钮（保留原有功能） -->
+    <hamburger
+        id="hamburger-container"
+        :is-active="appStore.sidebar.opened"
+        class="hamburger-container"
+        @toggleClick="toggleSideBar"
+    />
 
-    <div class="right-menu">
-      <template v-if="appStore.device !== 'mobile'">
-        <header-search id="header-search" class="right-menu-item" />
-
-        <!-- <el-tooltip content="源码地址" effect="dark" placement="bottom">
-          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
-        </el-tooltip> -->
-
-        <!-- <el-tooltip content="文档地址" effect="dark" placement="bottom">
-          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip> -->
+    <!-- 核心改造：替换面包屑/顶部导航，改为产品名称 + 登录信息布局 -->
+    <div class="custom-header-content">
+      <!-- 左侧：APP产品名称 -->
+      <div class="app-name">
+        仙桃市第一人民医院检验系统 <!-- 替换为实际产品名 -->
+      </div>
 
+      <!-- 右侧：功能按钮 + 登录信息 + 原生设置菜单 -->
+      <div class="right-content">
+        <!-- 保留原有功能按钮（搜索、全屏、布局大小）
+        <template v-if="appStore.device !== 'mobile'">
+          <header-search id="header-search" class="right-menu-item" />
+          <screenfull id="screenfull" class="right-menu-item hover-effect" />
+          <el-tooltip content="布局大小" effect="dark" placement="bottom">
+            <size-select id="size-select" class="right-menu-item hover-effect" />
+          </el-tooltip>
+        </template>
+        -->
+        <!-- 登录人信息（姓名 + 角色） -->
+        <div class="user-info" v-if="userStore.nickName">
+          欢迎，{{ userStore.nickName }}（{{ userStore.roleName }}）
+        </div>
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
-        <el-tooltip content="布局大小" effect="dark" placement="bottom">
-          <size-select id="size-select" class="right-menu-item hover-effect" />
-        </el-tooltip>
-      </template>
-      <div class="avatar-container">
-        <el-dropdown @command="handleCommand" class="right-menu-item hover-effect" trigger="click">
-          <div class="avatar-wrapper">
-            <img :src="userStore.avatar" class="user-avatar" />
-            <el-icon><caret-bottom /></el-icon>
-          </div>
-          <template #dropdown>
-            <el-dropdown-menu>
-              <router-link to="/user/profile">
-                <el-dropdown-item>个人中心</el-dropdown-item>
-              </router-link>
-              <el-dropdown-item command="setLayout" v-if="settingsStore.showSettings">
-                <span>布局设置</span>
-              </el-dropdown-item>
-              <el-dropdown-item divided command="logout">
-                <span>退出登录</span>
-              </el-dropdown-item>
-            </el-dropdown-menu>
-          </template>
-        </el-dropdown>
+        <!-- 原生个人信息/设置菜单（保留原有功能） -->
+        <div class="avatar-container">
+          <el-dropdown @command="handleCommand" class="right-menu-item hover-effect" trigger="click">
+            <div class="avatar-wrapper">
+              <img :src="userStore.avatar" class="user-avatar" />
+              <el-icon><caret-bottom /></el-icon>
+            </div>
+            <template #dropdown>
+              <el-dropdown-menu>
+                <router-link to="/user/profile">
+                  <el-dropdown-item>个人中心</el-dropdown-item>
+                </router-link>
+                <el-dropdown-item command="setLayout" v-if="settingsStore.showSettings">
+                  <span>布局设置</span>
+                </el-dropdown-item>
+                <el-dropdown-item divided command="logout">
+                  <span>退出登录</span>
+                </el-dropdown-item>
+              </el-dropdown-menu>
+            </template>
+          </el-dropdown>
+        </div>
       </div>
     </div>
   </div>
 </template>
 
 <script setup>
-import { ElMessageBox } from 'element-plus'
+import {ElMessageBox} from 'element-plus'
+// 引入原有组件
 import Breadcrumb from '@/components/Breadcrumb'
 import TopNav from '@/components/TopNav'
 import Hamburger from '@/components/Hamburger'
@@ -57,14 +70,34 @@ import SizeSelect from '@/components/SizeSelect'
 import HeaderSearch from '@/components/HeaderSearch'
 import RuoYiGit from '@/components/RuoYi/Git'
 import RuoYiDoc from '@/components/RuoYi/Doc'
+// 引入Store
 import useAppStore from '@/store/modules/app'
 import useUserStore from '@/store/modules/user'
 import useSettingsStore from '@/store/modules/settings'
+// 引入图标和默认头像（可替换为你的默认头像）
+import {CaretBottom} from '@element-plus/icons-vue'
 
 const appStore = useAppStore()
 const userStore = useUserStore()
 const settingsStore = useSettingsStore()
 
+// 处理角色名称（取第一个角色，多角色可自定义）
+const roleName = computed(() => {
+  if (!userStore.roles || userStore.roles.length === 0) {
+    return '普通用户'
+  }
+  // 角色编码映射表：key 是你的 roles 编码，value 是要显示的中文
+  const roleMap = {
+    'ROLE_DEFAULT': '普通用户',
+    'admin': '管理员',
+    'ROLE_ADMIN': '超级管理员',
+    'ROLE_OPERATOR': '操作员' // 按你的实际角色编码添加
+  }
+  // 取第一个角色编码，映射为中文
+  return roleMap[userStore.roles[0]] || userStore.roles[0]
+})
+
+// 原有方法保留
 function toggleSideBar() {
   appStore.toggleSideBar()
 }
@@ -91,10 +124,12 @@ function logout() {
     userStore.logOut().then(() => {
       location.href = '/index';
     })
-  }).catch(() => { });
+  }).catch(() => {
+  });
 }
 
 const emits = defineEmits(['setLayout'])
+
 function setLayout() {
   emits('setLayout');
 }
@@ -102,16 +137,20 @@ function setLayout() {
 
 <style lang='scss' scoped>
 .navbar {
-  height: 50px;
+  height: 50px; /* 固定高度，与原有一致 */
   overflow: hidden;
   position: relative;
-  background: #fff;
-  box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
+  //background: #fff;
+  background: #0d9488;
+  box-shadow: 0 1px 4px rgba(0, 21, 41, 0.15);
+  //box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
+  display: flex; /* 改为flex布局，确保子元素对齐 */
+  align-items: center; /* 垂直居中 */
 
   .hamburger-container {
-    line-height: 46px;
+    line-height: 50px; /* 与导航栏高度一致 */
     height: 100%;
-    float: left;
+    padding: 0 16px;
     cursor: pointer;
     transition: background 0.3s;
     -webkit-tap-highlight-color: transparent;
@@ -121,71 +160,94 @@ function setLayout() {
     }
   }
 
-  .breadcrumb-container {
-    float: left;
-  }
-
-  .topmenu-container {
-    position: absolute;
-    left: 50px;
-  }
-
-  .errLog-container {
-    display: inline-block;
-    vertical-align: top;
-  }
-
-  .right-menu {
-    float: right;
-    height: 100%;
-    line-height: 50px;
+  /* 核心布局：产品名称 + 右侧内容容器 */
+  .custom-header-content {
     display: flex;
+    align-items: center;
+    justify-content: space-between;
+    flex: 1; /* 占满剩余宽度 */
+    padding: 0 20px;
+    height: 100%;
+    margin-left: 5px;
+  }
 
-    &:focus {
-      outline: none;
+  /* 产品名称样式 */
+  .app-name {
+    font-size: 18px;
+    font-weight: 600;
+    color: #fff; /* 若依主题色，可替换为品牌色 */
+    white-space: nowrap; /* 防止换行 */
+    font-style: italic; /* 关键：字体倾斜 */
+    /* 可选优化：增加倾斜角度控制（默认 italic 约 14 度，可自定义） */
+    /* transform: skewX(-10deg); /* 向左倾斜 10 度，正负值控制倾斜方向 */
+  }
+
+  /* 右侧内容容器（功能按钮 + 用户信息 + 头像菜单） */
+  .right-content {
+    display: flex;
+    align-items: center;
+    gap: 12px; /* 元素间距，可调整 */
+    white-space: nowrap; /* 防止换行 */
+  }
+
+  /* 用户信息样式 */
+  .user-info {
+    font-size: 14px;
+    font-weight: 600;
+    display: flex;
+    align-items: center;
+    color: #e6f7f4;
+  }
+
+  /* 原有右侧菜单样式调整 */
+  .right-menu-item {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0 8px;
+    height: 100%;
+    font-size: 18px;
+    color: #5a5e66;
+    vertical-align: text-bottom;
+
+    &.hover-effect {
+      cursor: pointer;
+      transition: background 0.3s;
+
+      &:hover {
+        background: rgba(0, 0, 0, 0.025);
+      }
     }
+  }
 
-    .right-menu-item {
-      display: inline-block;
-      padding: 0 8px;
-      height: 100%;
-      font-size: 18px;
-      color: #5a5e66;
-      vertical-align: text-bottom;
+  /* 头像容器样式调整 */
+  .avatar-container {
+    .avatar-wrapper {
+      position: relative;
+      display: flex;
+      align-items: center;
+      gap: 4px; /* 头像与下拉图标间距 */
 
-      &.hover-effect {
+      .user-avatar {
         cursor: pointer;
-        transition: background 0.3s;
+        width: 36px; /* 调整头像大小 */
+        height: 36px;
+        border-radius: 50%; /* 圆形头像，可改为10px保持原有风格 */
+        object-fit: cover; /* 防止头像变形 */
+      }
 
-        &:hover {
-          background: rgba(0, 0, 0, 0.025);
-        }
+      i {
+        cursor: pointer;
+        font-size: 12px;
+        color: #5a5e66;
       }
     }
+  }
 
-    .avatar-container {
-      margin-right: 40px;
-
-      .avatar-wrapper {
-        margin-top: 5px;
-        position: relative;
-
-        .user-avatar {
-          cursor: pointer;
-          width: 40px;
-          height: 40px;
-          border-radius: 10px;
-        }
-
-        i {
-          cursor: pointer;
-          position: absolute;
-          right: -20px;
-          top: 25px;
-          font-size: 12px;
-        }
-      }
-    }
+  /* 隐藏原有面包屑和顶部导航（已替换） */
+  .breadcrumb-container,
+  .topmenu-container {
+    display: none !important;
   }
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/layout/components/Navbarold.vue b/src/layout/components/Navbarold.vue
new file mode 100644
index 0000000..3db2202
--- /dev/null
+++ b/src/layout/components/Navbarold.vue
@@ -0,0 +1,191 @@
+<template>
+  <div class="navbar">
+    <hamburger id="hamburger-container" :is-active="appStore.sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!settingsStore.topNav" />
+    <top-nav id="topmenu-container" class="topmenu-container" v-if="settingsStore.topNav" />
+
+    <div class="right-menu">
+      <template v-if="appStore.device !== 'mobile'">
+        <header-search id="header-search" class="right-menu-item" />
+
+        <!-- <el-tooltip content="源码地址" effect="dark" placement="bottom">
+          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
+        </el-tooltip> -->
+
+        <!-- <el-tooltip content="文档地址" effect="dark" placement="bottom">
+          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
+        </el-tooltip> -->
+
+        <screenfull id="screenfull" class="right-menu-item hover-effect" />
+
+        <el-tooltip content="布局大小" effect="dark" placement="bottom">
+          <size-select id="size-select" class="right-menu-item hover-effect" />
+        </el-tooltip>
+      </template>
+      <div class="avatar-container">
+        <el-dropdown @command="handleCommand" class="right-menu-item hover-effect" trigger="click">
+          <div class="avatar-wrapper">
+            <img :src="userStore.avatar" class="user-avatar" />
+            <el-icon><caret-bottom /></el-icon>
+          </div>
+          <template #dropdown>
+            <el-dropdown-menu>
+              <router-link to="/user/profile">
+                <el-dropdown-item>个人中心</el-dropdown-item>
+              </router-link>
+              <el-dropdown-item command="setLayout" v-if="settingsStore.showSettings">
+                <span>布局设置</span>
+              </el-dropdown-item>
+              <el-dropdown-item divided command="logout">
+                <span>退出登录</span>
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </template>
+        </el-dropdown>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ElMessageBox } from 'element-plus'
+import Breadcrumb from '@/components/Breadcrumb'
+import TopNav from '@/components/TopNav'
+import Hamburger from '@/components/Hamburger'
+import Screenfull from '@/components/Screenfull'
+import SizeSelect from '@/components/SizeSelect'
+import HeaderSearch from '@/components/HeaderSearch'
+import RuoYiGit from '@/components/RuoYi/Git'
+import RuoYiDoc from '@/components/RuoYi/Doc'
+import useAppStore from '@/store/modules/app'
+import useUserStore from '@/store/modules/user'
+import useSettingsStore from '@/store/modules/settings'
+
+const appStore = useAppStore()
+const userStore = useUserStore()
+const settingsStore = useSettingsStore()
+
+function toggleSideBar() {
+  appStore.toggleSideBar()
+}
+
+function handleCommand(command) {
+  switch (command) {
+    case "setLayout":
+      setLayout();
+      break;
+    case "logout":
+      logout();
+      break;
+    default:
+      break;
+  }
+}
+
+function logout() {
+  ElMessageBox.confirm('确定注销并退出系统吗？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    userStore.logOut().then(() => {
+      location.href = '/index';
+    })
+  }).catch(() => { });
+}
+
+const emits = defineEmits(['setLayout'])
+function setLayout() {
+  emits('setLayout');
+}
+</script>
+
+<style lang='scss' scoped>
+.navbar {
+  height: 50px;
+  overflow: hidden;
+  position: relative;
+  background: #fff;
+  box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
+
+  .hamburger-container {
+    line-height: 46px;
+    height: 100%;
+    float: left;
+    cursor: pointer;
+    transition: background 0.3s;
+    -webkit-tap-highlight-color: transparent;
+
+    &:hover {
+      background: rgba(0, 0, 0, 0.025);
+    }
+  }
+
+  .breadcrumb-container {
+    float: left;
+  }
+
+  .topmenu-container {
+    position: absolute;
+    left: 50px;
+  }
+
+  .errLog-container {
+    display: inline-block;
+    vertical-align: top;
+  }
+
+  .right-menu {
+    float: right;
+    height: 100%;
+    line-height: 50px;
+    display: flex;
+
+    &:focus {
+      outline: none;
+    }
+
+    .right-menu-item {
+      display: inline-block;
+      padding: 0 8px;
+      height: 100%;
+      font-size: 18px;
+      color: #5a5e66;
+      vertical-align: text-bottom;
+
+      &.hover-effect {
+        cursor: pointer;
+        transition: background 0.3s;
+
+        &:hover {
+          background: rgba(0, 0, 0, 0.025);
+        }
+      }
+    }
+
+    .avatar-container {
+      margin-right: 40px;
+
+      .avatar-wrapper {
+        margin-top: 5px;
+        position: relative;
+
+        .user-avatar {
+          cursor: pointer;
+          width: 40px;
+          height: 40px;
+          border-radius: 10px;
+        }
+
+        i {
+          cursor: pointer;
+          position: absolute;
+          right: -20px;
+          top: 25px;
+          font-size: 12px;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index cbbc5a1..f8ef7a8 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -17,6 +17,8 @@ const useUserStore = defineStore(
       token: getToken(),
       id: '',
       name: '',
+      nickName: '',
+      roleName: '',
       avatar: '',
       roles: [],
       permissions: []
@@ -42,8 +44,9 @@ const useUserStore = defineStore(
         const password = userInfo.password
         const code = userInfo.code
         const uuid = userInfo.uuid
+        const loginParam=userInfo.loginParam
         return new Promise((resolve, reject) => {
-          login(username, password, code, uuid).then(res => {
+          login(username, password, code, uuid,loginParam).then(res => {
             setToken(res.token)
             this.token = res.token
             resolve()
@@ -57,6 +60,10 @@ const useUserStore = defineStore(
         return new Promise((resolve, reject) => {
           getInfo().then(res => {
             const user = res.user
+            const rolelist = user.roles
+            if (rolelist && rolelist.length > 0) {
+              this.roleName=rolelist[0].roleName
+            }
             const avatar = (user.avatar == "" || user.avatar == null) ? defAva : import.meta.env.VITE_APP_BASE_API + user.avatar;
 
             if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
@@ -67,6 +74,7 @@ const useUserStore = defineStore(
             }
             this.id = user.userId
             this.name = user.userName
+            this.nickName= user.nickName
             this.avatar = avatar
             resolve(res)
           }).catch(error => {
diff --git a/src/views/liswork/work/components/labresult.vue b/src/views/liswork/work/components/labresult.vue
index 6e332cf..447e310 100644
--- a/src/views/liswork/work/components/labresult.vue
+++ b/src/views/liswork/work/components/labresult.vue
@@ -907,6 +907,7 @@ const handleWarningSuccess = async () => {
 
 const unShHandle = () => {
   uncheck2({ ...tableKey.value, yhdh: props.labPat.yhdh }).then(res => {
+    console.log('res',res);
     if (res.code == "4") {
       tableKey.value.problemId = res.problemId;
       reasonText.value = res.msg;
diff --git a/src/views/login.vue b/src/views/login.vue
index b9b62aa..2aa2d01 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,103 +1,173 @@
 <template>
   <div class="login">
-    <el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">实验室管理系统</h3>
-      <el-form-item prop="username">
-        <el-input v-model="loginForm.username" type="text" size="large" auto-complete="off" placeholder="账号">
-          <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="password">
-        <el-input v-model="loginForm.password" type="password" size="large" auto-complete="off" placeholder="密码"
-          @keyup.enter="handleLogin">
-          <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
-        </el-input>
-      </el-form-item>
-      <!-- <el-form-item prop="code" v-if="captchaEnabled">
-        <el-input
-          v-model="loginForm.code"
-          size="large"
-          auto-complete="off"
-          placeholder="验证码"
-          style="width: 63%"
-          @keyup.enter="handleLogin"
-        >
-          <template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template>
-        </el-input>
-        <div class="login-code">
-          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
+    <el-form ref="loginRef"   class="login-form">
+      <div class="login-header">
+        <div class="login-logo">
+          <img src="@/assets/images/logo_new.png" alt="系统Logo" />
         </div>
-      </el-form-item> -->
-      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
-      <el-form-item style="width:100%;">
-        <el-button :loading="loading" size="large" type="primary" style="width:100%;" @click.prevent="handleLogin">
-          <span v-if="!loading">登 录</span>
-          <span v-else>登 录 中...</span>
-        </el-button>
-        <div style="float: right;" v-if="register">
-          <router-link class="link-type" :to="'/register'">立即注册</router-link>
+        <div class="login-split"></div>
+        <div class="login-title">
+          <h1>{{ oem.appname}}</h1>
         </div>
-      </el-form-item>
+      </div>
+
+      <!-- Tab切换容器 -->
+      <el-tabs v-model="activeName" type="card" @tab-click="handleClick" class="login-tabs">
+        <!-- 工号登录 Tab -->
+        <el-tab-pane label="账号密码登录" name="first">
+          <el-form-item label="医疗机构:" prop="loginYLJG"class="custom-select">
+            <el-select
+                v-model="loginForm.loginParam.loginYLJG"
+                placeholder="请选择医疗机构"
+                style="width: 100%"
+            >
+              <template #prefix>
+                <svg-icon icon-class="international" class="el-input__icon input-icon" />
+              </template>
+              <el-option
+                  v-for="item in selectOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="用户代号:" prop="username">
+            <el-input v-model="loginForm.username" type="text" size="large" auto-complete="off" placeholder="账号">
+              <template #prefix>
+                <svg-icon icon-class="user" class="el-input__icon input-icon" />
+              </template>
+            </el-input>
+          </el-form-item>
+
+          <el-form-item label="登录密码:" prop="password">
+            <el-input v-model="loginForm.password" type="password" size="large" auto-complete="off" placeholder="密码"
+                      @keyup.enter="handleLogin">
+              <template #prefix>
+                <svg-icon icon-class="password" class="el-input__icon input-icon" />
+              </template>
+            </el-input>
+          </el-form-item>
+
+          <!-- 修复：移除空的el-form-item，验证码关闭时不渲染任何内容 -->
+          <el-form-item prop="code" v-if="!captchaEnabled" size="large">
+
+          </el-form-item>
+
+          <el-form-item prop="code" label="验 证 码 :" v-if="captchaEnabled">
+            <el-input
+
+                v-model="loginForm.code"
+                size="large"
+                auto-complete="off"
+                placeholder="验证码"
+                style="width: 53%"
+                @keyup.enter="handleLogin"
+            >
+              <template #prefix>
+                <svg-icon icon-class="validCode" class="el-input__icon input-icon" />
+              </template>
+            </el-input>
+            <div class="login-code">
+              <img :src="codeUrl" @click="getCode" class="login-code-img" />
+            </div>
+          </el-form-item>
+
+          <el-form-item style="width: 100%;">
+            <el-button :loading="loading" size="large" type="primary" class="login-btn" style="width: 100%;" @click.prevent="handleLogin">
+              <span v-if="!loading">登 录</span>
+              <span v-else>登 录 中...</span>
+            </el-button>
+            <div style="float: right;" v-if="register">
+              <router-link class="link-type" :to="'/register'">立即注册</router-link>
+            </div>
+          </el-form-item>
+        </el-tab-pane>
+
+        <el-tab-pane label="扫码登录" name="second">
+          <div class="tab-placeholder">
+            <el-icon class="placeholder-icon"><Sms /></el-icon>
+            <p>正在加载二维码...</p>
+            <el-button type="success" icon="wechat" class="wechat-login-btn">刷新二维码</el-button>
+          </div>
+        </el-tab-pane>
+
+        <el-tab-pane label="UKEY登录" name="third">
+          <div class="tab-placeholder">
+            <el-icon class="placeholder-icon"><Wechat /></el-icon>
+            <p>UKEY登录功能开发中...</p>
+          </div>
+        </el-tab-pane>
+      </el-tabs>
     </el-form>
-    <!--  底部  -->
+
     <div class="el-login-footer">
-      <!-- <span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span> -->
+      <span>版权所有(R)2022-2026 {{ oem.compay}} 电话:{{oem.phone}} E-mail:{{oem.Email}} version:{{oem.version}}</span>
     </div>
   </div>
 </template>
 
 <script setup>
-import { getCodeImg } from "@/api/login";
+import { ref, watch, getCurrentInstance, onMounted } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useFingerprint } from '@/utils/useFingerprint';
+import { getCodeImg, getInfo, getLocalconfig } from "@/api/login";
 import Cookies from "js-cookie";
 import { encrypt, decrypt } from "@/utils/jsencrypt";
-import useUserStore from '@/store/modules/user'
+import useUserStore from '@/store/modules/user';
 
-const userStore = useUserStore()
+// 初始化响应式变量
+const activeName = ref('first');
+const userStore = useUserStore();
 const route = useRoute();
 const router = useRouter();
-const { proxy } = getCurrentInstance();
-
+const oem = ref({
+  appname: "实验室信息管理系统",
+  phone: "",
+  compay: "",
+  version: "",
+  Email: ""
+});
+const loginRef = ref(null); // 修复：直接用ref获取表单引用
 const loginForm = ref({
   username: "admin",
-  password: "",   //admin123
+  password: "",
   rememberMe: false,
   code: "",
-  uuid: ""
+  uuid: "",
+  loginParam:{loginYLJG:"",localid:""}
 });
-
-const loginRules = {
+const selectOptions = ref([{ id: '1', name: '总院' }]);
+const loginRules = ref({ // 修复：改为ref响应式，方便动态修改
   username: [{ required: true, trigger: "blur", message: "请输入您的账号" }],
-  password: [{ required: true, trigger: "blur", message: "请输入您的密码" }],
+//  password: [{ required: true, trigger: "blur", message: "请输入您的密码" }],
+  hospid: [{ required: true, message: '请选择医疗机构', trigger: 'change' }],
   code: [{ required: true, trigger: "change", message: "请输入验证码" }]
-};
-
+});
 const codeUrl = ref("");
 const loading = ref(false);
-// 验证码开关
 const captchaEnabled = ref(true);
-// 注册开关
 const register = ref(false);
 const redirect = ref(undefined);
 
-watch(route, (newRoute) => {
-  redirect.value = newRoute.query && newRoute.query.redirect;
-}, { immediate: true });
-
-function handleLogin() {
-  proxy.$refs.loginRef.validate(valid => {
-    if (valid) {
-      loading.value = true;
-      // 勾选了需要记住密码设置在 cookie 中设置记住用户名和密码
-      if (loginForm.value.rememberMe) {
-        Cookies.set("username", loginForm.value.username, { expires: 30 });
-        Cookies.set("password", encrypt(loginForm.value.password), { expires: 30 });
-        Cookies.set("rememberMe", loginForm.value.rememberMe, { expires: 30 });
-      } else {
-        // 否则移除
-        Cookies.remove("username");
-        Cookies.remove("password");
-        Cookies.remove("rememberMe");
+// 路由监听（优化版）
+watch(
+    () => route.query.redirect,
+    (newRedirect) => {
+      if (redirect.value !== newRedirect) {
+        redirect.value = newRedirect || '';
       }
+    },
+    { immediate: true, deep: false }
+);
+
+// 登录方法（修复proxy.$refs问题）
+const handleLogin = async () => {
+  loginForm.value.loginParam.loginYLJG
+      loading.value = true;
+      Cookies.set("czlis_username", loginForm.value.username, { expires: 30 });
+      Cookies.set("czlis_loginYLJG", loginForm.value.loginParam.loginYLJG, {expires: 30});
       // 调用action的登录方法
       userStore.login(loginForm.value).then(() => {
         const query = route.query;
@@ -107,7 +177,10 @@ function handleLogin() {
           }
           return acc;
         }, {});
-        router.push({ path: redirect.value || "/", query: otherQueryParams });
+        const targetPath = redirect.value || "/";
+        if (route.path !== targetPath) {
+          router.push({ path: targetPath, query: otherQueryParams });
+        }
       }).catch(() => {
         loading.value = false;
         // 重新获取验证码
@@ -115,33 +188,90 @@ function handleLogin() {
           getCode();
         }
       });
-    }
-  });
-}
+};
 
-function getCode() {
+// 获取验证码
+const getCode = () => {
   getCodeImg().then(res => {
-    captchaEnabled.value = res.captchaEnabled === undefined ? true : res.captchaEnabled;
+    captchaEnabled.value = res.captchaEnabled ?? true;
     if (captchaEnabled.value) {
       codeUrl.value = "data:image/gif;base64," + res.img;
       loginForm.value.uuid = res.uuid;
     }
+    // 验证码关闭时移除校验规则，避免报错
+    if (!captchaEnabled.value) {
+      loginRules.value.code = [];
+    } else {
+      loginRules.value.code = [{required: true, trigger: "change", message: "请输入验证码"}];
+    }
   });
-}
+};
 
-function getCookie() {
-  const username = Cookies.get("username");
-  const password = Cookies.get("password");
-  const rememberMe = Cookies.get("rememberMe");
-  loginForm.value = {
-    username: username === undefined ? loginForm.value.username : username,
-    password: password === undefined ? loginForm.value.password : decrypt(password),
-    rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
-  };
-}
+// 从Cookie获取账号密码
+const getCookie = () => {
+  const cookieUsername = Cookies.get("czlis_username");
+  const cookieloginYLJG = Cookies.get("czlis_loginYLJG");
+  //console.log('cookieloginYLJG', cookieloginYLJG);
+  if (cookieUsername !== undefined && cookieUsername !== null&& cookieUsername !=="") {
+    loginForm.value.username = cookieUsername;
+  }
+  if (cookieloginYLJG !== undefined && cookieloginYLJG !== null&& cookieloginYLJG !=="") {
+    loginForm.value.loginParam.loginYLJG = cookieloginYLJG;
+  }
+  //console.log('loginForm', loginForm);
+};
 
-getCode();
-getCookie();
+// 获取本地配置
+const Localconfig = (localid) => {
+  getLocalconfig({localid}).then(res => {
+    if (res) {
+      const {localconfig, hosplist, oem: oemData} = res;
+      // 修复：赋值oem数据，显示动态标题
+      if (oemData) oem.value = oemData;
+     // console.log('oemData', oemData);
+     // console.log('oem', oem.value);
+      // 修复：判重后更新下拉选项，避免递归
+      if (JSON.stringify(selectOptions.value) !== JSON.stringify(hosplist)) {
+        selectOptions.value = hosplist || [{id: '1', name: '总院'}];
+        // 判重后赋值，避免重复修改触发更新
+        if (!selectOptions.value.some(item => item.id === loginForm.value.hospid)) {
+          loginForm.value.loginParam.loginYLJG = selectOptions.value[0]?.id || '1';
+        }
+        getCookie();
+      }
+    }
+  }).catch(err => {
+    console.error("获取本地配置失败：", err);
+  });
+};
+
+// 获取指纹并加载配置
+const {getFingerprint} = useFingerprint();
+const refreshFingerprint = async () => {
+  try {
+    const res = await getFingerprint();
+    loginForm.value.loginParam.localid=res.visitorId
+    Localconfig(res.visitorId);
+  } catch (err) {
+    console.error("获取指纹失败：", err);
+    Localconfig("default"); // 兜底使用默认ID
+  }
+};
+
+// Tab切换事件（移除activeName手动赋值，避免递归）
+const handleClick = (tab) => {
+  console.log('当前Tab：', tab.name);
+  // 仅在切回账号密码登录时刷新验证码
+  if (tab.name === 'first' && captchaEnabled.value) {
+    getCode();
+  }
+};
+
+// 页面挂载时初始化
+onMounted(() => {
+  refreshFingerprint();
+  getCode();
+});
 </script>
 
 <style lang='scss' scoped>
@@ -149,22 +279,20 @@ getCookie();
   display: flex;
   justify-content: center;
   align-items: center;
-  height: 100%;
+  height: 100vh;
   background-image: url("../assets/images/login-background.jpg");
   background-size: cover;
 }
 
-.title {
-  margin: 0px auto 30px auto;
-  text-align: center;
-  color: #707070;
-}
-
 .login-form {
-  border-radius: 6px;
-  background: #ffffff;
-  width: 400px;
-  padding: 25px 25px 5px 25px;
+  background: rgba(255, 255, 255, 0.4);
+  backdrop-filter: blur(10px);
+  -webkit-backdrop-filter: blur(10px);
+  border: 1px solid rgba(255, 255, 255, 0.9);
+  border-radius: 12px;
+  box-shadow: 0 8px 32px rgba(0, 0, 0, 0.1);
+  width: 480px;
+  padding: 35px 35px 5px 35px;
 
   .el-input {
     height: 40px;
@@ -181,12 +309,6 @@ getCookie();
   }
 }
 
-.login-tip {
-  font-size: 13px;
-  text-align: center;
-  color: #bfbfbf;
-}
-
 .login-code {
   width: 33%;
   height: 40px;
@@ -195,6 +317,9 @@ getCookie();
   img {
     cursor: pointer;
     vertical-align: middle;
+    height: 100%;
+    width: 100%;
+    object-fit: cover;
   }
 }
 
@@ -211,8 +336,87 @@ getCookie();
   letter-spacing: 1px;
 }
 
-.login-code-img {
-  height: 40px;
-  padding-left: 12px;
+/* Logo和标题样式 */
+.login-header {
+  display: flex;
+  align-items: center;
+  margin-bottom: 30px;
 }
-</style>
+
+.login-logo img {
+  height: 40px;
+  width: auto;
+}
+
+.login-split {
+  width: 1px;
+  height: 30px;
+  background-color: #ccc;
+  margin: 0 15px;
+}
+
+.login-title h1 {
+  margin: 0;
+  font-size: 24px;
+  color: #1989fa;
+  font-weight: 500;
+}
+
+/* Tab容器样式（修复冲突） */
+.login-tabs {
+  width: 100%;
+  height: 350px;
+  overflow: hidden;
+  border-radius: 8px;
+  backdrop-filter: blur(10px);
+  -webkit-backdrop-filter: blur(10px);
+  border: 1px solid rgba(255, 255, 255, 0.1);
+  padding: 1px 10px 10px;
+  background: transparent;
+
+  :deep(.el-tabs__header) {
+    background: transparent;
+    margin: 0;
+  }
+
+  :deep(.el-tabs__nav-prev),
+  :deep(.el-tabs__nav-next) {
+    display: none !important; // 隐藏Tab左右箭头
+  }
+
+  :deep(.el-tabs__nav-wrap) {
+    overflow: visible !important;
+  }
+}
+
+.custom-select {
+  margin-top: 20px; /* 可根据需求调整数值 */
+}
+
+/* Tab占位样式 */
+.tab-placeholder {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 40px 0;
+  color: #666;
+  height: calc(100% - 40px); // 适配Tab容器高度
+
+  .placeholder-icon {
+    font-size: 48px;
+    margin-bottom: 20px;
+    color: #ccc;
+  }
+
+  .wechat-login-btn {
+    margin-top: 20px;
+    width: 200px;
+  }
+}
+
+/* 隐藏必填项星号 */
+:deep(.el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap .el-form-item__asterisk) {
+  display: none !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/logincopy.vue b/src/views/logincopy.vue
new file mode 100644
index 0000000..c6201db
--- /dev/null
+++ b/src/views/logincopy.vue
@@ -0,0 +1,448 @@
+<template>
+  <div class="login">
+    <el-form ref="loginRef"   class="login-form">
+      <div class="login-header">
+        <div class="login-logo">
+          <img src="@/assets/images/logo_new.png" alt="系统Logo" />
+        </div>
+        <div class="login-split"></div>
+        <div class="login-title">
+          <h1>{{ oem.appname}}</h1>
+        </div>
+      </div>
+
+      <!-- Tab切换容器 -->
+      <el-tabs v-model="activeName" type="card" @tab-click="handleClick" class="login-tabs">
+        <!-- 工号登录 Tab -->
+        <el-tab-pane label="账号密码登录" name="first">
+          <el-form-item label="医疗机构:" prop="hospid"class="custom-select">
+            <el-select
+                v-model="loginForm.hospid"
+                placeholder="请选择医疗机构"
+                style="width: 100%"
+            >
+              <template #prefix>
+                <svg-icon icon-class="international" class="el-input__icon input-icon" />
+              </template>
+              <el-option
+                  v-for="item in selectOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="用户代号:" prop="username">
+            <el-input v-model="loginForm.username" type="text" size="large" auto-complete="off" placeholder="账号">
+              <template #prefix>
+                <svg-icon icon-class="user" class="el-input__icon input-icon" />
+              </template>
+            </el-input>
+          </el-form-item>
+
+          <el-form-item label="登录密码:" prop="password">
+            <el-input v-model="loginForm.password" type="password" size="large" auto-complete="off" placeholder="密码"
+                      @keyup.enter="handleLogin">
+              <template #prefix>
+                <svg-icon icon-class="password" class="el-input__icon input-icon" />
+              </template>
+            </el-input>
+          </el-form-item>
+
+          <!-- 修复：移除空的el-form-item，验证码关闭时不渲染任何内容 -->
+          <el-form-item prop="code" v-if="!captchaEnabled" size="large">
+
+          </el-form-item>
+
+          <el-form-item prop="code" label="验 证 码 :" v-if="captchaEnabled">
+            <el-input
+
+                v-model="loginForm.code"
+                size="large"
+                auto-complete="off"
+                placeholder="验证码"
+                style="width: 53%"
+                @keyup.enter="handleLogin"
+            >
+              <template #prefix>
+                <svg-icon icon-class="validCode" class="el-input__icon input-icon" />
+              </template>
+            </el-input>
+            <div class="login-code">
+              <img :src="codeUrl" @click="getCode" class="login-code-img" />
+            </div>
+          </el-form-item>
+
+          <el-form-item style="width: 100%;">
+            <el-button :loading="loading" size="large" type="primary" class="login-btn" style="width: 100%;" @click.prevent="handleLogin">
+              <span v-if="!loading">登 录</span>
+              <span v-else>登 录 中...</span>
+            </el-button>
+            <div style="float: right;" v-if="register">
+              <router-link class="link-type" :to="'/register'">立即注册</router-link>
+            </div>
+          </el-form-item>
+        </el-tab-pane>
+
+        <el-tab-pane label="扫码登录" name="second">
+          <div class="tab-placeholder">
+            <el-icon class="placeholder-icon"><Sms /></el-icon>
+            <p>正在加载二维码...</p>
+            <el-button type="success" icon="wechat" class="wechat-login-btn">刷新二维码</el-button>
+          </div>
+        </el-tab-pane>
+
+        <el-tab-pane label="UKEY登录" name="third">
+          <div class="tab-placeholder">
+            <el-icon class="placeholder-icon"><Wechat /></el-icon>
+            <p>UKEY登录功能开发中...</p>
+          </div>
+        </el-tab-pane>
+      </el-tabs>
+    </el-form>
+
+    <div class="el-login-footer">
+      <span>版权所有(R)2022-2026 {{ oem.compay}} 电话:{{oem.phone}} E-mail:{{oem.Email}} version:{{oem.version}}</span>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, watch, getCurrentInstance, onMounted } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useFingerprint } from '@/utils/useFingerprint';
+import { getCodeImg, getInfo, getLocalconfig } from "@/api/login";
+import Cookies from "js-cookie";
+import { encrypt, decrypt } from "@/utils/jsencrypt";
+import useUserStore from '@/store/modules/user';
+
+// 初始化响应式变量
+const activeName = ref('first');
+const userStore = useUserStore();
+const route = useRoute();
+const router = useRouter();
+const oem = ref({
+  appname: "实验室信息管理系统",
+  phone: "",
+  compay: "",
+  version: "",
+  Email: ""
+});
+const loginRef = ref(null); // 修复：直接用ref获取表单引用
+const loginForm = ref({
+  username: "admin",
+  password: "",
+  rememberMe: false,
+  code: "",
+  uuid: "",
+  hospid: "1"
+});
+const selectOptions = ref([{ id: '1', name: '总院' }]);
+const loginRules = ref({ // 修复：改为ref响应式，方便动态修改
+  username: [{ required: true, trigger: "blur", message: "请输入您的账号" }],
+  password: [{ required: true, trigger: "blur", message: "请输入您的密码" }],
+  hospid: [{ required: true, message: '请选择医疗机构', trigger: 'change' }],
+  code: [{ required: true, trigger: "change", message: "请输入验证码" }]
+});
+const codeUrl = ref("");
+const loading = ref(false);
+const captchaEnabled = ref(true);
+const register = ref(false);
+const redirect = ref(undefined);
+
+// 路由监听（优化版）
+watch(
+    () => route.query.redirect,
+    (newRedirect) => {
+      if (redirect.value !== newRedirect) {
+        redirect.value = newRedirect || '';
+      }
+    },
+    { immediate: true, deep: false }
+);
+
+// 登录方法（修复proxy.$refs问题）
+const handleLogin = async () => {
+  console.log("sss",loginForm.value)
+  try {
+    const valid = await loginRef.value.validate(); // 直接用ref.validate()
+    if (valid) {
+      loading.value = true;
+      // 记住密码逻辑
+      if (loginForm.value.rememberMe) {
+        Cookies.set("username", loginForm.value.username, { expires: 30 });
+        Cookies.set("password", encrypt(loginForm.value.password), { expires: 30 });
+        Cookies.set("rememberMe", loginForm.value.rememberMe, { expires: 30 });
+      } else {
+        Cookies.remove("username");
+        Cookies.remove("password");
+        Cookies.remove("rememberMe");
+      }
+      // 调用action的登录方法
+      userStore.login(loginForm.value).then(() => {
+        const query = route.query;
+        const otherQueryParams = Object.keys(query).reduce((acc, cur) => {
+          if (cur !== "redirect") {
+            acc[cur] = query[cur];
+          }
+          return acc;
+        }, {});
+        if (route.path !== targetPath) {
+          router.push({path: redirect.value || "/", query: otherQueryParams});
+        }
+      }).catch(() => {
+        loading.value = false;
+        // 重新获取验证码
+        if (captchaEnabled.value) {
+          getCode();
+        }
+      });
+      /*
+      // 调用登录接口
+      await userStore.login(loginForm.value);
+      // 路由跳转（防重复跳转）
+      const query = route.query;
+      const otherQueryParams = Object.keys(query).reduce((acc, cur) => {
+        if (cur !== "redirect") acc[cur] = query[cur];
+        return acc;
+      }, {});
+      const targetPath = redirect.value || "/";
+      if (route.path !== targetPath) {
+        router.push({ path: targetPath, query: otherQueryParams });
+      }
+       */
+    }
+  } catch (err) {
+    console.error("登录验证失败：", err);
+  } finally {
+    loading.value = false;
+    if (captchaEnabled.value) getCode(); // 失败后刷新验证码
+  }
+};
+
+// 获取验证码
+const getCode = () => {
+  getCodeImg().then(res => {
+    captchaEnabled.value = res.captchaEnabled ?? true;
+    if (captchaEnabled.value) {
+      codeUrl.value = "data:image/gif;base64," + res.img;
+      loginForm.value.uuid = res.uuid;
+    }
+    // 验证码关闭时移除校验规则，避免报错
+    if (!captchaEnabled.value) {
+      loginRules.value.code = [];
+    } else {
+      loginRules.value.code = [{ required: true, trigger: "change", message: "请输入验证码" }];
+    }
+  });
+};
+
+// 从Cookie获取账号密码
+const getCookie = () => {
+  const username = Cookies.get("username");
+  const password = Cookies.get("password");
+  const rememberMe = Cookies.get("rememberMe");
+  loginForm.value = {
+    ...loginForm.value,
+    username: username ?? loginForm.value.username,
+    password: password ? decrypt(password) : loginForm.value.password,
+    rememberMe: rememberMe ? Boolean(rememberMe) : false
+  };
+};
+
+// 获取本地配置
+const Localconfig = (localid) => {
+  getLocalconfig({ localid }).then(res => {
+    if (res) {
+      const { localconfig, hosplist, oem: oemData } = res;
+      console.log('本地配置：', localconfig, '医院列表：', hosplist);
+      // 修复：赋值oem数据，显示动态标题
+      if (oemData) oem.value = oemData;
+      // 修复：判重后更新下拉选项，避免递归
+      if (JSON.stringify(selectOptions.value) !== JSON.stringify(hosplist)) {
+        selectOptions.value = hosplist || [{ id: '1', name: '总院' }];
+        // 判重后赋值，避免重复修改触发更新
+        if (!selectOptions.value.some(item => item.id === loginForm.value.hospid)) {
+          loginForm.value.hospid = selectOptions.value[0]?.id || '1';
+        }
+      }
+    }
+  }).catch(err => {
+    console.error("获取本地配置失败：", err);
+  });
+};
+
+// 获取指纹并加载配置
+const { getFingerprint } = useFingerprint();
+const refreshFingerprint = async () => {
+  try {
+    const res = await getFingerprint();
+    Localconfig(res.visitorId);
+  } catch (err) {
+    console.error("获取指纹失败：", err);
+    Localconfig("default"); // 兜底使用默认ID
+  }
+};
+
+// Tab切换事件（移除activeName手动赋值，避免递归）
+const handleClick = (tab) => {
+  console.log('当前Tab：', tab.name);
+  // 仅在切回账号密码登录时刷新验证码
+  if (tab.name === 'first' && captchaEnabled.value) {
+    getCode();
+  }
+};
+
+// 页面挂载时初始化
+onMounted(() => {
+  refreshFingerprint();
+  getCode();
+  getCookie();
+});
+</script>
+
+<style lang='scss' scoped>
+.login {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100vh;
+  background-image: url("../assets/images/login-background.jpg");
+  background-size: cover;
+}
+
+.login-form {
+  background: rgba(255, 255, 255, 0.4);
+  backdrop-filter: blur(10px);
+  -webkit-backdrop-filter: blur(10px);
+  border: 1px solid rgba(255, 255, 255, 0.9);
+  border-radius: 12px;
+  box-shadow: 0 8px 32px rgba(0, 0, 0, 0.1);
+  width: 480px;
+  padding: 35px 35px 5px 35px;
+
+  .el-input {
+    height: 40px;
+
+    input {
+      height: 40px;
+    }
+  }
+
+  .input-icon {
+    height: 39px;
+    width: 14px;
+    margin-left: 0px;
+  }
+}
+
+.login-code {
+  width: 33%;
+  height: 40px;
+  float: right;
+
+  img {
+    cursor: pointer;
+    vertical-align: middle;
+    height: 100%;
+    width: 100%;
+    object-fit: cover;
+  }
+}
+
+.el-login-footer {
+  height: 40px;
+  line-height: 40px;
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  text-align: center;
+  color: #fff;
+  font-family: Arial;
+  font-size: 12px;
+  letter-spacing: 1px;
+}
+
+/* Logo和标题样式 */
+.login-header {
+  display: flex;
+  align-items: center;
+  margin-bottom: 30px;
+}
+
+.login-logo img {
+  height: 40px;
+  width: auto;
+}
+
+.login-split {
+  width: 1px;
+  height: 30px;
+  background-color: #ccc;
+  margin: 0 15px;
+}
+
+.login-title h1 {
+  margin: 0;
+  font-size: 24px;
+  color: #1989fa;
+  font-weight: 500;
+}
+
+/* Tab容器样式（修复冲突） */
+.login-tabs {
+  width: 100%;
+  height: 350px;
+  overflow: hidden;
+  border-radius: 8px;
+  backdrop-filter: blur(10px);
+  -webkit-backdrop-filter: blur(10px);
+  border: 1px solid rgba(255, 255, 255, 0.1);
+  padding: 1px 10px 10px;
+  background: transparent;
+
+  :deep(.el-tabs__header) {
+    background: transparent;
+    margin: 0;
+  }
+
+  :deep(.el-tabs__nav-prev),
+  :deep(.el-tabs__nav-next) {
+    display: none !important; // 隐藏Tab左右箭头
+  }
+
+  :deep(.el-tabs__nav-wrap) {
+    overflow: visible !important;
+  }
+}
+.custom-select {
+  margin-top: 20px; /* 可根据需求调整数值 */
+}
+/* Tab占位样式 */
+.tab-placeholder {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 40px 0;
+  color: #666;
+  height: calc(100% - 40px); // 适配Tab容器高度
+
+  .placeholder-icon {
+    font-size: 48px;
+    margin-bottom: 20px;
+    color: #ccc;
+  }
+
+  .wechat-login-btn {
+    margin-top: 20px;
+    width: 200px;
+  }
+}
+
+/* 隐藏必填项星号 */
+:deep(.el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap .el-form-item__asterisk) {
+  display: none !important;
+}
+</style>
\ No newline at end of file