From 6663d6f733522425ce0a2d9ef749c18cba920efc Mon Sep 17 00:00:00 2001 From: hanyuxia Date: Wed, 19 Feb 2020 21:33:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9BUG=20dashboard=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=201.panel=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=92=8C=E6=9B=B2=E7=BA=BF=E5=8F=8A=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E5=85=A8=E5=B1=8F=E7=9A=84loading=E7=9A=84=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E5=8F=8A=E5=8A=A0=E8=BD=BD=E6=97=B6=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4=202.=E5=85=A8=E5=B1=8F=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=8F=8A=E6=95=B0=E6=8D=AE=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E4=B8=8D=E5=86=8D=E4=B8=8E=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E5=92=8C=E6=9F=A5=E8=AF=A2=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E8=BF=9B=E8=A1=8C=E7=BB=9F=E4=B8=80=20=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=EF=BC=9A=E9=A2=84=E8=A7=88=E6=A8=A1=E5=9D=97=E7=9A=84?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E5=8F=8A=E5=85=A8=E5=B1=8F=E7=9A=84loading?= =?UTF-8?q?=E5=8F=8A=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E7=AD=89=E8=BF=98?= =?UTF-8?q?=E9=9C=80=E8=A6=81=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/img/loading.gif | Bin 0 -> 16710 bytes .../src/components/charts/chart-list.vue | 61 +++-- .../src/components/charts/chart-table.scss | 3 + .../src/components/charts/chart-table.vue | 256 ++++++++++++------ .../components/charts/line-chart-block.scss | 3 + .../components/charts/line-chart-block.vue | 131 +++++++-- .../src/components/common/loading.vue | 37 +++ .../components/page/dashboard/chartMetric.vue | 6 +- .../page/dashboard/chartMetricForPreview.vue | 4 +- .../page/dashboard/metricPreview.scss | 3 +- .../page/dashboard/metricPreview.vue | 2 +- 11 files changed, 365 insertions(+), 141 deletions(-) create mode 100644 nezha-fronted/src/assets/img/loading.gif create mode 100644 nezha-fronted/src/components/common/loading.vue diff --git a/nezha-fronted/src/assets/img/loading.gif b/nezha-fronted/src/assets/img/loading.gif new file mode 100644 index 0000000000000000000000000000000000000000..afc7e556cc3394d54427b8a4ce6ac7c775b3bda8 GIT binary patch literal 16710 zcmaKzWmHrTyY}~<9zaBLNQV><5Tp@s2q{rfkrbp$B&3F(p}RYWPLYxZhZH3QQMy4w zP(h_EUY_TD*LnWuoVDI>d(DUaWq#}4*L_{rt*)siBWrFBSOC2Mu(`Q8IyxE`7iVv8 zZ)j-f;o(tVU*FZ$m6eqh6clv#?p*~11tldVNl8grSy=!8I8P~W-_X6UqNH=Ff<%E4+xz-1OIw006X1#ty$G6voq3uYQ`UDB>*8*)Hq2iNFdde`m1qpIPNyDw)aVFMKc3?v0 zWFn#=?jD{jKE5{sI3YpNmQ0~xV*U{vV05$#=1GDWI++8N7L8{B%n}~wu|*Yl++mVS zfEFjc!MD9^zS|%%xliHqo-s*1OmB!S5)UYDM(Gp-H>)LC{M{jk3=v^0XP$Y z^OWBjTyf?Q80+a{nqh;uf&_qn4U07#wW!2iHoWb2@(rPu*{?mR3j(%cbevvV8q4Br z5k^h!rELP@L``??2~jH;gRtBuPl=I?SZ zOR5?+-<=8I4W+F?bl8l4v94oq(d`b_$0%mYyfz_Aur?cX^gp+1k3KMM+Bc}&7|B@( zKnSk`K@&)!WYdwh7dun6mP2{B+M7PlwYcr%g(x33z{x&+tF3UuWjqDNjYNbsV>iT*|rr%>T%Jf6_VoZ5~Ij-^cYQ+<|#* ze-QwG|K`Os$Ib&OEH#`3j}<@*wk*TWF&<+>E)5KLhhj(0FS zf*(Q86z*D_QAqgNnz0&!eZ$WcSvwO^=nNnt)_5d8l^ex_rSFXrq>R+864mNUi=t9Q z4cFscv6+QQ_ik@zrE&+<7N_WP1>M7~TW_z0+DM%&r`ww1*)p8&jTMEuPTFtg;x`z< z|DcKhpnx%8^dD5OyQpdffp%8*d0QUzDm&B~f^QqcI*t=!Jica!Jrvo$%pw35hLnch_F{U9~c?Pf{uflCE`*D%*Z%Z9soolL85v!pNQWnVRjL@~lO`Ftc@4Zsk?z4bDuKmda~`8BBd{4h|HSbQD)@(|%`$0po??X;L8Y z!VX?#i**r}YodD9C^mPy8{7P4;ga7e!nCk?uczcY~-?37wdK=Evdrf8A#y&bP)r6T^E~vJB>%V7-7!$r5mq!^vKz!3B=Dg9_yp04k3Tj@Pcezxs^P^pa5-T(Uk&v1Wl0RyN5mcRAQWX4XkOO0sYA> zv!~?O{j}dtQL|Mx*nCZqi#Oh%H0$(&$)ew_Z)%$JwmuZJ{PaHKX`y&Dv(~2&bPAs) z3{8urNpZ8&E()%Z34Ki`7?Xbgmfi~oWd}W&acdH8-=o-oUAgS4!nHIO!?GJQ7NVj! z5Q?Cnpg&-tE1AFV`IVxp3Sd#pczkL~Bid58+)~h!XT96<^kF|YweI3D?y3zMCZjKP zGy?<1QyEgEh=9k(54;pDo>bW(yEDO$<6B~X)i_;v=KJgKh^CC`DyQ-hUo2bj#$w*h z`<~}gG?TaV=yaZwyMvGXN6x`KtIeKCe%<=RRmLjgJpN;wj_!QwioD;~X>(*te1MG` zCHvk{cW_`PS_Vtx+_g0esG50oF^HQVe=+!lW&}rQo2wO09izOp5{?byUya~Nvs;a1 zHJLJhGAX&j6(!KdUlhnWDzg@qF(bnrCHzTa4V@^twH94^gK^zf#YZwf%(W)j{oh<#>@h!hR&W)m!4@0#agRV_a1N)lzkO4~i&*I)6cOYzulwy6MZyxK zPxiBMgQmstbdJ)*XD?1ZA7=uCvAZBq#5+U}$pS|5KaJ*&bN0go+zCtb&+xr?%RLJN zASA5wlnM$jg17IavY?>NEzONu6*Y!eQEKRftLWBOP;|AJctJZBM4(WJzKig|LCC$% zxR;NbW(G@@7F;GBfz=uKBVA|I(EXj6EiDjv@=a^yN9%h2G-}Ul*APd9xiQQ0mpoD? zP<`d?dvRrz+7aCu1CYm8BcODrFLUM0NLHG@9AYx`$U2B%vZ!%sPVKjh;d5ecqaoJ2 z8H6ZWjg1h2r)4(_kc8Wq%89M?bnRPm{wxd|x&k^?rXTfQ%ue!-R|@_SRNm4_vAP1F zJTEKBQ)!QvmH;F|P&@vsQ#;M%`g9fY8%5X6<*yGZiOBOJei#G*iDGDeJk0;psx?In z*CdaBYGaqf9Y}4CZCo8U(mt>Dr=amuM>Th682h!}jj6oH#yC-9aAP*!bw{Kis}3F) z28K)B1|N0#-4LIO{Y|(3edi_X^Zu>LWVhY1@NfX&Xvfp64_&{b__N*TFn^-zj*sbp zpMQ8SRm(L%$(`!xPxJi=048C!Ohhn}Qv8-jc!3}q4*Ue-V>i=a@C6&06$CrX%p8lf z;~h%+xwd_xPg>R_)-887s;!#ITkjf|E#c>;=Kv)i`;st+gm6t_(|mD7`&N z&A{Ua8lokYut3S?zE!}BL&z4>J}~nB$c6dVvZ7{cbYhOWw3v}iW1SUgoyE`LeJ7he zN7fX={|<%7eUwDVN#^W>*g`3E)2Z{r{zT?bKA4rI$c+@F*m`JUq*+p&T>3!3H^Zi_ z&?q-Rj-s@%@REH+sSk_BKR8F8i3lU$!GGrO9iZ_{?>Z1TdH88#9Cv(>f*v0Y{i{As!97HMZ0zvJCE;*B>ush>+Y z%V>>4-tQQ*-0(qb_;DcvJ@gqb`8)}ii+b$EY-Memn3Qam%B*dj#|%0kVwBx;3Yh{7 z6N1pt`UZ5BESO^!5hqc`fNJP&AZoUvo^zfl4LvNmXRJ@TC8tXT9Gihoio6e;SBA`v zg=z9W9()R{&DgPxWSyVh?P=QALi{*53P1VTaCm&{mo#M#jtz#Sml@p5RJ5l`1^7wM zoG1ZZDmGD!>tYLp?X=8l7$dqG0?;?`qGao>HIr#QVK)IWmB=(<*{pT4d5A_1kNF#L z_G<1Jr>Zf>$0UiO@e(YkywvR`e6 zaz8r!t>%1c2T##_Waej7>%diZ;pOOFbHmOIEyCoxc5MJ$sf&Cj`KEUpfL~e3q_JcneL$&AZ%**Ia|iC z2(z%33uatF(BdOP)Mdo9g%7k3gLU3Un^^|@Mz5@(z}<+Yc!s^c`|_d#GHWzyEETW8 zYgaMK$+y)Yt5MudIP28JEsRC{T}SU?J_IfT3*LKksWf<>jldKD$4zcVr(%lp0o_Mq8|*qj9QeBw@vAJ8z<3@%~obFFAuD>ZESA0 zz1fl9`dsmK@7nju!${Qe$DdEYy$`>ngCEHmG*R=jY3Pt;0=WP-QC#9G81|EjLnWfH zP(2EB`q`C`wrm_3dGYd7?u>OUt$0quJlshV7el6n-DF4P{m7v#K3~BVK%#t%NA7x! ze5K0jP_(wWgsU>Q!25C@2P!N%l?>eH&!Flx>cLGln4~8O6M<*O5QixT(O;9ocUt+H zCT|!6SE$;2#}^N(3UFr4H0Z};zAaTiKMzY$F2WFI`8xhGQ`)>_-3A4L_xxY&m8Z*H z#o{5<@^S|uP2p>$rm=@cm+sU&CjIf*_9QH|nA~~t2WZ(}s_|u$=4kl#ZSA$XyflYN zpZoHM&4abKjQi z8+dx*h#7=!G(U0&d5$0XE1%oK2GpPMl0%MPAI*efy2=V{Q0~VZ>RIgARc{&!k3tA6 zLTosC!)2N?QoO@%O%`P_y{aR%$gdfUDK*fJ7Y%~)5Md}yFi|m&o7>N9f3P@70h1WT zPSn=?XmtPE)Qx!4Ls3Ti3;!?-kifrqH2n{cLoT<0e+yXl2vQ}&uFE9`+;*TOR(~yV zJr&7wX*u~r)wd2K`<=uzlkOp9Ff~(b6$lgiva5inA3NCAeC3#zFIn9#+sCB7?bSUh zrrfgVSuaa2&=rCTa3nf&`Kq}^a1x?40%N68cy75TMP;TzkUSs?U4j;VoNUMkA_P!K zeo0`J!dwR8NA-cLUG<)y~=YdzR`gB`4Mra4dnhGXIATuxLN0yo( zD+y~aK5hgoZlTFL6<^Tt`>JoZJ{>+rZXJjNiW+m$AZw!)r;Pj7UOX1A+~s0rq*0gE z8&X4qvBN8w-w0zmozgwg5aY>6K($n3M`W&ctn=X z;pav8S9FSq(~Oa#N#$g#BWBbcTHz#{un4ikEwU9HhF_(TZIXe2ihL*M!@r%=v`Q2~ zq**1wtXyyj8w_J4ZJnCFwG;&>@nClKlX2^NW_;e6nmSQfT$ZAs&iy!UdY~-+@)vP( zuEK_We6C;5maRMrCTQsdVB`vu37qy@X|n8Q{6(Ri-er(rxfCELgGGM~a-T0jAp3|Y zR|xrm_gN@sR{dY7oBRj$n`Gj@G%>RomY*fTaVJ1skUQ*Xu>~{Ska$X_AiOe$$G5QG z-B5vm$lxDll(}j3mERdsea@+kF+{&}GF*5*6~ml7vzegzjJkiYyyfz(^st+F6w*i7 z-yx9M%OE5)%rt`8NjxFuVq83Tlz=1`pan5=1=Dl5^X|J~km%}XXh@2zTUc-^qNWA? zLZiVw^*q?xS|QVU|K)i|PYcR54+Q&ecMr9^8&qokP}4r`Iy+Z=YjJ7i+1k2s)dsq5 z`#P|Tp86_{+SoeiSb_YYXaBjbyJJg{r4)Fey)MYmLsGE=Svh2use2p3$7s|XiTf)9 z!c3>v^nPz~S*a&=sIsU=s`9F)DQU~SN7020+ezN%7#4U%sMpuUL&S7Q<>Q4XA@v$A zjrK$vEn`uSS$YTE3#t`zB^A1tA5`f}!uGTzg(9F<%~>B3B%j@_ksWXIZnrc%+ui#dYhMW@@r`KqjSMHlH~UFepbJFTAClqNJ7HLhXXl=y&FThH~lu)j0WxA zl}P7MJ9>IJ43&ja3y7NGAYr+R-(gq+;pbpVt2mq>inN)b2+=iI39Yn~#)V7+%LU;ph9P9Pu5-2K zIJ!K870I`v>Jc#X0)1T%U0i-S~^8P^j*z6wmdHpJkO4NUblK=fhu zE>2DW_m&dnYT(xK_tQLq%;!%;3E>nWXhWbAEYHct{S#6Y00#_!hyMjBCiqMrAQNKG zTruu3Zy{Qei%_z|ku>P(AWG88YB{xEgZ3m?E}r}iLFjOZL3az8vmG|DN4QBqju5-Sps zq4xxDbX6NjVYmS)uRxSsB^l;MfE5kpsA|!C=h{G^u?zK>*sOx;>e6^z+^f<#&`3@g zr>h@r9C{~*{Lt7wZ9Y3!v9PH1eg!hMesvQv_9+mtx%O4F|3mzbz{9R%3Gj4#OEa@y zVB%#k@O_0V6~(C>nvfx*jj9_}4FNA_wH)hMV&dpe6$BGy#EJ$lVDBKZ%j>BtF7e%{ z6a~0!hA8VPw&v}3N@<|ifrLlO%Z(Tx&ox@lykRFw2u-B9C(|yl-oU-f3%NU7U7<9y z^gJ$=SC7r`n^j{fvuSDKN!{DgJm;Xr7};+I)EpEdjq(fv#Hm_ja#sS-^kmxAcB*US z+L1N1BbW}S#zF>GIw*$&05)0Y)pWSbSA}-+k2#+!#xFUHrM>1GF8Bp5d@bG(Swn_! ztQrx2fe~W6U0;mN3E-FSo0oI~lxKHt=F$_~0$>~ICh#L!CXxn}am&pA=CBv5oZ!kP zDfotFoe3xcc&>y(b±cRIyaL;t+^up9}asGW%t+SpvR2KqFxA+|H+kD{LNl8StJ zE1}%c$lDv1F)-LkoU53!eoiP8tr?T~s%!=!iG!U$)~V8<`-eOGKRJ{MHXBA8o*7%R z9451%%}!UDV1vt(>>Qybzrby|EN2uy#Z7=jC9(U2T8BS5MYojt769X7dH1A4ZM2Y(m#Y6 z>8u(uco+7zdvHn$IgmZC(pbIBpq8@2XPl8WcYafCyK8Ur+w_lvL&xKjpN7BpfB%7Q z-NrHy5K8+u%V{`Nu7MW?DQHNfz6%IiyZ8L$*&D3jDa?^A6Cn1-ztpItCwzlLQU$$V zuw4N7hLdR@&GKx!+C=0E7M;+8DaB(2%u#XjQ9puimndZGl~+iBqd8jES}y<+|Ijne z@*W8^Blqh#>koIe8N@#GggY(u#9p@JT%bgKefpwmimkH?e>z%ha6xS@nvCE#)n?oa z2BNvIh+H}#tPer?&%+7K-yejbr8R5~ti+N}#8@9-W!pN*J_T1A~ z=YW~d8HI2b$c&l$6{=dxCvPs0ii5Em$5!!-+M3pK=v`D{iqT)&i>$XzBi0UIb3sYzml~W zEx(iQz9V4xVA@gOO>PqPBNYRALFcJ-_K8$nFp7gT3cSypx#v1>fc^o-|6_0 z)ZJr<=u4A&WmwktY((_+%Yk?5&)XfQGT--)(`(MlsU*p1uC8TnZGAG_{rp93Z~t4- zkL^R*;|66*|Zk% z`=`f{zNjf^3Sti1rJ+$U7>bH~!cVs7h`oZnFr=%+jxBgTz2bGn@S8@F&sNvHzDOGRPxqrDkfC@xMr7q^E-YS9glPfk9~ zVrXBNe1}s#ia&c3^w{%F^~_RIFVi? zNYfu1Ix)gX%Yh?<8(8SGyTDS&nxrK;l&YE&2wxXN1&96wHI#yQ)NEEMk@Ok>8+Vh& zg5*UXY3_ScY8#7^NcX8cLEwi5E^MSD$if!-P+cijxJ!nDWg|kzD*ARB4`;ZBC!7pW z*cd)ATU+o-(`3_N{%3vwJ^S37oW)@OmDfHZzc}-+0&p%lmqcqESs`|Q$R8s zUVf}2IBQ6Ncl*|Z>FmBJznZ>pe_8T5v0?!8;hv#h^?g`0M^{I!%;l@T<3*B(f1ngA zQYWdV=U1J5EH9h;1!5g6LN)mi2=TCppoG|zlqmbiFj^or7m>i0u9}x?n^i^&7Uve0 zDKntFQW{$9YTG(Gb#vOD^@zNz>VBpBx@0)4GIwaqPH%vcSu^1}IPofgl}# zGcJ`Qxv6xk?I^e-V;N5sg6vS=R(ia7ZgR<=h?Ho7LNj;$1OO!jCeEVm-EsXIEQ*2! z#ZXD!AZPMkxrd{1FP}hA_-(iuie(VW3_=4|^~YA}VTQe0xem*ZaFjq#*aK3-EbziS zHmW*-(Mb>PCd^jL+Vr`u%C9btArmV)`OKRakdmi&wSdOt{$$XTzPi{)pLLZHM;+Fk z6)d(JD}ORTgu(As-KMEi1_z!NaO&JLezBGfgPaF!NljlN1>0R=tl7-K`A1_}cdfTA*6 zjoiD%L-u0&S!)_`%zJzvyfkT77<2vEarQkGGCwJt4raEN00j)YLAg>sfEaun@hF;p zP<=h2`$pt>`P+-gk1*cbvOLl-tC_qQQ(D810_cd>9Fodu_G@V^5|=idm@vzwv8S!P zHg=wi-WK4z&K6G&E!*;Dq_-X&AwJT{r94vY5JHZ=9)Mdb&@Oyxl(Ea;9a#_{B{(4k zIX)q|qFXX6G)$;l*=)kG37-Hs%EjjVKYfR@jQdRG{v-X>r}6psK(6q%GpljD_OxPi z)Sb1+?Acc)Kd+8u1a3Ih?|MP~paiG$8?2kpZ;zO}vnfXPmGy1H=|6gdOjb(;Y!sW{ zsk+a122Tk0?fgkxybnPTgC02<2hbsdq7WhB;e_a@CvmnwVq!`_T6$8ZS3(XkIZv5X zP*g0RU4SUBxK@ooJ`b&~X_PC?ZFv!eZ0@MM(cRZS@M`e&o1x*6(YIsc??h?}W)*oyZ_x&@q_ZDNl`tDxUFmw%2~hysyT z-mpE%iXe+q+QHmttf_8=lD$~YkiOF-@!rTg$XK%rr2UC>p->pv+)SJrx{|_;?Eb_Zu!(4qU$nHQn(PCQyHVUuX}r>-6;k zC-|t}A6^c{?=PSQg}<^FlfUnHs|+(2$iLW?oO;g6uu?-Nd`AZvADb9-Qo>fAxBv9& z3ivb4rN}yJ+UxUs)eyuI68&L$N9@v1Imfi? zRWMy@9|&xW5fAARAzLhWFex&eA#rBKh2g9%1|;9O;s{Q#2r%O&N_0V114VxxTl&k~ zySnZM8O|g`J^$#F05$-`J4hS40ZnL{dg>9n%PATlzBE`DJ9cNn}&}b$VzqZvA zLfL83DJcRHZaog3VzxKq))B{!hRe%3S!(e~+LgLR*C4mVsa?{sf@;~HAO;U=#p$AI z=nMq?1%`774UoP>a)mo!a0@l|=9cegeqyud>S$^-LzqE2{_f|6%j4>hatsjiE+zc8Yk3$Jz1vx)=KMlf7cNiD+ zqt|93+Lm^m#$M)}KC(lL<|MppbF%~GOPbl%FN-V?9)0GZ!?kTjh`|-pM&BUF)__4xh(nlPv@>K1=jR~WN+xK*F4V%C(0Osl)&c$ z?EtpG4s&R`;{SUeHy@bik6(J?3)5M^TbY;@`tyIeu!0}6CND?B`}o(Q+86*zh)f|< zAq^OVn)6+N8=8dy+sZ+J47I>;5TA(GMC_5__FL$|O!IV_BHLbc%762){x^{S*Tcfn z4hx*$~O1T9x;cn9ch~lc?n0+@bFIR@CPZJ;crHtG2)M~A$}yEu)tH)&4)jZ=?kujhfq|~q z-fCRn+qV=g@38$-ujV9y#pz`UDkRvx{7r98T^2Q0uwGUmF_+YgptAu`tJgWmTt2pSX)mujn3@DSk9 z!8KI}!5}66C9nGdu)zhr*Sjqyzyx#oo|J3+qDQ0CXF`q*FmNVzsZl~1=bfupJI-C8 z3!q|Rwm>Hfq`&Z!ZP;i?=auQ8pZZ(+Pxmy z61>ULZT$S}Bg0VS=HnNV^WbnYT&G6>B~79ru&gZ@ zA>qHzSmc=!F!+xI)+e|B%a%2=g;-VAta#VEbhMQ^F7b}6_?>QD%NIqco{JY}f0|h+ zmS4o;uJz35`Lv!HtEf%Iyvy=6hVagHZZg~LD`&RD>_W8LrhAS_4TOyfiTA$l8-xK+ zFskTiC@Pr2mm8#rNsESACWJVKF(T3nqO%fQY`KtymBl3-+)msT_LjZGPJo6 z-6q&sNI~WSdkXXV69)_44AB82>2JqqCt_feobYKX$Q-s}x_SlEG4gWbB2e2oyMqN% zn_(YH&JtgfaC9By2=PY@mtZDK5rNRXx6Dr>2ho82;*4Ue-H}XyZgs@n#eoRw(-HVF zO3X?omIs|RA9mGRorYV}G^N&NNlOlTd85tjY&7Rzr`&y*-mu&cC=vyEb(Z-uv!t%T z47ARIure~h^Q^LwJVY7Ua!+!PVMVVFXPcVp0zCPUx!=?FK+E&leCzd{w9aV#uli7Y zYLCg3$ljgmY#1h>G0kSVs`1-}d3DI%e76A&=k)LlL1oB7?9upes{|w*puZ2-7;1bx zaF@!3x_F2Dc%tyqqSWW+{osYt#N)&#SZV6zl5ngbxuaEwe^8bZz1-mgx@bFcODn!^ z^Vsbv;_gZyw;vR!Lx9b=HyvKIF3JvGBc>t1(WG0|9rAS|@RrL?mnEE_yliXYY<5sa z3gmL_9gnaGvrPDXPP5p%usgyEvh}g@Y3 zfnU&24}kb>Sz88Rbv6PG9ccdX{f7a_GmZM+*!*{7U}T$QR~fX?+T}9a=K91~-2bb` z;y&3_M8oeSO2hE-Ye%{Kv2yp>_jhv%1kasTz2;@yR5Vri>%nU8XpzdPRnNUnj_81= zR15MHJSYkx3<7#Hy0{9#i7~N|Fa{S+fDoHT0rd#` zSK2B+I@BUl--IrM$Zy}jG9n>pI2v^@zyBThm3kShT?P%H0vI8F(SpuUfZYZF#0piZ z7&cA%GU`?ako2dQdseag`DcF!%~|eR4?sdXwcj-m2qh!gO^C|&z0K0MN*4uC$C~sD zuK?BLp7lxbiaSqf1!VuU?sC1WxSoF1GWW5C(J&FX5Y5H zCKxT>BBOU(SXA!~2qQoP@2^WJE%75Dm(>!)Lx_#ilvH6qyy{k83$5}R!O8U>d*2EA zQpb3it&RsR)DoYvNJ56CzA$7c{3@XvFE@XM!?hndF5vF9HFc^GzOIqI8xQBF2iDeJ zDK!|?OcQ?4juo)7bFu>-15;(z;Q^a@gzpF~b-7%{i2ePp582o6Ji@t2oGc%SD7;ks z^VzDSY{}LU4_{s)LU@?q&d^arGKk{fR|n30y0099tlU%$_$gqA4LcA(!9#y4d31+k z3)5eLd+1tvK;Yda3;F=NOUf~u_8Q!f<7qEUhybMJLX5zt!E=chMl*D5Q7o=BzxkwAGP853$66qQXd#sjIr=u9Vkyf3WGDPJqn0ruRbrco0# zQ_Vcz)Le@$ri4LWzNkqK?4WBBV}U~9kUK--BfR_+vvU+s@Wa(|Uda5%*^Fhr0$$X{ z7t8H1@XL>Z{p-*lUrLW$zW@BPdmuheO_Ie!%V6RL)F#Tjl*~?U$22I}NV>}#-7V(| z)E={)zCiy*adD}DJgEQ{>#C<^KwHtNZ2@4xOz|81RRDRt$wJlxA%putmZo8*;Xk0! zwH+@*s!74YgYEH(>wvDmAj3{bfpMhi0R^|?c%9Wv!ntTEVdjRr3j?BadNmWz@*!9a zGLw?Yb6}FClLiYm_Kwm1hW~y8tiBp!oJ&ohyt-a<3#6~5%3QLdjFVM4JU$_skH_Cl zDwP%c z&e&t4u?q=!zhZt?;S#j#0e{XkLqljPr6L3Hjs(u2@f9U=ui?An6X7U_=`ir7p@x!~ zg(ki`n4il|`<~WE)Uvw7WLks&r48La*Gnj#YgdaQ2LlYM%5gDSKu4i(jx707ca$2W^aTQfo`+pye}V1 z{4CMl{79nZQ#TK1AU5t{uv=J6T&gi(s!y;_&3y)6ev)L z?vjae=et`%pG6%i7i2$Crt7TrC-Wdkx7uV4E9pZf7}nsPeQE@%2y@Nw`Ow%jpvEM{ z?Fvx-_(;Tn1o=t9k*co@bVr<4T1B>88LlR>&hh4?KVNUo{-)NooA&J?ENAJ>h_8%0 z*r+RfbM#@$59|JGCfsTYU&;-kvL-N{SZ1l`bL8-CwFE2?fHgjbKKk3@GV_s~Y#U15 zDQf&_$iFHi^iPu~Eh31M#wpzQX#AEI%HXXj;3M(2PWo+Pb*KMZ%i;T{U%I;jk33-n z_L#sMzc()u2Svk|;fS9{i%8I}cJj*Y&Ud6hZWuNX|DA!39C{c@vlzxIGTj%Bt)Ds< z$)kw6(8L)V&#-Uj(rNzQ;lB}*= zT;Pu&d?-rBmG-7M-$qy#DjQEun;Td=;Wr*K|HfOI&&T{zf5HIpY|j3p7BFR|{ck7A z8y@IMA`!FQsyg_uf4s;uUP29zZ~#P&Cz+vHEjU zcCbUoT+l$2Mp*+!FJfg^dmC_k0;391t~2MRhMdB%GPPni)qOs7<))lDGeb!NM;;R9 zB=XB_G|#~MeizfAY}{$EyOl*VJbdt>2g5^j_`-jGy>fzEAa$u0_KPKvtVb@)iLC zVY1v32ohRM6A?E~`+d1#^L&o2-(NO4#KySDO-kiwhLVvJGd)m zi6O8gPEA_9trd_7f+UAuOlqDE;W65J1Q!Ts;ereMM4+SCjOe&SIY(V^8uC$Ah3wLQ zGnB3?9A3`Coy^dRTSO^$_3|W-Hm?<%r>;w4rOVs6ALRg`Tb{QL1bj1;bfL2 zqo;ClQW^s}Z7>oLC=FC(0P;CYPFPCWg&fX#BS~`QSs9gr%!NT+`0dP2N!owNTlg9J z2LD7~|KIId3$^YXDx&+@Y@RG2{fH#v|8jb~r4q{3vE4gC^zsOqNi3$w5IDs!^faJO zp*@wdIwHtITaUhj5ty<&Zle9z667*SKc!H74VFH%!z7Pa@Wmnm0$_Hu#=(-I9Dqf{ z(>n~1xcCImlt?D8Oo41>|6Er?)&i*_474bZlQ=I#!^nz@iW(Y~Np^Esk|D;%KU$%=iH2swYh>0$T6JPhS|j~ct&VDFaB3lkmj5z+4ijG7U?-cgQ| zg`XGmI=#Ji2ITdBNu8T7-CJ>sei;+%_r5WcrEOz`lP+u4d6mI$R``cdZl2^XbLBMxkm)fx`+0&JyQ2MVt8QH9d3r9B| zqSg2p`AXh+HmV`UUi3S(btpt(>FjF{s!jD8N5 zr0bWyA5D!-+%8Nw2ghv$1+XvkW}k13|;xk-434W;?_ z#Tbl7Yp1C#zED0A8n@jH_SP1mwgd~qLb zm2nn0j9?mLB6!Q*E}H!O8!$x=N1{FXWxPX)Ovu1%@Ssbkp`o|vBcraw#PTR7ghE_X zuXto&@Yzp{m{jtU3K>x)p?-9bdeg4 z)g#4SXLhHrUP7l{yK?v=6I9YEP`$+_<8Z0` zENQhRs5d+Vo-#7T*|6#Df5msSW5)62c+nayLoAEicFnW9OifI4;;XYwlnrs`vOe3- zKkk1w@cG#5@rOIHzG}DQUD}{|;}=ZSb7jr)-!~xNR+;#IM1E?!f68Gh-~Q%fzxbuB zu3tX1V4=3RbMNmqpKrW(W+uCQSonX!`Axj9{uvKfvH}ryB;zUBZlxfwYx02#jbMZ_ z9+}g8A(TOj@BZ0wBR`ilrR%ggj*lR-8bPOkw{ZSi-LmRA*CAsVb@i-E9!Zmzuogw> zM8t+%{Uc+MVBE)K{!lF{!ir^vv#c<2OH#AQFySMf*Vr(w#oA;=Ayerem4biKsQ*tI z-?_JL5RLb7ZNHQ9>MGp z?SRB2h`1(WfHVRGgUh0b4K7mvNuFp7SW=jWf>Jk8!;|C%tL@>}vntM`n){n5GAcXm zYx10Y+UVc|@2N-RhfMH{z}pAov=blRPl-cjpgDQPGTWHGwGW@fs)jzYfDpJ46#Y7L zzfwTvT@^v}A_5Y3R_RVFfqbuxxNoODS)(;f&3G4=IGe# zM{{|}tVd4VoxZ1s7vzszKJ=T4FbcBg7Y(qN759WC^7jSf< zf01}#4;0`LddCX^oI>Gqj$QWUM8^gqf8izGQcQm&V|hkl@TX&K{- zv+QO7ee(>e2%-4bsu)yxCu*65q4zFMl%PE-WK&e|=1I0OizKG%X>G9s4~>{vBaAFS zn+)~Qx`ixUfG1zp^&10x*>}0V@nxCTOJB;i4uW0M;r-FF>FMzeWt+!J^@h*hizCvm zFv=-C%kz%lv1)OA5bs0B491_VrT$kd?aFISwD>EUOr$mc%{lzvC*}X*T=$<9g^B;y z5EtN7t>hz~RjTOA8>9O0aqJ#59{+~vJOu*f8M%wTTL=hG=A3Ouc}L>&O_iC zGvDCakd5_`Y}@C2XqaHEf=q40R!6MjC7L~qQ~7wAMl!@ePUkH0y_27%%@Xmc3G|_| z@@Glh2{j%;q%eq1^51M=gjlJ%0F0AOYAY12(O#Pho!rNVaEL+pXqPi(I#y1m(&8L2 zy?X0+hAN>e@NzT?JM+Y5WRIHLg-T9ud!qb))jv+kfAJ79i>;v<(Il^hSti{B4#nSY zI|6;lFCmJ==5LG2_S}KD=kX3J@549M*srvEZcKMNUsqUYKX|`bAf8V1_r&|dLVo?pK2(3;$B$yM;Gy*L12_fVEQo@7kVK?ZJT^r&k4O|y)2e}h8p7R< z>@O=H(dWdGW}v5mjx$(|`gx9@DVo>RfF @@ -163,11 +165,13 @@ export default { }else { this.dataList = this.dataTotalList; } - if (this.dataList.length > 0 && this.$refs.editChart) { - this.$refs.editChart.forEach((item) => { - item.showLoad();//之后要实现 - }); - } + this.$nextTick(() => { + if (this.dataList.length > 0 && this.$refs.editChart) { + this.$refs.editChart.forEach((item, i) => { + item.showLoad(this.dataList[i]);//之后要实现 + }); + } + }); this.dataSetFirst(this.dataList); } }); @@ -211,10 +215,10 @@ export default { startTime = this.filter.start_time; endTime = this.filter.end_time; } - } else if(filterType==='searchTime'){ + } else if(filterType==='showFullScreen'){//全屏时间查询 startTime = this.filter.start_time; endTime = this.filter.end_time; - this.$parent.refreshTime(startTime,endTime); + //this.$parent.refreshTime(startTime,endTime);全屏查询，不更新panel列表的时间条件 }else { startTime = this.filter.start_time; endTime = this.filter.end_time; @@ -324,23 +328,44 @@ export default { } }); if (chartItem.type === 'table') {//表格 - this.$refs.editChart[index].setData(chartItem, tableData, - this.filter.panelId, this.filter); + if(filterType==='showFullScreen'){//table的全屏查询 + this.$refs.editChart[index].setData(chartItem, tableData, + this.filter.panelId, this.filter,filterType); + }else { + this.$refs.editChart[index].setData(chartItem, tableData, + this.filter.panelId, this.filter); + } + } else if (chartItem.type === 'line' || chartItem.type === 'bar' || chartItem.type === 4) { if (series.length && chartItem.type === 4) {//曲线汇总 //series.push(sumData);//后续需要 } - this.$refs.editChart[index].setData(chartItem, series, - this.filter.panelId, this.filter,legend); + if(filterType==='showFullScreen'){//table的全屏查询 + this.$refs.editChart[index].setData(chartItem, series, + this.filter.panelId, this.filter,legend,filterType); + }else { + this.$refs.editChart[index].setData(chartItem, series, + this.filter.panelId, this.filter,legend); + } } } else { const type = chartItem.type; if (type === 'table') { - this.$refs.editChart[index].setData(chartItem, [], this.filter.panelId, - this.filter); + if(filterType==='showFullScreen'){//table的全屏查询 + this.$refs.editChart[index].setData(chartItem, [], this.filter.panelId, + this.filter,filterType); + }else { + this.$refs.editChart[index].setData(chartItem, [], this.filter.panelId, + this.filter); + } } else if (type === 'line' || type === 'bar' || chartItem.type === 4) { - this.$refs.editChart[index].setData(chartItem, [], this.filter.panelId, - this.filter); + if(filterType==='showFullScreen'){//table的全屏查询 + this.$refs.editChart[index].setData(chartItem, [], this.filter.panelId, + this.filter,filterType); + }else { + this.$refs.editChart[index].setData(chartItem, [], this.filter.panelId, + this.filter); + } } } }).catch((error) => { @@ -397,7 +422,7 @@ export default { } this.dataList.forEach((item, index) => { if (item.id === chartId) { - this.getChartData(item, index, 'searchTime'); + this.getChartData(item, index, 'showFullScreen'); } }); } diff --git a/nezha-fronted/src/components/charts/chart-table.scss b/nezha-fronted/src/components/charts/chart-table.scss index efc9ac482..42274ee9c 100644 --- a/nezha-fronted/src/components/charts/chart-table.scss +++ b/nezha-fronted/src/components/charts/chart-table.scss @@ -7,6 +7,9 @@ .clearfix{ margin-bottom: 20px; } +.loading-font{ + color:#232f3e !important; +} .dialog-tool { margin-right: 40px; } diff --git a/nezha-fronted/src/components/charts/chart-table.vue b/nezha-fronted/src/components/charts/chart-table.vue index 28487160d..cab62355a 100644 --- a/nezha-fronted/src/components/charts/chart-table.vue +++ b/nezha-fronted/src/components/charts/chart-table.vue @@ -2,68 +2,63 @@ @import './chart-table.scss'; + + diff --git a/nezha-fronted/src/components/page/dashboard/chartMetric.vue b/nezha-fronted/src/components/page/dashboard/chartMetric.vue index 5d53b9f24..baaf24ac3 100644 --- a/nezha-fronted/src/components/page/dashboard/chartMetric.vue +++ b/nezha-fronted/src/components/page/dashboard/chartMetric.vue @@ -24,7 +24,7 @@ } .symbol-area { position: relative; - height: 135px; + height: 100px; } .symbol-equal { position: absolute; @@ -48,9 +48,8 @@ color: #666; } .li-list-part-label-val-list { - height: 170px; + height: 176px; border: 1px solid #dcdfe6; - margin-top: 33px; border-radius: 4px; padding: 0px 0 10px 15px; } @@ -149,7 +148,6 @@ -
{{elementInfo.metric}}
-
{{elementInfo.metric}}
{