From 81c21cdc02217758d3a131dd5a678cf08fc3671d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98daijinzheng=40xingtongworld=2Ecom=E2=80=99?= <‘ceshi@qq.com’> Date: Wed, 19 Jul 2023 18:30:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E8=82=B2=E9=A6=86=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E5=AE=8C=E5=96=843?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/img/bwg_icon.png | Bin 0 -> 792 bytes public/img/tsg_icon.png | Bin 0 -> 792 bytes public/img/tyc_icon.png | Bin 0 -> 790 bytes public/img/tyg_icon.png | Bin 0 -> 822 bytes public/img/whg_icon.png | Bin 0 -> 789 bytes public/img/yyg_icon.png | Bin 0 -> 794 bytes src/App.vue | 32 ++++++++++++++++++---------- src/views/HomeView.vue | 37 +++++++++++++++++++-------------- src/views/TycView.vue | 17 +++++++++------ src/views/WhView.vue | 45 +++++++++++++++++++++++----------------- 10 files changed, 80 insertions(+), 51 deletions(-) create mode 100644 public/img/bwg_icon.png create mode 100644 public/img/tsg_icon.png create mode 100644 public/img/tyc_icon.png create mode 100644 public/img/tyg_icon.png create mode 100644 public/img/whg_icon.png create mode 100644 public/img/yyg_icon.png diff --git a/public/img/bwg_icon.png b/public/img/bwg_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2babbd474167036d7f97bc16d52af68144773143 GIT binary patch literal 792 zcmeAS@N?(olHy`uVBq!ia0vp^dLYcf3?viMZ?gia`2jv5u0Z-fS>Vrq6paurkc1OP+QtWl;^v>jim54^B0+E(Td`N zoQHbL1MD>UKfHf<^Wq!>xl=2=?0$#LW?*3a;_2cT;&Hrp>dT}i1A&%efkTS!fh#LQ zvu&&5_x#^{^#PmErjY0DO21vzPUa}ATck6^Q|a&mh486Qd$v8QeDMEpAIpZhGh}!# zDlVSE@~cJTnwZu@)|*jJe!0o)EMZt^X^ z*WbEYRAf2dzBPijP9Nu8zVOXxwc*?~ZL@<`u79pkx8bwrO1_NVtkg#*CHWJ+7uMX& zdsE`FWaFP?k^AMpXPFg>H0)peW8-ag&r_e%S%2^?e(rW+&$7u9cYYrE5GyXVRqfB8 zt&(v+K2Dcyit%Oqu-N*hx^+@-rJuuUyT6OIH^w=#iAUt5Mem5;_EvGl&6;-e!{!zn zf89(E%gz_SpuB#!zP8qu7io^nn_0h~KKd#+cIMn!_o{SUU;Qk6y*_lJ%@i;bSM%}%%5xoiy*q0x4gIfBL8D|tntBj+;2T4FOa z@9zHkdw-N+#}SuB1$sXeekuEz$h1wBTzkstW#Qp-ng%-`tWB}w``7rGaU&mTj!gY)FaF9h=cMq5Yjm^BS>Syrb-_*_P4z-z!EPt(Dz2xCBefJy3^K<>bb9c13l)u-xWZV*V?rh=pdU>5| zGEK}Wb!nV;oeZYhB)UsQdcEg)vgQc$I*AOYNB7T6{&wu>q+g#tCUy5O{B2^#yy;2v z49)d_oEc7BT9S7<@{t{5z1m0D>*`yj+hjhNy81`ypKH6V!WdqsQFE8KcXem<*QYNJ z@!wC#N#x)<|A)!`O>F*=tarJ`_xRT@Vifz(DmD8eZxsLAOWQYp`}O4KJuAoGGP}RH zZoe6PW8(3z(ba}UC&TX@H2fA`U_ATWLhD@jox8q7oN9^ZyS8J#lC9_IIIF`4`IkoR zNa)~yqjaobfknHUQe2B;|2marb9)-h?_M%q`|xXs;gV+`w1jtZt=8%(O86;S`>DN2 zSjZ}2OOmdjjH7<$)z&XJ?kqUt;XBvG%hhx4!yEEnkHkHh#hBD?0BmFfe}eba4#vINm$;Wz}j0fi}U^%NbW!^hVBJdiv$f z*MILvD;n@}T&uC~>Hq9x*Cy$(&n(mR)0~i=#gR*S`}V0wO{+Pqw<0Aranp=N+6}Ua zQh(adDo4D?JacJLmeFU$+doVW&srMR6JB-X(&A)W|A)G^%y*W5p5WbewCat^K?~RK zoyo5D3#`9dxc@%(e2xLr=hUpJ+YkKvQT5{0^U$A{V`a@uubk$&R}@sn{Nk%w!wJn! z&8d4He)zdbN~cu)$G+gxpHDr%o>&m_fAeL*{*TKOm;B06a!n}z&o?h_!4753^6UC{ zA7p1YdGqVHH_Y?-;P_zT_p1Vzj%MyqRr_#{_2cB;;7m>~k%orK0KLMrGW(wC8#Y$# z-0@EDOMvW=eybhR61ug1E@7+ZeDpl}uF#ZI>G>bF3*3DD%TZccgye;%y>d{~? zt8@Rsk$2Botk>?<_wBd&Us>+OTKxJ!LK(N*>7w6>wGrBjO8b}24A%30XY*x8z~tzM zCP6mbm#x<ls?xTeqf5NYS3+|aVer>q+>BP#8WjRGVP8Hlg)+4$_ykKhU zWC8z}DH%?lsx=jj`!22%6uZ5IbC&S^qf;iB`R$bd&Eohmx literal 0 HcmV?d00001 diff --git a/public/img/tyg_icon.png b/public/img/tyg_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6174fcccef6948b98c7d67da7010635666ea6b68 GIT binary patch literal 822 zcmeAS@N?(olHy`uVBq!ia0vp^dLYcf3?viMZ?giar2#%6u0Z-f=^!obKM=tIE;djB zTqT4-9=ZOOvO3VAW+g#>!3@6M9&Vb_a;nPCiY$hD+QPgUUrjjJUfJ7lZ!?z=<^L0{ zt0m5P{fM_6|HE^0dMo8t^pyk|ms~wDje&uQ%hSa%#N&AH)R$F@6-3%(Sqrzn>ou(2 zTsHIEmZ$&p*RJ8^F#B1jVmC+p&$-6tzLituQ!;0}S_GX!}Cmx=b(SCKVsK)Vf_A$Qsd=bH=L8k@#J}S$tymc}}xBVfr zbd})3wp|y?|6WQAmKK~NxaaBzq39BkgX|C3c1_>O8y_FCWaiG9HSad~ri-?#uvR*3 z43!r3=j=Q3?)Jx^2{Wy;Z@fDtw`$D~b$&h08Jiz-u>MOrT7Lc89V@$^vMm477F)k; zy{VC*+&NKS`kxvH{!YI~?!n;5ys}dV zE-n4K<9n3Wi{Fc%obz7Ku=r_B*-|Czy&p16%+`P3V){@;oiXjslf4F#7dbXC%=vMn zV&|ic4Ig8YIRd_CMWS@rl-9aWU%40WVLxNS^igxJ4tGnaUgnHJ4?q_;f4PE(Bk z!~2If&(1NBzPQ3mq5FQ(WCjMtkDe}$As)wjr=}-283?qUOqkN!(X}}&dVAT2|Mk(A z3tl*$d-eO^#OkK}JeSi`ZhxPnQMBj6R=HL4i_4~-aQ-b{reNBAbnY9uw}oz=llDK@ zXCmhH^7~|mXNw{WI4=uK(wJ8HwQpYLk~ZeYnoI>veHzmzbxtWdB>dWP=PbQ7>Pw3! z*&W&N@gK8B0oRugFT^6&_|4z_w$5a)f>j95mF+1$cZ!VWhAepa^6{=$8h0AQIzMIS znl0wa+_cRhd6~%zt3MVYy1e@ft^Vl!iz?kxo8RXZ@_nsQNzSi!&8@5V-3(p!OyG^= zk2OkPxDGlQtbdyt5_l^iT?U*XAh-DPLFxlP_*ir>!G##8jeVe8q9#Gdw)iXYe5pF~?4KD+sB?Zr5s zM7M9J=ZCG{@TQDQ?2%y1*=3)Nqdfk1{J5EY^63Nd+NUpLqYOf%J=A^}nm*%szHXy` z{Ef0R2X>q+-oIN>#7bdppHN(W2X{(T){HGPP3u$l^!zp8c_b9^&FTIhyYvXLKLo+efs0Vg zn3_~k1azWFNswPKgRh61rk=E%nlhiGBCDYehX{|2iO~0F+sq|cGSi~Pxvn4SEf28M z{P6zV9615D6<)@Ae6Lr1+Q`7b_|4PBF~s9|@6?w`s|*BMPr5ZIoltueHhtCI_qnsb z*KbSmP*HLI`sdIYahsWEc;>A>!5=YcL&NiXzCTsn!Y5Ah|Cg{_MA>^r??3kjL6u!C z4_-J%XJnlCJ7b!QzDq-<=pr{A{#~-I&h4@?*7=G8avoNVpBw~Fu2I#S{Gj@~=A@FR zcQt2D&e7qL+W%A~ZR*EQOZap8^LI~wUbU}ki{J8h+Z{W;SVmrT%KUaMKSB3g$V!!` zU-Rsq9SW$u^qTuhR+e?mozBLz|7S~D#QyFSpEmFOuN4R0+HtzC-?bxf^~1IQ_i%(u zi|WYK=rX(w-Jql)Q8km>L%z99Tj26}(~kK*bG|+Or0J0BW0P69E>Hg0_3Pcb%RZHr z@}G71bAxrWm`|!@Q0xAtA3O8?)uML={$N~`z4%1ZP0xt6HI6?V#eJtw_Ff(SxO4tq zY1a#UD}v+}UcPDjX0l-n-fAX`knowdKD&^6ELK z+?H=;Tf-%7_V9bLK0Q|RB#m3{`s%aWH%^G{_;PQf$iv3_e?AGPFWw?^d#ddnOCNm$ zqvGXn4>MQKR7$<`v~b6k48N2HtNEOFay_&Un@lyxFup$D=*|+w=Y_X4#B2{twm-rl zu - + diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index b44e857..0911639 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -430,7 +430,7 @@ export default { option = { - color: ["#0780e2", "#fdff00"], + color: [ "#F2A0CE","#0780e2","#FF6504", "#01FE00","#00FFFF","#fdff00"], series: [ { @@ -458,11 +458,12 @@ export default { show: false }, data: [ - { value: 1048, name: 'Search Engine' }, - { value: 735, name: 'Direct' }, - { value: 580, name: 'Email' }, - { value: 484, name: 'Union Ads' }, - { value: 300, name: 'Video Ads' } + { value: 348, name: 'Search Engine' }, + { value: 335, name: 'Direct' }, + { value: 480, name: 'Email' }, + { value: 384, name: 'Union Ads' }, + { value: 600, name: 'Video Ads' }, + { value: 700, name: 'Video Adss' } ] } ] @@ -767,6 +768,7 @@ export default { background-position: 0 0; padding-top: 2.26rem; height: 20rem; + position: relative; } .gymbox .gympic { @@ -788,11 +790,13 @@ export default { } .gymbox .gymnum { - width: 60%; + width: 100%; margin: 0.6rem auto; text-align: center; height: 3rem; - padding-top: 1.4rem; + position: absolute; + bottom: 0.66rem; + /* padding-top: 0.7rem; */ } .gymbox .gymnum span { @@ -807,7 +811,9 @@ export default { font-size: 18px; font-weight: 600; display: block; - margin: 0.2667rem auto; + margin: 0; + margin-top: 0.5rem; + /* margin: 0.5rem 0 1.7rem; */ } /* 數據box */ @@ -841,20 +847,21 @@ export default { display: block; float: left; width: 100%; - line-height: 0; + /* line-height: 0; */ } .numbox .numdiv .ndtitle { padding-top: 0.2rem; font-size: 1.08rem; font-size: 1.1rem; - margin: 1.3rem 0 1rem; + margin: 0.7rem 0 0; } .numbox .numdiv .nddesc { color: #ccc; - font-size: 0.32rem; - padding-bottom: 0.2rem; + font-size: 0.9rem !important; + /* padding-bottom: 0.2rem; */ + margin: 0; } /** 客流趋势 */ @@ -994,7 +1001,7 @@ export default { } .today_rs .tdrs_title { - background-image: url("../assets/img/left_t3_bg.png"); + background-image: url("../assets/img/left_t2_bg.png"); background-repeat: no-repeat; background-size: 100% 100%; background-position: 0 0; @@ -1014,7 +1021,7 @@ export default { } .pcgrs .pcgrs_title { - background-image: url("../assets/img/left_t2_bg.png"); + background-image: url("../assets/img/left_t3_bg.png"); background-repeat: no-repeat; background-size: 100%; height: 3.8rem; diff --git a/src/views/TycView.vue b/src/views/TycView.vue index 48fe2a2..fda8149 100644 --- a/src/views/TycView.vue +++ b/src/views/TycView.vue @@ -252,9 +252,9 @@ background-position: 0 0; background-repeat: no-repeat; background-size: 100% 100%; - height: 1.8rem; - line-height: 1.4rem; - padding-left: 2.02rem; + height: 2.5rem; + line-height: 1.8rem; + padding-left: 2.62rem; } .gcgrs .gcgrs_charts { @@ -480,13 +480,18 @@ export default { legend: { bottom: 0, right: 20, - itemGap: 15, - itemWidth: 15, + itemGap: 20, + itemWidth: 20, + itemHeight: 20, textStyle: { color: '#fff', fontSize: '14' }, - data: name + data: [ + { icon: 'image://img/tyc_icon.png', name: '体育场' }, + { icon: 'image://img/tyg_icon.png', name: '体育馆' }, + { icon: 'image://img/yyg_icon.png', name: '游泳场馆' }, + ] }, title: { // text: "负面言论分领域趋势", diff --git a/src/views/WhView.vue b/src/views/WhView.vue index 1fa66a7..91de23b 100644 --- a/src/views/WhView.vue +++ b/src/views/WhView.vue @@ -95,16 +95,16 @@ background-repeat: no-repeat; background-size: 100% 100%; background-position: -1.8rem 0; - height: 12rem; + height: 14rem; } .tyclogo .tyname { - height: 3rem; - line-height: 3rem; + height: 2.5rem; + line-height: 2.5rem; text-align: right; padding-right: 6.8rem; - font-size: 2.02rem; - padding-top: 4.8rem; + font-size: 1.7rem; + padding-top: 7.8rem; } .tyclogo .tydesc { @@ -112,8 +112,8 @@ line-height: 2rem; font-size: 1.03rem; text-align: right; - padding-right: 1.06rem; - color: #999; + padding-right: 0.3rem; + color: #fff; } /* 总计进馆 */ @@ -234,8 +234,8 @@ background-position: 0 0; background-repeat: no-repeat; background-size: 100%; - height: 1.8rem; - line-height: 1.8rem; + height: 2.4rem; + line-height: 1.9rem; padding-left: 2.02rem; } @@ -249,15 +249,15 @@ background-position: 0 0; background-repeat: no-repeat; background-size: 100%; - height: 1.8rem; - line-height: 1.8rem; - padding-left: 2.02rem; + height: 2.4rem; + line-height: 2.4rem; + padding-left: 2.42rem; } .gcgrs .gcgrs_charts { - margin-top: 2rem; + margin-top: 1.8rem; width: 100%; - height: 17rem; + height: 18rem; } /* 图书馆趋势 */ @@ -270,9 +270,9 @@ background-position: 0 0; background-repeat: no-repeat; background-size: 100%; - height: 2.2rem; - line-height: 2.2rem; - padding-left: 2.02rem; + height: 2.4rem; + line-height: 2.4rem; + padding-left: 2.42rem; } .tsgbox .tsgc_charts { @@ -506,13 +506,20 @@ export default { // backgroundColor: "#141f56", legend: { top: 0, + right:30, itemGap: 15, - itemWidth: 15, + itemWidth: 20, + itemHeight: 20, + // icon: ['image://img/tyc_icon.png', 'image://img/tyg_icon.png', 'image://img/tyc_icon.png'], textStyle: { color: '#fff', fontSize: '14' }, - data: name + data: [ + { icon: 'image://img/tyc_icon.png', name: '图书馆' }, + { icon: 'image://img/tyg_icon.png', name: '文化馆' }, + { icon: 'image://img/yyg_icon.png', name: '博物馆' }, + ] }, title: { // text: "负面言论分领域趋势",