From 8776fcafe935c39f70193b81a015e023189ed2b3 Mon Sep 17 00:00:00 2001 From: liuyx <1517482303@qq.com> Date: Sat, 19 Nov 2022 19:35:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0tab=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/.vscode/extensions.json | 2 +- admin/index.html | 4 +- admin/package-lock.json | 57 +++++++ admin/package.json | 1 + admin/src/assets/logo.png | Bin 0 -> 11122 bytes admin/src/assets/scss/element.scss | 1 + admin/src/assets/scss/index.scss | 2 +- admin/src/layout/components/Header.vue | 156 ++++++++++++++++++ .../src/layout/{menu => components}/Menu.vue | 6 +- admin/src/layout/header/components/Avatar.vue | 28 ---- .../layout/header/components/Hamburger.vue | 28 ---- .../layout/header/components/Screenfull.vue | 22 --- admin/src/layout/header/index.vue | 40 ----- admin/src/layout/index.vue | 13 +- admin/src/main.js | 9 +- admin/src/router/index.js | 8 + admin/src/store/index.js | 19 ++- 17 files changed, 263 insertions(+), 133 deletions(-) create mode 100644 admin/src/assets/logo.png create mode 100644 admin/src/layout/components/Header.vue rename admin/src/layout/{menu => components}/Menu.vue (95%) delete mode 100644 admin/src/layout/header/components/Avatar.vue delete mode 100644 admin/src/layout/header/components/Hamburger.vue delete mode 100644 admin/src/layout/header/components/Screenfull.vue delete mode 100644 admin/src/layout/header/index.vue diff --git a/admin/.vscode/extensions.json b/admin/.vscode/extensions.json index a7cea0b..ef2ad2d 100644 --- a/admin/.vscode/extensions.json +++ b/admin/.vscode/extensions.json @@ -1,3 +1,3 @@ { - "recommendations": ["Vue.volar"] + "recommendations": ["vue.volar", "cnblogs.vscode-cnb"] } diff --git a/admin/index.html b/admin/index.html index 795e4fb..812fdea 100644 --- a/admin/index.html +++ b/admin/index.html @@ -2,9 +2,9 @@
- + -o6PioVE1EBw?(tI5!E&0MyUj{a0MgH|w` zCZ93-Y|fDHU+7iDwe;wN#{<_E!hS_0^r9pzp}XVi<#<~FX&yT z_FRt(b*5UbUaZ`~SM&V7;`~ yaX3hu@G9qmSe+&!v{2_++*yV;th=AKIOv%(Ko=#g{5BMDg{xFM}*? z#WnBGr{e;1dZP$i-k9+9oPohz#`P{gxxmz`wqebn2&liq=`dSsFr4HJhHY8ts3epn ze|8(p)*cLhw*td oOQD;AO*5KI5+w_1446iqYJds`LbO?}H z?VLk!4de29M1il};?aDuOXiFisYX=I;G4C7N$Wux$f2GE+ex$|G49JGuu}zyk qat7wE0t`#=xea4QdsSF{I45Jnvn$`Mnd^b3zg`ZdR$mZcKr5FP#_y zcBrp_kVBPSNwh7=?yhG(9^<>{3_8B(=Sw>Fk_{{WT4fS2VZJDG;d@P>^Ba242r&4| zl`Vi6M;0^AtuFZU+Q?OsC7P_kF=vM+@wX>Al&*@Vh&KcoQhCFTuE9*T%#{Vd^x3($ zdy~pGgO%?AIV(jw=Bc-wri~a`6t{^{v39`|!F^QRt%z2*7p^FO> 7%4!shQe3&n EQJ}r{IRgK(8%?H*Kjm~Tc4E#pcrdGW0cx*cDfqd z*vO`)s5cK2C=Q|zOg?40tt!??KGCnS3C_JAj &6Q zN;qJF)iiXbCgH0uerODxrxuA!+<`zhBQWEUcVcT(jO3l}{ GOe?Up z>QQ57k2)0ZXrc+U4nRe2?#pV`8BOOl!tis@?#eoMSCbA;5eeP1=y>^kHs5DpwXZ7z zz3r(z8P95^Q(V#UU6~ExdKl&=_s+6J_sp1~7*Sibtk(R8-k)<3tBRDgAuQ`yjz ZeN;hRD>*OD0|&2{Jd0x zs0ipv9%`=@C82N-zadv@*Q@y v?_K5^l0l}M~)kBabxr9Vqo^z$fz4G#gM1#P0 zSHfoSTl)J=5Hg+`uOYHU;}^*+)^#DTB~~uXs`~p$&)%FjGIpRxG!J}O3FmHq-M!D3 zQcp4_?AQs(2MvZ@=|wJ22wts9tfvF_Ui*A+MvZ-sBCh?`UH;)0qw7NOpnhhQ{6&hm zPnwT$(=$y!X&(@jItccPK4|8|AINsgU|3#XSKM|A8b4E+o)WfWeob$wd+r{WNfpI{ zAjl_I5 GjB#Sw&ntY}b}FTfOZ zUkQoBF)ZOPca #hr$8nS&F zSb52F`&9^OkIE;quoVjtl^i%jKIzT=xvh}i)}g}agon`DXVM+wdy+4t$!V~UT49gA zbO-)B>SQ;5J-ZNxA-VVj{>Bydj(J|(xJRy8d&v5A8{k$}NLMs9In$~}PJQ8S>ix{K zl&CmedN^4hlhPEM-5MR!+$;m|5o4nvO-nE_*>qjc8px7DfRLVTNWR>Treb%y9CE^r zH=Vwuln%Npb0Iu|AlQTo+q^W32I8d3X-Z(2V&OH;@!@=d`pRCndOpXEQGtTJ@4GXB zf|fom8*+%Cl^uN}_krC{q2)Cl&{WyoomZS}#z9bj{sBhkpg+Pw0bSbdARK1=r-!?V z5@;jhi3eOCg}ZAaAAT;&ZZ&!S&UXr+DC~PIpSxgg&D5HP`ohYQ;>c9MtzEEU{UL~@ zGiwdE-n4?C#>|4b9O!JAAF(BRJ-sWeJ5~PAn5I5EF{*Cu$JOfUn~S73TG=3RN%njR z0J@# $82 zclLUk2L_0PoUDpgTL}0Wdhltuk)>=U5rhycpS<->t)l$B&x)x4qsT4or~-Ck{NvLn zuCd^ebJ4`@ZwoKsV1)+Br|id1a_DhYtfVdmO_4u4wiOa3hU7HjlR~lanxa1sL!zPZ zRmHvY(hdq)y|MzcyfQ@wqbVN>;+P5ISb?YtLvnJSi5S!13DF`22LXhmvnUFQ0;BjK zP;2(P?9&2j$aj7@2Ym)e$d6&hX|m9NK^Ait;)|xj) ZOe+Scnu{r>YzH>$i#vAw zw!CSA9l((^wsw|{iP~DT$R~%MduA&D6!Gk%=6{qhd`h};DW(y?_*o4*^9e*FvU7Y7 z51Fd)0GLp!^w10< #M{&~uS $q8{Z^*Ma+x(O85D;AD|dTi2X?u7Vo{wKU+OI1u)pwzC`~2 z5*N{w|Hl8b!+-Jc-@f=S5B!%0{=dlswi^N!;8DPK{#$_mr)!+sV (NHRK#%N01 z`x~DtAa;nLrzFr?5b)=*n_T95 zS~~gXwS+s>7xW=}$tUdrr(hZ?@I-XDQ6{(pX+wzEjUNK*letUOk_+J2Rj_u;B^KSP z80X9+*Jc#OJ^kN}@PxF8^Z0R?Gqr1Z>GotcI7M6C?rrynsF6=%0o5rQYR>irc*$^B zCVi)+f?fRNe*Y%aP*2MzV{j789-~%{K&@r|qA`tle1R 4y7L(r{ zRbRk6w(t=&*1?EFedE&*@*1S%t)-Kb{*Mk6rB`QhampRs@lZea_6CDCQ(lKe6F>JC zopEde4aVrNo9jk`#)Q_zEV_7u6)S4wZjlN&2HQAts^Y>G8NwdRW-xqtE5Tq{kF#!D zV;>I$K<;;{#Q^N#*GVKBQM?w5N9^xO0*6$ybB!)Z5&-W}n5CVj%*$Mum?X5&9zOPh zfqOzB(j|>3fWkET%hcr2Wd-C`IhF2p%j;Nw?-1{>L9=bO-RaP);5r%HTPz)hWZozr z@G|h9)I(LaHx>4|qABz9Z~ODf_+y$_OVApqs^S`d0s!WYg_&~>J=xuHL9vOpFR?8b zG!r(_)eH#e=LN1kEk~@LxDkzd-plWB-9d*7t{~+=!z=!H$8Z1%B```fLvl7 )VbatEId{iz&KWAC6NxVxE^^RMWBlLjMfa;On&u-uwiZJfJS$)H-kdb;WY(+^m) z*;3S+hjH;0CjluRmm|3Q+Eab9=|}PmrdfQf=erD+nI9Ar^3GkpN9Xr6O#k+uv4@4N zEw=}+*^y|HjI;9gETx7CXM4(I2VwXlVx>Oo)WJM@)VJNi2bxf&*ZP;>!2mwkc`;sG z`S|Dw82 SL1xT z7b2L_P*8fHi6(_@jz$DGe@jlg5U<%}+hPo>jm=0J$Z>b=R2#8_>0e?-#TB%QFTYxF zCb@Xr6w`hK8p59;PL#>EweSas6+taY7kj3p^~r0Sn+T82SM?x*t6Fj51+BPf=vt+b z`1a{%@o?^*$2T?kuOl)uvGJ;87jVryKz))F?(LDo0#hUtfXBcBZY5G`!WjE)&~rSvv>7SJ2d6tp&;sa|!1 z;R8x4GBK=6C3eh_Y`gIh#lcVo60P!54FVogaUKzzauyMkf{c A@BOs*wfiI @!J$?kiO880!B2-^hHCp0fwzU=kv z0u8kcQ86 >;U~Z8q z+n4|-%H>lenl?qzHN8_f@85*53WmM)02=mG(KWSQcmfRjsSa=C1Bl{D2YmI*6>{ix zb=f3vdunF(fsiDNVVOCpu}QY%(7o|u=K$81qk1I_K!02#B@#g)UeVxD^REBB`ica@ zL~Q`d#V9gPjgtC7!krcE=eY FsF5KNmO14UoF{v? -GB&wrRYNSAX*|evajtI({e`<9fh}fv>sGNc>br%OLPWIwDbb+1O zBm3XLF$(9X!bpGPJ-@gfFD?O(6+g2VQ^$l*u@}KiChn6%BdA#;=5Mw;WOch2@o5gv z$A4}HG{-6&k5!<(n_R2__hE+ISPXb!*HZHC4ut4PuI0-qO4B^E8@$MgoAFxO2g#8Q zX&@E0CWM+iJWd1NX7tKQi6%O-gk-7|E!nkN(? |5 znU+PQk*CoVS*d&865C69O@Ni=;*~Keps??k7}%=?E|?sc AI74RO zTo_*tcc?m0?a5}(0jRwiM;YcEAM!%P7I;-doX!#5Z^Md$^97R>0k6y=q1U%Sq7YmZ zf8k+h1fb Bv5qGV)S+UrLHE53;oyY%*Ht#vAN?6vh%uqQMjy_N1 a3ENZ3_Q>=_UICA21x$@CP8S-vMf@M9a0&qc literal 0 HcmV?d00001 diff --git a/admin/src/assets/scss/element.scss b/admin/src/assets/scss/element.scss index 85d1f8a..8398e4e 100644 --- a/admin/src/assets/scss/element.scss +++ b/admin/src/assets/scss/element.scss @@ -10,4 +10,5 @@ .el-header { --el-header-padding: none; + height: 84px; } \ No newline at end of file diff --git a/admin/src/assets/scss/index.scss b/admin/src/assets/scss/index.scss index 69f6af0..2ec0d04 100644 --- a/admin/src/assets/scss/index.scss +++ b/admin/src/assets/scss/index.scss @@ -8,5 +8,5 @@ #app { height: 100vh; - // font-family: 'Times New Roman', '仿宋'; + font-family: 'Times New Roman', '仿宋'; } \ No newline at end of file diff --git a/admin/src/layout/components/Header.vue b/admin/src/layout/components/Header.vue new file mode 100644 index 0000000..f950376 --- /dev/null +++ b/admin/src/layout/components/Header.vue @@ -0,0 +1,156 @@ + + ++ + + + + diff --git a/admin/src/layout/menu/Menu.vue b/admin/src/layout/components/Menu.vue similarity index 95% rename from admin/src/layout/menu/Menu.vue rename to admin/src/layout/components/Menu.vue index 0e1bb83..5647c80 100644 --- a/admin/src/layout/menu/Menu.vue +++ b/admin/src/layout/components/Menu.vue @@ -4,13 +4,13 @@ background-color="#304156" :default-active="$router.currentRoute.value.path" text-color="#fff" - unique-opened="true" + :unique-opened="true" :collapse="store.collapse" - router="true" + :router="true" class="side-nav-bar" > - + ++++ + {{ item.name }} +++ + 全部关闭++ diff --git a/admin/src/layout/header/components/Avatar.vue b/admin/src/layout/header/components/Avatar.vue deleted file mode 100644 index a2ca988..0000000 --- a/admin/src/layout/header/components/Avatar.vue +++ /dev/null @@ -1,28 +0,0 @@ - - 首页 - - - - - - - diff --git a/admin/src/layout/header/components/Hamburger.vue b/admin/src/layout/header/components/Hamburger.vue deleted file mode 100644 index 8997b1e..0000000 --- a/admin/src/layout/header/components/Hamburger.vue +++ /dev/null @@ -1,28 +0,0 @@ - -- - - - - -退出 --- - - - - diff --git a/admin/src/layout/header/components/Screenfull.vue b/admin/src/layout/header/components/Screenfull.vue deleted file mode 100644 index 0de5ac9..0000000 --- a/admin/src/layout/header/components/Screenfull.vue +++ /dev/null @@ -1,22 +0,0 @@ - -- -- - - - - - - diff --git a/admin/src/layout/header/index.vue b/admin/src/layout/header/index.vue deleted file mode 100644 index 987713a..0000000 --- a/admin/src/layout/header/index.vue +++ /dev/null @@ -1,40 +0,0 @@ - -- -- - - - - diff --git a/admin/src/layout/index.vue b/admin/src/layout/index.vue index d22d169..33b752d 100644 --- a/admin/src/layout/index.vue +++ b/admin/src/layout/index.vue @@ -6,17 +6,22 @@ -tabs-- + + + + ++