From e3006a31acccfcde95ade0bf4a92813baedc14b5 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Fri, 22 Apr 2022 16:36:05 +0800
Subject: [PATCH 01/25] =?UTF-8?q?=20NEZ-1833=20feat=20:=20asset=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=20Type?=
 =?UTF-8?q?=20&=20model=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/rightBox/asset/assetBox.vue        | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
index b6d4cc072..c7908126a 100644
--- a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
@@ -51,7 +51,11 @@
             <el-input  maxlength="128" show-word-limit v-model="editAsset.number" size="small"/>
           </el-form-item>
           <el-form-item :label="$t('asset.brandAndModel')" class="placeholder-emphasize" prop="brandAndModel">
-            <el-cascader
+            <div @click="judgeType">
+              <el-cascader
+              ref="cascader"
+              :clearable="true"
+              :disabled="judgeTypes"
               v-model="editAsset.brandAndModel"
               :placeholder="lockModelInputValue"
               :options="options.brandAndModelOptions"
@@ -60,6 +64,7 @@
               size="small"
               style="width: 100%;"
             ></el-cascader>
+            </div>
           </el-form-item>
           <el-form-item :label="$t('asset.location')" prop="location" class="is-required">
             <location-cascader v-if="!vmLock" ref="locationCascader" :dc-option="options.dcOptions" :default-model-u-size="1" @change="setLocationData"></location-cascader>
