From bde369d327e19d18b7055c89673f69e36ec3f346 Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Wed, 18 Oct 2023 09:41:09 +0800
Subject: [PATCH] theme

---
 src/assets/img/cala.png         | Bin 717 -> 342 bytes
 src/assets/img/clock.png        | Bin 586 -> 582 bytes
 src/assets/img/status.png       | Bin 995 -> 834 bytes
 src/components/Header/Date.vue  |  31 +++++++++++++++--------------
 src/components/Header/User.vue  |  42 ++++++++++++++++++++++++++++++++++++++--
 src/components/Header/index.vue |   8 +++++---
 6 files changed, 61 insertions(+), 20 deletions(-)

diff --git a/src/assets/img/cala.png b/src/assets/img/cala.png
index 350d218530008f5ad3595cef45a0567d522760a7..60fcf28518a9ffa7913d974096bb1ae05d4aa783 100644
GIT binary patch
delta 322
zcmV-I0logs1=a!~iBL{Q4GJ0x0000DNk~Le0000S0000Q2nGNE0HjnriIE{6e*pkV
zL_t(YiS3ikO~XJCh2NV^AwI3*_(BP|gSeE4SjsKp=7SL}&_U7xl#q*w<qOk@cRBE*
zfP`&D_97A9arJ3G?Y<eHC$`FWw#s*7akD-E@XLN?I7a}OA2*S6?H0f_;G<KZNlF5M
zt=7KlqMtb`fP;ux)p4P-ciH22f6;jH5rD|K_G*6Iq~ctAKb`EW*tvE~TjejELi+5D
zXZJu1;;8KFX6#5v8F0E5^jWjG+fN~}&o|4DuMYmgzu(~{3+b~aDcK|?KbQKP^TEQ2
za>-Nr-{G10jSi{dbW{QG6i$ePh?v_jucV5YmDF*eA|?g6pGHgt_#k4^7&<QW6}Y^B
UPA_Rg{{R3007*qoM6N<$f|vxC0RR91

delta 700
zcmV;t0z>`Q0?h>>iBL{Q4GJ0x0000DNk~Le0000W0000U2nGNE08I)UDUl%`e*$+&
zL_t(YiS3s^Z_`i|#ec`C5Ml}&1GEl*_H;|K<aNN!*nWc2PY^mXm2PZwWGfw+8n(6!
z*b-{GQ9b}_kXV>-w=VHz$R8z9Vw=)X299L;$>;jM^RDl^?^@(Q)vZ34*>)mt`7}K2
zq}kTo)3TWk5UqB2yp`qK%Oe1@f2Kjvqw8{5mjNGREstvr1{K%vg{^_rLB+B8(ar*p
zU>gR0x<iXRyfC5b8{WpmN@7rCs5OYB0BSCHX~y;}rzWp-8Xk6PZgtPho}~(q-kyX<
zn-$maWy$%BRmUdnw8Nuaui_dmZSr}*porP)ifj0uNSawMcyx<dHdleLf4#!u(xW%P
z?Q~0BF8U9DV7$t-h2s6vlP@CK04nJMD5_cy?6+iJGxBZ2IbvaCd{&T`SvdX_U6LZE
zCYT!+Ankt&55sv20I0eEj0pi|&6*45lI@c)V_2X@KY{<Z>jC@&N%&ttx&Ud*<dyo@
z3ebVxVS-qn;23ZPc`E}>f3nTgDP~ndL3|P&-yMBcb-_XZobR-w<I*Tss|TMA%Kb)U
zeS-UGFm;DzlwyUFMg8&8_)(m~NxQ->01VZ!UeURNfcaw~gYO`905J0z?}mn)%*qoX
zPUG?k5X851XE_X8@!(n2t$xJJ_48va2deepyeCj$J31OBWm;zhe<{1bpm@pUP<h2Q
zd~C?Y&aI7c8m`j(Q7#L4a-ajf=3z=GJN>&q<`iOscp5i}tQ;6Rn4xm2^S;nrQMl1c
zD2P3z@TLS9I`c%be^UYw?*&k;2M3VvSLzzkYDdTG1%U70zP@`<dVC?cr(WBg)p}nY
iQYhI@JNobf;1^Ib67fV%LqYQZ0000<MNUMnLSTZ^W=a+S

diff --git a/src/assets/img/clock.png b/src/assets/img/clock.png
index 41aa5750249ec2fbebb20485019ae4dbb3623b24..2c946a6f5015181a184a2ff4c7fc4b8a7b80c131 100644
GIT binary patch
delta 528
zcmV+r0`L9G1jYoAL4WW`L_t(YiM5tNZrVT;hQBwq8Z|49;7wXWisYOiaDvby<OU#l
z!H%%Y!V=toBLq$m=LAKn3M5&S-hfr3Mz&uUHfc}|HU$3Ny!mIo8GGiv5pq<XwjGVa
zhKgJOE@&z3nv1X?W+aw9oSojxH_an!0pGovT69#Y<t+w4gnvN9zFG&&1f5L0o+!;C
zfDCmX&;09+Aop9d^n7IB7Tv`LjgMc#`uM!RSO(17-rpbWyFEYv+~*_v_HE!5^y!Cp
z4Y+%N0H8|kWa9OfZGq%u#c}wv&;&x?#QajBm+uA>Q=e7+z$El=P;{kF6~FcH#qSsO
zt3?OEl&5WHPk;X<8>H0A)3#$Y3LA%lyuzZeVK7`C93*mKR4L_K-!0bwPI14?cjIWu
z<eUCMjIrtf<*8TO7G*#d`L+ZyJH44FcTNglhg5R|jJJbCcc9KT6cH9iRPPT70U%~%
z#IlF$IdSXV5I`(@C;*=)US`%-p>IWuVk3i{Awuv_@qg<EKq9)CCZ!o0cHT(>vacX5
z6SJxxs8BdjZlUh7w69dyb)RrYjUUha^JQb@!hZY{ekJ#~=Szg(_$92b#IlTOwe9Qz
zQKA1-@mv4F*9}POR5;k`xfRi!RsA5dKW~EN0}{h!n(3W%=mHpv>V1(1<X`Cu+BN>~
Skk0@B00{s|MNUMnLSTYjLjyqo

delta 532
zcmV+v0_*+81j+=EL4Wi~L_t(YiM5uoa@s%;hQB=*OkC*!LPiWpPdeF?8IFdiGwIU$
z4a^hRJb_7<&W~W+0gaCeN*=(TC=-g5s*<4yn?fSkF|q`Pzq`G?{q|0`+7ogV*w7cW
z1zJa`33%yLq#`kJqeyS!`q6W7<Qae!)pJmrmrN2#oFb=Lz<+~v#v|Lj6xFYQUkH-O
z7xe5+r7Az7d-o)dhXZR{-dulQ7v4p-rX@LSIM<7p2J>)suD@<~00F2a39t0;=#Fjk
z0{FZG$Wnf}QuSuh{Q%OV3vB3%F1{67E_6Y@qk37yUBxseuJ25;R<DYtId;SL*bTZx
z{gayuCa|H8?tkRFWJqmbL*FFDxL*m{GQi2cL7;Ubs$Rb1OF7gGn^k|b4M)H;`EDzS
zifI6Ru%X=)W)$Llw*)eA{V1@Z|3?>v%VD|RAWS!bh%Ro~?6^^p*no`o2}yNh6zOG7
z3+)|1P^5P-i|*pG|JJSzBK&;qznhCLuD69C;wEnJ#eV>(NGBtevzP272_dJDwuxDE
z7nLhj4+ypmxK1K;#%|Dq|2phZ{o}40AHZ}x8opl+9u;g!UVVbx>s~<ON^;nEWLf8S
zY?~LVoNvdVJ9fkNQ*(yW_uN(SUL{UNIuqA->-jlaJs>$r|MWh9LY(|nWK`q<`4^x!
W&boL$1q~4Z0000<MNUMnLSTZdY5%?e

diff --git a/src/assets/img/status.png b/src/assets/img/status.png
index aeecd5170f2e6d0752d899b65fb8517e47fc71d4..bd0ebffb0a64aa054283d61eb58f26e8ddf59aaf 100644
GIT binary patch
delta 783
zcmV+q1MvLg2f_xBKz{=4Nkl<ZScT<S?Qz>M41M4N^#)Zoa3+W{frSm44crNmOptVf
zx)YF^Al|^r1W_l5CJ_3=ppKR$igf(1@6Kmi0-+~-5g;KG*4hF<Nkkg}D*%Ol0HD?H
zy@<R6*fDdLqn|Q}tcd6hz&hsvB67pbZK}M<&|T${3DzYehkwvMj|Tvt1F#D(sLN+D
z=`vmP1Hhh{2O`e7-+Da>BJ#}4PZR4~5xJjo<ryJs?OJ1HrAmhwu+|oOuSnq2R#kNq
z=q+{aaDR%_iOckX){_AMBKqxrGjl5<&k1B8A`jvJP>-S@qQlsQCl+$f9WW8NBJ#k@
zyMXvs(;h_B^nZQ-7sq%hj4|K(zJDLdKM~R64EGaD4utBuei4yv%A#C2=ROfweT*>H
z2pC-T5mPE6%*-yAjMlFM7UIswssVtAIYTtLWB`DfI}!P{B<DGhzQN~$@atx?`FRN;
zkA*k_aI})aa$VVfl?(uAj4WBXG(KDAkecQxSkgsA8-IiN{?vq(`m4~SXd@z(L1d4*
zrgai^?#Wua!t{>ZF!M#3wFGNziSshh;j#_<KZAE!iSyFlUNfLWSZmjqP9{grxi=+r
zhViC)B{G$E6jN|!jtr2zrDTDKULv>4XxalPG$XEpnd}PD7!mmsQ!>$5U5tditX{GZ
zaJ16XSAWUWb^U@!cqn#8d)i%0iijSUriB=+wcAMZH;`fG&H%|<#3eJCZ_pN#!*eh|
zQuE&8!m_TTbab31qE|nCjGO!qOk}~hebr{`4nRjlZQu9rejO2g7m<2Ge$GlwRaLhG
zx$w@++_kT&>OPR!F4PkL5+_A<=4Cq(xeaHtlYhBPU3ZVb#3C|ui>dJdoTvCiNVH=z
zXM_S$w<7Ya3x*cN81sn8I5WaYxnSlU5xoXv(njey=!kttm7jaCwRRorvvN*9icB(o
zO&MNTYWi{rHMlJG+Z^F!mw5z7dUrS$%T@4caZHFtkMvy5=@|h016iw)?bEMVqW}N^
N00>D%PDHLkV1j{-cdq~d

delta 945
zcmV;i15W(H2IB{iKz{>`Nkl<ZScTn~&vm0n5XQf+C3GESFgOD_f?*<1Zw8(WyhlrK
zpYgMij`l=gO$5`5K+3>!1j9x!oCTuxAcO%!1GeX~b+HlE)jztc>rWFsMK8rg8hfCc
z0x}ke3!w`DpoGUiY70r9kvJ>kGwNfXok4sVi<4{sOnObAhJR<~ieXoM)!DKW>%K4m
zfJ3bNsCNfa&bBWLfC!1RD*m9C;@Sq(ZrRaKk_)8RntxtEbdWp><f1DLfg3Y-{L}L^
zNFD*X02z{luXS7b3P=b0iGUjbW1#E<dMU2RVFR&$<<T<3^=x>S+r5oFQP>pU*FlxG
zOfSV1s-Gtq0DpiakEegl6+=pT(+UHC2l-ZfmH{723L>tg$y0R;ODi-D;wRKNE+OB{
ze6-5J@Aj8aoMw+Zr1CF_2%rn%6GWa%`a$dqa9vMcUdbFtFXDR<Ty`1MSEfPy8^u+x
znlJbofo!YN<d@AT$-m5OX!^ovU&b;zJhl1V$ybj)lz$%Tm$Nitu<Hv00LEv;H2vPH
zm@zPmz`w05#DkeRf4>FjBvwB<&7+2A3d8uqYKhps7X|<_AF;1;8hc7!PD?${0iBL{
z7a?i4MKx6rYkt}lBlUa5%!USRPP8JT70Jd4TfgWHVhyasmfDwbmdUHKGxO1#PF9=f
z+t`Dugnt352>ZeIPt5oKlH-<*4jv>ehxU}=M>=#-bg-YGuGotm!|5X4K;YF4tR~eD
zfmtM4M1I!JM;g@x0{}wRo>F>>0QZgWL_9@e+dNuay^Ot&g3-6JXHBxiPC?{{&4@^)
zuzH8cpe2{3vR19dyNIiU*ncmKUc~n{_W%GS&VNdoD~1GDRwm%Oty{3d-0d$Li@!_=
zu8hy<SP!W|dy0@l|DFt4fkw6;j*LM8S@8}_Rwu)^hIQjJ0`2WIiHB47Q7-Zq$*;Oo
zP%U3|5c?p$0E_?$A@U3`8^_Ne)>VB=akg8}o%4LI;+xvOi`cGb&evS$Zht9cV=Q?Y
zR(}qv4Idj(4bO|cS*b5GSI6cJK)%Ej$*aZA{(#p(^;OwHhE<qXKsl5eo)fqs<h)dZ
zjFM|u+L<y@Ib4|eXhq^7hw0i%H%ZoFKXuh_npg+>iLK7+e)~b?_JRQb$u74F(pL2K
z02=II%X>|dcE79wdTiNA@+&>4F9Ml>GAf2}3}6gO2w_BU2T7kXa7>@uGXVGx$pEow
T?_sBF00000NkvXXu0mjfs|3B5

diff --git a/src/components/Header/Date.vue b/src/components/Header/Date.vue
index b6a0989..92084c8 100644
--- a/src/components/Header/Date.vue
+++ b/src/components/Header/Date.vue
@@ -16,39 +16,40 @@ import Clock from '@/assets/img/clock.png'
 .date_container {
   display: flex;
   align-items: center;
-  padding: 13px 35px;
-  box-sizing: border-box;
-  background: #ffffff;
+  padding: 13px 29px;
+  background: #393f46;
   border-radius: 34px;
-  width: 528px;
+  width: 392px;
+  height: 68px;
+  border-radius: 433px;
   box-sizing: border-box;
   .cala_img {
-    width: 32px;
-    height: 30px;
-    margin-right: 19px;
+    width: 28px;
+    height: 26px;
+    margin-right: 8px;
   }
   .cala_text {
     font-family: Poppins;
-    font-size: 28px;
+    font-size: 22px;
     font-weight: 500;
     line-height: normal;
-    letter-spacing: 0.1em;
-    color: #393f46;
+    letter-spacing: 0.06em;
+    color: #ffffff;
     white-space: nowrap;
   }
   .clock_img {
     width: 26px;
     height: 26px;
-    margin-right: 17px;
-    margin-left: 36px;
+    margin-right: 7px;
+    margin-left: 22px;
   }
   .clock_text {
     font-family: Poppins;
-    font-size: 28px;
+    font-size: 22px;
     font-weight: 500;
     line-height: normal;
-    letter-spacing: 0.1em;
-    color: #393f46;
+    letter-spacing: 0.06em;
+    color: #ffffff;
     white-space: nowrap;
   }
 }
diff --git a/src/components/Header/User.vue b/src/components/Header/User.vue
index 2c9bcea..769edff 100644
--- a/src/components/Header/User.vue
+++ b/src/components/Header/User.vue
@@ -1,7 +1,45 @@
 <template>
-  <div class="user_info_container">123</div>
+  <div class="user_info_container">
+    <p class="user_name">毛超颖</p>
+    <div class="avator_wrap">毛</div>
+  </div>
 </template>
 
 <script setup></script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.user_info_container {
+  width: 234px;
+  height: 68px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-left: 20px;
+  .user_name {
+    font-family: Poppins;
+    font-size: 26px;
+    font-weight: 500;
+    line-height: normal;
+    letter-spacing: 0.1em;
+    color: #d6d9f1;
+    margin-right: 11px;
+  }
+  .avator_wrap {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 60px;
+    height: 60px;
+    background: #26d574;
+    box-sizing: border-box;
+    border: 3px solid #22c56b;
+    font-family: Poppins;
+    font-size: 28px;
+    font-weight: 500;
+    line-height: normal;
+    letter-spacing: 0.1em;
+    border-radius: 50%;
+    color: #ffffff;
+  }
+}
+</style>
diff --git a/src/components/Header/index.vue b/src/components/Header/index.vue
index 17ca7ab..0587b9a 100644
--- a/src/components/Header/index.vue
+++ b/src/components/Header/index.vue
@@ -5,12 +5,14 @@
       <img :src="Status" class="status_img" alt="" />
       <p class="status_text">机器运行状态</p>
     </div>
+    <User />
   </div>
 </template>
 
 <script setup>
 import Date from './Date'
 import Status from '@/assets/img/status.png'
+import User from './User'
 </script>
 
 <style lang="scss" scoped>
@@ -19,10 +21,10 @@ import Status from '@/assets/img/status.png'
   display: flex;
   align-items: center;
   .status_container {
-    width: 1362px;
+    width: 1490px;
     height: 68px;
     border-radius: 34px;
-    background: #ffffff;
+    background: #393f46;
     margin-left: 20px;
     padding: 0 18px;
     box-sizing: border-box;
@@ -40,7 +42,7 @@ import Status from '@/assets/img/status.png'
       line-height: normal;
       letter-spacing: 0.06em;
       font-feature-settings: 'kern' on;
-      color: #1c1c1c;
+      color: #b0b0b0;
     }
   }
 }