@@ -327,6 +332,7 @@ export default {
     const vm = this
     return {
       assetConstants,
+      judgeTypes: true,
       showAllTalonOption: false,
       showAddressOption: true,
       talonShowTow: true,
@@ -546,6 +552,17 @@ export default {
     this.getFieldGroupData()
   },
   methods: {
+    judgeType () {
+      if (!this.editAsset.type.name) {
+        this.$message({
+          type: 'error',
+          message: '请先选择Type值'
+        })
+        return false
+      } else {
+        this.judgeTypes = false
+      }
+    },
     clickOutside () {
       this.esc(false)
     },
@@ -629,6 +646,10 @@ export default {
       })
     },
     selectType (type) {
+      this.$refs.cascader.$refs.panel.clearCheckedNodes()
+      this.$refs.cascader.$refs.panel.activePath = []
+      this.editAsset.brandAndModel = ''
+      this.lockModelInputValue = ''
       this.editAsset.type = { ...type }
       this.editAsset.typeId = type.id ? type.id : ''
       this.editAsset.authType = ''
@@ -639,6 +660,7 @@ export default {
       this.editAsset.snmpCredentialId = ''
       this.editAsset.authProtocolPort = ''
       this.editAsset.pid = ''
+      this.getModelData()
     },
     addLabel ([groupId, metaId]) {
       const label = this.options.metaOptions.find(m => m.id === metaId)
@@ -798,7 +820,7 @@ export default {
     },
     getModelData () {
       return new Promise(resolve => {
-        this.$get('asset/model?pageSize=-1').then(response => {
+        this.$get('asset/model?pageSize=-1&typeIds=' + this.editAsset.typeId).then(response => {
           if (response.code === 200) {
             this.options.modelOptions = response.data.list
             const titleSearchData = {}
@@ -810,6 +832,11 @@ export default {
               }
             })
             this.options.brandAndModelOptions = Object.keys(titleSearchData).map(b => titleSearchData[b])
+            if (!this.editAsset.type.name) {
+              this.judgeTypes = true
+            } else {
+              this.judgeTypes = false
+            }
           }
           resolve()
         })

From c02619ee61a5e6327f2580074a20627d93722e69 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Fri, 22 Apr 2022 17:55:21 +0800
Subject: [PATCH 02/25] =?UTF-8?q?=20NEZ-1830=20fix=20:=20Network=20Zodiac?=
 =?UTF-8?q?=20=E5=89=8D=E7=AB=AFlogo=E6=9B=B4=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/build/webpack.dev.conf.js  | 1 +
 nezha-fronted/build/webpack.prod.conf.js | 1 +
 nezha-fronted/index.html                 | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/build/webpack.dev.conf.js b/nezha-fronted/build/webpack.dev.conf.js
index 3c6ef7a3d..45b7911e6 100644
--- a/nezha-fronted/build/webpack.dev.conf.js
+++ b/nezha-fronted/build/webpack.dev.conf.js
@@ -55,6 +55,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     new webpack.NoEmitOnErrorsPlugin(),
     // https://github.com/ampedandwired/html-webpack-plugin
     new HtmlWebpackPlugin({
+      favicon: './static/favicon.ico',
       filename: 'index.html',
       template: 'index.html',
       inject: true
diff --git a/nezha-fronted/build/webpack.prod.conf.js b/nezha-fronted/build/webpack.prod.conf.js
index 37f617375..396e1f024 100644
--- a/nezha-fronted/build/webpack.prod.conf.js
+++ b/nezha-fronted/build/webpack.prod.conf.js
@@ -91,6 +91,7 @@ const webpackConfig = merge(baseWebpackConfig, {
     // you can customize output by editing /index.html
     // see https://github.com/ampedandwired/html-webpack-plugin
     new HtmlWebpackPlugin({
+      favicon: './static/favicon.ico',
       filename: config.build.index,
       template: 'index.html',
       hash: false,
diff --git a/nezha-fronted/index.html b/nezha-fronted/index.html
index 740f68da9..f6e379b09 100644
--- a/nezha-fronted/index.html
+++ b/nezha-fronted/index.html
@@ -5,7 +5,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <link rel="icon" href="data:;base64,=">
-  <link href="./static/explore-tab-logo.png" rel="icon" type="image/x-icon"/>
+  <link href="./static/favicon.ico" rel="icon" type="image/x-icon"/>
 
 
   <title>Network Zodiac</title>

From 4674054048c9c36b72fbb0b633bf3e31a0c7efe5 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Fri, 22 Apr 2022 18:02:21 +0800
Subject: [PATCH 03/25] =?UTF-8?q?=20NEZ-1830=20fix=20:=20Network=20Zodiac?=
 =?UTF-8?q?=20=E5=89=8D=E7=AB=AFlogo=E6=9B=B4=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/img/favicon.ico | Bin 0 -> 50461 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 nezha-fronted/src/assets/img/favicon.ico

diff --git a/nezha-fronted/src/assets/img/favicon.ico b/nezha-fronted/src/assets/img/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..0b402b5cefc931b8d1cc353b69e8ba38c3e706a7
GIT binary patch
literal 50461
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%0D*o`^#F*q`6t!>LQ)7+bz6GYO}50VviDZB|q
zSu=&k0~7+mpb%$*_2lVP-)!{CP~?f^$CX|o-a<b`y|K#X>J`E?lg--KwQ&m<%R=?y
z<OwS?H3+*@O_2U3Rg1Q!uWbXNSweOb%i~1kXY1;253D`JKu{*)+z<UelmARmgbqzN
zp9$+$T=UvF?C>QKXHjBngXn!5JD@g|1Ha6VjJZY69pv$#PJ{a=2ojv}V{-c5Q`l+!
z+BHuE>X@R|@1OUI;>hxSk~@SOrZLqUX2G?da_QhZv=o?w-)7neP72Hni0`C-wk-pC
zbOsXmNm0v>2IsSGI%ES|Cx<D}dT%BOdvbDqO%(VuSPT*h-yV0#EVW@qw7aVhE8ePv
zD^Q^Ebu)lv1n5KvsoUjtd^72x%mFDzntA2E0-GF=oz~YHngEt~BZc+iCG7Gv#2no`
z=&0Xc8Ys(GEmSH+EutM|g=lFSH-2uJ-zzv9ZF8IK4_T-S@xGM)1hPRMg$CzG9q#_z
zI=haO)1MS@9NIh#-d&1=`X<D@D5F0pqt+K7ldbDLFo7Cq`Av92KM!$cnfsQOBcI#*
zL?Bhm*)#x~>t}zO*Msn(%J;%z*;xuk!$)}d=7<jW3E$?|YS+=h4#`SX<uYTAr(^)f
zY{ZT=J>0_NyX{XYayV&2)1FQ_w@+8mx$yWD*eWCZ*Ko6he27fH*+s;255k5<EJK6+
zUu44IJ6?g(84Kw9yy+%;ab~M5cSCe@NVw{ODGVxNsAwk+5(RrVyH|ynG&n5J<9o_h
z_Jk3qkEyR=OxTcx@r>2pwDZ_fv%`&;7FROu25d(Z(qvZfTVg;~(vEs>CmnY<#Wm3A
z1**6zmXU%Z(8%PkL|K36j(J4MfvCL7#cuG1i`x|U<}nKe?mOdB+IZ~JQa~bIr)=jL
z?G(Lhiy%p57DqE5G3IMx{!8!X<GHXUefv^@{oJs}>p?yyX+IU?NI9zWt%G!t0kA11
zBI`TlY(-chnp`M*0sQF7y_3)<ffpZJLf!m^H%c${j}-2Z2~An_hC)3Qzb`ajOgy|a
zre<R|1axUwO1;Vb^JBrWMgv&<bO%S)YB2#PWI38vDcUyN>f*lK76gAR{N@9B`1O8H
zV>*$^`HoqdY!=>|2ImK8;15)!xHJaJ`SrM&b03C2gXg_+7uxLk<AbaF)iAh@!22*e
z!DZY~DK*~rxsu)Iu2p=xqh-c{f7jg1W%6Q*OeJTev;hZlmcN|tT;EVZgmjFu{P`wX
z&*u6Kd!f$06*bR^12R5XvWU*ig(CcUpgVwk>BF?=$%W#sJIyM8y^E@Gq_zm36qD0y
zRHSRS`sU{nrEe~=Kt7~9T4*%9egge@0c+NlO6C6H{f;nsoJK9)t_mx$@E~V(^7lrX
zdS6CI=e@j_+xdlC#I)G18Kxu|OXy)kr%TLM&$;5DEQtsgl22^k6uuG6{5*}%g0NaW
zc!#=bE<KB^l-)}mc_2hRM|elr=#cM5$g+<x;M_V(H^;|}!?YsKN+7B!_LxBEBr;wc
z-Pq`oT29v|^$sG2`N~nK=6Jp4LemA7tVkivUK%=w>xBP8>NScL*&0)XF5pelT{5e_
z(NEXwNB)MbJwj7A0}Y3-z<Jc)$x(RQ@~XMcB-=;n=esf<)F*pc5&c6%<Ze*J#8WYH
zM3}K2)Ts8a*f}PRtevcYq%0sEBw)8ge9L_xVkot#@sBpen{oMdm5?pQAT{cIOw3$t
z&R0@2F>f0R7ciBgLG%$&_0kl7*$BB!&+ZW*f;_3x<%9X$Oty6!!``RF{0?9(6R!|a
zQ8tp<gud-|z8a`4YQMy$!M@GWAd%}uM_=Npuo3&qkKAv92Y(r7@tu$84gOZK=?0C@
zdO+fz3=^6~nkb1c4w8AtAKdyOmqsFcL_o2Y>fENOVD|$P$)|UGTD3wjT(Y5BY<UMg
zZLMKWi<RNXbr<XS@h`z;sfa?E8A$WqN*EuE1VE$8MUrMuVwNMSdM6~*oWih)F#DIz
zCj(QSO}zsVQIx8B6c)L#MTLqoC^jf5_Avn#E6wUYSn1r&0}qrKzX~b{ZE6gYuqTp2
z8*Dcdz<DozY7FuirM5U=Ni-N{x3rMP8q?SScKQG;?S%(-1?Xe)`vk&<i$oG38>0r=
zc#CA`Xz^8E8R7q?_5Sl+A)Oq?9ZKgY*?@TstGnZ{3io`!g&K$Ni<#C1dqeSoWVezI
z-Q&Lme&AXLf1D=_Jsnm%A@8D5C%P@fCr$PXem$g);U$UYd<0FR$w-yX?Od?Q>&Vr=
z=o`x~)y<(a)K^!*Eswgkit%=-2KI&rGXvcYsHhYL7Tm$QIpNNY1>wt4P8WpT*x%=k
z6-`6-wp&APN%{6{U>7=rk3J<_wCH<Av@wHBiR=4*9(O<&|Hn5^UuHFpql>2g2S|Fy
z!I83k4M)#>>uk8YjwuF)1>db1;kjT7lTqC_;?MFwKH|2f)erkeV+&C6z|~#*OS!7z
z!&&#A{Lcpf2r5*oy&F;BPAPX0Pb=W(ZVetCuKVb-K@O!+Ft15(7Kx@|UW)KC9}-Zm
z5p)W;Ff$68g~W}baIgzA9EWfG5#7Vbr=zwu9AO-XHoK1~l=#3xvUx47d-}jCWYA6m
z(jfxyEs(6PDxy>N;iNn?Rm~L_ucs)nRP7t`+nS0*N)}{)!7tR-((fb%4l9{=ua0w%
z)hiQCO~&f(EiMQvUKAaQb~na18AVG}sOO1R;r4d?L3kOQn-;cf_zuppYBC@ZwWZZ@
zofv~@vU4eTxfW;G-i}jzK_2Dh@9qnQ9b<y-#04d36!|PGpay=|OP5;A&XyK(oUUNy
z;Oz7#@u`41P1u2&yf*T?;+`1IJg6LGOZr29QkU2LJ8!%Y19<fAY!zB*5lOJ-ud|Jj
zZj4f2e-6%|uk!Pq9ER%B=afC=!cay0n0$I}hZ~e@WR_U0%@mdrOeP>RrhJIg3?vok
z%NaiCfx&JlmI%e%MCpZQwr^nESHuJ)bG?-TB`EjDbV9*F{QP|PRadTGiWI@XGZ=DY
z#y*!Ln6)c5-9E`6Z1Ru+$!ww9`_Ng#Vs?VN63lSS@5(Z|&#H}-{qol2WEd7(wLJ_!
ziGqy^E@kc)M79@EMwG$o1O=zsgy<^uOZ8XmmR(O7NK&U1gDNvLRvlJ6wz<7a48jie
z%7S~Sb;vs~1CaUgj}2u~Ha}thj9w6U{zPsi808?mT0Izaiu9(Y?u77u-q4g=NAM4a
zL<e{I&B4lth-7p~iwpdWG>+&-!Z`?a^M&QR07=Ef*c+`(>|fGoHb}WDxz=Jvwdi6Z
z2^w@#yB<S`F_*3_3rQ4wYoK@4Ds+wweS(?vx?|k<kbSAMFPq4m({=WW2T=jhIlU$*
zQ-f4CDNa>kgV})U#P;+%BQV9|XyP`VXDf$n=e?IyZn5*ZSWiv6{G2|p?6~F0<TH-H
z7R%G<I1F|T-Yc0eyKBCz_P`2FtjJ^^aU8=<*S?~0@CP1I2_JrA5T{H@kiIjh=${82
z!JR&s&fl<I_L0C2mGqCAHcbzyYNdrvt6{=we`%_%gz-}3PWt5h86Ry$OH5BwEofy~
zhx<W8iYoF$ocF~GXZu<q0AuHl^}bx-x)*17KIQCg1b!Gb1l027C5AvacuPD-AV^|&
zp(*h1)0Bx(y5=Rd=vcYDvHNnz=x5u$oIo^2B99WVHc%#~ko5jdU^UK0OqaASbtuC~
z=nQdkE{zjDGvdbA^~@JPhNA^{XZNoshs(FZKpLaUEkNT^RtKP_ZF_%dQ&1C66PF%;
zD=ANIj+#UKZ}LaTy$^rZH~-^xDoGfrPjJ#?LC_R3Oo!<74Ktr#NIvX8h92rifG_nu
zpQi0}uk@1;J(fFc6b;qO%8la=%Fol6UH3Ou60s=^&=t%Unr-g?M6xwb^Rp6MEUYQ}
zs81($7)#B%Fc^K`@w)unA3na|C#Mxl6n#wz$q`>q6stm1OACyqX--Z|cf*l2u0tqR
zDn%#0XS)Zs7zmN%qEch!>AC;#<2Frj#!L}=kC?2sH+bjR+NjmT`4?!$9yrLQCfb>v
z;{9@MwwKJ_*jaw|XuStx*JS0hyZqfiqHCP+qc=Nwjs6@@-ohR`Azd8p`W1s5UCxZW
zc|hjOPvYwzj8DjOEI^*_uNi<|)z`YN%3IuSMw!}3hw6a+7Bp34BwT-Pji^J?k#y{t
z1%mvq9nBOtuIwDOo?GdhMiImfUtMFe?*{|Dyt_21p`Cv=QC$dfh5E~lrWoBR^1UDQ
z(lX4b;h$lAG9y1mJboet;ETyz7`_4Ig{#}Fm6XekaX1Ns4D8gzo|3@T>1;nEiXfzu
zpLB%nR(<amqLXYt6Fn%j(OJ!!5APOetj5Ey0@d(VGdSMs{g_#_hykxLCXU;xFN=wk
zwWHpPUKH=3M{Pr=RaR|y$z0v>oF<jDV(gES2HRaqR~M%`5n_zp<IzIXj<yLnqaoYR
zJ#0L&6RZs`3`raB>qNX#u9>&e4EHmN3?+~3GY!{*{J;-szqX`kKhIsn_t8ff2~w5z
zQyKMP$6XFVL@;%v!wA`6yrOlzBG{^yMcB#JUtObz`W@ziR3^nQg<1|YpmdvTS7<QZ
z30CjdW@5q_hG(4V=s;UsP=BIK!0D~`LjFWVo0j%M+I+)BHRt8Sa6<D+nwkU)bC0G%
zm`S7oP2tp>{M+pKo~_>Fe(|<ipy?0hey8f@xi-6ldD#JCeyon&!uS*yU^ay}VpSPm
zBZxKaOa2Cr-L?6x#1~r!;;b}Hc-eE^Tc)(wssKr(wX8d;w}g-P;Ex0-Q{=LO@o9z~
zhF%%R3HV`50DI{zwm?N-Ax5c0FU%tk>);s6X+^k*2z|;ro2Brd)C;$ZM3VT+_UUGE
zcSH&mCIQ?8Z?r!jhtpn-afb~5`V1Cw2v(O>poi-Wzm5p|eS>Qyn5$%cYR3w=S(D@t
zcu)Txzz&%rO$KPSRgg>pg?K{|3EUumJo(HjCjp`KBe~}}V~!CH+S1NknbYiZHGDL$
zWO8-)mewAYBSZvn*Q1-X6!k__YPy3N!tPl5<43J0VsF{2R$<Y*pNUf9*CtI)ge0X0
zumS7=UWCM_G_?f`xJIZm4(Y}gpmqiV?Aj>*t{DrA2C?SDT$;5GGs}n{A}zy%s6X-r
z1VpTR5wYq=`6cKA_>AKRCg7vzc!;Pf=U!th48*B*7Se`W((G>prHiJ~vpvR~PW)~n
zIZCB_G1PAaU#q$~<gqJdk7jB+$xc`@$rX5Q9pYLr?JZ)Yd>2xI!B(Ve^f-`$T;4{=
zah|U1YwWJYtnl+Z6G&#O1#(69*R+hI;%DiYjekO!yfCPtdt7y*o#@Ls)hC}Se*LwE
zo6(SO9?W2mMAnmAE!G|*v2kc!;~PV?!<9_c-2+!l*SLE5aNBU~8dnvKI(c=3S*-u{
zu;#Ci$KIOCo?RC+rxpSyqBE>tnqBUUr3Zi^ISEJ;cFhaTLh+EpXyQw;#_P@YgUQ#e
zihr7Fmn0hXJ6#jf?DO@BwWh$4@WiGXkfV(6v+%IU-7L!Pvp?04(UlBz27$JI+|W3r
z_~X>j*%H`@l7}u_sb)BFLN<$oUdTf#X0#nu;X4O=0cdoUIw6P%z9%bUf8*@k^v*B1
z=h{<!BT^`FPBSwVl$v_JipS_h;)ER^<fg8ATo{}%Lhe6~!cLmsz);}f&TD`<Ia&br
zKt4Mp1BLU`Wj|%yHp`J_tBJr!<sX%!dj`$ohNxXA<(VTr+BKm{SFLLqFgPj!THEDL
z`<@0`a(SyM>bVW~;bd_@?f{z*M(czNp(WyrNVlx}IuCQ>LHFoQq?70*TIz1YteD-;
zI@BIh8uT%(;3^V5kWd)ey8kejcJ13mx!q0za&wbP$cX^Vp!k|iaZiOqV_vUkYp!#v
zHW+7ZwZB?!P;_T9nQ7QC1tq+A>jwQBY{@${OJ?^rvc0VyR)I5;V#q(}iXS+v0yT>E
z1#<Sr>B=#Zk-7tzQ;}ho-L%;y$yE>mbQ+|_@gQ4Z(Pawtyb}?z#>y3yoKktlXdfr!
zcS^FWjc@t>aUWQ{7D*V)=Q7?we>a6!wR>`lqD<v)dzRGXx*sRF*(h|VqG7-)Rha9>
z5<BRL(P5G~*^)?UftZHn0Rezd0w&dvC#zv4KC#`)%%o}$2>MsjKxpXs3A*w|I9vTg
zb9ws{HU3iLek}`f*Z4{LHBdK>?*+@UT?!dah3z6ex`LO4d`sUy`~XetVn1UU5Bdoo
zy~#sdewp&A=u`*&`yO3Egv121mPC>M9a?N*bgKP2tF!XE_e#-}4k@_o^~I6ef`Tt9
z4$}IEeX&HdcxMJJ4slWvkvvmFA*0psUA!dg8e4V4Wp^_01^{4hHAO-0-&3c+HP(0=
zTaQ|B#XSlRe!hQ1Mei~=ZKj|(`Tje|<vU1#faKPGvPP+`@2t07-oChxhCxKJJO;*R
zP@Av^F9S(p;%+!Wg<pn!Y6XzR2`NGjqEF%klL!&b6I{&i-lLU{-GtI)LeS7c*agl>
zslZo|^{*r~6+IgB=o4&V?RlrDgN_;l%%hDHV2)}Hy%G~gQ37C~Ops&v>T~9?QJeyP
z2pJH439M{GANcydJX5{P_7azU&K!Y%jt!O-IkgWeKfj=`aZK<(adLU*jEd3f-ABfx
z`MN57OkkQtr@(Y`>Jk>+n}3Oj-YhV2bs_80fDIl2csPLTl|OPSf^A>)WRe>ns9Dnz
z3;{iR#R`odLM<&NkWDEfJ`(*Q>W9lF8r46?{rW7C{&cuOw<cS8*L2M&$8=%AnP0uo
zJ&;nT-161np(_sv503c(V<g!>_)-E<En*)N**r{t#Dm1($%G75zp@dK`-dpUZsA1Q
z^jmC%wBE;JH@q(pRNI;HP{+Wy@A6MetY2AuS?Q*ji--><fS0Y!Ra`(F#FIN56c!C8
zU}(jOA8>(&{>=A5gV9Jb&<)iX8(x7bA1lXtu@><&8+q1<(zf2+hUCoQC_2Jjo}Kg8
zt7~xy=9dElvToIV*A;Xyz;z7YFv<#{2`u}pDX{`F4;YjItr6jN-DFIagb2}_<@}9u
zn<Yst=Mv~7SY%xYlZ{IobgkE1NYUUo1Bh1|Ae-<3=&u!UXn*AC6SJ5@Yf6C>H?uJ~
zy@GOx1RG096Qs2sEc)<5ynszN4_?MHzhDXwlJ&wx3C{}J)PLUoqnADN+Wa-L_LkBO
zIkATFKqNCG>r|g(f1P;M^WY5yBiH(&h<Fe*I(jQXVFW|MVCWDgP&G@7$sBrkdbIO2
z#L4N941@>kAQMDfE<{*qrr0e>Kxa6fsBul|$7(Z^ZhzeT#PFsStDD?TQ8{Ea+QJi^
zg2o>ytOd|q4FTT720wou63gZe;P}MyZA72aNbSJ)Cm9)qO*>f`I_*$zR3JL4)rV|3
zljZpdZ|E!|p8?6La#SXDcRh0Rz)0yVxxG~VIbFnu=ZMldpIbGftN|W3bXg<%NN={%
z7yq==!}0G`r*kivD3A;9m+dzS=_nq0n$|T*)4_<d!^#c$t|(fT{_^NZ{*Jw-6o-jT
z2&)8%pNc1Cq8@Gt0qnJ=_*AKf=2YIbb573P{rf-=pQ=AC`J>5C$UMPeVIKA9vm-1+
z`wy54<eeY(liZpO<v$d{`f9^5PAQpj?FHQ32zyXpc-VcE?jN7GV6n~cS?U@?17g0B
zaRdO$%i&)a`}IJ%aO9~bG0;cw$!aR}sG>x1fxh8a#1$=+MGMA7{o;a>DjR|(vSzi}
zZRMQ9<Rjv3idqRts3b_t)!i0@3HP7gbQR&z_W2+Qcw_{FSPKB!$A48XqG~Oy_79-q
zMj6>%B?xd6jGPd=IBG{BzfQELPa4hYk?hUP$H0I;d*I~^h$dRk>r5K=+X;8nI)@yl
z#wqz6RqlgUC?jdY2OlTmEc<tuO|R+9q*1P55p|bYl0fu5El9cV!tcIN*zhjlBJ86t
zLmW|l3FOc*pU?>^?Z?Tvsu{7{OxjxxeD0%!^xUTnp2H}pMVRy90%9j-bO!_BkpcJ!
zi<e#kY*Ml4;W`7~uv@FcoUj(;yp<|@yI^n<dZGi3UoAAmm)aF<l(vaHub5Jly2-A8
zE~@E#!RfIoZw38TaGlIW5j(?{`qZ^|@sTVS5R7wgFZ=gtsl=U}SzfC+QA*aAf+q#F
zc7opp8*h{$``ZD^&f*;pBcIa%wh2XfLu6}j`<@<v(mATjdTt0Xg)BuBfK$0>eVbGa
z|D;m|6Zrvf@f!O5;Yq0I^!$9Hr@=cx%J^Dtzt7BWYglEDlmP}O=DuHY?sqMtj<>%$
z_)>lp3eCM<5eJ%5npof2I})lOJ+_<t^l<-OVgr&ujfKn#tq?|a9>p{p9nG{kAx_Nn
zOeR%iPMm#<4AYQRpNi3qr!>12m*sn9)E-SLF5OXU|E~o_I+%YL0c%_KO-xajIG579
zOP@U3ryrAT?8<t2*w_5Ujt2W0A`}TW4}m^g+A}ywou;4tUMGtu#Kv&_i~Bch#dGc8
zU&_7xf87piZ~3Sa#x8pa76=q4+Ob<bKM%ni8vyc&ktQHLBqm^5Af(9%AuITD1A@5p
zEk~{=F86rOkIO6@;Pk2C%-Xc-Icqmz7go~?w7xgAKd5|~g6zWIs74pW%RDXUOIH+l
zWpvbg(1zfnV-6jc<enwI0dBY%OO~1O{*fIIcyi&XR@HN3o&50ug*hH_50EYQ{F(Rh
zuO1<~H)uLWB;DtZ@hV{UvN|;HbV21>mrwfo{SIP9asWNWFWdzV!>M9-`Rn$1)hC7u
zW~T);zZp5fwAEF%Fsle@CJqyWGw8|YS7zdv77-(cw3GRzH}m8{nvJt(ZeT3^y-LAi
z^zn*iK#pW){I0mhZ^xI#T@|W>fLo%^AEl`U7g*P3uz%`QGc{@FHs4;4aN<GulsA-l
z8Y;?{z+O8BW9s_NJg%pfQGs^m$3VK_{gdm46UOjQ*A=}Dam4@HfeZEX`7$TCx;T=N
zfU)f+mSs@0qN$c8G>PUO#F%EJ6l$%}7QKql2U2+&UU4<_p@w5>q2huH3?~}Z_8dyT
zN5Enh3}vvcT;)cf18F~NSDG_HtbL}n;;>F$*%Y^SL%Z@(c`qqqb5)(}ahtZP@9F&9
zekR7V#_K4U#za1$b;0Fo_abCI5Hif+vt2BUn7xv?a5-c!rLUt;WK%cCUg`>?PNP<o
zBb;{Wdme65N*W{pZz6-IX<O!c=kzVx?Wijiw-q-_6KAgrRyQz^>7C6&6r>+8qoKA&
z#c^&OOnuvWPJemf^B+A>^@m;${Dk^C?zCTNk?(we{{X(?OWHcw4p{oCo%M2%Ssh0i
z6pf&lI8#WT9|Lx;|1xge!lYD<gx6&w28+Tb%hD`MfRoH$&*&^`dfmTZg&PK9V087A
z?ITheT%j3kg5{}IB8{k{rtuF?`y<AO``Sz%88YhD9~hfk>KY|z9jO`TIxoySn+eN0
z0WpGvJK+|tOn(f=-?jgf)>NUHydjR!Vt1}@B4eBYXEH=lm!>lwpY=_|iiS%Z7P192
zvKuZCm=UjTzaK>*5~)z-E-XD_c?bNqKTPJ&s>8CD7PsZjC_5>BR<d!V3{`ugMvPE;
zEkE-5A>;m)wvi^yM#u~~eHZI4dIeO3!;wQ;RUGTZJp8#u@1*BosLR0ZXyd$ZY~LPM
zo+&lirBk~IG~~>4jwQO~>{m2$-FF}Ujx6lJN`W-uH@HG0y;xpKt1DXeMxZ}_`rs*;
z?h_w*Y)OX&`-Z+u<@8S^WPRvH1*>irVxT>TdqP*sOpJCXC4=say39nhL;f|RLK$4V
z<^ft6lro#R2GbZ12|o>0U){nnJYTOnxm=Mt(UOs*7VZ7^Vn!?-7>jwr;3$(>iSr2t
zE}DiRcY>^Z^D@tis1rD8*pHw8n#=E`ASTS^212Vw7E<Uj#_fLQVdtzG`Jv3>CPALV
zNi$7z^~n6d8VsFe7%Sz3No2jZ;&a-g^G(gPs$pI1AGkpc*ehlL6>_&}r+S=NKmY!1
zF!8y{E)&#646br-cdD(4vWPuxQB$G^L0cr22h98>>JCxX?F(C^;)}ZF`57RVK%X3O
zMck;VV+=`b%9%gqA;g1;MHV>m9flI)(DKcJjkDH!bBI;*_lb;%4@4lW-X_n)iSJQ|
zuy{=KH_6PnzvEEs4dBliAji;~_RcLHdiT~h>E7DwajX^>?8GKS<`B=qWyyvq(o#-)
zwprxk3QityI|<YnS}D8BA60`HpK%ujxBQvZARDlHCNZfvpkKCN?47TQOv}-W?FzAE
z;|h9)`>Sh6&qv^^;vmWiK=vU$FP3YHiiXW;@~9T9Fn3Bb?Kpz%)7OC$;4~{-QaNv0
z^hGa|nkOP(bVsS*f3oa1SpeDEk{M3+4|>w~$qtr5*;tF7kUHGIn#w?-7=t%PYVS1Y
zELO0fI}Qg3zrFXnJ@wD6Qq@_@3t&FfV_G{@KmX)vmLeDTvmvY~jVva%AaO#|V3R@9
zW~{s`2!fcD`dAF4TvR^4MWiDo60sKqTAIWyvHB$>68UBv^C@AMdTK=UXg3us^;;%F
z45F3(s+58wBe0=-cBssm>ZTFoo<0baiy3JEf7%*eo_}1C)bL$jty6m)NM^iy&jm!3
zM<2<$gC|QY#-nId9bTFvr}$$w{Fh>CBxo^d=J-HVorIinj}~&BP*0!o7{0#L*<Uxy
zzQy3nyX5KeH+gv`yV@J^G5^~!u7!lPq`vrl<2>Ua1gT&HnFY=<8MVK6EBLiGvw@Iq
z=LLgsvnbSRD)Z}cpZo&lU0AHpzej(1IWJ1F@Ue`57_7&l{_`T6;B$9)8C=5sbvDz;
zIE}@Ys5}*j)Xkkd&!lst7QL-Di(odEIhS2)a|df(I8e3gf!c-fkkVHxy6=(f7!(1&
zzjD13cZ($dRisc^cqs<>FOCdwLUL?94Zfs`9Qmz|NJ!;K3}baIG&9)YPI7NF_l}2x
zZ((yPG$%R5J=|i7pZF`6VodAqSBFLt%wL7j{V%o}VXr3!_o}{=@8p*Yf`v&e{2S#s
z!SCO>{z_K=xMq&32i|peC8@-vzi^Jck0Aksa39Ue;C)(l%fFmhm<enOt=n_fFZ`H%
z>(aq6BM-_`YI5asu$wVEJChcL1-g?;GFYXEj?BqA%H1IO3OU|^G5O4W`YU!-QJQeB
zCoi+CQ};^JXZ-Tz@+G0&;`$UzHMdm;Xt&q4Xqqe5GUiTG=t)e#IiuQS6_d0`dI$7p
z*IdSK>8vxc8ZM**P961U$JVH&;KKl7NvZ%wo7V$-_m;iDjdB*G%6@Y<x{7N@%G6tk
zdqTnV@sTl`dnY2sxE14JLi(!JDZb7?_qx#xu%{A;qUAnIbx?d81N&no`8<?5g}O{9
z=EM%+#2Up{l?;Q@BR#{=TB_l}3&n1@;g%xe4LG&MbQ?o=$=k0M;8xPMwnv>!FLCL=
z1XjwV%KB8Kw5hih{TNs$O23H2?D;=ch*SjgP-}=upM`xh7geCT^`gccB<6&45r?>C
z$#Z*5u0ob8=#qpUYv(!EGu#6O(BjAhdVL}lKu|xgNGh1;orIaJPqeda`}-k0DgWZJ
za*wD$dP*dzPxTiH*Vs8FU=gB-p2<+20=GGpNu$4nvU-<3qq~X9_xMNkyKvp*yIQV<
z0Lu(6I6!w%g4ko(-W{F<>@qs6w>;tMHX67$jq|~`+^!uE{w83DKd_VdD)NCkSGYsB
z{m0!m^gUO!Z=@D?@;bFyh2W%bj*>L~dI53;SPP`sQV7KT8<k{;p-*cFmO~MJ3;u}Z
zeqCwK6(m8XR7He_4n#g)k)mmFO+u>=(67YIR#rVUXw4_+*?P**9Y0{S+Hif~YFGV?
zla}exb5f=Wylhv2GzF_|^e`DfPM(frw9!5jDtgbD06l3jW+Y97+c4+n0mMAsBC6LE
z7`r2TPH@k+eld+)p$G6wp71xwVX#CshMxT4K_hjOut?1%(~BoY^1uHAD3tEDdJVW=
z)-hZ7u_zKgD@V0;qg?dUzhkxD6y6dG>qxz6I^wXZI*Lprm14wjvs1%rMt_|C23D_(
zN5&QXM|x(rF_VG9YVDI1W8#qT?dfGyQOo|Q?#s-uX{a|cB6%=x^4xYiBK=`aEb?z9
zI2u&TdP)0^K2K|Ari+Tk;S%wpa~}B6RXRr_pEfqFFoy`Ys5~XV3k6xb&q{mclA6<7
z?_A4|6tqT{gv~!l#7^KK3&+5uoq^iZ^pV+dcU4j*uCbJV6T5<h=?hSm1km=4l>RT{
z(4Q0AhIYZ-?wbVNz3Z_;v12pCd>$0TxNxWcqv<RBqUye{VHjlSp$3o|x&}eIr9rx+
zyOHjOA%;$+BnKpv9=fC(1QZ3NQ$i_8rQUhI@8|aq?78=xJNxXt_FC&;ON-~yUW+rZ
zt10$|V($JMB}ost-YOb7nPp-v{!{$If^^d`UJCOw`*@z8PmJ<rl{g*G+DqZiU*j8H
zGc8P%{D9qL_*AZBo4bh}v|)Nhu6Ni#IBa)`XW`V<9<g$sVpR5)j(ojuSFRQdt(QB{
zl`kyKCLjLTx0u%*{lw(Sk0|4=`VzOsgNuG?+UC&pUB5!Azc0j7gY!?qxWAUPhg`FH
zk9>L#IWGrQ)F{D7Zit>yZFb(*Pkbo%U^Z!AeOX-K(yliMyADH-Lr)>*P3ne~8moOG
zyClOfaSlKHy~{_@jKt+EU9Kk+W4X9CKa1j!y4nf`XZkyFcFKoC%D>^x84T)InDNvp
z_1fchOq6avTu#l=5Hg93B=Ogf<9IwgrP2wn1(~`{Z=P#gSPvK<Et3^Kk}_=PvNM{H
z`16HqKcp`PyKZ}9pcD*l6A{)HJ)r5Tp`6v#cjOYRfIBzy{K2Bo=R^?sW(Kk%>L0-w
zNi||Ps*G=M?SM=Oj4ctbwT3*E{m|{=Yrvs$<003AXGiv}=U+LPI=+u<bf1OS{gZNy
z4RWlWyl|Pv96ozT4F+kWj?RW!N~Pi9W~)!>)pdV%A>oLzVdAWXCK+tb)qiilUDN^c
zeFT)CYas1AlLjKife9X-(F*KT;=f`G-f05Hf~dfdgMIpoiy!M6MRn|SpLyMn06c2_
z*W<=MMo9iivs}qMycXMf%#!h&+jlC1)|)wKzT%6-3o5fr_Q~Oyeb8A%r~W3B5;BxT
z=B|4k1y#j%_yarA7`<a`&R%v2&KO8ygRFkJkLNt9tVEW(hhzk2H;WZ2)60ib2&i(!
zNX#U{3q$M-wgWhMR*f1hT*pl~#YK8m82ch<>HN;W`Hs*%s{35TNt$~3DIp2KeX^(j
zeyS9JNepY;D{Jf|3fWk%^Nzp$xw$WmM@SA<Tc@hzXSXWuc0=1ejox^}CFRn|5yM_8
ze_t_z;zOR!N6r7b_Z>Rx#doe(r-|X!2G`zZei>C(blv+^<hZ7~v&G8LwOdCO83=`+
z?tUN`;<<=6n@dWW(OI$Syx^y9iwY$xsE^6k4xuUg_}8WEUU8av;|&trFc>wnbe?AC
zU1?iTD#g+9Fo}}Zdig7SE24Mv+9~cqxH&)GO!Ox`$Wm<{4H{r!hDO+xdTEBDGFs(L
z=(MY1>snSzM6Zvw;t^~sbEBn;ycIQ0)3r*XLZ|(*lo^)83xgTcx`klmhr$;)pQ#k*
zlSB#*IU*QpXTGEnxSb81kOl||eqB*#_3j_l-WK^JS!x4rs8KQEDI=>afB&A0U23JH
z{z#0EE7wRxFX0`g;U;<4fbkh^BDQXU<_j5i**B46HjF`xP>16ckkrhZ9i~oG=Il$q
zMzc`H`bgz6{)`tLbbq}5Rff9e#mh{*9>I#l6|F4NrT!4XTJ?I(_p5H*(XeYAxjJlP
zyqd!!>eWG6?vbB~anm45atAP>FP2q9f%^Ox%-`J;pW_f9et47C%)_5ll*;^6x&I%D
z@iXZId}yMd9J}IJhTdJ1&1;l+vdkDL_e+C`SyMMcbLVIhFWYQ+_o?N^D>Omg=xDEf
zTwy7iVgYvISxsg@z2%z1|LP&c=#Q~`I7nNjwqwUcq6mVL`rD$9Y*j}k&(Cn&ENS35
zZFk`biueLw-K|`wcE~G18$t1DTUeKVI@;@kUioi}I_3i_{r`l^4gt^}1O(sAn0=`^
zT03!xT3n|Gi#Kv9N~UGj28NSYt7Wt-RI`)zvA@09?8OX^MpIs<LpF4rw7)!RGEvSb
z%D$RM3(Ca+@wj}oGg)S-#DF(g|HMe~J4Pm3dce=Ig`!Bbu0+1r(<nG-&xM@86iRg4
z`pfrTrCScSsq)0#qKB`~ZEr28!uxTYNSN1i<IVZKj7RR675BRZZSwZ?4b|7vpA6oF
zFonIo)!(JXHM9bT%3*90-Tjz7mcBG-bRQa1+=17kHMUmuXU+4D+>?IwP@4?Q$yH~v
zW~Fy8d2&v*C)%24SZtnikpF-+I{}?Sc;tUxcR7>1#r#|fscpi+wlS64+_t^`OBQhA
z8XF^wP+9LUWq&7O1uRX)u+egIOHlCU7htBXg>=jZS2|DR8>u`3`Bez~4`+MoT~ZS}
zTe-cgb6N)esU{42USmRKQlrmh7u=yyXZ{#lcVv;X#JUZlcv=E~iA??*Pf<N(hfPw7
z)-h<ItAS^D);({-3Kv{D=9i@tf~K|ChDz_xSa&kFycP7^qiH{`zpJG0*I)nophK!p
zlgyW``x?kmd+mdy$;k-W8PT2m(-JY1RB|~c*Q-l@TV<M2n9xO2RQare@&}=aBd|0L
zV@u}dSAIn0KN-7tk3V87`Q}<CzjAnJ(mzf8bzd7|%J57xj|35t4@m67_@_vd?bRds
zNC-`Z-)*$X)w>&}<34<B@Eg~A06LijMHIO)=@izyOnX!MA~mM5hJ{&M6$rc2=j^(!
z_Mjt8jpN~WDtwEcKgA<H5k_rvzHoh=owp42Ih2+`57qu)$N#EMgSY!llC<AMjiZl=
zhJQ;%NXD(z%w`zr+BUn>(b4X(eD4IiVz=yY%T_XmW?xV=eku+LIX~f1Lv;9y=lPPI
z5*+JC>D}?zl7HEklstbt!Tema|EoZVC;w~Y>ig!_$Z;FlNM<Vuzv-ng97Jh3L4n<3
z(gfnvR>H_s|KjpPWdZSrj}LtJMn``ZW2&D6&g5n2g+%noceIXNHUuTMKgt(CP0o*6
z)^Dl)Fhdq~PUeLW7;a$ZgZ+0ll+s2K(jb;Jzn-mB3`E`oaU$C_iOFmx!E`ou1flw!
zpZ)-b<Cpcb?3=0Vd*nfcRyMwnR=n8jY3yWpF-XByVrWVfXEKV`<?*A_t|DyTD3Ke*
z2ju7=1W^C-500g%Bq~}TMUOw4yciMTUBYt83|%_D)9c&sqi5omljEto=D(P&(6xD;
zp*c>H;C9d+A#IlOy>^ws1(KYWXqmBN{y~r8N*(qeF<Hkw-J;U}^f=^Wy1&DA*9k?C
zb;z2jXEoDd!&6MgS&EMW&r`>Sr{M|^&L=a7>}kv0t{mgCS(&^5`)UMsB*>OA8J-9-
z`dO*3|4X6J>9#Ri7mr@_Y^|%_`KV2-uS;ab5=~7lq{A_<rO;($jkY<m43qkcxCn@g
zRNIb+=c2X=@s@lQ?NZ+}sYi7Xe@@*tlUZN829Jk4&$iu`eGcd#xp6Y2EnlG+tg$v;
z++caZjw4!9;%K9jF>Cg=s-4p}s(ZuIWWF+ra)R`gtjx;ySy1qns>wHl52bIr=x=zv
z)Q#9G+|(nX5%`!tnm9Y72g;LWnn`4SV|%o$m;Hm1CU7a+WF%n~hze^B$>lkIPTp08
zt&ofBSf$r{^@~ZpT>C6LVP|~EXcd=#T*NY&6=)`Pr1|B;B<22d)t2ynPS%VFZik~K
zjno!~_mM^!3<SjJww@*uB)Ow`caCZ9WK6ftigVie>Q{nM-&fYKaZK*bnD@0H&K-UF
zrF-AoI8G6Hd#69f4g8>ZEsqm;xUGF@jdGUG#7mNQj(tpy(?Nr;3#t?@rN!nS62^vq
ze>j{8762$hJ(-`0njW|XF@~{XJ6vaF(#m*a66dhnWK4TKRp7GW-jTIJzJi^N%j}}~
z%1My%4Qx}c-6@dPVy;@J9B<0V@3ggWOAFb;pxc0i4XJ|`@daC;O(Z<oIYX73VGaP@
zY^Qtk7Qb6Srzjp#5!tm}k;G&j2K~KA0Vh9v$E&m<3V4H&WSml5i8xvwJ>mL?cgDQq
z;gw&yL{XCsZsJjycxy6nhEuaK-NDF=mTJczzW8mx+GGj?Ev%R!@$U+T(9)p~6}A<h
z%=ab~Nf!LeVd~q;sz0Qz>D+)E#ls>AW(tgRNB94c?@Lpz4wjM*x`=1bm*YON_ylvV
zqg{=X`V<2r?(MnKrltMyQb#pImJ6Vx7~Z7#7=z!P-~M}Xn#v@mfNhq1LyW0r=S3n9
zN0)&K(d#c?SN~FvH`4eyx4tp(uPVMjU(Z}(KE6Un6AcSQ^2^B>k*63OsVNT*=jFa7
zOILG9<;JSuMtK@SmG@Y=!X0U1$WpUF>!N<#$IfOlTGPcy+w_Wo?WaVyQ@7;v^;X}<
z-kp!yiT#uBr$gH?K)pd5`n#_*U#AW+QL?AoPQHWzL8_8Jy*oHIzE(9WI$u&-J7aFF
zoy*EhEuM2Poji)R=q$iI`hC$zvYPaEqPqF&4Z&uw0RO+n(*I1cpl0#sIE8xZl&l^h
zgA@1gA3k?GJHWC6Zqz>BcFJl24x=uVLi=dT4gB3fAt=nrbVmf~!oaHdos|+!yp0u&
z!%gf^gtz3S1PoR8s@5rbzjc@l#|Jo=I9DTly_HLjro{n~tKNufe^yAkyMK!TGC`w?
zP9SVAE<nLR=7x=VBMP4T<)&Amr82`=`bd|jn~8dzsqkM*;Uk+Qk1Er<_*GSzR1Y0e
z&kj9o60jb*{vk^i3>>1>={1l)O}o;UWn?!SMl%HXbO1Dd-91&d=&YCWF1`$c?m*V(
z-U_&hr3-0}<MYOSs_v;Mdp*o0^y}(`<amZ+nXt_f$OP~EezU%Jsck${#z?ymAcZ61
z$qJDptJ7(HgOM5~k3}FGl(szEVBKE?M!FWHMYHYulyP)`Z!|)!`fjBN+2pc*-#{pE
z4}O)dUA>O+w0p%2$FKnqwXGwYD@5vESDbqr*S2-EM>79MNal!XQ@g`sgzeLo=~H=x
z2CDEVV$#)K*rB{L(CS!j7@N%*BkMTgPDgdyR%a|b_rxygK;jBs5s_G<l<Q$yHv>|@
z!<^JzpOKrRee=ZRlUL*p=m)Q|4JHovOsOOdQ;0y2A#H;^i-aMlr%cL^`JT38pSD{S
z_Pi4`tMiQ&`6F^(-*=yu$aMKz8of#1MbbM$wSy4a$?X>GzJ86ZM2y6j7H@+Q*qC_+
z{x*yq{opMSQ4TXo#ZlaxPK0Mt78#9{amO#9il>F>3WI$An#G%DNusPab2xUc7mYNP
zde<zO*_RA$#DwX|nXQ=Njstgb&kU)P6%@1HV^z{9d$K?>b^5c6SenapA1H*+<+Vd*
zRCl$&zkbHU!^kOGX0)-tGx@&0uzR#bGs&MR575Px`$p!rKF7w5zT;8o`kL72{oglh
zguL(v{dSU&IfFI2t95$C)C>W}r({hFQXPmAY~{HfL^8;+yq~)<1m<qlzYo!TYx8ff
z)jkEoElE-dW98%8+KVFmxNAM9KR4!E(}fY`+r5?v>tlfm$$b(aC|B5TeRS!^mJ=WS
z<ENT8aGats%bpdY9Py%4L<(0-+yUcI`H7}!?fhGX*f!Zl4ZihrVoa}@qPT=l>)V!T
z(w8xw>}xMJ#EXOVs%XSZ1k%P<bjves?5Qvx!Blm@vl62Xq(daGb?MkiHAAH#x;|14
zRrva^X@=-?`f!a$M%&PCZzSOB-$m7S2KtfsTe%;min=EzW@as=qYi(et3$mfk-n<V
z)rx?Eg%I|-^eiJdpLv_Cc%h`Cd>*G6--dc)Lo&fj$s`^D;P09bc}o2S<elK@$gue~
z@~>keuZE76^JJRB%tC*?m9PPl%gMN{_hGh7#{zNwi<K+a{*O!FNN750Ah(v>OwFb#
zm6gEH$l;CzDN1?$CgDN0Tq*HpSoF#C8>(e5Mg2k3kK>N^XhSZzmu3$hSMtkbvu{cU
zOWCfSqF#tO$adWvMW9lvX6JE2=FP?*`RUz~Of!l^eTc~#XsSRuy2tZTiyE9x+UK~D
zA^MXP^;|QNmt;6lkGk8KM5&J$2oCAT!s5MpU#)u?`N4iYQ9+W~6qY&{KfK90bHTzp
zJ9o@rXe7uGQ9H)1zy?WFR}}kb9f#DsdITCj%jOhtA5trE-lhCs`#E&6>PG(h{%uU#
zfo<Cg1v6M0K&^HlH03Eu&D0U~nOal!R1olmOgyAecdx9ilgK!&s6d~yPvk}=%;R4P
zH3X>w83uJH!NX{)4RV4M4Z1@F?kLv>{zgyZS`t1AA$c;sH~;#J^%(M#o*G@r_EisN
z7ODB;<fcABxE5>*qR-Jy%Zv$8{IPPgmlMmiUOVmYE@5sjcf2Z-`#3@I&V)zWI%10N
zR5IefTRD9D^C*hlRJt}_^gKU)rCRZ_KZP2z1>CO7<EJ@a(OA*-UY3!@Q8dK}G`Z>}
z@UF&_+_RAj^Aj1e8J81EZlpejRs)z4%i9kFOWRH54a(Idw=M%CR@pOWhaFjee<+B(
zN>g}7uHkla4)5slMo*>C1_V`yGQ&cXrUm?kY%&F{lV0K|j9<;F?1Zf|p2}~>US388
z+oB>AwY8gQ(WX1L8MuX8A3=(Z4_j%T?&b^uweO9&j@<*ZR91SG^g`zINXDYzxZ8~@
zuYP9NIUA?oRrm!%F5bptyLYp`bRMNUC)!8SQ7|)1<P}RLf7wR+EwEhQTaP)sOO_D^
z4iyr5=uTmG@O;g#m0S$T+yR}&^-mCJn;b1ZvJ{N(Me!;@pMXHL<$pN%;XhLFhNxYS
zJ){1xli)A*tO|vr4aV4gsrJ>Hj2&VH09oS$RFSkG?WGeT@_!*urF7yVg8K)wHoH4r
zyg$&6+dMyNV<Sn@%0Q^pUH~!_-ewWeVUnwo;bW!LK=5hW^x6l<hX8&HZs5V$LJ1;U
z1Hl$*3##-6bs;da%wEmuOP3z58!QxzmhP9tJd@^@tyB;uL*2yAta_t~=~N)Inu}{e
z&Vq$UbfA|*Oz-W@cp!9~++Cb3$(-r@V#xtUV@+nnAZ<Xca=h8pm3B+>D=;s-ZRwb&
zHXR&N>~|a1%}UDj09#@Jg2@_Mw!<EL4Wca2BOk3@BJ>MecNT*_)*Nn58L9FS5u2x;
zYR6Uc0ZJHUf)slclhy`HI6c+*1`NH{eo)ef&{X#NBl+p1HADl3oXsS&`4##aGgpaF
z_uO=HA;lAPnoJO62jb7Xdi(JKbCvp~M8fE_fg;0vG>NAI(*L*ljt7bNp@(`@mIcyV
z6QF!2Ngm%7;K79dQ$$LCmn#|G3F0{JOV|fP-=f2T4!ec`Ihr*{UWcurfwvZ>^NftZ
zB46Gq5l%Z7#oU`F*BQ{FW~|8x@f_KurKAX#qT&#@wZ*Di`Mybl^li%hbL(y;TyrB_
zCA8v_e0@!Mwy{gzDZN2#NWwNe#|Z6m+C@Xu$w;myS>cuE+lIT%Uyde83Af6Wr;lm}
z#8puZ5T9-`wv-%dGi{m!pPe~-|NITh03B!lCwc(HZlP<nuXvo@*D)0m=WsI7Auk(i
z7CUv&D7Txl@mz(tFh>w3KZ-+a1lEV<@E)ZQHnZ|){d2u+TJQe%<{i0&_{n6oMhsUH
zwZt0q&(#s=<5U$t01fI=ClcpU()E@sRyQ9^VQFrFM-vdN=sm}cRHmR|@<4D1GuCLj
z1NY0u)R0MOx*FU8N2K3n?l`6oB5V_aiF=prUa0DhbSMlIgXWP?pn8d`lgEc&zy2?j
zL#GK0`qtBd3%kTHkU4Z?r6;q_&uUZ3Q|&*R-ca&t(wO(z@Tp(}>kDM#cng*5@8l-A
zUX26{`(c8Z<!o-iiH`pU^TVPhr2jXuBD-gNK!PIMwmS+LDK3zO)M*gsB{X4~v<2QN
z$V@Gr>jhU8?Ku_)T_X5^SH`GSesGh2Z6!lr@eTsl&;h6~gCT32gb0HV_Va8h5S=|k
z@x|=AqS7m6-8-eb!#4HUm-(}>AM{`Sm15qAm+3_n<6ly7ZS9>s{F|h`ObV8bN-eH>
z<0gD))c7FFgsdBm(w4z#izgEs>KclQI+nOKGMaV3DZwQ*F*M!+EZ96l<G65mSYk=%
zsIt@9GF4*dR~>?>;>`i;aqXQPqYt?~U4$|I%Kw2O$?$bhLA`G`_2-F0h!;~_16u4v
zD?e%q`<F2uK3-GtLrtzLB;4tZF(2~=GhnM#Ls?d9MZw{=E$p{&ab4`-+Rw$<+X^$L
z2qssC&p6<^Nl;7@hCzR{d?w+86KFM(*eIAX2cscDF=^AL78)Z!M8GO}%6W~6rmCug
z!2u^LczNxJ*tfX$DuA9?pF>_EMSrjy;s)<;6D>%Nd=iZ%$wKEo9{cycTeV>v4NF#A
z94cjd=YLg?oQNGPO60}(`2$y4y!{PR%%6mGNw4k0*UV4{L1|^J`C@!UwRd-*sp9Pc
zQ`*|>lKtJc+KndN8bdt4^+cspV!JrWfZr~gX1VBK5RB3G7!BCheRtHp;AKq+SBbi3
zwcoSxmP;Z<X?%O2Y77P|EMMyZLY(~}<l5byWAhWYZPyKH#|^77&%+K808J83gu?Mg
z8=b~Q|3uoF4Ok!%$KFgao^`V@<yg`?!LlG4mcUtK8*LB^&We0#5wYsZOK;#EjkFPi
z<s++k*V`Jo0?f;@mwO_wnc(u@z9sGdZT^0A;p*WqcS4o3AN;2+CdBp6yn8AEtLa|(
zr%`q})g<0)dNzQ+XC>Ylv0cX^q@6xKE4?+mqFFf@-E~qEn(jNENhtdEYfwib!5@fK
zwHdvAJ>!S&iE{QEjo=?VkM8QXm(3=lVa;$Ji0szqMu0Lr^(8&VAo48}Sh6ICT6=GP
zmEr~&P0BGCh9Ahx;RTB$;UK^)5k!rF#wKuwB+LfbAVbn-@d%ZKA5Behr!WH4mI-cr
z{l`{OyLP{1^!6SF7Z%k$W<X>KLXG0rN3pS<U_TSVh-_5^U36iAhnc7%nZSJlrzo{f
ziZ8M+^PgrH`Kg^z<)DSUoC@Vlki>GRlJ-?-y+Ewl0B9!-L(JzP(j<)cF<Y^1pQx}M
zxo<&!B!d>%XjWwiuv;d>2SClV+Vih7FslV<ywO|ga8hY94Z$}bteIjltt{_Z@S`Qd
z$uuFlo&j-0_e~wFvzQlwWQ%dpl1w+oF+wG~(tne7B;w>~6mI}T4u_W?`^T4<{s_YK
z!X4)nG!o{-1t8`c1S+z#-idzaJ-Dx+bom(ZzKp-!M@fbe_*?s*(w1#AYom~73pj#y
znJ1%bZAlr$(?c&>0YkHqQ{jyed<-cG-gL7lQEWE^t?yYq@|Bs7728_>S$&1Is!cy7
zv$g?9+iu!H=1AUGpTBxgAGd!Wv+(r1y@)iDx^42P$d7d>t;+$3r`)G23NG6n!6!0s
z;-TwIioljxN_a<3WVp#QH(Pl+vhs!`{ux@cHqr}^4FJ9XbVGiAAO8B|OY0L{`BV+M
zy^9U@T-K^YxWh*mlnis%a8yHPfn4=LwttHeOTm@yKrTW55EH?oam7<mJatI8;t%nN
zr|rU!2b^bA9L#GY$E5!yIJXLA8xcNw?F$kaoyy<Ps;S@7kg|pyauY{YpBAICuNBM!
zxYo0-C=jME<Rcg`IP=KQ6B9vX^xl2e`2pb78kPvN`cY2FF8HSfjHAXI&&me~VniMX
zR~ky30|dDQ8PyGw6u+v7^1tnd{wZ(NrgX9#87<@k9E0M~Bras5_tU?of}IN&UF4(v
z1#!I_0rgxLj_jOR{yX~C&y3>G7On!Cp_Pj+$`<Kp7xNaD{kox2jk3abFK3x40v%?V
zjOm$?PtmdgHw^`tdr8EBj33zzop@B0`~0v?U#{Qn;I~lu=jNWKN_~#N;J+)y9;-iy
zMT!2(u~g3T=N)uX=oWtTwqxsYK4@W13WIga4PS1hU`W~5SJ-YnlJ9faKO^aTOtcNY
zth4>JG^Nc{_(VJb2IB`IwX=<Ut#hSRvUkXz8U=r)aB?*qwZR-SWvqKUjM$BV=XUI|
z+qK+;A#Ih~3Gxi?eUSWEq-@9Tp&1HZ3e)gYhvyw&q?I22uT`>`pNFL}yPXyGBI4jm
zs3S}*Aj^DCYS)C`m60sT>de8piaEXJPEd@#hvGwC{QA(}%N!t=0EhK>8H<K;H0h`}
z6{aCDkG$0+cOa6+s8cC2U`6WF=!+bolTL1`a;}~2igLN^+Y}D8K6`#J9c~(L26QqW
zV#%GiZTHOWY7vOaO+>fe=@jvL)ykg7HXj?cbByc+xkK(Kx5)Ek=6={jk{9d6Z!~d>
zhs)jQ$1@9>X}5ynyZn3A`<sq&$uWkm(X_z;tSsuxh9!#^jHOo&+FM3M=u;3r#_`)R
z(l~|ajh>Ut&VZM8=h)ILDtsKjL3v!U0nMn40;Ts3%QsU!a2b6+QxmN}&a<-5w#Y+w
z!HPi&Jx0MVVUZ+b3GmLL0n#5lkRi^MFc@rVjgKAjVAzNDQiks|{f}K>r@WCYP&p^E
zlkywE+RojZ1}P*B@@<&dJHme|TG(l<Zpx%Z`7M{`IiQCT`Df7AKM8TM?AvC9#9}@p
zY?c&X+AV_dq!qPuF@x2BL+loA2!$;MC(qhQLa-OKxr`p9Zjl~EaG#`5NZz#c1Q%lx
z4_!9bc~!`L*YerGX&q+T_U9T($cW)9$d*U>kmF-2La2SvmA%BH>T-Snwz&FG+D7*S
z1F^mX#=wwymjw=a^Y9SbHHZ|zk!gNS;9W76i06eDkc9BGVlfWkKGXR2&EB1rUOd1u
z7&um7Nu8rdWH<82`tIzp`r<<&w4e0cvmY+YzLGFHiFd<h9VAL0y{V%>jH&*i%4g(T
zW0&gA1quU4iF8CIC9`pghd|V*Vg`i#LU$#!e(Y1f=~sDK%JIg=#|jU66+`~O@18J$
zZWwVu^3vf?7jY7>3uE9D5d4NlQ<y6Q{-!sV0xLrjLAel`0ms1#fUKx#t$r^jC(&O=
zvvnbS8_ba-Z8Gh6Kcz0RkRw#N1wPe#>Gi{{eLE<q(gqbk&OAwR$-BV_T#3Xm-Va^T
zXHCNPK+xWPI9q?i2)}0}Y*L*M>!Vvf;{k>XX`?{vBREgGUueH$g|M-?9RN#)`ICbZ
zO16)a6lLIz#NQHPqKDC$Hv?~z7OKX|fG_nP);ApP-~LGs1P!IwBi6nC9ayBD@E;$_
zlqu=l)gaKXjJ<~7L3NiF2SJc}X8<8ht;Tnrbfb!lB9Te-uHMh`|AT^RmgvNyX%2|v
zolEKw8I3hOT&%0cw+V~*Q|jGCnur^6p2U>M&#VK8S-S^OzMy{G#C2gU&qY*O6c{`q
z?!orIr$R7)OsBFdxYEW0d{|V%E8gSrcUrL!0v`9r{W^T5SEU`c?|kcqab)nicr~eO
zHg$E0aV5d$@NunH_1nZy%_?^S5<6c*_%#&O^T32`IA?R}+&;nmYt&B5`5k7swaFVL
z7EI=TChXn3Yoi23_ek6&SdTo#Y*h;sO;5AuN^e$WE){-dEYit--*kzwX49rMHu}p1
zo&E8O(N14C`&}UedJ_P9%;mAW?q5LuX1PQL^lIELK=6x~S}T;Jc+pF!b*ADfivASb
z894bJ@w0Bl9}J_RD0GRprogU1Ki)>S;0VN%lbID!`NIA2Ew|!4eu7uKs8gOVy^u>6
zpL^-m<Bwa?K+Z$v$ExFZK{zLo(5UWf8HI0DSqhjWtchnpmJvI9ksmeru1pG;Z(ZwF
z?>$I`^X){&+44P|_!8WY<6kCkUMXPfV0ygg@Rrsj0k4S(tX|ezGT#LHUekJ1+%8Cc
zFD9OvI;pBUskeNr`eoS5r2`x2`{eE1C^YlWqF`v0^V&!oJ7Ol{{1)qN(!R~&r#BRN
zROTPQiBJ!=QoUp;-A}|QX-!ld;TGt$MV<Q03U<>;U=`!c%|kZ&P~a$8Mo+@e?(Iw*
z=sO2C;aa9aI(M$%=G3pyn*~vO*<oi>fBx746Z2=X$Q6*bV+SX>M7XZvv45AkJ?d07
ztV%q6Mn}I5bJEy>RRP7p-oxKY33w52F8I>VmvqC>0+3TuP%Loaa@DqP8H*aE<~JUm
zhpkW&d6k%;;c4ft;~*25Q6--`0|Wk;*K3x=@fJI77Nb5yUNlC^hSQtkWIC$*;Lld?
zgmKs?b+Aq#kCs*!6Y8K!x6u4Bo*q*Ne*Vy5W~+S{)afZoTO45>R4(nurq9fPFYvMU
zr@`5E_zGsjrs>5b$)_zAws4z4+3Y=~hrJ-Xnw>wS8l@f4(r6#5!KZxKKK(=H))|zY
z6mWQL{V-EL$}Eg8OLNl$#Wx#9%$oUkDsh;Jd<DUAf=d+DcKw9rsRYL2*?eJ|&xb>+
z^-j0DXP@0fUtpX~Xhz+?TH44y>Q@xv=~9rBkpL2eQ6$A2gulLM7#>&{m3uGH{OY?6
zYWBFU9vTbkQ8<74WK?tO+xWWGyLoJO$~X?T_WW?E?f_50No8D;kD>1;(O655DWkDB
zS~5<{fZwafSe7vi7)Fx-?W~z(gu0!<zn8->wziu6sHHdibi`0n7~XL&!Gv-5wE<6*
zv_QB39YvY#TCi3U_Am0-h(-4l7zB%~U+Shbm<(@yR}sE%E7<1c8k7KhAs$y1o<&E}
zOU_{*mG-qjwirLN0!#)hjm3DnWOCR<jZWBKIYni%kB+(#F$yu_Q^T9zh8Ih)cn9RM
znPslheE;Ti?7|wny=b^8)l|hCj!~z#f^E*~$NpdCz#p`M@fYUjlA*9n&Hm|kvAYuX
z*XmzJBi};X<0E^JD)z%nGM<=I&i_V@CM?bGwO|YRk>eG*HOp6kf5v*feNK3cvQSk}
zZrM>@9KAF|wUY0qxcB33nTU|;aux5GPNyMafu0F|74c<ersiamW65tcU-;+=mIq$;
z^QVBL`T8v<Y&?i^2?Tx1h^PRnf-<tp-OAXR**gEBBHOi8l?D|x<%LX{9f<b_feQ%S
z;(F@nELp8Uj=$T}3dJIHqDuZSL|HLSx!mO3NvNpFBIUq*LIyB(-|vK^6+ilm7_%en
z>RaW%Kh-E{bzn^4BQ=PU-SGK67No>i2B^@@*@7A@(sI0tdMsPcdq()bh4od!_-l3b
z?c=}Ll(z9#BIxfoLzU&82h#G=u$HCZFA{5WmZB<3Mg*7{fg$1T&z&-?b@%Nj7X0F!
z41$rbzcF0vg_NHa(if2nMREgTZb=-280tV79wwgA<I`)nA`tXSSIRZ^K$50?mtJvu
z(KOuIV^)Mb>*bSUJOqK&H#pubD4G+9Jb3+_-o4vsAFQo&wSS%T@zZ(0w0yOzf}NEt
zlpnPJ%TlN5%koB_I0Dn4rGB^+PyGZls)#|1f>dxzj+YW3d>;=H{J!%VG9LVXo$}qu
z=l(yMIsHYiQ1}WESgafm8)(1U$SS4HqE8%~fmP$y1jcV*z>tJstdz6)gG0vtJa*uj
zM0RSN=>0B4=3LLU10?L)qG4(Gn8oSU`BDKQi?jmzN|U^iVfY073`x?9y)l8kc{yk*
zz)AIy-XFR$H%L;}1=S7)f_voJ2&oPJMGi8MI11Nq=rQ>K_J&$d%9e48$wbW=IY3U)
z7zZvWWb%K{f{1infBS@};Q(Pj-xwxHR&Qa?r7U2ib;+N=I5<LpX>+pgDx95KFs)9=
z_khSsS^yNaSfsZcm;W972UIs4!v%Cgk+o>(*J0%nFwcr!Yg5Kh>irJ7sEu#~A@ZFR
zcv>HVsSKRL1`vGrQ!tbxulv>~MK5pJ7<I$ahBq&7&dRM8aAy+b_;)7l+Xw}wyy-Ag
z*2SMsk~M0giHHNrw3YcWo9BWpQm6N8?Q2a;hSXr>55eA&RsyUzX_o25p1iE2N8AFE
zQWtA?TUc}kc4|2|83Is|@Us`SrLKeElM(L;dy(Vgck@834!3PLS(um?tGO2k3=zyS
zo_J-OE-1y#=B4^3n@8`{KVL+g{I|<C4)7FZq58m9gz9QsASuj{A&I$j$T|se@K*M7
z1=lC_j7GXGfpuL9X@F%}P-OvyG)?*5MuUyV0~t5vLjt~<MqVz{Y`wF^+^H@x&o(Y#
ziAe^%Nc|tbtnxrk_DNH1GBj>EAit9^xu5xb*Obcxdu<Tl1~TU3pe4_hSv^u|*%_`;
zZNe`;n=&zqR(-{#eRpn=7vOKs5=mBp9VrLaR_^|#n~#4$YG*14TUeA*_Qh33sgzC0
z_o%m+UiMtd8kF{!n5FZ9cxp-7Gc~S7UVpaM%B8UiP030kl%g&j>)C_1SQdyS0kt|6
zL6`$>v?l8!<O(0YF78)tFnnR99R|R<hI7VUD}O<I!X{oNut1W$t+}_e!I=Lrae~BA
zF<7q!GJRBm$@v3bWfi}yEauvpG3BX9fD@4za<ijd=h;#7ni}5E7_ZHf1AG$(6A?N`
zE+`eULt7MvJb6;L2c|O>J>XmMJ>Y>|^51UxZ{Rc_*V2NE{{8Y*uUBez@A-!;8(An3
z$f??>Z;kTPW#s>&D5}jb*ktg#g`t5T>s+gC&-aN0vdmU<?9Q5VH^}iPO7*SRhJk7<
zv^WAZ$7Rb;QV7%y7+FBT1dOl0WZ!VdXFCV~!usC^MCuu|`DDVhv`%17cBl^{m)Mce
z6m0ZV1A5EeY}elPgHOFjRfguprw1_d><1~qt0AyH7GzENJhsS8!SR3z<dh2kSUb$L
zx^`fV;;R|#1iFwZ&k99Kw#kDpQAQh%dDqWpJm@z~rLi$Tkst*&Q(7aw=Z|i63{rnq
zYrn2fWGKOrN_hGgIQ_}%)k-it**8TT@buQGOcDk$_ltj@sF+P~as=i-6il*bG)VgJ
zxT#P22z;E_>{%x>&2afV)5Pqkf(tm13w(c>x@f~4^@<)4PaSx2`neOYi1k{p^#2E8
z+H^y0kYlpJp6&*_3$bik5+>B8QvefX;JPaZj=`LJit(FYb{i<Z<ZkMiKiEXkIQtLg
zOlqlcfB=!u23%g#48j;)5(U!OQJuMG;zK&aOm6vW5PU_+SGz|IIzS((!zd^ui5`=q
z5K9@pZ<D(asJ7vY#S|~lwmz6zaQ#GK8bNR`Vv3Odt;?twCG!nDJKrmZ>1^+Y{!7*U
zFP{C4F$_bThc_+-{BsHoECIhE?6gQ44tkv|1~-a`-n&IG`{8p_-pX%jNlk{!`#ed*
zOXxwrf-0iVQcXzv<7f#hS=FL|z=5#4A>Gyo8_XZc=<GakDrU2#R9;|T!D!03J7hTW
zj1q8ZHK#Qp6u7v(b@90izF%E(COh=bz6sy9wj1%J4opOVIpi1lg)3A0kmsZ@3H`QR
zi3qX2bN%?z!p}~=I~P-%`8S_A^f=hQT7W@xm{AF?jgNu*p_xgM?<B%UBJ$I6Ty6@s
zNec*sVHL&22e0cs|FC=t0$4L!<+=<y^uG-sIeq9lES0By1@qkcs`(IoVOAqnV(p=2
zgJ~$5%2VcrkpVvgd!uO=8>8q17cta6on)@S!uMtlgRjsq&RdX4oYI8&84_D0cbCdy
zgd8{#i{Zh##bYXx?RG~`RG^6_@AP#>quo3N9(0BW{<=MtzJ0&g7AKk2DzSxMPN%Iz
z28@z}4~A7*YifUss)(Lz>mC@@>ZK7}b-$>KG_STv@)9xLbqod12GGPj7bd7K=Ki+o
z8)r+7FSl%p+9+dg_UAvbe(mEdg}H=eN#0Mu__F?GMRwuWxEXG{c<t3PdXCc=Ah9}?
zu<_6V{5l4XlF<h3cM%SNpj35Fo=nhJOVGYIV)-4D`1&C1=*M<lZQwPBWr}kR=lTYJ
zBNU7Q5MI%I;qrCQqbi1Jdx)^m%1ULkrwe4Wyq?wqSWwje`xFOA;6{O8YFxuRi|fw8
zK4t5Ne!L`uW^{6YE$F>qumZ~ZR8zGepg#Caf{qai$|R1AoOK_aH%psqdof^;WSL3a
z)2$>7KW+QX7vg16Tb=<0vjGxfda`eJC$%<w5B8sE1*~pT4VNy=mOMc4r(U1?@3P1M
z(rqi<n_%`|Wa0bU1%SKGeLgd2WxS;w*5Mi;B&$_SM+kg}_*v*};Ea>~1sF-n1iyi-
zbqD$2D#MPnTic55{}&W6)5HFGDXf}OBpb2B0U=6@N1r1?#=7)$!1!?VsqMAem7EGb
zF4#&w@<7@2Pbe-@USe@KC1W`W#e7bfr39LhKxY?B`UxBxsjn}K{hlZX>@$6Po`~QQ
zAsk$OZLM8AcndRE0-bY5aX_rMc$?Lt;fbHD>>Y9(`0kbZP1_#dv?<UN6$?BC*zuHG
z5}(jX^A1EpJ!t`2^oFH6vizIJc$*ahw3SA7jXOt<vUYu2IJZvB)jUK6OH&BGuL3}j
zG|4YB%9q<sHD<mS1ZBDx6(kM4M;0cYt*Qj<IZz}SU=urg5(|6M|HbRW|3zZa_|s~{
zu@!sdPBb2kdLu$@aUc32GEntdI)Tv_5O`I#tymbEO10sbZ@K3-@8QBo^99HH`oVHY
zXt@SLg-?cHN=K0WtAEz4r+rjN%ZO38$+qGfyG@?dRx+_{)2|zNjCK&VrWBvf5QbNF
zk&he7LMK24z#mtCbs&8?*Hv$OCvi3{uiVJ=Sw~4CI|yHZ5({QYfT1KCchJCX{Gx}H
zo-nKrt^(ci8tn%Jqnwa1HuE##e3(?47gOg+6A+p&fs4i9Q=hIYiw3U1VYv<>YgDq+
zK8?w9^Y$1i`Ryfp=d63sa#xvC>^!OcbycylWL6M)0(^cM+TuU3+EL(#t?anZcHxzX
zy#>psNWxlOqPtJn@0sy#mYua6gA6k{O(86TNM!Qp76=MMRqcdcSh{ob!m(2x+)}55
zd}O7{P*CmHK!Vv|x=E9bV?cjr)O!Kn!EMoDx$pTqzZ`Ycw32HNgf#<Sq=Z-J1`10)
ziD`st+W_PLol4vnqAoE%)H-rw3g=L@Y{fMlbqIEC+71&#rLZIEp>SGzY%=Z;KDi%V
zrQ?57%%1U@_rF46@UQz)Z?BfNId62m7`Ts}vvjv6Dk99mFL?&aq{1xaw$j|bAWf?p
z_SE#0Aanl`^=?p|>i6v#e%`X64s%gVR-!D1<yLY<Pfv=qoUBVFTjW?6_mI4y=PMXd
z`H@t3l%4CW63X*NA@p0C<wr6gQ)1us)>9tR$`hk8gCy*wDSRDL*IVLlY#~jWqL>U-
zSu4bR)N!a61~;Uxr2CUEw&8H;!@tTa)RW>fQsIPb3*{{Z)M*|UXPO{DAItw|8!Dwk
zThEXC*3{{uqT)1GQLz5(KBLDi=C2c@OuLz5tiT3JzF$1*J$F0bNtF?l>8v7c&p+N?
zHX_(AbilsbGcmaM2Go1+8!K=20S{oW0N=lFaC~f=P+@E?Ijhj<dUul}Z`+sBu)S`>
zyJuy8;#Hl^FN<sjp(%@s-Qfoztb_sbQC~?i>o!I@s%=W1lD_%(KA=~0(AadZ<n0P~
zG_O?XgW<_IE<HsF6%8=HXUOAA&ahI^v#5<Jx)+Ysh$rZ*$ES#dH4=a6uGlnJ-L3v#
zVNXBkEU~2e!qZu)%(#hQQfYw>?*(1I9!iC+s+$7;X9q;x(59TEGF}H9G-L2g7TsB&
zR%04nOt!OeMU#gnIvybn1eCw^NmCNf9m&VN9?sz-699UCoCl<sex;oCUoBK|==K9@
z4FiPzy2m|8>l}!%6@;UM#XKvlGUmxxrf>mLa_~H8{{73e*x6=*UX<Ie<LA8=+cYOW
zI|+u0VqszD(R@B~Vqo$Re=YXQkeYK<k;P&0sL|bzMxr`@`Xq|5aaNup=fpzxHi0)$
zaRs_C&=3Y@-avoB!}BLmwCn(ngq7imVawENP#1hd->EXrd2ROXpo8N6C;?^+k7(E=
zx42r?r6i{6EzvK~@k$66q^cvKV#Xg-ZgqyE>B%5mrpxk!2p2b)kp>JH>MscY>KiQc
zEs9moTqvus;rfZ1Aj4~4aic=wFNK3GXWWx<F3#_z0Kp#7e4$Q@b<c<&Ix+XSE~9(q
zuF@PcD*QjS%B#z_%HOf+AEMdbvUGO8*GJDlRp`1`>{DmaLP$yZk!;@j#?we`t!xDM
zCz9Fa-Y7_NJyw2jhjp%+$muIs)tj*YYE{lb&+iT^RJdiof94lCh={CjSVW#ODgYzB
znPhyWe@mZ!@_qwyaV_|9ryQ>JPs8Zq{@^P}WpL1@<5c<O>vK6I#gnJRJKy<hlv-+w
zeuX?+?K4F6RiAk5`c$rcG#ej8F|$C|ULsprSpLWvfI&o<jW0$YAPY~F`D9ctKT`kp
zKuO6Y{(bvj0b$BevaEF;y8rV<ZgY(h5S+7-`P08}cMoWG9IjYHCfXTEeBP6YI8@%C
zn;8If6=f$M90`P<zG`I*hxEUHMm{LhSJAb9RWZV+lJk}={Pj7e0W9-v75%~YE_^jl
zVY_96czMSFtDS%~5cGlZq?J)fL1w`*saVr9=6gY+B4EnQgD9A8nE!TVrsCTL3FfXI
zIGz_!;Kk>1pXX#S-Mjt4y6@mS17PsR!|gAdDE{vYX2Hiy*`+@m$<B!wt@0;ilr9qm
zgY(wWk>)2Ow)EnWz2`qSWt(~uvG<%8R8fKK%LjNOGG*%Ecsc-Z+j@=ekzS%BQ^v9Q
zfiV1Kpq%NC_%*D9sYFqel;&YcqGU#x1TBw=i*@L{UqqqI%Ph2%j=kOmi~lM}w$F?I
ziF1~S!t+E@*rZEOnPe<F{}=ugOi9bP3;dA?)9)V*G*x)7V85!(CLXPIAgSu3B~@;k
zaz_sA2G54m49!{fb;9411-`t}4ALByYiV+Gx}qNyE-BZmx2;6e#f$^Ba=#4`Vgkte
z{+ZKW-w`YCmT94ll6{{p7IGi7#tK~i)N99Qz|<6<Z!`GS0GiN75<GD?`uhuTay6!g
z{@;%&qc-{ph(v0>AVfUYrW}&kg=}6Lp}Vjo3=~e=>R$;HPb_Zgvrf;E>5#uCK}Bo2
zX9BaOqv#&@_Ts<L)RDJmWHc8ONpp1IQSH7bSUKF4&rUUqyUFo$MV*On9UaZ~MHL}-
zExIt;3WCnbBuh?8piKh&Put@8kcchk^63)qpX{-7lgXcUisclc1c5d4p?E%<jBuoL
za`v<IKx({9BBXDmWF0yp1;c<k)tY7jFl@gk$y`e1e4|8C<Bd?jdGv?(lF^eNqTm&v
z^!s`=R#sZELh%`*xiULWBONh`MavbOE+hUGw>#htgPSr3M@}<d0fZ@u;rH>@*Kx72
zDS9<fUmQ-xJyF|eYHWf2cIV!qK2hM;Y2{}d7~mJQp1C<BX?*a;1yIDmRZ*H(ykZv@
z>FqC5+I}0&P$x@MV|E04aqJ8WR&EZGY`iiez{89_{z=7S()(Nd2>^J#sK2x45(JA6
z;)bAabq>9U5q$HK06v@;dF|#vwJ|~9!m*M{%GtY&@%EQVZNiTUJQ@E++C=e0UwH-g
zznJ|kD?-QfhL<80eulq_c`5{E(L5D;=9|UiF}&p&=rMS{NLl(^MPd|XS|L5AY1xCP
zW5~DD1qGuIh7p<IJz^VXEkjuc_4|msfX|Vqg1rTE;+{C4o$vB~7T|^0qi=uSLwZzC
zYF5MnB?*Cczh@{$y0{O}=fU^!3kf=#Wn59~ID=8m^>MmC)pdZ$09m9B7@9X8a{mYx
z2`cRUWwLDxTllFmrgSBO?)}`nlGC5!-uYRP>V&u;_z5_$B5BNocSWg}YV~9jv8`Gj
zmwU6m@Tw3@_^Y&u<rHVdz%|Yfu42!(*!aUMf*5i~E?qlj#WUu*+UGv=1v~&u_zT)p
zcB(jli@$Jn%kJ^rl|PRt`AcfHf7am7vOPMP|HwDIbvP-O(iuQc#EoA`O5*>X<WNia
z#ix;w#-)6u9QMojQ7X);NP_zW9!mBR4V8kPdodZ?*LFKhHyqtxf?uo(mwDI)LX<*M
zF*XM^k!?k3`tu~Db_Iu;@P$yvqkwupZXOksHk%5WXVS8aCiT+yhC9-0{pzAZzz1l8
zGYQ6ooSY>v7Vza{%PDd6-RIt)K75bWycesY%<aI&AKz=t2!0tbzt~R17%*E^^l6n<
z_m+BDF(2x9i^5>U(}fjy5w7frgwMM#oDf%3Imr5|SA_4Y7DBaI01Ac!1rj}ab{?O)
zKIdMsKHR2iQ$>iAHNInKP0wCyd-bwiei0;4@leiUo8^;kv78?`IC4*JoGP@QQaeDA
zgiGds;}+K-wo9H@Zur!Zy#iZR9lwo6W`YYB^B)&G_pQ?ki~m}M=Kjod!HsK-okT*d
z3h{YD1`X3tQ-g^ppb0;0nYTazH+Zr2S~$MxC#BMRt6{lF1v}R(CR-AZxMZ{AL*v8m
z?CIX*?9(!y5T-n4t9ypebl$B$)ge<wZ)3%s)g2<Lj<5rWs<Cv0Dg(Roe+q{R!5}g2
z#w4PkmQN=zZUiYo-J4Wnt1kEG4=p`Z!ynMUFrI-q7$E`dZZ0N8YX1h$RZ0(e2%07x
zJ-Y`+8bM{War_-fR>POzMq_h|pze+!2^K4U$`*gl`P=Hm%-3@fa|N=!>152oTCYe}
z?g?IevN#7{z+NdUlOb=N)6HByQL-s=LWF+RtvQ!&Qs<F>p|8q+pZngA`o@+QT4o0R
z00qX%wcgKonT?(Pq??IK;2J^Def-PPP9oe~iwu&#^a)QRPhaB8N7#L*b!$Jf9b!Ur
zA6rJMTh{8U4b62Dv8VIw9h+LO55P$M+pr{>Pw}w^7JAou!dX3ZPs12tp#3O}FGhjy
zd9tbDUjI@NR(+Iyk>U~3`*ICmUG`gLna@v{d0G_u;KkdY^F>_7O(`q%7bEajw4y%<
zS=3&d=k49Ma16_(6n&`rv9HYf4rs_TR<G6ZYwfw(XI>FHYD;iD5TL-Ytzf(!53I-L
zPZ02bh___wF|-mP%+n*YJM+5gx{)BvC4ry|Z4}{~kB=M`E*oJ_38(EQbXd&l%v`$F
za^5Q{azi{XZM#H8QyjlZuuzqnAA^-$&qwe2#%UF0dO(1zWQ-GI?{?=FKX4bm<M9pG
zW9_44aFmy}K>l{>6#WI(t`Viw19yS#5W{9OkD?nRFvToek^tkio1sf+hT)e)Y$nnl
z4L|aql^1|Z)(GW3_P<-cX@}hjlW)oCgJ(%FV<c>8^sG0A=N6^@Xo(LL;b=V)@YY4}
zrKYw9jnRK*i}yfzD6+upoBdzESvX@8L4IGVn-6U344p_cfPLG*jSkg{V;Q3@A|{J$
zdzt%4CaQr3ulEz-;#VqH#Rpd<@_zOxqaM!*DM-QmukBE#WG#f^pUzA=x8joJr@YB5
z*I6TiTLA^_FLlsDbf4dK8|byNb(>+eNJAfQH-dXak;1%8V~lcbJXEIJuNVx(*1C^a
zD?Y(s|Ktq8vqYFtnCVAm3cd7erV?wxV_@`ogzK<Qe9q?*EUGWMn(&lSEv@mz)RZR`
zxGIPd-i{gjeQL70_DKpXpSiE|yRTT||9Jsex}DS<9k&E!UZE3F1u0DmVUe$Br;;9;
z-TgXp<XY-)Hl8e!lmseDbJem|Tj`-c!v?JET>->Ck8D%4IQXGreOW=Sd|2@L?Ae1#
z0HG8k>{(1517JiWmGsww!dr0@!8%@O;m$~^$y`VyVd=>444aZCqA@pl|1LUV65Hhz
zL4LSpw2tl(xpZAcxG}k45@2a`pHPF#E7<lY&x-A~z7PMPkE^{;3lH{3IQx~6<>%CS
zB7webPybSL0d52|<J*|@A$W}Lf%TIe^B19G7e**iuPr?sG4hl)9GIMkiR8bX&|KVZ
z!pIvFAW<jy8v|w@y<wAt=6W}N@;Cc0EoP^y?<N28xUfpBJP44KJY4Hdi76~%Uw-6O
zR#dgmXm(u=V~<?$cGNg2;gd3ek%!IoUG{`Rot#_XJ~Qoc41A`cK{=|jNG1~G<8F*S
z*%n9Vdoz7QWz&ugXpGhJ3wTG$r1Jx3^p>dBmyGd($l|3?DF5BO8^gqs^F+#eflG%e
zdrspU4#=#qFFx46Gx>zvSeU3B4IOqL4swl78rY%d5jsW}h&m{e2LNPC_Y+x_zM*vs
z`i*HDI9IWX%*2QHURmXyc9ELn7QUktMb7(e3g|`Bp6WQP0sh)%vb5DS-zN2#41PDU
zK)ZJ&BE-Mi(^RyPRr-|KuRF7Dv|Y$s^%kG$H19j*qp#*s`maR%5QiSE;7(@trFv)7
zr1W@Wek;a$egCel{uo(YY<wd0PS?T)nAx(d9$qo@KHE<;*vgI}{GGp_hPF$)k7O5+
zHd6tm9m?WT9o8lfn>=??!yV!Xj~`syLZc6C!)l!97M}_IQ6aWDU@6<r^%0=8yAk^E
zz_V76v?Yt&|6}PYxZ>KHC6FNu?(P!Y-QC^Y-Q5EOcXxMpx8N|ihKsusBsjr&lW)C0
zaAwvyy?1w4S5?2blXt_eBlSt&;iWZGXz`#bFXT+*26xzR87Z=UBj&Tq-Q%!iz3dPF
z{@_N(lw~@&0S6<`tga9L7yh!Z_3%smnBFEIK$~|!-3MA-T(JuPDN@J>C4Mse(Js+i
zDDyLueM^VoxT8eBw3_LtF9B=Os76p0we>P$)t4nAfTuV^vj-H7`@*`t{^p)4u8KQW
zN1y*^v_<#l%?swYmdy<LCgo|*<j;l0+Li72oKnd2J#eGKi40=JRSRT>tKudXzK2|O
zcvrCyi!I4iY#n*2wtIp;m`ln?c(RdX|FRvBQiqMGC1FUk1#o_&^_0Aler&c7gSfQi
z;&!Xsa`b<jl&#iQUs|%?FR93f?R#=0F5gdiWx>$h3XHjmzJGq44@4ir41pK~NMF6h
z`QAm9Okb?+Kz?ERz~3e@>94`jpKVgtofQEK8l}{fVuQr-A_E)5s*elUjZ2NOn$s`;
zv`*Nyw|HXn7kfn{3zGat1JCvwJqrC&+;@fT&ydd@j`R$lBHbq*kcE^CD2@qPjBh+k
zcvmtRz}UCs2H~{jf^Oyb(V*`@uBPNn&ga!Pxj|l#+=(ra#j!cngh?q$i7kz-@_YM+
ziexp;AUZxk!>-*;^wwHtu0K`1N%?}n7G_5}mvaBRO?ti)f3D^8oPC@2mYcQ(Km@$}
zWZvq@+pIQZ%Ef&9huIY9#2f3<dzzwvfV3O^n7zJqE$%8NLLO2!Xch8n0I-7VH8%hu
zu>eZO0{t?7Y}Bo84LaF1J43(e^gXF!XJ2{`T-J+wFx%eDn`R=GA}?rtDIy1Vx76U#
z47QEp!Adc`DC72;D+@k?8*2w&W{rdU*>AFKD<i2Ee8-Y!#P^b6ugKh6BEbfmg5AXH
zB){JjihxO*Uj88goS(=IYh|F0!{{*6xmwxYQ?T*GVU@u11AH-()7CS0e-%AKaQZw7
zfGiGTZ70_5^osm0m@PX)n3gAfi<FCqCg!aIF5s&>oBPmtEkQsKR_-NU7|X3|x-0~H
zA4VIA_E_Y0&g`vhLcU#{pk*#pK&nJjARW=pC~tm2`i{}Y8z~$=d66H3sVNl0u47_(
zu<#&oK4Gmjz-(}f>_14MpAQWeZZ4251n&oxW4nq}5NkrA2CvJDJt9AtKCs6E-JT+X
zcC6$;$Og7#D&h&TO4_(FnD7~Lbqlt2jKdmOAki{?i<%L+fH%va*@qhB79=Zs|15uo
z08~n3QN4eKz?n7qx>xhj{&3Q6hcsp0bfpHO*68ubcoR1QG<?8}k5qm|S4cfJ^Z}6j
zNg=oCfKDnv;)ZQ&-G#S8s=@WZpl(4xA>j{aJuO`fI4dYFEjckSoGR~ZF;d{jBkM1K
z*Gt5(h8*ZpM-cuy!UM#RR1Ltl{J)nC*G@Q>y1DI)2e~+qxf5`byz9R@ot562t%eJ<
z2ffo1Diov6n@q7M45F{;_*atR9ZE68(e1T5zO-@HaI8yQCu5{3G&#pN6uw6@Wn_J+
z7kzz%tptO7tD{$@Zct=Y=769`^1|(CZX=LG9JZu>V(ta_(_zo|WELRjxN^puekuOz
zazFdi<PYKb^Znd?bo6c&0S9Wu9l;NwXtkBJlX#&7fiSQ8^PlO2@3VGpRSB6yggO1G
z3Qfx5*?P$htgtn7gY`Q+Zfn;L7ftJJ@-<hI`~6Qd<^`JkuxwyH3Gf~&CVk#Pf&AX0
zi9L63+QF`<{>;xXw3xVR5gx60kKogkk-*yx#>rzQgg(ME;V!I)G<39r`(nVs1%)lk
zwL`O#<N11BUyx?1S{ot1xjPSGV{FqjM}cF~Ok-|JhS_W&<Ka-T6Ai#F9$3j_UibQ&
zN}-+ymi@5PI-Ohf1ky0H{$!<vsWEsD*QL`M>c#zHhK1R2uVd%uy-C$bF3F!0ZcOyG
z3`(p%kJh(h$cs$A0mN@@lr?Q@b@l2N78>*zDN&{U=oQe*I+Jc~>QHHZxxY7-h}EWh
z2Ib<D5vYOg62>Iv7gF8@+iWSOE2Ao(@!(PtIF2)>M}EVTjQ1cz6Z!+}H_FVodwKN=
z|GV66!=CrRhns9ATOY1#vR->P?R@)Kp{6c>nl@qS(bIugIDW+*s^TVHx}pL>l@ths
z8Y2__Z`?^f;g?c)&)?N(?+;g2gGZjIj=*bAO=jwR)lp^I5sCSZl`xgK%HN#i_XFdC
ze#|NFbn*TF>DDeE9@xq1sd|D$n{tG&1$=ES>i+(=ZyV6_tUZZ<e$^ZQ2L1&f@R**}
zoHb!SmvXM7qGv2xSghwJOw;q_Cp3_!q;hUb9bjGs#6tbVx0LTi5^5S`I##_eJeAHr
z0l8bnx2@I~6&(dpV{zNeFfI;o31qPqQf{r^63zJ%(tdq>XWEvsuu}gQ`6NyNpm#w=
zhlHckwcqNIfTlQJv+E7XeT{_$+*K@aDh))rzwt)@$@iG>tTm$31Q#kDGy2fR%s1^I
zx`d}cX4j-=P&EamLXWX{Y2!Vc;3KHT7kr%XA6pqOTfCZ~;vH&>jp^}yjszI-)<+@X
zMQy%DnZf5@FXK#?IAh4fj8$^0Pm+0?UPY55EuqHP|Dqgs(x~d<g|RjVa!cnGQ2KMI
z8{!scAnk7)EpZvK;+*M3Tm!wf#7t3i35yC%JG=Ur*%OB0`dvm(WS0=|pA9PAD+!-_
zd>w^+u0HvfnU<%+@s6i8(g58(g#bD}>+K;pkcRi-<MH(>HL=CZA~convu0)6icZLs
z)JJC07d3he4Mp$fKR9Pw0oppR`nr4?dNpCg^;u7>{XrMMN4vo=7a(X8c-<uN8t~YK
zQ}ENqPxl{~D9Cfm!HkHB;;iFG5fe?(iB^qvbx=~;Ar*FD`ZTS%mcJaWZ|B5v|Mmi?
z*51{q@ys;$y}G%EO`6WPYK<GM3UoKsg9sQzRtLW*03<R1c&6Q@UGA#t-5Tl8#OpJ#
zmO=%#4|-@8KpST#-Zxe@3eHkv0@-YA14B)v#jPh`6jg0lH^*x@wCZ{tJ&tJM)tj6{
znJ=u~LRp%fkr=WD_JSUIS92fr0=Vf{GQ{@eQRZ<W1x*#5k!Oh9Q)czkW4HnW-m*$O
z`yv$Xj1INZdXI|LnhtnT+4qnts{{$1wmw2Sd91r<?3N!N>jDYv>NmUv7~u7rl&Qpl
z3wqyKNnjrZ>*}x~M3lCtk;9rLna+P7%Ki`$)&r>Tvj*~6D;|6<rjN0*j;iqS<+^Y7
zo<-cqP5xk}3HX^_a{}CbPn7N<w)&GB&gHPab$4@59P|gD4Q0^L{Xo60&34A4hR#Z7
zH#!WhyoBwyU0Y-1>~Sa7(h){ah1tP0L(Xb0Pff*v^be83VlbCMFZc9pEG@hGe?$g7
zW=j!Fq=VPph+1=Z_4{|_p6ee+YTwbHDQ1_v?>KilWk4zOEfp5p<h|TeZOgt7=Qcjn
z(Gu@c`Kw~)zTc0F^Tu0SPYcGacR@nNHK56S#o&8v04*M5j^mN~R{z3tr%%@jOvUBu
z)CaZ^fZT)DDakLQfbMltfeq_`{8o-OfIyLm3(AU<DK1PN8YnU)$Q)_ptmJuKysX`}
z+`W|clO6*k3Y!*K+pshwd_b?u-Q2zjac}OI>zV+qasBr#y{Vt-K-x&8a37WA1;_o5
zzPbucw*e(#h0`_&Y)^-*cq$Z%J)PBKZSQVFDFKw@LH~VZe~CMx8NI_Zw+|-{YUUNF
z!|YmKbsfUYHVsNyx#Uo|hb1t}(HX|kP~4Ma;q14ux0pMKb{D0C4qy!@xn_iN$0S&N
z<$iB%`n}aW`Sz&jeci?Eyou{4|L|3lnW#pdqFXl3W>)y+N1}Z0lpqGW%kg8x&t=VZ
zFI{%uOs%hKZSB<@ob>XdYV-s_b+kq`&}fKOMll~IK`BfIoP+O4pVwF89lfppLY)b4
z%70o|0Y(t=olFe{4z%mHM_gVWg|0<?X)=$0zvVu2>aq58B$>fN@z1dSKuYEaaT$$Q
z(#S>*+eoe6)Wr(&qSzp?tJ%mbqledM8nDy)bMkc5cM?<A-VQHE<GePCXC06~_F=a+
znh^vYBr6hF2}$o4YsuwbswzG!rAUP|I-U19>w>Fj0)2qD9o(Dq*><$Z<?C?mk$x#e
zVv#>6yM(j-Co_(#A2qr^Fn-knsXZ57x_8rC&8}KkZ|f|W7W}i$q3o~qM|FTHHREO&
zcY0i(Y^z>MOxkWDis^(KVlls-?kEG3Lo~pUa9}0Y{L7aao2Lxs@pE}Kki{;@ljjxt
zjSzwT<&N!y_v5ddCTH=_>uUA8$hn*T&pn(O*(BpI(=qxt`@3`AISHJeh1(im+;Wzo
zJkEx)+3Yhze07?y65|PqFMTQ}xRl;jLhOx8wZ9*vdh8{Z!J8G%o=!L28*S>5dhRn}
zMtI)F{OuCPq6Q$`Pp(r6%Q(7`kAcSe>@l`R{=z#piev-DFi}6GigmtjdX9w|4@PKD
z;LOQ!2&vJO)g49<su7!0O-GQ(AlIa@tlw6nnq`HRjFJyAbEVtE=PMX=JnD3GlT5XG
zlPf&de_yb*5g49o9ftQ{vbI`87CsF;$|l(Uk~`+4qXoGT;o7#;pN}pz@eLRn7pPDW
zy7e0F0@adm9Tn9vWGSWfawVSW7yPXD8TbcJ7m?w2QmwK6Nc5<LzANgF6ZS_F{Yj=!
zL(`Kf>@}l(3Fef9f4Eb`piHXGuiKcf+F7kNs)JFZx+%TiS^D;jbhYU*5GIG0pzy8`
zqfD|Kz%EBLbh<qorz*q91L!(U-ua(hl46S?Q~aI6+C!8pGCr-be&|iw;-+w1cgLGM
zy9|8(DY%lN$%&bz8##D7T{uYT0=d}U+ot7vvrZ3R<^QXoZvT%n9NjA<739Rl<oumG
zhfeDIh}K}cQSeJOHqWoqpyJVVMJZHek;7V036)#WdC*sMXK2Hpk}(GpU}6NEfUf%>
z1^h*jRMN#GsB}a!_w6v+5v2Q3>Jyi7Lwpr7t^X824<ZZg%<d3<QlR?CpvFSYIv5s|
zXM5^<^AYEcN62a2{fho5xRldD`2u0_U2NG@V)%5Xi_)79G~Ot|Gczd~&M<C6@_@g-
z*5%5S>vEQ(vRWQLE$+=MJ2i^b(VQi>S*^hAdC;cB<XHn>BF_Xe-5dYFD!#%Bw#kaQ
z>8>C{{gQu-@Pc)IyD$?L_(Ur-Fb8)qijZASjU__9E#^C^)5ORjcC>lAC;iI+Wu6EU
zGi@0!^v7^R6^G+=w)hWNHb)7s{8rx_%>fjgKEr`@o46=>!yvcWT#(^xO?L=U*3Kaj
zEhp<6e8~-%p1gP=)EMnZ%*);<8f_j7c5z^*l=P;-w4M1+rb?N>u1uRc9L>D$pu?|!
zk@($YB6CqgZ;NS+U)$h8g_GEEDNoDm;}nq1);ZX#C<`5wh)Tjs-2B_hT5&Nnkq7lQ
zSa=Pk@SB-$%jX_XJ;1xpeOZ2G@*1v9jb8iCmJR*bEg;ePaS{GBs;Qomv_HV)KSIT=
zbNj2-aFPBocEqXo@IN;LtbruTPyp#X{bsB?nOY}aL8xyys^KUAchP}KUF<Kb<@idr
zb?SEIdIp&m>oizMI1%AJ)3ekOJwbadYp)m9;)mv>*UOi4cj@C)t7}oc737|4-ku}e
zSl|uikVthSRCs+~e`*OR{v)^A?8o%nNEDjgKwDk+4Uurc=5Zvi$aZu$PPMAjBUvFT
z2pqx0LoZjgI&Y%%bMh`Vp&u6L)IE9Sc~8b*-!cy#E$QIFLP3%Vvtu=9oq)$-R9{MI
zO94U6B!#uNu<f(okqpy(WmjtJb!oBSq<dVCG#8mUzXwlZVtML|g9#1q>!<1w9e>`C
z<R0<C&zyjdHcdh&w*k{%9_%^$Vl0unBLcvik*G#Pu|>cVXM&oZ?}zGboYfr7g*Q<4
zwRNU@#>P5Ix1!Tl6#@<G7xh-XY&|}n@J+>n54hV{H*KS#<6AeSusc$B__hfRiD)9i
zc7Tts>zCNv+FM7uZZzOgJR^|WuBUnOr@9MjL)7g0sbP&+)pB&0tL%hs>nJkyw!S~|
z7S||SWxCN0^I5LjU&*s!KR4&d4QhRLXq$sy)Xud0a8P3;g=9O)?+|)S0m5?OT7+s;
zLI6kwRAo(Xi@3k0N_A1Zy!M_)T6Q2&7G3|X^@od`fjyI6CiprRm0RH0?;I}?)o*ao
zvXf@r>-hdvr~r0JVIEJYH@2RIM<`-B!UmR#p=^>}lIwWP?Je19yP_6K+xWD{=&+$V
z_L(#S*I~Z4Zb<*azwLi*;vZNp_Gb9<j~Y8aQQ}g_inR&Yd~V5o!P7NJa{<v7d@w44
zy^zx<yQi(QlZLr%U^ts`R2%lEjW<nFv}qtpiI834e#YL`qW14Xu}jkAXw<(+Tv|-S
zxw}~Bt!U2{dp{{Fm9xG@qNvD#NZ<$TdYu;cAJ7;yiij{3Aa%(=XQ$U&)viz%zW2<7
zHX+n>55jW>px9-1aR)%=xx@E}kCE@Z@&fGPVDIcRB<=W4mdQ!rQJoD%Uy}mwfskpu
zxu;yU`t&6{72e$A50Sy{SYWAVVR+r2$(KK#s15$Mh_U0CxF9H(bO+sKS;NrY5P8zP
zR2_Cpaq-3<88iPCDuD;7$zJg8Z;}Q7CDHB4pitvMs_OY=WoQpR!7*^>uz62{vqK1k
z0BfI60hG(m><Pylz^+X9%kW;kb9IsmeX8{Z?9Y|<39et6knVym>HiHC0UKZx^)iBZ
zXK8{P$@m#vl_~MW+#;kgW(k;OJVsDRsx8hzUM7G0w4SWbQX^fME=D0BsoZSjUcD9N
z8VKSNe*TwTvD|k+%gz{?YFgwhzq}-Hfd5C&AxhYk-!2d~&P6D`ZFo%iRbiQT6xu@2
zpWr~11ULc-8Ej&_;nm`HVw=6P>+>HIQgJkbFKMEKbSz}6?@yPqW!|>quBG4lSUjMi
z37qW8eKj&cY$et9G6B{u@p$QAFyRQ2jU^~8<|HB2=0WBO*_3tJRx&gznOqn<SOV;W
zT_`mFHdvA7=Z&k3avCiB+KY`O(K>so>VBbR2zIQyT2;OLA)(l$9J$YtaMkMIw}5QG
zq0{<QtoF8ksvQA_IFX~WYqTdHUT&n`P5uU*-yg_vqXA@NAqJ&L>l72%KO#G%73ptI
zS#wDsT0LDISc_OQx{Yk()a>%U*KL<2sncVWPE4dMLuNZY58AC|xm-By5m}Ekn2mdQ
z-{F5R{Mum5$r&*n4e#@Uogqqt2H1~)P)R2D3W)!7DDOi21k+f#MwFzJs1X3Ui!ndF
z42A+QHR|tCw_TUHS7hJe$!oN^E5ubF=={D|-IQ7&9wb*1ifD8oZnyU0R-<WMw~r&$
zIg*>6tac%qw$0nBhGsRBf#+(R{z+f#9S#|ipPMCAHCyRSukVv%W}71UF*J}u(|AoJ
zQWb;T3tGo%v1CztZU;LUn*Gpyi?Vw_CFDNYkQEN!za&S|>8SSd2g6!QsOX#r+)X)&
z6fy&zE|ZOEOIyyLBhQ?8#Gkst9x|4LAt2s=2cs*D$KMZ$*4fxP+*K!t`jleALpv`W
zdNjE52G#`_>qV9z-I~9&Ewmy1L&^x)k8IoZPu)sTdx?)ZoXI%406}o#fdhx+)x=*K
z^R1xGNMB9-lrb*hdXS@0bn-M?(H_0~e(0|lwxw5b)I}Dxo$b@+Y7!g|$`@-fA>~@M
ze&;-rsa0AiQ{fBt6(`DV5+mfw9{JQwNDce2A=hKD1nqyo63Us7WCJS!R^lto$fIJ+
z6*nHU#V=0(SS1S>lATCULH2g%(D@4-K8SA1%_KN9Y;oH32z~?=!>u!8Z;j1?ijn)M
z|B<uqO%v9v>OAOv_@7GabQZ8f9dEkGb@Br}M1-*c(u4}{oTZB!tI;mRV?&t)WwBG;
zg*aA%)-=Qn5Aw{T6P!MXYIZsV%+7K5m>PrDH(_S<lP@o7<_y}HVXZBOZo(aic(6L)
zn56P)gKd06p_pm8K0dyL{6!B>)9v;oGyki*f<9!bFfA(3wMX(zh&gU&Z)Srm<)ny}
zs-{PEvG+i!5siV^6hFgmR}vka>7bO#{~da2%EU%0Aq=!nO;H!J;@Up{F7@N5pA3a_
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
IbxsLQ0GGx!?EnA(

literal 0
HcmV?d00001


From aebe62f3b9f8ce913b188eba0a56d8d9778c9af6 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 22 Apr 2022 18:55:50 +0800
Subject: [PATCH 04/25] =?UTF-8?q?feat=EF=BC=9A=20=E6=B7=BB=E5=8A=A0prometh?=
 =?UTF-8?q?ods=20=E8=81=94=E6=83=B3=E8=BE=93=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page/dashboard/explore/CMTheme.tsx        |  14 +-
 .../page/dashboard/explore/promqlInput.vue    | 157 +++++++++---------
 2 files changed, 85 insertions(+), 86 deletions(-)

diff --git a/nezha-fronted/src/components/page/dashboard/explore/CMTheme.tsx b/nezha-fronted/src/components/page/dashboard/explore/CMTheme.tsx
index cb9051b71..312fa1134 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/CMTheme.tsx
+++ b/nezha-fronted/src/components/page/dashboard/explore/CMTheme.tsx
@@ -120,15 +120,15 @@ export const baseTheme = EditorView.theme({
     lineHeight: '1',
     marginRight: '10px',
     verticalAlign: 'top',
-    '&:after': { content: "'\\ea88'" },
-    fontFamily: 'codicon',
+    '&:after': { content: "'\\e76f'" },
+    fontFamily: 'nz-icon',
     paddingRight: '0',
     opacity: '1',
     color: '#007acc',
   },
 
   '.cm-completionIcon-function, .cm-completionIcon-method': {
-    '&:after': { content: "'\\ea8c'" },
+    '&:after': { content: "'\\e76f'" },
     color: '#652d90',
   },
   '.cm-completionIcon-class': {
@@ -141,7 +141,7 @@ export const baseTheme = EditorView.theme({
     '&:after': { content: "'𝑥'" },
   },
   '.cm-completionIcon-constant': {
-    '&:after': { content: "'\\eb5f'" },
+    '&:after': { content: "'\\e76f'" },
     color: '#007acc',
   },
   '.cm-completionIcon-type': {
@@ -154,14 +154,14 @@ export const baseTheme = EditorView.theme({
     '&:after': { content: "'□'" },
   },
   '.cm-completionIcon-keyword': {
-    '&:after': { content: "'\\eb62'" },
+    '&:after': { content: "'\\e76f'" },
     color: '#616161',
   },
   '.cm-completionIcon-namespace': {
     '&:after': { content: "'▢'" },
   },
   '.cm-completionIcon-text': {
-    '&:after': { content: "'\\ea95'" },
+    '&:after': { content: "'\\e76f'" },
     color: '#ee9d28',
   },
 });
@@ -180,4 +180,4 @@ export const promqlHighlighter = HighlightStyle.define([
   { tag: tags.brace },
   { tag: tags.invalid, color: 'red' },
   { tag: tags.comment, color: '#888', fontStyle: 'italic' },
-]);
\ No newline at end of file
+]);
diff --git a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
index 4aefd59ce..bef19dd49 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
@@ -420,6 +420,7 @@ import { lintKeymap } from '@codemirror/lint'
 import { baseTheme, promqlHighlighter } from './CMTheme.tsx'
 import { closeBrackets, closeBracketsKeymap } from '@codemirror/closebrackets'
 import { autocompletion, completionKeymap, CompletionContext, CompletionResult } from '@codemirror/autocomplete'
+import { newCompleteStrategy } from 'codemirror-promql/dist/esm/complete'
 
 export default {
   name: 'promqlInput',
@@ -459,7 +460,7 @@ export default {
   },
   data () {
     return {
-      oldcCodeLength:'',
+      oldcCodeLength: '',
       newView: null,
       codeMirrorValue: [],
       dropDownVisible: false,
@@ -537,22 +538,49 @@ export default {
       const self = this
       const promQL = new PromQLExtension().setComplete(
         {
-          remote: {
-            url: 'http://192.168.40.42:8080/prom',
-            fetchFn: this.fetchFn,
-            cache: {
-              initialMetricList: [
-                'ALERTS',
-                'ALERTS_FOR_STATE',
-                'alertmanager_alerts',
-                'alertmanager_alerts_invalid_total',
-                'alertmanager_alerts_received_total',
-                'nz-agent'
-              ]
+          completeStrategy: query(newCompleteStrategy({
+            remote: {
+              url: 'http://192.168.40.42:8080/prom',
+              fetchFn: this.fetchFn
             }
-          }
+          }))
         }
       )
+      function query (CompleteStrategy) {
+        const obj = {}
+        obj.complete = CompleteStrategy
+        obj.queryHistory = []
+        obj.promQL = function (context) {
+          return Promise.resolve(this.complete.promQL(context)).then((res) => {
+            console.log(res)
+            const { state, pos } = context
+            const tree = syntaxTree(state).resolve(pos, -1)
+            const start = res != null ? res.from : tree.from
+
+            if (start !== 0) {
+              return res
+            }
+
+            const historyItems = {
+              from: start,
+              to: pos,
+              options: this.queryHistory.map((q) => ({
+                label: q.length < 80 ? q : q.slice(0, 76).concat('...'),
+                detail: 'past query',
+                apply: q,
+                info: q.length < 80 ? undefined : q
+              })),
+              span: /^[a-zA-Z0-9_:]+$/
+            }
+            if (res !== null) {
+              historyItems.options = historyItems.options.concat(res.options)
+            }
+            // console.log(historyItems)
+            return historyItems
+          })
+        }
+        return obj
+      }
       const dynamicConfigCompartment = new Compartment()
       const dynamicConfig = [
         promqlHighlighter,
@@ -622,92 +650,64 @@ export default {
         const view = new EditorView({
           state: EditorViewstate,
           // parent: document.getElementById('editor')
-          parent: document.getElementById('editor'+self.index)
+          parent: document.getElementById('editor' + self.index)
         })
         self.newView = view
       } else {
-        console.log('viewIsOk')
+        // console.log('viewIsOk')
         // const { from} = self.newView.state.selection.ranges[0]
         // const to = self.codeMirrorValue.length
         const to = self.oldcCodeLength
         const from = self.oldcCodeLength
-        console.log(from,to);
+        // console.log(from, to)
         self.newView.dispatch(
           self.newView.state.update({
             effects: dynamicConfigCompartment.reconfigure(dynamicConfig),
-            changes:{from,to,insert:self.codeMirrorValue[self.index]}
+            changes: { from, to, insert: self.codeMirrorValue[self.index] }
           })
         )
       }
     },
     newChange (val) {
-      console.log('newchange', val)
-      if(val){
+      // console.log('newchange', val)
+      if (val) {
         this.oldcCodeLength = val.length
-        console.log(this.oldcCodeLength);
+        // console.log(this.oldcCodeLength)
         this.codeMirrorValue[this.index] = val
         this.expressionList[this.index] = val
-        console.log(this.codeMirrorValue);
+        // console.log(this.codeMirrorValue)
         this.metricKeyDown(val)
-      }else{
-        this.oldcCodeLength = 0;
+      } else {
+        this.oldcCodeLength = 0
         this.codeMirrorValue[this.index] = ''
       }
     },
     newDoc (val) {
-      console.log('doc', val)
-    },
-    getHint (val, params, b, c, d) {
-      if (params) {
-        console.log(val, params, b, c, d, 123123123)
-        console.log(JSON.stringify(params.body))
-        return this.sendAjax('', params)
-      } else {
-        return this.sendAjax('http://192.168.44.61:10091/api/v1/series', {})
-      }
-
-      // this.$post('api/v1/series')
+      // console.log('doc', val)
     },
     fetchFn (a, b) {
+      const params = {}
+      console.log(b)
       if (b) {
-        const form = new FormData()
-        console.log(b.body)
-        form.append('match[]', b.body.getAll('match[]'))
-        return this.$post(a, form)
-      } else {
-        return this.$get(a)
-      }
-    },
-    sendAjax (url, body) {
-      // 构造表单数据
-      return new Promise(resolve => {
-        const nowUrl = url
-        const formData = new FormData()
-        formData.append('username', 'johndoe')
-        formData.append('id', 123456)
-        // 创建xhr对象
-        const xhr = {
-          ...new XMLHttpRequest(),
-          ...body
-        }
-
-        // 设置xhr请求的超时时间
-        xhr.timeout = 3000
-        // 设置响应返回的数据格式
-        xhr.responseType = ''
-        // 创建一个 post 请求，采用异步
-        xhr.open('post', nowUrl, true)
-        xhr.setRequestHeader('Authorization', localStorage.getItem('nz-token'))
-        // 注册相关事件回调处理函数
-        xhr.onload = function (e) {
-          if (this.status == 200 || this.status == 304) {
-            // alert(this.responseText)
-            resolve(JSON.parse(this.responseText))
+        params['match[]'] = b.body.get('match[]')
+        params.start = b.body.get('start')
+        params.end = b.body.get('end')
+        a += '?match[]=' + b.body.get('match[]')
+        return fetch(a, {
+          ...b,
+          // body: JSON.stringify(params),
+          redirect: 'follow',
+          headers: {
+            Authorization: localStorage.getItem('nz-token'),
+            'content-type':'application/x-www-form-urlencoded'
           }
+        })
+      }
+      return fetch(a, {
+        ...b,
+        headers: {
+          Authorization: localStorage.getItem('nz-token')
         }
-        xhr.onerror = function (e) { console.log(e) }
-        // 发送数据
-        xhr.send()
       })
     },
     closeDropdown () {
@@ -792,7 +792,7 @@ export default {
       this.cascaderValue = ''
     },
     metricChangeNew (value) {
-      console.log(value);
+      // console.log(value)
       if (!value) return
       this.insertText(value)
       this.dropDownVisible = false
@@ -1088,16 +1088,15 @@ export default {
         }
       }
     },
-    expressionList:{
+    expressionList: {
       deep: true,
       immediate: true,
       handler (n, o) {
-        console.log(n,n[this.index]);
-        this.codeMirrorValue[this.index] = n[this.index];
-        
+        // console.log(n, n[this.index])
+        this.codeMirrorValue[this.index] = n[this.index]
       }
-    },
-    
+    }
+
     // codeMirrorValue:{
     //   deep:true,
     //   imediate:true,

From a7d47d8fbc5fa7493781609913f4ff6a089fb49c Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Fri, 22 Apr 2022 19:13:14 +0800
Subject: [PATCH 05/25] NEZ-1830 fix :

---
 nezha-fronted/build/webpack.dev.conf.js  | 2 +-
 nezha-fronted/build/webpack.prod.conf.js | 2 +-
 nezha-fronted/index.html                 | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/build/webpack.dev.conf.js b/nezha-fronted/build/webpack.dev.conf.js
index 45b7911e6..cf74c1258 100644
--- a/nezha-fronted/build/webpack.dev.conf.js
+++ b/nezha-fronted/build/webpack.dev.conf.js
@@ -55,7 +55,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     new webpack.NoEmitOnErrorsPlugin(),
     // https://github.com/ampedandwired/html-webpack-plugin
     new HtmlWebpackPlugin({
-      favicon: './static/favicon.ico',
+      favicon: 'src/assets/img/favicon.ico',
       filename: 'index.html',
       template: 'index.html',
       inject: true
diff --git a/nezha-fronted/build/webpack.prod.conf.js b/nezha-fronted/build/webpack.prod.conf.js
index 396e1f024..1066b82f9 100644
--- a/nezha-fronted/build/webpack.prod.conf.js
+++ b/nezha-fronted/build/webpack.prod.conf.js
@@ -91,7 +91,7 @@ const webpackConfig = merge(baseWebpackConfig, {
     // you can customize output by editing /index.html
     // see https://github.com/ampedandwired/html-webpack-plugin
     new HtmlWebpackPlugin({
-      favicon: './static/favicon.ico',
+      favicon: 'src/assets/img/favicon.ico',
       filename: config.build.index,
       template: 'index.html',
       hash: false,
diff --git a/nezha-fronted/index.html b/nezha-fronted/index.html
index f6e379b09..835362dc2 100644
--- a/nezha-fronted/index.html
+++ b/nezha-fronted/index.html
@@ -5,8 +5,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <link rel="icon" href="data:;base64,=">
-  <link href="./static/favicon.ico" rel="icon" type="image/x-icon"/>
-
+  <link href="./favicon.ico" rel="icon" type="image/x-icon"/>
 
   <title>Network Zodiac</title>
   <style>

From f46788f95f524902c37a8a28acf9283bfeaa82f4 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Fri, 22 Apr 2022 19:21:36 +0800
Subject: [PATCH 06/25] =?UTF-8?q?=20NEZ-1830=20fix=20:=20Network=20Zodiac?=
 =?UTF-8?q?=20=E5=89=8D=E7=AB=AFlogo=E6=9B=B4=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/build/webpack.dev.conf.js  | 2 +-
 nezha-fronted/build/webpack.prod.conf.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/build/webpack.dev.conf.js b/nezha-fronted/build/webpack.dev.conf.js
index cf74c1258..b9343e8db 100644
--- a/nezha-fronted/build/webpack.dev.conf.js
+++ b/nezha-fronted/build/webpack.dev.conf.js
@@ -55,7 +55,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     new webpack.NoEmitOnErrorsPlugin(),
     // https://github.com/ampedandwired/html-webpack-plugin
     new HtmlWebpackPlugin({
-      favicon: 'src/assets/img/favicon.ico',
+      favicon: require('../src/assets/img/favicon.ico'),
       filename: 'index.html',
       template: 'index.html',
       inject: true
diff --git a/nezha-fronted/build/webpack.prod.conf.js b/nezha-fronted/build/webpack.prod.conf.js
index 1066b82f9..1f2600c43 100644
--- a/nezha-fronted/build/webpack.prod.conf.js
+++ b/nezha-fronted/build/webpack.prod.conf.js
@@ -91,7 +91,7 @@ const webpackConfig = merge(baseWebpackConfig, {
     // you can customize output by editing /index.html
     // see https://github.com/ampedandwired/html-webpack-plugin
     new HtmlWebpackPlugin({
-      favicon: 'src/assets/img/favicon.ico',
+      favicon: require('../src/assets/img/favicon.ico'),
       filename: config.build.index,
       template: 'index.html',
       hash: false,

From 13831771d05e8be16dea0114d043e47396d09ab0 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Sun, 24 Apr 2022 09:37:55 +0800
Subject: [PATCH 07/25] Merge branch 'dev-3.3' of
 https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3

---
 nezha-fronted/build/webpack.dev.conf.js  | 2 +-
 nezha-fronted/build/webpack.prod.conf.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/build/webpack.dev.conf.js b/nezha-fronted/build/webpack.dev.conf.js
index b9343e8db..3c79326bf 100644
--- a/nezha-fronted/build/webpack.dev.conf.js
+++ b/nezha-fronted/build/webpack.dev.conf.js
@@ -55,7 +55,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     new webpack.NoEmitOnErrorsPlugin(),
     // https://github.com/ampedandwired/html-webpack-plugin
     new HtmlWebpackPlugin({
-      favicon: require('../src/assets/img/favicon.ico'),
+      favicon: path.resolve(__dirname, '../src/assets/img/favicon.ico'),
       filename: 'index.html',
       template: 'index.html',
       inject: true
diff --git a/nezha-fronted/build/webpack.prod.conf.js b/nezha-fronted/build/webpack.prod.conf.js
index 1f2600c43..b3d516e39 100644
--- a/nezha-fronted/build/webpack.prod.conf.js
+++ b/nezha-fronted/build/webpack.prod.conf.js
@@ -91,7 +91,7 @@ const webpackConfig = merge(baseWebpackConfig, {
     // you can customize output by editing /index.html
     // see https://github.com/ampedandwired/html-webpack-plugin
     new HtmlWebpackPlugin({
-      favicon: require('../src/assets/img/favicon.ico'),
+      favicon: path.resolve(__dirname, '../src/assets/img/favicon.ico'),
       filename: config.build.index,
       template: 'index.html',
       hash: false,

From 88f6e09b7f3cf6336eb54e9435d518efc0b5fe1d Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Sun, 24 Apr 2022 09:38:17 +0800
Subject: [PATCH 08/25] =?UTF-8?q?NEZ-1830=20fix=20:=20Network=20Zodiac=20?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AFlogo=E6=9B=B4=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/static/config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/static/config.json b/nezha-fronted/static/config.json
index 5f74f5d01..abcddc473 100644
--- a/nezha-fronted/static/config.json
+++ b/nezha-fronted/static/config.json
@@ -1 +1 @@
-{"baseUrl":"/", "version": "21.04"}
+{"baseUrl":"http://192.168.40.42:8080/", "version": "21.04"}

From 403e309600a5d0e06996e7faacdd3a7887c46fc0 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Sun, 24 Apr 2022 09:41:19 +0800
Subject: [PATCH 09/25] =?UTF-8?q?NEZ-1830=20fix=20:=20Network=20Zodiac=20?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AFlogo=E6=9B=B4=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/static/config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/static/config.json b/nezha-fronted/static/config.json
index abcddc473..5f74f5d01 100644
--- a/nezha-fronted/static/config.json
+++ b/nezha-fronted/static/config.json
@@ -1 +1 @@
-{"baseUrl":"http://192.168.40.42:8080/", "version": "21.04"}
+{"baseUrl":"/", "version": "21.04"}

From eadf2fb68af57829667c238d24d310a3def8d921 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Sun, 24 Apr 2022 13:49:34 +0800
Subject: [PATCH 10/25] =?UTF-8?q?fix=20:=20=E4=BF=AE=E6=94=B9Name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/alert/alertLabel.vue    | 20 +++++++++----------
 .../components/common/alert/alertRuleInfo.vue |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/nezha-fronted/src/components/common/alert/alertLabel.vue b/nezha-fronted/src/components/common/alert/alertLabel.vue
index f9866bbb5..10f78ad38 100644
--- a/nezha-fronted/src/components/common/alert/alertLabel.vue
+++ b/nezha-fronted/src/components/common/alert/alertLabel.vue
@@ -27,12 +27,16 @@
           {{ alertLabelData && alertLabelData.id ? alertLabelData.id : "--" }}
         </div>
       </div>
-       <div class="alert-label-box name-labe">
+      <div class="alert-label-box name-label">
+        <div class="alert-label-title">{{$t('overall.name')}}</div>
+        <div class="alert-label-value">{{alertLabelData && alertLabelData.name ? alertLabelData.name : '--'}}</div>
+      </div>
+       <!-- <div class="alert-label-box name-labe">
         <div class="alert-label-title">Name</div>
         <div class="alert-label-value">
           {{ alertLabelData && alertLabelData.name ? alertLabelData.name : "--" }}
         </div>
-      </div>
+      </div> -->
       <div class="alert-label-box">
         <div class="alert-label-title">{{ $t("overall.manageIp") }}</div>
         <div class="alert-label-value">
@@ -43,10 +47,6 @@
           }}
         </div>
       </div>
-      <div class="alert-label-box name-label">
-        <div class="alert-label-title">{{$t('overall.name')}}</div>
-        <div class="alert-label-value">{{alertLabelData && alertLabelData.name ? alertLabelData.name : '--'}}</div>
-      </div>
       <div class="alert-label-box">
         <div class="alert-label-title">{{ $t("overall.type") }}</div>
         <div class="alert-label-value">
@@ -188,7 +188,7 @@
         </div>
       </div>
       <div class="alert-label-box name-labe">
-        <div class="alert-label-title">Name</div>
+        <div class="alert-label-title">{{$t('overall.name')}}</div>
         <div class="alert-label-value">
           {{ alertLabelData && alertLabelData.Name ? alertLabelData.Name : "--" }}
         </div>
@@ -281,7 +281,7 @@
         </div>
       </div>
        <div class="alert-label-box name-labe">
-        <div class="alert-label-title">Name</div>
+        <div class="alert-label-title">{{$t('overall.name')}}</div>
         <div class="alert-label-value">
           {{ alertLabelData && alertLabelData.name ? alertLabelData.name : "--" }}
         </div>
@@ -376,7 +376,7 @@
         </div>
       </div>
       <div class="alert-label-box name-labe">
-        <div class="alert-label-title">Name</div>
+        <div class="alert-label-title">{{$t('overall.name')}}</div>
         <div class="alert-label-value">
           {{ alertLabelData && alertLabelData.name ? alertLabelData.name : "--" }}
         </div>
@@ -508,7 +508,7 @@
         </div>
       </div>
        <div class="alert-label-box name-labe">
-        <div class="alert-label-title">Name</div>
+        <div class="alert-label-title">{{$t('overall.name')}}</div>
         <div class="alert-label-value">
           {{ alertLabelData && alertLabelData.name ? alertLabelData.name : "--" }}
         </div>
diff --git a/nezha-fronted/src/components/common/alert/alertRuleInfo.vue b/nezha-fronted/src/components/common/alert/alertRuleInfo.vue
index 0aa6aa6b5..33d8c8e80 100644
--- a/nezha-fronted/src/components/common/alert/alertRuleInfo.vue
+++ b/nezha-fronted/src/components/common/alert/alertRuleInfo.vue
@@ -14,7 +14,7 @@
         <div class="alert-rule-value">{{alertRuleData.id ? alertRuleData.id : '--'}}</div>
       </div>
       <div class="alert-rule-box name-labe">
-        <div class="alert-rule-title">Name</div>
+        <div class="alert-rule-title">{{$t('overall.name')}}</div>
         <div class="alert-rule-value">{{alertRuleData.name ? alertRuleData.name : '--'}}</div>
       </div>
 <!--      <div class="alert-rule-box">-->

From 9c4c5278c22974dbb7cb3dc1d47937f01f25d66c Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Sun, 24 Apr 2022 13:59:02 +0800
Subject: [PATCH 11/25] =?UTF-8?q?fix=20:=20=E4=BF=AE=E6=94=B9Name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/alert/alertLabel.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/alert/alertLabel.vue b/nezha-fronted/src/components/common/alert/alertLabel.vue
index 10f78ad38..3198fd10c 100644
--- a/nezha-fronted/src/components/common/alert/alertLabel.vue
+++ b/nezha-fronted/src/components/common/alert/alertLabel.vue
@@ -27,7 +27,7 @@
           {{ alertLabelData && alertLabelData.id ? alertLabelData.id : "--" }}
         </div>
       </div>
-      <div class="alert-label-box name-label">
+      <div class="alert-label-box name-labe">
         <div class="alert-label-title">{{$t('overall.name')}}</div>
         <div class="alert-label-value">{{alertLabelData && alertLabelData.name ? alertLabelData.name : '--'}}</div>
       </div>

From 9b1a3e7db1099a1c0dee06afa8873a9b7739cf92 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Sun, 24 Apr 2022 17:05:45 +0800
Subject: [PATCH 12/25] =?UTF-8?q?fix=20:=20=E6=9B=B4=E6=94=B9=E5=91=8A?=
 =?UTF-8?q?=E8=AD=A6=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=AD=97=E4=BD=93?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/alert/alertMessageInfo.scss           | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss b/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss
index 1db5291c8..a697b36e3 100644
--- a/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss
+++ b/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss
@@ -11,6 +11,7 @@
       align-items: center;
       font-weight: 600;
       font-family: PingFangSC-Medium;
+      color: $--color-text-primary;
 
       .alert-message-state {
         display: block;
@@ -18,10 +19,9 @@
         margin-right: 15px;
         font-size: 14px;
         font-weight: normal;
-
-        padding: 2px 8px;
-        border-radius: 4px;
         color: $--color-text-label;
+        padding: 2px 8px;
+        border-radius: 4px; 
       }
     }
 
@@ -235,7 +235,7 @@
 
         .time-line-item-header {
           font-size: 14px;
-          color: #333333;
+          color: $--color-text-primary;
           font-weight: 400;
         }
       }
@@ -274,7 +274,8 @@
 
     .info-box-content {
       font-size: 14px;
-      color: #666666;
+      // color: #666666;
+      color: $--color-text-regular;
       font-weight: 400;
       width: 100%;
       margin-bottom: 40px;
@@ -307,12 +308,12 @@
                 padding-left: 5px;
 
                 span:nth-of-type(n) {
-                  color: #999999;
+                  color: $--color-text-secondary;
                   margin-right: 5px;
                 }
 
                 span:nth-of-type(2n) {
-                  color: #666666;
+                  color: $--color-text-regular;
                   margin-right: 15px;
                 }
               }
@@ -417,6 +418,7 @@
                     .nz-alert-tag__content {
                       padding-left: 6px;
                       padding-right: 6px;
+                      color: $--color-text-primary;
                       display: flex;
                       align-items: center;
                       justify-content: center;

From 11b9ac1c5655e41f44227dff69cb95c9f9374b82 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Sun, 24 Apr 2022 17:45:18 +0800
Subject: [PATCH 13/25] =?UTF-8?q?fix=20:=20=E6=9B=B4=E6=94=B9=E5=91=8A?=
 =?UTF-8?q?=E8=AD=A6=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=AD=97=E4=BD=93?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/css/components/common/alert/alertMessageInfo.scss  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss b/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss
index a697b36e3..e2202ff70 100644
--- a/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss
+++ b/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss
@@ -51,7 +51,7 @@
       }
 
       .alert-message-info-tab {
-        height: 63%;
+        height: 61.8%;
         flex: 1;
 
         .alert-label-header-title {
@@ -97,6 +97,8 @@
           }
 
           .el-tabs__content {
+            // box-sizing:content-box;
+            // height: 100%;
             padding: 25px 30px;
             flex: 1;
             border: 1px solid $--border-color-light;

From 99149197471439c658e93a37687db55d638138b6 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Sun, 24 Apr 2022 18:02:26 +0800
Subject: [PATCH 14/25] =?UTF-8?q?NEZ-1787=20feat=EF=BC=9A=20=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E9=80=89=E6=8B=A9=E5=99=A8=E7=BB=84=E4=BB=B6=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/config/index.js                 |   6 +-
 .../css/components/common/timePicker.scss     |  58 +++++++---
 .../src/assets/css/themes/theme-light.scss    |   4 +-
 .../src/components/chart/chartMixin.js        |   8 +-
 .../common/bottomBox/tabs/panelTabNew.vue     |   2 -
 .../src/components/common/js/validate.js      |   7 ++
 .../src/components/common/timePicker.vue      | 109 ++++++++++--------
 .../page/dashboard/explore/promqlInput.vue    |   5 +-
 8 files changed, 125 insertions(+), 74 deletions(-)

diff --git a/nezha-fronted/config/index.js b/nezha-fronted/config/index.js
index c9782e0ea..67c925f61 100644
--- a/nezha-fronted/config/index.js
+++ b/nezha-fronted/config/index.js
@@ -19,10 +19,10 @@ module.exports = {
       }
     },
     // Various Dev Server settings
-    // host: '0.0.0.0', // can be overwritten by process.env.HOST
-    host: '127.0.0.1', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
+    // host: '127.0.0.1', // can be overwritten by process.env.HOST
     port: 80, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
-    autoOpenBrowser: true,
+    autoOpenBrowser: false,
     errorOverlay: true,
     notifyOnErrors: true,
     poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
diff --git a/nezha-fronted/src/assets/css/components/common/timePicker.scss b/nezha-fronted/src/assets/css/components/common/timePicker.scss
index 19b319138..2f45a1e7a 100644
--- a/nezha-fronted/src/assets/css/components/common/timePicker.scss
+++ b/nezha-fronted/src/assets/css/components/common/timePicker.scss
@@ -166,7 +166,7 @@
 .date-range-panel {
   // height: 460px;
   width: 500px;
-  background: #FFFFFF;
+  background: $--background-color-empty;
   box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);
   position: absolute;
   right: 4%;
@@ -179,26 +179,58 @@
     flex-direction: column;
     .content-title {
       font-size: 14px;
-      color: #666666;
+      color: $--color-text-regular;
       font-weight: 400;
     }
 
     .content-input {
       width: 230px;
+      display: flex;
+      position: relative;
+      align-items: center;
+      margin-bottom: 12px;
       .el-input{
         width: auto;
+        flex: 1;
         .el-input__inner{
-          border: 1px solid #E7EAED;
-          border-radius: 2px;
+          border: 1px solid $--border-color-light;
+          border-radius: 2px 0px 0px 2px;
           width: 230px;
           padding: 0 8px;
-          height: 30px;
-          line-height: 30px;
-          margin-bottom: 12px;
+          //height: 30px;
+          //line-height: 30px;
           outline: #169AFF;
         }
 
       }
+      .input-hint{
+        display: none;
+      }
+      .nz-icon-box{
+        height: 28px;
+        box-sizing: border-box;
+        background: $--background-color-disabled;
+        line-height: 28px;
+        padding: 0 4px;
+        border-radius: 0 2px 2px 0;
+
+      }
+      &.input-error{
+        .el-input{
+          .el-input__inner{
+            border: 1px solid $--color-danger;
+            outline: $--color-danger;
+          }
+        }
+        .input-hint{
+          display: block;
+          color: $--color-danger;
+          position: absolute;
+          left: 0;
+          font-size: 14px;
+          bottom: -25px;
+        }
+      }
     }
 
     .date-range-history {
@@ -236,22 +268,22 @@
         display: flex;
         flex-direction: column;
         justify-content: center;
-        color: #333333;
+        color: $--color-text-primary;
         font-weight: 400;
         padding: 0 10px;
         cursor: pointer;
       }
 
       li:hover {
-        background: #F5F5F5;
-        color: #333333;
+        background: $--alert-rule-background-color;
+        color: $--color-text-primary;
       }
       li.activeLi :hover {
-        background: #F5F5F5;
+        background: $--alert-rule-background-color;
         color: $--color-primary !important;
       }
       li.activeLi {
-        background: #F5F5F5;
+        background: $--alert-rule-background-color;
         color: $--color-primary !important;
         font-weight: 400;
 
@@ -264,4 +296,4 @@
 
     }
   }
-}
\ No newline at end of file
+}
diff --git a/nezha-fronted/src/assets/css/themes/theme-light.scss b/nezha-fronted/src/assets/css/themes/theme-light.scss
index 9807384e4..738ab8f21 100644
--- a/nezha-fronted/src/assets/css/themes/theme-light.scss
+++ b/nezha-fronted/src/assets/css/themes/theme-light.scss
@@ -32,7 +32,7 @@ $--left-menu-background-color-hover: $--left-menu-background-color-active;
 
 /* 3.字色 */
 // 标题字色(覆盖element-ui内置变量)
-$--color-text-primary: #333332;
+$--color-text-primary: #333333;
 // 普通字色(覆盖element-ui内置变量)
 $--color-text-regular: #666665;
 // 次要字色(覆盖element-ui内置变量)
@@ -221,7 +221,7 @@ $--switch-background-color: #dcdfe6;
 $--project-input-background-color: $--color-text-disabled;
 
 /* alert rule */
-$--alert-rule-background-color: #f4f4f5;
+$--alert-rule-background-color: #f5f5f5;
 $--alert-rule-color: $--overview-icon-color;
 
 /* webSSH */
diff --git a/nezha-fronted/src/components/chart/chartMixin.js b/nezha-fronted/src/components/chart/chartMixin.js
index ade2ed351..5909fe0ea 100644
--- a/nezha-fronted/src/components/chart/chartMixin.js
+++ b/nezha-fronted/src/components/chart/chartMixin.js
@@ -117,7 +117,7 @@ export default {
       // 处理legend别名
       alias = alias + this.handleLegendAlias(legend, chartInfo.elements[expressionIndex].legend)
       if (!alias) {
-        alias = chartInfo.elements[expressionIndex].expression
+        alias = chartInfo.elements[expressionIndex].expression || ''
       }
       if (alias == 'Previous ') {
         alias += chartInfo.elements[expressionIndex].expression
@@ -148,9 +148,9 @@ export default {
       if (/\{\{.+\}\}/.test(aliasExpression)) {
         const labelValue = aliasExpression.replace(/(\{\{.+?\}\})/g, function (i) {
           const label = i.substr(i.indexOf('{{') + 2, i.indexOf('}}') - i.indexOf('{{') - 2)
-          // if (!legend) {
-          //   return label
-          // }
+          if (!legend) {
+            return label
+          }
           const reg = new RegExp(label + '=".+?"')
           let value = null
           if (reg.test(legend)) {
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
index 56b62dcc3..d5ce05025 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
@@ -494,7 +494,6 @@ export default {
       if (this.$refs.pickTime) {
         const nowTimeType = this.$refs.pickTime.$refs.timePicker.nowTimeType
         this.nowTimeType = this.$refs.pickTime.$refs.timePicker.nowTimeType
-        console.log(nowTimeType, this.nowTimeType)
         this.setSearchTime(nowTimeType.type, nowTimeType.value)
         this.filter.start_time = bus.timeFormate(this.searchTime[0])
         this.filter.end_time = bus.timeFormate(this.searchTime[1])
@@ -520,7 +519,6 @@ export default {
         this.$set(this.searchTime, 0, startTime)
         this.$set(this.searchTime, 1, endTime)
         this.$set(this.searchTime, 2, val + 'h')
-        console.log(this.searchTime)
       } else if (type === 'date') {
         const startTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setDate(new Date(bus.computeTimezone(new Date().getTime())).getDate() - val))
         const endTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())))
diff --git a/nezha-fronted/src/components/common/js/validate.js b/nezha-fronted/src/components/common/js/validate.js
index 7e614a1dd..695c01fda 100644
--- a/nezha-fronted/src/components/common/js/validate.js
+++ b/nezha-fronted/src/components/common/js/validate.js
@@ -221,3 +221,10 @@ export function sysObjectIdInput (rule, value, callback) {
 export function longAndLat (rule, value, callback) { // 校验经纬度
 
 }
+export function dataValidate () {
+  // const time = '([0-1][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])$'
+  // const YMD = '/((([0-9]{3}[1-9]|[0-9]{2}[1-9][0-9]{1}|[0-9]{1}[1-9][0-9]{2}|[1-9][0-9]{3})-(((0[13578]|1[02])-(0[1-9]|[12][0-9]|3[01]))|((0[469]|11)-(0[1-9]|[12][0-9]|30))|(02-(0[1-9]|[1][0-9]|2[0-8]))))|((([0-9]{2})(0[48]|[2468][048]|[13579][26])|((0[48]|[2468][048]|[3579][26])00))-02-29))'
+  // const DMY = '/((^(3[01]|[12][0-9]|0[1-9])(\\/)(10|12|0[13578])(\\/)((1[8-9]\\d{2})|([2-9]\\d{3}))$)|(^(30|[12][0-9]|0[1-9])(\\/)(11|0[469])(\\/)((1[8-9]\\d{2})|([2-9]\\d{3}))$)|(^(2[0-8]|1[0-9]|0[1-9])(\\/)(02)(\\/)((1[8-9]\\d{2})|([2-9]\\d{3}))$)|(^(29)(\\/)(02)(\\/)([2468][048]00)$)|(^(29)(\\/)(02)(\\/)([3579][26]00)$)|(^(29)(\\/)(02)(\\/)([1][89][0][48])$)|(^(29)(\\/)(02)(\\/)([2-9][0-9][0][48])$)|(^(29)(\\/)(02)(\\/)([1][89][2468][048])$)|(^(29)(\\/)(02)(\\/)([2-9][0-9][2468][048])$)|(^(29)(\\/)(02)(\\/)([1][89][13579][26])$)|(^(29)(\\/)(02)(\\/)([2-9][0-9][13579][26])$))/'
+  // const MDY =
+}
+
diff --git a/nezha-fronted/src/components/common/timePicker.vue b/nezha-fronted/src/components/common/timePicker.vue
index 52f41880f..ebbbed796 100644
--- a/nezha-fronted/src/components/common/timePicker.vue
+++ b/nezha-fronted/src/components/common/timePicker.vue
@@ -46,22 +46,31 @@
               size="mini"
               ref="calendar"
               :format="timeFormatStrToDatePickFormat(timeFormatMain)"
-              @change="dateChange(whoChoose)"
-              v-model="searchTimeValue"
-              type="date"
+              :value-format="timeFormatStrToDatePickFormat(timeFormatMain)"
+              @change="dateChange"
+              :default-time="['00:00:00', '23:59:59']"
+              v-model="oldSearchTime"
+              type="daterange"
               popper-class="panel-time-picker-popper time-picker-popover__select-top"
               align="right"
             >
             </my-date-picker>
-
+<!--            @change="dateChange(whoChoose)"-->
             <div class="content-title">{{$t('dashboard.panel.chartForm.valMapping.from')}}</div>
-            <div @click="myDatePickerShow('start')" tabindex="1" class="content-input">
-              <el-input  v-model="searchTime[0]" @change="dateChange('start',searchTime[0])"> </el-input>
+            <div  tabindex="1" class="content-input" :class="oldSearchTimeError[0] ? 'input-error' : ''">
+              <el-input   @focus="searchTimeValue = oldSearchTime[0]"  v-model="oldSearchTime[0]" @change="dateInputChange('start',oldSearchTime[0])" size="mini"> </el-input>
+              <div @click="myDatePickerShow()" class="nz-icon-box">
+                <i class="nz-icon nz-icon-table1"/>
+              </div>
+              <div class="input-hint">{{inputError}}</div>
             </div>
             <div class="content-title">{{$t('dashboard.panel.chartForm.valMapping.to')}}</div>
-            <div @click="myDatePickerShow('end')" tabindex="2" class="content-input">
-              <el-input  v-model="searchTime[1]" @change="dateChange('end',searchTime[1])"> </el-input>
-
+            <div tabindex="2" class="content-input" :class="oldSearchTimeError[1] ? 'input-error' : ''">
+              <el-input  @focus="searchTimeValue = oldSearchTime[1]" v-model="oldSearchTime[1]" @change="dateInputChange('end',oldSearchTime[1])" size="mini"> </el-input>
+              <div  @click="myDatePickerShow()" class="nz-icon-box">
+                <i class="nz-icon nz-icon-table1"/>
+              </div>
+              <div class="input-hint">{{$t('date.formatError')}}</div>
             </div>
             <div>
               <el-button
@@ -132,6 +141,7 @@
 
 <script>
 import bus from '@/libs/bus'
+import moment from 'moment-timezone'
 
 export default {
   name: 'timePicker',
@@ -159,6 +169,13 @@ export default {
         bus.timeFormate(bus.getOffsetTimezoneData(-1)),
         bus.timeFormate(bus.getOffsetTimezoneData())
       ],
+      oldSearchTime: [bus.timeFormate(bus.getOffsetTimezoneData(-1)),
+        bus.timeFormate(bus.getOffsetTimezoneData())],
+      oldSearchTimeError: {
+        0: false,
+        1: false
+      },
+      inputError: this.$t('date.formatError'),
       showTime: {
         id: 4,
         text: this.$t('dashboard.panel.lastOneHour')
@@ -253,6 +270,9 @@ export default {
     this.getItem()
     this.getUtcStr()
     this.getRangeHistoryArr()
+    const timeTemp = this.$loadsh.cloneDeep(this.searchTime)
+    this.oldSearchTime[0] = timeTemp[0]
+    this.oldSearchTime[1] = timeTemp[1]
   },
   methods: {
     changeDropdownFlag () {
@@ -268,8 +288,8 @@ export default {
       this.utc = localStorage.getItem('timezoneOffset')
     },
     myDatePickerShow (item) {
-      this.whoChoose = item
-      this.isCustom = true
+      // this.whoChoose = item
+      // this.isCustom = true
       this.$refs.calendar.focus()
       this.$refs.calendar.pickerVisible = true
       if (document.getElementById('viewGraphDialog')) {
@@ -308,9 +328,13 @@ export default {
       this.utcStr = str + this.utc
     },
     timeRange (item) {
+      if (this.oldSearchTimeError[0] || this.oldSearchTimeError[1]) {
+        return
+      }
+      this.searchTime = this.$loadsh.cloneDeep(this.oldSearchTime)
       this.showTime = this.nowTimeType = {
         id: 0,
-        text: this.$t('dashboard.panel.customTimeRange'),
+        text: this.searchTime[0] + ' ' + this.$t('dashboard.panel.to') + ' ' + this.searchTime[1],
         value: -1
       }
       this.isCustom = true
@@ -329,49 +353,42 @@ export default {
       this.$emit('change', this.searchTime)
     },
     showDropdown () {
+      const timeTemp = this.$loadsh.cloneDeep(this.searchTime)
+      this.oldSearchTime[0] = timeTemp[0]
+      this.oldSearchTime[1] = timeTemp[1]
+      this.oldSearchTimeError[0] = false
+      this.oldSearchTimeError[1] = false
       this.dropdownFlag = !this.dropdownFlag
     },
-    dateChange (type, v) {
+    dateInputChange (type, v) {
       if (type == 'start') {
-        if (!v) {
-          const startTime = bus.timeFormate(this.searchTimeValue).trim().split(' ')[0] + ' '
-          this.$set(this.searchTime, 0, startTime)
+        const dateValidate = moment(this.oldSearchTime[0], this.timeFormatMain).isValid()
+        if (!dateValidate) {
+          this.inputError = this.$t('date.formatError')
+          this.oldSearchTimeError[0] = true
         } else {
-          const str = v.trim().split(' ')[1]
-          const reg = /^([01]\d|2[0-3]):[0-5]\d:[0-5]\d$/
-          if (reg.test(str)) {
-            const startTime = bus.timeFormate(v)
-            this.$set(this.searchTime, 0, startTime)
-          } else {
-            this.$set(this.searchTime, 0, '')
-          }
+          this.oldSearchTimeError[0] = false
+          this.oldSearchTime[0] = bus.timeFormate(this.oldSearchTime[0])
         }
       } else if (type == 'end') {
-        if (!v) {
-          const endTime = bus.timeFormate(this.searchTimeValue).trim().split(' ')[0] + ' '
-          this.$set(this.searchTime, 1, endTime)
+        const dateValidate = moment(this.oldSearchTime[1], this.timeFormatMain).isValid()
+        if (!dateValidate) {
+          this.oldSearchTimeError[1] = true
         } else {
-          const str = v.trim().split(' ')[1]
-          const reg = /^([01]\d|2[0-3]):[0-5]\d:[0-5]\d$/
-          if (reg.test(str)) {
-            const endTime = bus.timeFormate(v)
-            this.$set(this.searchTime, 1, endTime)
-          } else {
-            this.$set(this.searchTime, 1, '')
-          }
+          this.oldSearchTimeError[1] = false
+          // this.$set(this.oldSearchTime, 1, bus.timeFormate(this.oldSearchTime[1]))
+          this.oldSearchTime[1] = bus.timeFormate(this.oldSearchTime[1])
         }
       }
-      this.searchTime[2] = ''
-      this.$set(this.showTime, 'id', 0)
-      this.$set(
-        this.showTime,
-        'text',
-        this.searchTime[0] +
-          ' ' +
-          this.$t('dashboard.panel.to') +
-          ' ' +
-          this.searchTime[1]
-      )
+      console.log(moment(this.oldSearchTime[0], this.timeFormatMain).isValid(), moment(this.oldSearchTime[1], this.timeFormatMain).isValid(), !moment(this.oldSearchTimeError[0]).isBefore(this.oldSearchTime[1]))
+      if (moment(this.oldSearchTime[0], this.timeFormatMain).isValid() && moment(this.oldSearchTime[1], this.timeFormatMain).isValid() && !moment(this.oldSearchTimeError[0]).isBefore(this.oldSearchTime[1])) {
+        this.oldSearchTimeError[0] = true
+        this.inputError = this.$t('date.fromGreaterTo')
+      }
+    },
+    dateChange () {
+      this.oldSearchTimeError[0] = false
+      this.oldSearchTimeError[1] = false
     },
     setCustomTime (timeGroup, timeRange) {
       if (timeGroup) {
diff --git a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
index bef19dd49..edefebb9f 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
@@ -552,7 +552,6 @@ export default {
         obj.queryHistory = []
         obj.promQL = function (context) {
           return Promise.resolve(this.complete.promQL(context)).then((res) => {
-            console.log(res)
             const { state, pos } = context
             const tree = syntaxTree(state).resolve(pos, -1)
             const start = res != null ? res.from : tree.from
@@ -687,7 +686,6 @@ export default {
     },
     fetchFn (a, b) {
       const params = {}
-      console.log(b)
       if (b) {
         params['match[]'] = b.body.get('match[]')
         params.start = b.body.get('start')
@@ -699,7 +697,7 @@ export default {
           redirect: 'follow',
           headers: {
             Authorization: localStorage.getItem('nz-token'),
-            'content-type':'application/x-www-form-urlencoded'
+            'content-type': 'application/x-www-form-urlencoded'
           }
         })
       }
@@ -1063,7 +1061,6 @@ export default {
       // elInput.selectionEnd = startPos + insertTxt.length
       this.expressionList[this.index] = insertTxt
       this.codeMirrorValue[this.index] = insertTxt
-      console.log('inserttext', this.codeMirrorValue[this.index])
       this.initCodeMirror()
     }
     /* setMsg:function(){

From 79b8804f7e71da8f660d7727f5e6190b2e40904c Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Sun, 24 Apr 2022 18:31:26 +0800
Subject: [PATCH 15/25] =?UTF-8?q?style=EF=BC=9A=20=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=20=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../css/components/common/timePicker.scss     | 27 ++++++++++++-------
 .../src/assets/css/themes/theme-light.scss    |  2 +-
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/common/timePicker.scss b/nezha-fronted/src/assets/css/components/common/timePicker.scss
index 2f45a1e7a..b4fb4ae87 100644
--- a/nezha-fronted/src/assets/css/components/common/timePicker.scss
+++ b/nezha-fronted/src/assets/css/components/common/timePicker.scss
@@ -81,13 +81,14 @@
   display: flex;
   justify-content: space-between;
   font-size: 14px;
-
+  color: $--color-text-regular;
   .utc-str {
     line-height: 44px;
     text-align: right;
     span{
       font-size: 12px;
       background: $--background-color-2;
+      padding: 6px 8px;
     }
   }
 }
@@ -113,6 +114,7 @@
 }
 
 .date-range-text {
+  color: $--color-text-regular;
   font-size: 14px;
   // min-width: 150px;
   flex-direction: row;
@@ -121,8 +123,8 @@
   display: flex;
   justify-content: space-around;
   height: 26px;
-  background: #FFFFFF;
-  // border: 1px solid #E7EAED;
+  background: $--background-color-empty;
+   border: 1px solid $--border-color-light;
   box-shadow: 0 2px 4px 0 rgba(51, 51, 51, 0.02);
   border-radius: 2px;
   line-height: 26px;
@@ -144,7 +146,7 @@
 
 .date-range-title {
   font-size: 14px;
-  color: #666666;
+  color: $--color-text-regular;
   font-weight: 600;
   padding: 14px 0 7px 8px;
 }
@@ -194,12 +196,12 @@
         flex: 1;
         .el-input__inner{
           border: 1px solid $--border-color-light;
-          border-radius: 2px 0px 0px 2px;
+          border-radius: 2px;
           width: 230px;
           padding: 0 8px;
           //height: 30px;
           //line-height: 30px;
-          outline: #169AFF;
+          //outline: #169AFF;
         }
 
       }
@@ -209,17 +211,22 @@
       .nz-icon-box{
         height: 28px;
         box-sizing: border-box;
-        background: $--background-color-disabled;
+        background: $--background-color-2;
         line-height: 28px;
         padding: 0 4px;
-        border-radius: 0 2px 2px 0;
-
+        border-radius: 2px;
+        color: $--color-text-regular;
+        border: 1px solid $--border-color-base;
+        margin-left: 4px;
+        .nz-icon{
+          font-size: 14px;
+        }
       }
       &.input-error{
         .el-input{
           .el-input__inner{
             border: 1px solid $--color-danger;
-            outline: $--color-danger;
+            //outline: $--color-danger;
           }
         }
         .input-hint{
diff --git a/nezha-fronted/src/assets/css/themes/theme-light.scss b/nezha-fronted/src/assets/css/themes/theme-light.scss
index 738ab8f21..7fe14a84c 100644
--- a/nezha-fronted/src/assets/css/themes/theme-light.scss
+++ b/nezha-fronted/src/assets/css/themes/theme-light.scss
@@ -34,7 +34,7 @@ $--left-menu-background-color-hover: $--left-menu-background-color-active;
 // 标题字色(覆盖element-ui内置变量)
 $--color-text-primary: #333333;
 // 普通字色(覆盖element-ui内置变量)
-$--color-text-regular: #666665;
+$--color-text-regular: #666666;
 // 次要字色(覆盖element-ui内置变量)
 $--color-text-secondary: #999998;
 // 链接字色

From 97570affada16dba3536714689eef6dcb4d94a45 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 25 Apr 2022 09:49:03 +0800
Subject: [PATCH 16/25] =?UTF-8?q?fix=EF=BC=9AtimePick=20=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/css/common/loading.scss              | 3 ++-
 .../src/assets/css/components/common/timePicker.scss          | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/assets/css/common/loading.scss b/nezha-fronted/src/assets/css/common/loading.scss
index 9d1f2c3a8..038ff2787 100644
--- a/nezha-fronted/src/assets/css/common/loading.scss
+++ b/nezha-fronted/src/assets/css/common/loading.scss
@@ -15,7 +15,8 @@
   width: 100%;
   position: absolute;
   z-index: 2000;
-  background-color: rgba(255,255,255,0.9);
+  background-color: $--background-color-empty;
+  opacity: 0.8;
   margin: 0;
   top: 0;
   right: 0;
diff --git a/nezha-fronted/src/assets/css/components/common/timePicker.scss b/nezha-fronted/src/assets/css/components/common/timePicker.scss
index b4fb4ae87..b4543e704 100644
--- a/nezha-fronted/src/assets/css/components/common/timePicker.scss
+++ b/nezha-fronted/src/assets/css/components/common/timePicker.scss
@@ -212,8 +212,8 @@
         height: 28px;
         box-sizing: border-box;
         background: $--background-color-2;
-        line-height: 28px;
-        padding: 0 4px;
+        padding: 0 8px;
+        line-height: 25px;
         border-radius: 2px;
         color: $--color-text-regular;
         border: 1px solid $--border-color-base;

From f1f7d83ee78ee564c4b033e061b08b4078a1de78 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 25 Apr 2022 10:07:10 +0800
Subject: [PATCH 17/25] =?UTF-8?q?fix=EF=BC=9A=E6=97=B6=E9=97=B4=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=99=A8=20=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/css/components/common/timePicker.scss       | 4 ++++
 nezha-fronted/src/components/common/timePicker.vue         | 7 +++++++
 nezha-fronted/src/components/page/dashboard/panel.vue      | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/assets/css/components/common/timePicker.scss b/nezha-fronted/src/assets/css/components/common/timePicker.scss
index b4543e704..47432bc42 100644
--- a/nezha-fronted/src/assets/css/components/common/timePicker.scss
+++ b/nezha-fronted/src/assets/css/components/common/timePicker.scss
@@ -221,6 +221,10 @@
         .nz-icon{
           font-size: 14px;
         }
+        &:hover{
+          border-color: $--color-primary;
+           color: $--color-primary;
+        }
       }
       &.input-error{
         .el-input{
diff --git a/nezha-fronted/src/components/common/timePicker.vue b/nezha-fronted/src/components/common/timePicker.vue
index ebbbed796..6767d8a67 100644
--- a/nezha-fronted/src/components/common/timePicker.vue
+++ b/nezha-fronted/src/components/common/timePicker.vue
@@ -577,6 +577,13 @@ export default {
           }
         }
       }
+    },
+    sign (n) {
+      if (n) {
+        this.rangeHistory = localStorage.getItem('date-range-history' + this.sign)
+          ? JSON.parse(localStorage.getItem('date-range-history' + this.sign))
+          : []
+      }
     }
   }
 }
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 6765cb2b3..d3c6350cb 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -40,7 +40,7 @@
 <!--                </el-input>-->
 <!--              </div>-->
 
-              <pick-time id="panel" ref="pickTime" v-model="searchTime" :refresh-data-func="dateChange" :use-chart-unit="false" class="margin-r-10" :sign="panelId"></pick-time>
+              <pick-time id="panel" ref="pickTime" v-model="searchTime" :refresh-data-func="dateChange" :use-chart-unit="false" class="margin-r-10" :sign="showPanel.id"></pick-time>
 
               <button id="panel-add-chart" v-has="'main_add'" :title="$t('overall.createChart')" class="top-tool-btn margin-r-10"
                       type="button" @click="addChartBefore">

From 647cd8c9e5ed39f63778b71b523cc761a9f45137 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 25 Apr 2022 14:43:54 +0800
Subject: [PATCH 18/25] =?UTF-8?q?fix:=20=E6=97=B6=E9=97=B4=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=99=A8=20=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=20?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=20=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E7=9A=84=E7=94=A8=E6=88=B7=20=E6=9C=AA=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E7=94=A8=E6=88=B7=E4=B8=BB=E9=A2=98=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../css/components/common/timePicker.scss     |  8 ++---
 .../page/dashboard/explore/promqlInput.vue    | 36 +++++++++++++------
 nezha-fronted/src/permission.js               |  2 ++
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/common/timePicker.scss b/nezha-fronted/src/assets/css/components/common/timePicker.scss
index 47432bc42..6b42f61ce 100644
--- a/nezha-fronted/src/assets/css/components/common/timePicker.scss
+++ b/nezha-fronted/src/assets/css/components/common/timePicker.scss
@@ -8,7 +8,7 @@
   line-height: 40px;
   height: 40px;
   box-sizing: border-box;
-  border: 1px solid $--border-color-base;
+  border: 1px solid $--border-color-light;
   border-radius: $--border-radius-small;
 }
 .calendar.calendar--small {
@@ -122,12 +122,12 @@
   padding: 0 10px;
   display: flex;
   justify-content: space-around;
-  height: 26px;
+  height: 30px;
   background: $--background-color-empty;
-   border: 1px solid $--border-color-light;
+   //border: 1px solid $--border-color-light;
   box-shadow: 0 2px 4px 0 rgba(51, 51, 51, 0.02);
   border-radius: 2px;
-  line-height: 26px;
+  line-height: 30px;
   transition: width .3s;
 
   .cn-icon {
diff --git a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
index edefebb9f..905af90a6 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
@@ -76,15 +76,18 @@
           class="input-box"
           @click="dropDownVisible = false"
         >
-        <div :id="'editor'+index"
-        class="not-fixed-height no-resize no-close"
+        <div
+          :id="'editor'+index"
+          v-if="type !== 'log'"
+          class="not-fixed-height no-resize no-close"
         >
         </div>
         <!-- <div id='editor'
         class="not-fixed-height no-resize no-close"
         >
         </div> -->
-          <!-- <el-input
+           <el-input
+             v-if="type == 'log'"
             :id="inputId"
             v-model="expressionList[index]"
             :autosize="{ minRows: 1, maxRows: 6 }"
@@ -93,7 +96,7 @@
             @input="metricKeyDown"
             @keyup.enter.native="expressionChange"
             ref="elInput"
-          ></el-input> -->
+          ></el-input>
 
           <div v-if="errorMsg" class="append-msg error">
             <span>{{ errorMsg }}</span>
@@ -231,8 +234,10 @@
               @click="dropDownVisible = false"
               v-if="plugins.indexOf('metric-input') > -1"
             >
-            <div :id="'editor'+index"
-        class="not-fixed-height no-resize no-close"
+            <div
+              :id="'editor'+index"
+              v-if="type !== 'log'"
+              class="not-fixed-height no-resize no-close"
         >
         </div>
             <!-- <div id="editor"
@@ -240,8 +245,9 @@
                 ref="elInput"
 
             ></div> -->
-              <!-- <el-input
+               <el-input
                 v-model="expressionList[index]"
+                v-if="type === 'log'"
                 @input="metricKeyDown"
                 type="textarea"
                 :maxlength="styleType === 3 ? 512 : 4096"
@@ -249,7 +255,7 @@
                 :autosize="{ minRows: 1, maxRows: 6 }"
                 class="not-fixed-height no-resize"
                 ref="elInput"
-              ></el-input> -->
+              ></el-input>
               <div class="append-msg error" v-if="errorMsg">
                 <span>{{ errorMsg }}</span>
               </div>
@@ -528,8 +534,7 @@ export default {
     }
   },
   mounted () {
-    this.initCodeMirror()
-    if (!this.fromFatherData && this.type !== 'logs') {
+    if (!this.fromFatherData && this.type !== 'log') {
       this.queryMetrics()
     }
   },
@@ -1092,7 +1097,7 @@ export default {
         // console.log(n, n[this.index])
         this.codeMirrorValue[this.index] = n[this.index]
       }
-    }
+    },
 
     // codeMirrorValue:{
     //   deep:true,
@@ -1103,6 +1108,15 @@ export default {
     //     }
     //   }
     // }
+    type: {
+      deep: true,
+      immediate: true,
+      handler(n) {
+        if (n !== 'log') {
+          this.initCodeMirror()
+        }
+      }
+    }
   }
 }
 </script>
diff --git a/nezha-fronted/src/permission.js b/nezha-fronted/src/permission.js
index 4b5bb2463..021ade4dd 100644
--- a/nezha-fronted/src/permission.js
+++ b/nezha-fronted/src/permission.js
@@ -143,6 +143,8 @@ router.beforeEach((to, from, next) => {
           })
         })
       } else {
+        const theme = localStorage.getItem(`nz-user-${localStorage.getItem('nz-user-id')}-theme`) || 'light'
+        document.getElementsByTagName('body')[0].setAttribute('class', 'theme-' + theme)
         resolve()
       }
     })

From 29258f31d391b346900c1ff1d8d6e0a52258d524 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 25 Apr 2022 14:47:40 +0800
Subject: [PATCH 19/25] =?UTF-8?q?feat=EF=BC=9A=E6=B7=BB=E5=8A=A0=20promql-?=
 =?UTF-8?q?input=20=20=20metrics=20=E4=BB=A5=E5=8F=8A=20logs=20=E7=9A=84?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/page/dashboard/explore/promqlInput.vue   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
index 905af90a6..16d9d83ac 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
@@ -1111,9 +1111,11 @@ export default {
     type: {
       deep: true,
       immediate: true,
-      handler(n) {
+      handler (n) {
         if (n !== 'log') {
-          this.initCodeMirror()
+          this.$nextTick(() => {
+            this.initCodeMirror()
+          })
         }
       }
     }

From 4db091ef1e7911cd5f20724d0bb8509bb625d20f Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Tue, 26 Apr 2022 09:38:33 +0800
Subject: [PATCH 20/25] =?UTF-8?q?=20NEZ-1833=20perf=20:=20asset=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=20Type?=
 =?UTF-8?q?=20&=20model=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/rightBox/asset/assetBox.vue        | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
index c7908126a..43ddb7a2c 100644
--- a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
@@ -554,10 +554,7 @@ export default {
   methods: {
     judgeType () {
       if (!this.editAsset.type.name) {
-        this.$message({
-          type: 'error',
-          message: '请先选择Type值'
-        })
+        this.$message.error(this.$t('asset.assetBox.message.type'))
         return false
       } else {
         this.judgeTypes = false

From a283ea8c2a3ff1494b5b0686bdcad08a49f2e81c Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Tue, 26 Apr 2022 10:50:07 +0800
Subject: [PATCH 21/25] =?UTF-8?q?NEZ-1821=20perf=20:=20=E5=91=8A=E8=AD=A6?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=20=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../css/components/common/alert/alertMessageInfo.scss       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss b/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss
index e2202ff70..05243ea3f 100644
--- a/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss
+++ b/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss
@@ -54,9 +54,9 @@
         height: 61.8%;
         flex: 1;
 
-        .alert-label-header-title {
-          display: none;
-        }
+        // .alert-label-header-title {
+        //   // display: none;
+        // }
 
         .alert-rule-box {
           margin-bottom: 25px;

From 5da36a22402e84c861e6592cc98d161c0d718911 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Tue, 26 Apr 2022 11:26:31 +0800
Subject: [PATCH 22/25] =?UTF-8?q?NEZ-1821=20perf=20:=20=E5=91=8A=E8=AD=A6?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=20=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/alert/alertMessageInfo.scss        |   6 +-
 .../components/common/alert/alertLabel3.vue   | 874 ++++++++++++++++++
 .../common/alert/alertMessageInfoTab.vue      |   4 +-
 .../common/alert/alertRuleInfo2.vue           | 221 +++++
 4 files changed, 1100 insertions(+), 5 deletions(-)
 create mode 100644 nezha-fronted/src/components/common/alert/alertLabel3.vue
 create mode 100644 nezha-fronted/src/components/common/alert/alertRuleInfo2.vue

diff --git a/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss b/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss
index 05243ea3f..2c43a6cf8 100644
--- a/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss
+++ b/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss
@@ -54,9 +54,9 @@
         height: 61.8%;
         flex: 1;
 
-        // .alert-label-header-title {
-        //   // display: none;
-        // }
+        .alert-label-header-title3 {
+          display: none;
+        }
 
         .alert-rule-box {
           margin-bottom: 25px;
diff --git a/nezha-fronted/src/components/common/alert/alertLabel3.vue b/nezha-fronted/src/components/common/alert/alertLabel3.vue
new file mode 100644
index 000000000..f8a16efbb
--- /dev/null
+++ b/nezha-fronted/src/components/common/alert/alertLabel3.vue
@@ -0,0 +1,874 @@
+<template>
+  <div
+    :class="calcHeight(that.position, that)"
+    :style="calcPosition(that.position, that)"
+    class="alert-label__border"
+    ref="alertLabels"
+  >
+    <div class="alert-label-header-title3">
+      <div
+        class="alert-label-header-circle"
+        :style="`background: ${alertColor}`"
+      >
+        <i class="nz-icon" :class="selectIcon(type)"></i>
+      </div>
+      <div class="alert-label-header-name">
+        {{ alertLabelData && alertLabelData.name ? alertLabelData.name : "--" }}
+      </div>
+    </div>
+    <div
+      class="alert-label-info"
+      v-if="type === 'asset'"
+      v-my-loading="loading"
+    >
+      <div class="alert-label-box">
+        <div class="alert-label-title">ID</div>
+        <div class="alert-label-value">
+          {{ alertLabelData && alertLabelData.id ? alertLabelData.id : "--" }}
+        </div>
+      </div>
+      <div class="alert-label-box name-labe">
+        <div class="alert-label-title">{{$t('overall.name')}}</div>
+        <div class="alert-label-value">{{alertLabelData && alertLabelData.name ? alertLabelData.name : '--'}}</div>
+      </div>
+       <!-- <div class="alert-label-box name-labe">
+        <div class="alert-label-title">Name</div>
+        <div class="alert-label-value">
+          {{ alertLabelData && alertLabelData.name ? alertLabelData.name : "--" }}
+        </div>
+      </div> -->
+      <div class="alert-label-box">
+        <div class="alert-label-title">{{ $t("overall.manageIp") }}</div>
+        <div class="alert-label-value">
+          {{
+            alertLabelData && alertLabelData.manageIp
+              ? alertLabelData.manageIp
+              : "--"
+          }}
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">{{ $t("overall.type") }}</div>
+        <div class="alert-label-value">
+          {{
+            alertLabelData && alertLabelData.type && alertLabelData.type.name
+              ? alertLabelData.type.name
+              : "--"
+          }}
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">{{ $t("overall.state") }}</div>
+        <div class="alert-label-value">
+          {{
+            alertLabelData && alertLabelData.state && alertLabelData.state.name
+              ? alertLabelData.state.name
+              : "--"
+          }}
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">Ping</div>
+        <div class="alert-label-value">
+          <div
+            v-if="alertLabelData"
+            :class="{
+              'green-bg':
+                alertLabelData &&
+                alertLabelData.pingInfo &&
+                alertLabelData.pingInfo.status === 1,
+              'red-bg':
+                alertLabelData &&
+                alertLabelData.pingInfo &&
+                alertLabelData.pingInfo.status === 0,
+            }"
+            class="active-icon"
+          ></div>
+          <span v-if="alertLabelData">{{
+            alertLabelData &&
+            alertLabelData.pingInfo &&
+            alertLabelData.pingInfo.rtt
+              ? alertLabelData.pingInfo.rtt + "ms"
+              : ""
+          }}</span>
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">{{ $t("overall.dc") }}</div>
+        <div class="alert-label-value">
+          {{
+            alertLabelData && alertLabelData.dc && alertLabelData.dc.name
+              ? alertLabelData.dc.name
+              : "--"
+          }}
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">{{ $t("overall.cabinet") }}</div>
+        <div class="alert-label-value">
+          {{
+            alertLabelData &&
+            alertLabelData.cabinet &&
+            alertLabelData.cabinet.name
+              ? alertLabelData.cabinet.name
+              : "--"
+          }}
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">{{ $t("overall.brand") }}</div>
+        <div class="alert-label-value">
+          {{
+            alertLabelData && alertLabelData.brand && alertLabelData.brand.name
+              ? alertLabelData.brand.name
+              : "--"
+          }}
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">{{ $t("overall.model") }}</div>
+        <div class="alert-label-value">
+          {{
+            alertLabelData && alertLabelData.model && alertLabelData.model.name
+              ? alertLabelData.model.name
+              : "--"
+          }}
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">{{ $t("overall.alert") }}</div>
+        <div class="alert-label-value" v-if="alertLabelData">
+          <i
+            :class="alertLabelData.alertNum ? 'red' : 'green'"
+            class="nz-icon nz-icon-overview-alert vertical-align-top;"
+            @mouseenter="tooltipHover('', true, $event)"
+            @mouseleave="tooltipHover('', false, $event)"
+          ></i>
+          <div
+            v-if="alertNumtooltipShow"
+            class="alert-days-info-tooltip"
+            :style="{ left: position.left + 'px', top: position.top + 'px' }"
+          >
+            <div class="tooltip-title">
+              {{ $t("project.topology.alert") }}({{ $t("asset.pingActive") }})
+            </div>
+            <div class="severity-info" style="justify-content: space-between">
+              <div class="severity-name">{{ $t("overall.result.total") }}</div>
+              <div class="severity-value">{{ alertLabelData.alertNum }}</div>
+            </div>
+          </div>
+          <alertDaysInfo
+            v-show="!trendLoading"
+            :alertDaysData="alertDaysData"
+          />
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">{{ $t("asset.endpoint") }}</div>
+        <div class="alert-label-value">
+          <i class="nz-icon nz-icon-overview-endpoint monitorColor"></i>&nbsp;
+          <span>{{
+            alertLabelData && alertLabelData.endpointNum
+              ? alertLabelData.endpointNum
+              : 0
+          }}</span>
+        </div>
+      </div>
+    </div>
+
+    <div
+      class="alert-label-info"
+      v-if="type === 'module'"
+      v-my-loading="loading"
+    >
+      <div class="alert-label-box">
+        <div class="alert-label-title">ID</div>
+        <div class="alert-label-value">
+          {{ alertLabelData && alertLabelData.id ? alertLabelData.id : "--" }}
+        </div>
+      </div>
+      <div class="alert-label-box name-labe">
+        <div class="alert-label-title">{{$t('overall.name')}}</div>
+        <div class="alert-label-value">
+          {{ alertLabelData && alertLabelData.Name ? alertLabelData.Name : "--" }}
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">{{ $t("overall.project") }}</div>
+        <div class="alert-label-value">
+          {{
+            alertLabelData &&
+            alertLabelData.project &&
+            alertLabelData.project.name
+              ? alertLabelData.project.name
+              : "--"
+          }}
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">{{ $t("asset.endpoint") }}</div>
+        <div class="alert-label-value">
+          <i class="nz-icon nz-icon-overview-endpoint monitorColor"></i>&nbsp;
+          <span>{{
+            alertLabelData && alertLabelData.endpointNum
+              ? alertLabelData.endpointNum
+              : 0
+          }}</span>
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">{{ $t("overall.asset") }}</div>
+        <div class="alert-label-value">
+          <i
+            class="nz-icon nz-icon-overview-project monitorColor color23BF9A"
+          />&nbsp;
+          <span>{{
+            alertLabelData && alertLabelData.assetNum
+              ? alertLabelData.assetNum
+              : 0
+          }}</span>
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">{{ $t("overall.alert") }}</div>
+        <div class="alert-label-value" v-if="alertLabelData">
+          <i
+            :class="alertLabelData.alertNum ? 'red' : 'green'"
+            class="nz-icon nz-icon-overview-alert vertical-align-top;"
+            @mouseenter="tooltipHover('', true, $event)"
+            @mouseleave="tooltipHover('', false, $event)"
+          ></i>
+          <div
+            v-if="alertNumtooltipShow"
+            class="alert-days-info-tooltip"
+            :style="{ left: position.left + 'px', top: position.top + 'px' }"
+          >
+            <div class="tooltip-title">
+              {{ $t("project.topology.alert") }}({{ $t("asset.pingActive") }})
+            </div>
+            <div class="severity-info" style="justify-content: space-between">
+              <div class="severity-name">{{ $t("overall.result.total") }}</div>
+              <div class="severity-value">{{ alertLabelData.alertNum }}</div>
+            </div>
+          </div>
+          <alertDaysInfo
+            v-show="!trendLoading"
+            :alertDaysData="alertDaysData"
+          />
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">{{ $t("overall.remark") }}</div>
+        <div class="alert-label-value alert-label-remark">
+          {{
+            alertLabelData && alertLabelData.remark
+              ? alertLabelData.remark
+              : "--"
+          }}
+        </div>
+      </div>
+    </div>
+
+    <div
+      class="alert-label-info"
+      v-if="type === 'project'"
+      v-my-loading="loading"
+    >
+      <div class="alert-label-box">
+        <div class="alert-label-title">ID</div>
+        <div class="alert-label-value">
+          {{ alertLabelData && alertLabelData ? alertLabelData.id : "--" }}
+        </div>
+      </div>
+       <div class="alert-label-box name-labe">
+        <div class="alert-label-title">{{$t('overall.name')}}</div>
+        <div class="alert-label-value">
+          {{ alertLabelData && alertLabelData.name ? alertLabelData.name : "--" }}
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">{{ $t("overall.module") }}</div>
+        <div class="alert-label-value">
+          <i
+            style="cursor: pointer"
+            class="nz-icon nz-icon-overview-module monitorColor"
+          />&nbsp;
+          <span>{{
+            alertLabelData && alertLabelData.moduleNum
+              ? alertLabelData.moduleNum
+              : "--"
+          }}</span>
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">Endpoint</div>
+        <div class="alert-label-value">
+          <i class="nz-icon nz-icon-overview-endpoint monitorColor"></i>&nbsp;
+          <span>{{
+            alertLabelData && alertLabelData.endpointNum
+              ? alertLabelData.endpointNum
+              : 0
+          }}</span>
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">{{ $t("overall.asset") }}</div>
+        <div class="alert-label-value">
+          <i
+            class="nz-icon nz-icon-overview-project monitorColor color23BF9A"
+          />
+          <span>{{
+            alertLabelData && alertLabelData.assetNum
+              ? alertLabelData.assetNum
+              : 0
+          }}</span>
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">{{ $t("overall.alert") }}</div>
+        <div class="alert-label-value" v-if="alertLabelData">
+          <i
+            :class="alertLabelData.alertNum ? 'red' : 'green'"
+            class="nz-icon nz-icon-overview-alert vertical-align-top;"
+            @mouseenter="tooltipHover('', true, $event)"
+            @mouseleave="tooltipHover('', false, $event)"
+          ></i>
+          <div
+            v-if="alertNumtooltipShow"
+            class="alert-days-info-tooltip"
+            :style="{ left: position.left + 'px', top: position.top + 'px' }"
+          >
+            <div class="tooltip-title">
+              {{ $t("project.topology.alert") }}({{ $t("asset.pingActive") }})
+            </div>
+            <div class="severity-info" style="justify-content: space-between">
+              <div class="severity-name">{{ $t("overall.result.total") }}</div>
+              <div class="severity-value">{{ alertLabelData.alertNum }}</div>
+            </div>
+          </div>
+          <alertDaysInfo
+            v-show="!trendLoading"
+            :alertDaysData="alertDaysData"
+          />
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">{{ $t("overall.remark") }}</div>
+        <div class="alert-label-value alert-label-remark">
+          {{
+            alertLabelData && alertLabelData.remark
+              ? alertLabelData.remark
+              : "--"
+          }}
+        </div>
+      </div>
+    </div>
+
+    <div
+      class="alert-label-info"
+      v-if="type === 'endpoint'"
+      v-my-loading="loading"
+    >
+      <div class="alert-label-box">
+        <div class="alert-label-title">ID</div>
+        <div class="alert-label-value">
+          {{ alertLabelData && alertLabelData.id ? alertLabelData.id : "--" }}
+        </div>
+      </div>
+      <div class="alert-label-box name-labe">
+        <div class="alert-label-title">{{$t('overall.name')}}</div>
+        <div class="alert-label-value">
+          {{ alertLabelData && alertLabelData.name ? alertLabelData.name : "--" }}
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">{{ $t("overall.project") }}</div>
+        <div class="alert-label-value">
+          {{
+            alertLabelData &&
+            alertLabelData.project &&
+            alertLabelData.project.name
+              ? alertLabelData.project.name
+              : "--"
+          }}
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">{{ $t("overall.module") }}</div>
+        <div class="alert-label-value">
+          <i
+            style="cursor: pointer"
+            class="nz-icon nz-icon-overview-module monitorColor"
+          />&nbsp;
+          <span>{{
+            alertLabelData &&
+            alertLabelData.module &&
+            alertLabelData.module.name
+              ? alertLabelData.module.name
+              : "--"
+          }}</span>
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">{{ $t("overall.asset") }}</div>
+        <div class="alert-label-value">
+          <i
+            class="nz-icon nz-icon-overview-project monitorColor color23BF9A"
+          ></i
+          >&nbsp;
+          <span>{{
+            alertLabelData && alertLabelData.asset.name
+              ? alertLabelData.asset.name
+              : "--"
+          }}</span>
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">{{ $t("overall.alert") }}</div>
+        <div class="alert-label-value" v-if="alertLabelData">
+          <i
+            :class="alertLabelData.alertNum ? 'red' : 'green'"
+            class="nz-icon nz-icon-overview-alert vertical-align-top;"
+            @mouseenter="tooltipHover('', true, $event)"
+            @mouseleave="tooltipHover('', false, $event)"
+          ></i>
+          <div
+            v-if="alertNumtooltipShow"
+            class="alert-days-info-tooltip"
+            :style="{ left: position.left + 'px', top: position.top + 'px' }"
+          >
+            <div class="tooltip-title">
+              {{ $t("project.topology.alert") }}({{ $t("asset.pingActive") }})
+            </div>
+            <div class="severity-info" style="justify-content: space-between">
+              <div class="severity-name">{{ $t("overall.result.total") }}</div>
+              <div class="severity-value">{{ alertLabelData.alertNum }}</div>
+            </div>
+          </div>
+          <alertDaysInfo
+            v-show="!trendLoading"
+            :alertDaysData="alertDaysData"
+          />
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">{{ $t("overall.state") }}</div>
+        <div class="alert-label-value">
+          <span style="width: auto">
+            <span class="endpoint-cell-left"
+              ><i class="nz-icon nz-icon-Metrics active" />
+              {{ $t("project.endpoint.metrics") }}
+            </span>
+            <span
+              v-if="alertLabelData && alertLabelData.configs[0].state === 0"
+            >
+              <span class="active-icon red-bg inline-block"></span>
+            </span>
+            <span
+              v-else-if="
+                alertLabelData && alertLabelData.configs[0].state === 1
+              "
+            >
+              <span class="active-icon green-bg inline-block"></span>
+            </span>
+            <span v-else-if="alertLabelData && alertLabelData.configs[0].state">
+              <span class="active-icon gray-bg inline-block"></span>
+            </span>
+          </span>
+          <span style="width: auto">
+            <span class="endpoint-cell-left" style="margin-left: 10px"
+              ><i class="nz-icon nz-icon-logs active" />
+              {{ $t("project.endpoint.logs") }}
+            </span>
+            <span
+              v-if="alertLabelData && alertLabelData.configs[1].state === 0"
+            >
+              <span class="active-icon red-bg inline-block"></span>
+            </span>
+            <span
+              v-else-if="
+                alertLabelData && alertLabelData.configs[1].state === 1
+              "
+            >
+              <span class="active-icon green-bg inline-block"></span>
+            </span>
+            <span v-else-if="alertLabelData && alertLabelData.configs[1].state">
+              <span class="active-icon gray-bg inline-block"></span>
+            </span>
+          </span>
+        </div>
+      </div>
+    </div>
+
+    <div class="alert-label-info" v-if="type === 'dc'" v-my-loading="loading">
+      <div class="alert-label-box">
+        <div class="alert-label-title">ID</div>
+        <div class="alert-label-value">
+          {{ alertLabelData && alertLabelData.id ? alertLabelData.id : "--" }}
+        </div>
+      </div>
+       <div class="alert-label-box name-labe">
+        <div class="alert-label-title">{{$t('overall.name')}}</div>
+        <div class="alert-label-value">
+          {{ alertLabelData && alertLabelData.name ? alertLabelData.name : "--" }}
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">{{ $t("overall.location") }}</div>
+        <div class="alert-label-value">
+          {{
+            alertLabelData && alertLabelData.location && alertLabelData.location
+              ? alertLabelData.location
+              : "--"
+          }}
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">{{ $t("overall.cabinet") }}</div>
+        <div class="alert-label-value">
+          <i
+            v-if="alertLabelData"
+            class="nz-icon nz-icon-cabinet monitorColor"
+            :class="
+              alertLabelData && alertLabelData.cabinetNum > 0
+                ? 'color23BF9A'
+                : 'colorEF7458'
+            "
+          />&nbsp;
+          <span>{{
+            alertLabelData && alertLabelData.cabinetNum
+              ? alertLabelData.cabinetNum
+              : 0
+          }}</span>
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">{{ $t("overall.asset") }}</div>
+        <div class="alert-label-value">
+          <i
+            class="nz-icon nz-icon-overview-project monitorColor color23BF9A"
+          />&nbsp;
+          <span>{{
+            alertLabelData && alertLabelData.assetNum && alertLabelData.assetNum
+              ? alertLabelData.assetNum
+              : 0
+          }}</span>
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">{{ $t("overall.alert") }}</div>
+        <div class="alert-label-value" v-if="alertLabelData">
+          <i
+            :class="alertLabelData.alertNum ? 'red' : 'green'"
+            class="nz-icon nz-icon-overview-alert vertical-align-top;"
+            @mouseenter="tooltipHover('', true, $event)"
+            @mouseleave="tooltipHover('', false, $event)"
+          ></i>
+          <div
+            v-if="alertNumtooltipShow"
+            class="alert-days-info-tooltip"
+            :style="{ left: position.left + 'px', top: position.top + 'px' }"
+          >
+            <div class="tooltip-title">
+              {{ $t("project.topology.alert") }}({{ $t("asset.pingActive") }})
+            </div>
+            <div class="severity-info" style="justify-content: space-between">
+              <div class="severity-name">{{ $t("overall.result.total") }}</div>
+              <div class="severity-value">{{ alertLabelData.alertNum }}</div>
+            </div>
+          </div>
+          <alertDaysInfo
+            v-show="!trendLoading"
+            :alertDaysData="alertDaysData"
+          />
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">{{ $t("overall.state") }}</div>
+        <div class="alert-label-value" style="margin-left: 3px">
+          <div
+            v-if="alertLabelData"
+            :class="{
+              'green-bg': alertLabelData && alertLabelData.state === 'ON',
+              'red-bg': alertLabelData && alertLabelData.state === 'OFF',
+            }"
+            class="active-icon"
+          ></div>
+          <span v-if="alertLabelData && alertLabelData.state === 'ON'">{{
+            $t("overall.enabled")
+          }}</span>
+          <span v-if="alertLabelData && alertLabelData.state === 'OFF'">{{
+            $t("overall.disabled")
+          }}</span>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import trendMixin from './trendMixins'
+
+export default {
+  name: 'alertLabel',
+  mixins: [trendMixin],
+  props: {
+    id: {},
+    type: {},
+    // labelLoading:{},
+    that: {},
+    detailList: Boolean,
+    alertTableDialog: Boolean
+  },
+  data () {
+    return {
+      alertLabelData: null,
+      loading: true,
+      heightList: 0,
+      boxWidth: 0,
+      severityDataWeight: this.$store.getters.severityDataWeight,
+      alertColor: '#23bf9a'
+    }
+  },
+  watch: {
+    id: {
+      immediate: true,
+      deep: true,
+      handler (n) {
+        this.init()
+      }
+    },
+    that: {
+      immediate: true,
+      deep: true,
+      handler (n) {}
+    },
+    LRTriangle: {
+      immediate: true,
+      deep: true,
+      handler (n) {}
+    }
+  },
+  computed: {
+    calcPosition () {
+      return function (position) {
+        const clientHeight =
+          document.body.clientHeight < document.documentElement.clientHeight
+            ? document.body.clientHeight
+            : document.documentElement.clientHeight
+        const clientWidth =
+          document.body.clientWidth < document.documentElement.clientWidth
+            ? document.body.clientWidth
+            : document.documentElement.clientWidth
+        let leftOffSetView = 0
+        let leftOffSet = this.detailList ? -80 : 10
+        let topOffSet = this.detailList ? 60 : 22
+        let topOffSetView = 0
+        let labelPosition = {
+          top: 0,
+          left: 0,
+          right: 0
+        }
+        if (this.alertTableDialog) {
+          let dialog = document.querySelector(
+            '#dialog-alert-massage .el-dialog'
+          )
+          if (!dialog) {
+            dialog = document.querySelector('#viewGraphDialog .el-dialog')
+          }
+          const dialogHeight = dialog.getBoundingClientRect()
+          leftOffSet = leftOffSet - 3 * dialogHeight.x
+          leftOffSetView = dialogHeight.x
+          topOffSet = topOffSet - dialogHeight.y
+          topOffSetView = topOffSet
+        }
+        if (position.top > clientHeight / 2) {
+          labelPosition = {
+            left: `${position.left + position.width + leftOffSet}px`,
+            top: `${position.top - this.heightList - topOffSetView}px`
+          }
+        } else {
+          labelPosition = {
+            left: `${position.left + position.width + leftOffSet}px`,
+            top: `${position.top + topOffSet}px`
+          }
+        }
+        if (position.left > clientWidth / 2) {
+          delete labelPosition.left
+
+          labelPosition.right =
+            clientWidth - position.left - leftOffSetView + 'px'
+        }
+        return labelPosition
+      }
+    },
+    calcHeight () {
+      const self = this
+      return function (position) {
+        const clientHeight =
+          document.body.clientHeight < document.documentElement.clientHeight
+            ? document.body.clientHeight
+            : document.documentElement.clientHeight
+        const elHeight =
+          self.type === 'asset' ? 318 : self.type === 'project' ? 70 : 70
+        if (position.top + elHeight > clientHeight) {
+          return 'alert-labelUp'
+        } else {
+          return 'alert-label'
+        }
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.loading = true
+      if (this.type === 'asset') {
+        this.$get('asset/asset/' + this.id).then((res) => {
+          if (res.msg === 'success') {
+            this.loading = false
+            this.alertLabelData = res.data
+            this.alertColor = this.returnColor(res.data.alert)
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
+      }
+      if (this.type === 'project') {
+        this.$get('monitor/project/' + this.id).then((res) => {
+          if (res.msg === 'success') {
+            this.loading = false
+            this.alertLabelData = res.data
+            this.alertColor = this.returnColor(res.data.alert)
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
+      }
+      if (this.type === 'module') {
+        this.$get('monitor/module/' + this.id).then((res) => {
+          if (res.msg === 'success') {
+            this.loading = false
+            this.alertLabelData = res.data
+            this.alertColor = this.returnColor(res.data.alert)
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
+      }
+      if (this.type === 'endpoint') {
+        this.$get('monitor/endpoint/' + this.id).then((res) => {
+          if (res.msg === 'success') {
+            this.loading = false
+            this.alertLabelData = res.data
+            this.alertColor = this.returnColor(res.data.alert)
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
+      }
+      if (this.type === 'dc') {
+        this.$get('dc/' + this.id).then((res) => {
+          if (res.msg === 'success') {
+            this.loading = false
+            this.alertLabelData = res.data
+            this.alertColor = this.returnColor(res.data.alert)
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
+      }
+      const weekDays = this.getWeeksTime()
+      if (this.trendTimer) {
+        clearTimeout(this.trendTimer)
+        this.trendTimer = null
+      }
+      this.trendTimer = setTimeout(() => {
+        this.trendLoading = true
+        const params = {
+          type: 'total',
+          dimension: 'priority',
+          step: 'd'
+        }
+        params[this.type + 'Id'] = this.id
+        this.$get('/stat/alertMessage/trend', params).then((res) => {
+          if (!res.data) {
+            return
+          }
+          const alertDaysData = res.data.result
+            ? res.data.result[0].values
+            : []
+          const newWeekDays = JSON.parse(JSON.stringify(weekDays))
+          alertDaysData.forEach((item) => {
+            item.values.forEach((time) => {
+              const findItem = newWeekDays.find((days) => days.time == time[0])
+              if (findItem) {
+                findItem[item.metric.priority] = time[1]
+              }
+            })
+          })
+          setTimeout(() => {
+            this.alertDaysData = newWeekDays
+            this.trendLoading = false
+          })
+        })
+      })
+    },
+    alertActiveStr () {
+      return this.$t('overall.active')
+    },
+    alertStateStr (num) {
+      if (num == 1) {
+        return this.$t('asset.inStock')
+      } else {
+        return this.$t('asset.notInStock')
+      }
+    },
+    selectIcon (type) {
+      switch (type) {
+        case 'asset':
+          return 'nz-icon-overview-project'
+        case 'dc':
+          return 'nz-icon-Datacenter2'
+        case 'project':
+          return 'nz-icon-project'
+        case 'module':
+          return 'nz-icon-overview-module'
+        case 'endpoint':
+          return 'nz-icon-overview-endpoint'
+        case 'alertrule':
+          return 'nz-icon-Alertrule'
+      }
+      return 'nz-icon-module5'
+    },
+    returnColor (obj) {
+      let color = ''
+      if (!obj) {
+        return '#23bf9a'
+      } else {
+        this.severityDataWeight.forEach((severity) => {
+          const num = obj.find((alert) => alert.priority === severity.name)
+          if (num && !color && num.num > 0) {
+            color = severity.color
+          }
+        })
+        if (!color) {
+          color = '#23bf9a'
+        }
+        return color
+      }
+    }
+  },
+  mounted () {
+    if (this.$refs.alertLabels) {
+      this.heightList = this.$refs.alertLabels.getBoundingClientRect().height
+      this.boxWidth = this.$refs.alertLabels.getBoundingClientRect().width
+    } else {
+      this.heightList = 0
+      this.boxWidth = 0
+    }
+  },
+  beforeDestroy () {}
+}
+</script>
+<style>
+</style>
diff --git a/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue b/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue
index e50b10ad7..b9347c7ec 100644
--- a/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue
+++ b/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue
@@ -40,8 +40,8 @@
 <script>
 import alertMessageInfoDetail from '@/components/common/alert/alertMessageInfoDetail'
 import searchItemInfo from '@/components/common/globalSearch/searchItemInfo'
-import alertLabel from '@/components/common/alert/alertLabel'
-import alertRuleInfo from '@/components/common/alert/alertRuleInfo'
+import alertLabel from '@/components/common/alert/alertLabel3'
+import alertRuleInfo from '@/components/common/alert/alertRuleInfo2'
 // import alertLabelMixin from '@/components/common/mixin/alertLabelMixin'
 export default {
   name: 'alertMessageInfoTab',
diff --git a/nezha-fronted/src/components/common/alert/alertRuleInfo2.vue b/nezha-fronted/src/components/common/alert/alertRuleInfo2.vue
new file mode 100644
index 000000000..24848c082
--- /dev/null
+++ b/nezha-fronted/src/components/common/alert/alertRuleInfo2.vue
@@ -0,0 +1,221 @@
+<template>
+  <div :style="calcPosition(that.position,that)" class="alert-label__border alert-label" v-my-loading="loading" ref="alertLabels">
+    <div class="alert-label-header-title3">
+      <div class="alert-label-header-circle" :style="`background: ${alertColor}`">
+        <i  class="nz-icon nz-icon-Alertrule"></i>
+      </div>
+      <div class="alert-label-header-name">
+        {{alertRuleData && alertRuleData.name ? alertRuleData.name : '--'}}
+      </div>
+    </div>
+    <div class="alert-rule-nfo" >
+      <div class="alert-rule-box">
+        <div class="alert-rule-title">ID</div>
+        <div class="alert-rule-value">{{alertRuleData.id ? alertRuleData.id : '--'}}</div>
+      </div>
+      <div class="alert-rule-box name-labe">
+        <div class="alert-rule-title">{{$t('overall.name')}}</div>
+        <div class="alert-rule-value">{{alertRuleData.name ? alertRuleData.name : '--'}}</div>
+      </div>
+<!--      <div class="alert-rule-box">-->
+<!--        <div class="alert-rule-title">{{$t('alert.name')}}</div>-->
+<!--        <div class="alert-rule-value">{{alertRuleData.name ? alertRuleData.name : '&#45;&#45;'}}</div>-->
+<!--      </div>-->
+      <div class="alert-rule-box">
+        <div class="alert-rule-title">{{$t('alert.type')}}</div>
+        <div class="alert-rule-value">
+          <span v-if="alertRuleData.type === 1">
+            {{$t('project.metrics.metrics')}}
+          </span>
+          <span v-else-if="alertRuleData.type === 2">
+            {{$t('overall.logs')}}
+          </span>
+          <span v-else-if="alertRuleData.type === 3">SNMP trap</span>
+          <span v-else>--</span>
+        </div>
+      </div>
+      <div class="alert-rule-box">
+        <div class="alert-rule-title">{{$t('alert.severity')}}</div>
+        <div class="alert-rule-value"><i class="nz-icon nz-icon-circle" :style="{color:severityColor,'font-size':'12px','margin-right':'5px'}"></i>{{alertRuleData.severityId ? severityData.find(s => alertRuleData.severityId === s.id).name : '--'}}</div>
+      </div>
+      <div class="alert-rule-box">
+        <div class="alert-rule-title">{{$t('alert.config.expr')}}</div>
+        <div class="alert-rule-value">{{alertRuleData.expr ? (alertRuleData.expr + alertRuleData.operator + formatThreshold(alertRuleData.threshold,alertRuleData.unit)) : '--'}}</div>
+      </div>
+      <div class="alert-rule-box">
+        <div class="alert-rule-title">{{$t('alert.alertNum')}}</div>
+        <div class="alert-rule-value" v-if="alertRuleData">
+          <i :class="alertRuleData.alertNum ? 'red' : 'green'" class="nz-icon nz-icon-overview-alert vertical-align-top;"  @mouseenter="tooltipHover('',true, $event)" @mouseleave="tooltipHover('',false, $event)"></i>
+          <div v-if="alertNumtooltipShow" class="alert-days-info-tooltip" :style="{left: position.left + 'px',top:position.top + 'px'}">
+            <div class="tooltip-title">{{$t('project.topology.alert')}}({{$t('asset.pingActive')}})</div>
+            <div class="severity-info" style='justify-content: space-between'>
+              <div class="severity-name">{{$t('overall.result.total')}}</div>
+              <div class="severity-value">{{alertRuleData.alertNum}}</div>
+            </div>
+          </div>
+          <alertDaysInfo
+            v-show="!trendLoading"
+            :alertDaysData="alertDaysData"
+          />
+        </div>
+      </div>
+      <div class="alert-rule-box">
+        <div class="alert-rule-title">{{$t('alert.config.trbShot')}}</div>
+        <div class="alert-rule-value" @click="trbShotShow"><i class="nz-icon nz-icon-guzhangshuju"></i></div>
+      </div>
+      <div class="alert-rule-box">
+        <div class="alert-rule-title">{{$t('alert.state')}}</div>
+        <div class="alert-rule-value" style="margin-left: 3px">
+          <div v-if="alertRuleData.state === 1">
+            <i class="active-icon green-bg inline-block"></i>
+            {{ $t('overall.enabled') }}
+          </div>
+          <div v-else-if="alertRuleData.state === 0">
+            <i class="active-icon gray-bg inline-block"></i>
+            {{ $t('overall.disabled') }}
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import chartDataFormat from '../../chart/chartDataFormat'
+import trendMixins from '@/components/common/alert/trendMixins'
+export default {
+  name: 'alert-rule-info',
+  mixins: [trendMixins],
+  props: {
+    id: {},
+    messageLoad: {},
+    detailList: Boolean,
+    that: {},
+    severityData: Array
+  },
+  data () {
+    return {
+      loading: true,
+      alertRuleData: '',
+      severityColor: '',
+      severityDataWeight: this.$store.getters.severityDataWeight,
+      alertColor: '#23bf9a'
+    }
+  },
+  components: {
+
+  },
+  computed: {
+    calcPosition () {
+      return function (position) {
+        if (!position) {
+          return {
+            left: '0px',
+            top: '0px'
+          }
+        }
+        const clientHeight = (document.body.clientHeight < document.documentElement.clientHeight) ? document.body.clientHeight : document.documentElement.clientHeight
+        // const windowWidth = window.innerWidth
+        const boxHeight = this.$refs.alertLabels ? this.$refs.alertLabels.offsetHeight : 231
+        const windowHeight = window.innerHeight
+        const leftOffSetView = this.detailList ? -80 : 10
+        if (position.top > windowHeight / 2) {
+          return {
+            left: `${position.left + position.width + leftOffSetView}px`,
+            top: `${position.top - boxHeight}px`
+          }
+        } else {
+          return {
+            left: `${position.left + position.width + leftOffSetView}px`,
+            top: `${position.top}px`
+          }
+        }
+      }
+    }
+  },
+  methods: {
+    formatThreshold (value, unit) {
+      const unitMethod = chartDataFormat.getUnit(unit)
+      if (unitMethod && value) {
+        return unitMethod.compute(value, null, 2)
+      } else {
+        return value
+      }
+    },
+    trbShotShow () {
+      this.$emit('showText')
+    },
+    severityDataColor () {
+      this.severityData.forEach(item => {
+        if (this.alertRuleData.severityId === item.id) {
+          this.severityColor = item.color
+        }
+      })
+    },
+    returnColor (obj) {
+      let color = ''
+      if (!obj) {
+        color = '#23bf9a'
+        return color
+      } else {
+        this.severityDataWeight.forEach(severity => {
+          const num = obj.find(alert => alert.priority === severity.name)
+          if (num && !color && num.num > 0) {
+            color = severity.color
+          }
+        })
+        if (!color) {
+          color = '#23bf9a'
+        }
+        return color
+      }
+    }
+  },
+  mounted () {
+    this.$get('/alert/rule/' + this.id).then((res) => {
+      if (res.msg === 'success') {
+        this.loading = false
+        this.alertRuleData = res.data
+        this.severityDataColor()
+        this.alertColor = this.returnColor(res.data.alert)
+        const weekDays = this.getWeeksTime()
+        if (this.trendTimer) {
+          clearTimeout(this.trendTimer)
+          this.trendTimer = null
+        }
+        this.trendTimer = setTimeout(() => {
+          this.trendLoading = true
+          const params = {
+            type: 'total',
+            dimension: 'priority',
+            step: 'd'
+          }
+          params['rule' + 'Id'] = this.id
+          this.$get('/stat/alertMessage/trend', params).then((res) => {
+            if (!res.data) {
+              return
+            }
+            const alertDaysData = res.data.result ? res.data.result[0].values : []
+            const newWeekDays = JSON.parse(JSON.stringify(weekDays))
+            alertDaysData.forEach(item => {
+              item.values.forEach(time => {
+                const findItem = newWeekDays.find(days => days.time == time[0])
+                if (findItem) {
+                  findItem[item.metric.priority] = time[1]
+                }
+              })
+            })
+            setTimeout(() => {
+              this.alertDaysData = newWeekDays
+              this.trendLoading = false
+            })
+          })
+        })
+      } else {
+        this.$message.error(res.msg)
+      }
+    })
+  }
+}
+
+</script>

From c3099e1d8a00dff8d0dea91b0384e1d3105e4f71 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 26 Apr 2022 13:39:24 +0800
Subject: [PATCH 23/25] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=20=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=8C=BA=E9=97=B4=E9=80=89=E6=8B=A9=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=8D=95=E6=97=A5=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../css/components/common/timePicker.scss     |  6 +++
 .../myDatePicker/src/panel/date-range.vue     | 43 +++++++++++++++++--
 .../common/myDatePicker/src/picker.vue        |  8 ++++
 .../src/components/common/timePicker.vue      |  1 +
 4 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/common/timePicker.scss b/nezha-fronted/src/assets/css/components/common/timePicker.scss
index 6b42f61ce..f4e51bb53 100644
--- a/nezha-fronted/src/assets/css/components/common/timePicker.scss
+++ b/nezha-fronted/src/assets/css/components/common/timePicker.scss
@@ -308,3 +308,9 @@
     }
   }
 }
+.el-date-range-picker.el-picker-panel__body__only {
+  width: 324px;
+}
+.el-date-range-picker__content.el-date-range-picker__content__only{
+  width: 100%;
+}
diff --git a/nezha-fronted/src/components/common/myDatePicker/src/panel/date-range.vue b/nezha-fronted/src/components/common/myDatePicker/src/panel/date-range.vue
index a557e15a7..facc15492 100644
--- a/nezha-fronted/src/components/common/myDatePicker/src/panel/date-range.vue
+++ b/nezha-fronted/src/components/common/myDatePicker/src/panel/date-range.vue
@@ -5,7 +5,8 @@
       class="el-picker-panel el-date-range-picker el-popper time-picker-popover__select-top"
       :class="[{
         'has-sidebar': $slots.sidebar || shortcuts,
-        'has-time': showTime
+        'has-time': showTime,
+        'el-picker-panel__body__only': isOnly
       }, popperClass]">
       <div class="el-picker-panel__body-wrapper">
         <slot name="sidebar" class="el-picker-panel__sidebar"></slot>
@@ -17,7 +18,7 @@
             :key="key"
             @click="handleShortcutClick(shortcut)">{{shortcut.text}}</button>
         </div>
-        <div class="el-picker-panel__body">
+        <div class="el-picker-panel__body" style="min-width: auto">
           <div class="el-date-range-picker__time-header" v-if="showTime">
             <span class="el-date-range-picker__editors-wrap">
               <span class="el-date-range-picker__time-picker-wrap">
@@ -84,7 +85,9 @@
               </span>
             </span>
           </div>
-          <div class="el-picker-panel__content el-date-range-picker__content is-left">
+          <div class="el-picker-panel__content el-date-range-picker__content is-left" :class="{
+             'el-date-range-picker__content__only': isOnly
+          }">
             <div class="el-date-range-picker__header">
               <button
                 type="button"
@@ -108,7 +111,32 @@
                 :disabled="!enableMonthArrow"
                 :class="{ 'is-disabled': !enableMonthArrow }"
                 class="el-picker-panel__icon-btn el-icon-arrow-right"></button>
+              <button
+                type="button"
+                @click="rightPrevYear"
+                v-if="unlinkPanels&&isOnly"
+                :disabled="!enableYearArrow"
+                :class="{ 'is-disabled': !enableYearArrow }"
+                class="el-picker-panel__icon-btn el-icon-d-arrow-left"></button>
+              <button
+                type="button"
+                @click="rightPrevMonth"
+                v-if="unlinkPanels&&isOnly"
+                :disabled="!enableMonthArrow"
+                :class="{ 'is-disabled': !enableMonthArrow }"
+                class="el-picker-panel__icon-btn el-icon-arrow-left"></button>
+              <button
+                type="button"
+                v-if="isOnly"
+                @click="rightNextYear"
+                class="el-picker-panel__icon-btn el-icon-d-arrow-right"></button>
+              <button
+                type="button"
+                v-if="isOnly"
+                @click="rightNextMonth"
+                class="el-picker-panel__icon-btn el-icon-arrow-right"></button>
               <div>{{ leftLabel }}</div>
+<!--              <div>{{ rightLabel }}</div>-->
             </div>
             <date-table
               :timezone="timezone"
@@ -125,7 +153,7 @@
               @pick="handleRangePick">
             </date-table>
           </div>
-          <div class="el-picker-panel__content el-date-range-picker__content is-right">
+          <div class="el-picker-panel__content el-date-range-picker__content is-right" v-if="!isOnly">
             <div class="el-date-range-picker__header">
               <button
                 type="button"
@@ -321,6 +349,7 @@ export default {
     return {
       popperClass: '',
       value: [],
+      isOnly: false,
       defaultValue: null,
       defaultTime: null,
       minDate: '',
@@ -440,6 +469,12 @@ export default {
           ? right
           : nextMonth(this.leftDate)
       }
+    },
+    isOnly: {
+      immediate: true,
+      handler (n) {
+        console.log(n,'isOnly')
+      }
     }
   },
 
diff --git a/nezha-fronted/src/components/common/myDatePicker/src/picker.vue b/nezha-fronted/src/components/common/myDatePicker/src/picker.vue
index 89a82eed3..c427b5224 100644
--- a/nezha-fronted/src/components/common/myDatePicker/src/picker.vue
+++ b/nezha-fronted/src/components/common/myDatePicker/src/picker.vue
@@ -392,6 +392,10 @@ export default {
     validateEvent: {
       type: Boolean,
       default: true
+    },
+    isOnly: {
+      type: Boolean,
+      default: false
     }
   },
 
@@ -444,6 +448,9 @@ export default {
       if (!valueEquals(val, oldVal) && !this.pickerVisible && this.validateEvent) {
         this.dispatch('ElFormItem', 'el.form.change', val)
       }
+    },
+    isOnly:{
+      immediate: true
     }
   },
 
@@ -840,6 +847,7 @@ export default {
       this.popperElm = this.picker.$el
       this.picker.width = this.reference.getBoundingClientRect().width
       this.picker.showTime = this.type === 'datetime' || this.type === 'datetimerange'
+      this.picker.isOnly = this.isOnly
       this.picker.selectionMode = this.selectionMode
       this.picker.unlinkPanels = this.unlinkPanels
       this.picker.arrowControl = this.arrowControl || this.timeArrowControl || false
diff --git a/nezha-fronted/src/components/common/timePicker.vue b/nezha-fronted/src/components/common/timePicker.vue
index 6767d8a67..addfe9029 100644
--- a/nezha-fronted/src/components/common/timePicker.vue
+++ b/nezha-fronted/src/components/common/timePicker.vue
@@ -50,6 +50,7 @@
               @change="dateChange"
               :default-time="['00:00:00', '23:59:59']"
               v-model="oldSearchTime"
+              :isOnly="true"
               type="daterange"
               popper-class="panel-time-picker-popper time-picker-popover__select-top"
               align="right"

From 133d76d80e557ba3b40450d3dbefe8706a4a7a69 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 26 Apr 2022 14:58:25 +0800
Subject: [PATCH 24/25] =?UTF-8?q?NEZ-1838=20fix=EF=BC=9A=E6=9F=B1=E7=8A=B6?=
 =?UTF-8?q?=E5=9B=BE=20Y=E8=BD=B4=20=E6=9C=AA=E8=BF=9B=E8=A1=8C=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E8=BD=AC=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/chart/chartBar.vue     | 8 ++++++++
 .../src/components/chart/chart/options/chartBar.js        | 7 ++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/chart/chart/chartBar.vue b/nezha-fronted/src/components/chart/chart/chartBar.vue
index 3f94ef31d..faba90b60 100644
--- a/nezha-fronted/src/components/chart/chart/chartBar.vue
+++ b/nezha-fronted/src/components/chart/chart/chartBar.vue
@@ -28,6 +28,7 @@ import { formatScientificNotation, getMetricTypeValue } from '@/components/commo
 import chartDataFormat from '@/components/chart/chartDataFormat'
 import { initColor } from '@/components/chart/chart/tools'
 import lodash from 'lodash'
+import bus from "@/libs/bus";
 
 export default {
   name: 'chart-bar',
@@ -107,6 +108,13 @@ export default {
           }
         }
       }
+      chartOption.yAxis.axisLabel.formatter = function (val, index) {
+        const value = formatScientificNotation(val, 6)
+        let chartUnit = self.chartInfo.unit
+        chartUnit = chartUnit || 2
+        const unit = chartDataFormat.getUnit(chartUnit)
+        return unit.compute(value, index, -1, 2)
+      }
       chartOption.tooltip.formatter = this.formatterFunc
       chartOption.tooltip.position = this.tooltipPosition
       /* 使用setTimeout延迟渲染图表，避免样式错乱 */
diff --git a/nezha-fronted/src/components/chart/chart/options/chartBar.js b/nezha-fronted/src/components/chart/chart/options/chartBar.js
index 849596953..7936bca8a 100644
--- a/nezha-fronted/src/components/chart/chart/options/chartBar.js
+++ b/nezha-fronted/src/components/chart/chart/options/chartBar.js
@@ -43,7 +43,12 @@ const chartBarOption = {
     }
   },
   yAxis: {
-    type: 'value'
+    type: 'value',
+    axisLabel: {
+      show: true,
+      fontSize: 10
+      // formatter: 动态生成
+    }
   },
   series: [
     {

From 8a86d86d05996cd6f9fa60cc8d764a48dddd3693 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 26 Apr 2022 17:20:45 +0800
Subject: [PATCH 25/25] =?UTF-8?q?style=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E9=80=89=E6=8B=A9=E5=99=A8=20=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/timePicker.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/common/timePicker.vue b/nezha-fronted/src/components/common/timePicker.vue
index addfe9029..b0bc33fee 100644
--- a/nezha-fronted/src/components/common/timePicker.vue
+++ b/nezha-fronted/src/components/common/timePicker.vue
@@ -61,7 +61,7 @@
             <div  tabindex="1" class="content-input" :class="oldSearchTimeError[0] ? 'input-error' : ''">
               <el-input   @focus="searchTimeValue = oldSearchTime[0]"  v-model="oldSearchTime[0]" @change="dateInputChange('start',oldSearchTime[0])" size="mini"> </el-input>
               <div @click="myDatePickerShow()" class="nz-icon-box">
-                <i class="nz-icon nz-icon-table1"/>
+                <i class="nz-icon nz-icon-date"/>
               </div>
               <div class="input-hint">{{inputError}}</div>
             </div>
@@ -69,7 +69,7 @@
             <div tabindex="2" class="content-input" :class="oldSearchTimeError[1] ? 'input-error' : ''">
               <el-input  @focus="searchTimeValue = oldSearchTime[1]" v-model="oldSearchTime[1]" @change="dateInputChange('end',oldSearchTime[1])" size="mini"> </el-input>
               <div  @click="myDatePickerShow()" class="nz-icon-box">
-                <i class="nz-icon nz-icon-table1"/>
+                <i class="nz-icon nz-icon-date"/>
               </div>
               <div class="input-hint">{{$t('date.formatError')}}</div>
             </div>