From 006ee502ff2cc4f8feb5af656936b4bb81e0b1c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9C002001lixiaobang=E2=80=9D?= <2547956374@qq.com> Date: Thu, 29 Dec 2022 18:00:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/mapIcon/binhai.png | Bin 0 -> 1346 bytes public/mapIcon/dafeng.png | Bin 0 -> 1765 bytes public/mapIcon/dongtai.png | Bin 0 -> 1188 bytes public/mapIcon/funing.png | Bin 0 -> 1110 bytes public/mapIcon/jianhu.png | Bin 0 -> 1240 bytes public/mapIcon/location.png | Bin 0 -> 427 bytes public/mapIcon/sheyang.png | Bin 0 -> 1363 bytes public/mapIcon/tinghu.png | Bin 0 -> 1321 bytes public/mapIcon/xiangshui.png | Bin 0 -> 1229 bytes public/mapIcon/yandu.png | Bin 0 -> 1367 bytes public/mapIcon/圆角矩形 1.png | Bin 0 -> 580 bytes src/App.vue | 51 +++- src/views/index.vue | 519 +++++++++++++++++----------------- src/views/pop.vue | 59 ++-- 14 files changed, 336 insertions(+), 293 deletions(-) create mode 100644 public/mapIcon/binhai.png create mode 100644 public/mapIcon/dafeng.png create mode 100644 public/mapIcon/dongtai.png create mode 100644 public/mapIcon/funing.png create mode 100644 public/mapIcon/jianhu.png create mode 100644 public/mapIcon/location.png create mode 100644 public/mapIcon/sheyang.png create mode 100644 public/mapIcon/tinghu.png create mode 100644 public/mapIcon/xiangshui.png create mode 100644 public/mapIcon/yandu.png create mode 100644 public/mapIcon/圆角矩形 1.png diff --git a/public/mapIcon/binhai.png b/public/mapIcon/binhai.png new file mode 100644 index 0000000000000000000000000000000000000000..951af72f23b8fdba0ffc80a68a37200784edeeef GIT binary patch literal 1346 zcmV-I1-<%-P)H2E+Yd>GkY!#; zrkiA%VT{pi5*%zLnL`AI$;L*vQA(kurG-MrO`(9apE;*r%U7TaYxhIzleFi2=l#z4 z-t(OIea|^Bum0;k9smJ=U;rWjLI6PsOgI3{1F!*@1F$GyCm#Vo&i*6-9s|G&FbWs| ze*>5RU}k?)u9cUM+w7%NbM|)_hFU?ug2#g`BA9 z+=ui!m<)O+bqupaBg4SKFw{I4j*OIyvjT^+;%r-1XW*@kSsIIstczX`xd5bN`gI~as=CvP?m2BZ;~Oa`(*p{%P51#G}u=YC;u zZIdr6--ee8H_`gr2foCvSF#WiDnv?(90`h8G&SC&GSzJZT9j(k)V@WZ4MrZWapf14uUwEg7bIXGc+Sb| zVKS_3rVt>@)!STU|vYo-L` z7AWZCuU}WAS$T_Evp&BTv|sH*+toh0dV3D!U{F6s zdl4&eK_(MpbM8}kB2J2$lS;S069TUNs>1B-yhj`v=(phKA8ydPINTYFWwLPWV+rFz zBoZPdM7U;sy+PnxH&19a7JPW3WXt$Fy<>pEU|sR9$vEy210rQ&s8o8qceoBmD|SP#8%14h8@~GX zAfjU;Jo*+D<$2XXt2Ozmz8gLhU>TW$rq@i(nwTO9N~9z~kfGa+6gJxeCdU6lTWhbo zUu2{hQmL5M%a6Q_?Cb=@$IB2E9ZuU*Ql9kqPD4W{=jmT$0o)jHsC+wy%@Zg;bl!aq z`0VWK=vA9hbF!H#{%*%PO4jo`l5zBdJ&;JkkeIlhj>WAL5?&}w!?EK|mwJ!|5F9za z8&wtczE0!O#DHYF^~IpR`F)Reg(8;j0@all=~hTU%96dq=vABWY1L(%{-zW?Jwy29 zqbBMCYV{C|hH<(ZBqhncT0m4(1oHD!(bYBJm+p^*01^WT0h5z6=xBGEdtAH>>FMzp z=pUgmU^$4K;J220)Ow=VFS&;1?g%{}5SKbtd1=*?;2Q@EC;@(KgA_g!z&!}*1}wDv z{=46C`C>P9fyn3(RG!)gMPe-720uStO5f@4AI5#_pUBPI0A=g372}da62aKmH1hLP zaIK@ls}3aY_zM>S%)^eOY*ev_A?M1NjT7ka9dpa?kIta%wX-NJ&ZHJlb>aeTpPshi zM#mtEUd@6cF~;K@Kn_WDwe7V2apfhnw%mg_Jec!U#{EzFDE(V~I+%dHBR@2idW{u2 zjdjJPV>ucxbklEXdq&*{A%cdVZh5^7x$sAu?tzyfU$Ajwma7+;vptAS5KIK|Fe8yg z`Nrjc1ZioR$VlG=cJ)bKU_roUN6Zny{4=SU*<}s~6B^JgEG0%rLc}IuQ$xcN5&xV- z#J|E`6W0Z3MreVP5gI0QCj=~#)DY_mB%J?$a)Q9(KVO4$#UH7dyZ`_I07*qoM6N<$ Eg3oq)0ssI2 literal 0 HcmV?d00001 diff --git a/public/mapIcon/dafeng.png b/public/mapIcon/dafeng.png new file mode 100644 index 0000000000000000000000000000000000000000..2d24e959f123d9996f659aceeef12128a2411a01 GIT binary patch literal 1765 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 literal 0 HcmV?d00001 diff --git a/public/mapIcon/jianhu.png b/public/mapIcon/jianhu.png new file mode 100644 index 0000000000000000000000000000000000000000..2b81eca37c8632d7c4945e7082f6109c2ebcec4a GIT binary patch literal 1240 zcmV;}1Sk86P) ze@s(X6vsbci-Py{SK?pFHgsSGe-i~?sPB9?i+1X7Qi$T%jVqEl1IGE7h9L}1LQ1cKY`?M^yc zoG6mKf}*IGm@5GkF^EylL;8SbBV?wmg>1Aj5C~g~Bx^bWMIk-QVk+Obq0&UgS-`1N zYamHsVv>N(Nk^MA`a+W_W*UGx{A4qxs%AIUq`7#E5{4{6#hCLj)_8rwNr)T3M{EpSB6IsN<`A(I9fP2h` zQ6JCIr*?DN{yST8pAWmkp{IAtab)}+)-!L>JYZ*N%+FnaFGtqx(d??9siLvJjT_w! zw0P}oE!e2(-Y(gK-Rt0TS6y&HOB*OoFW~*sHzJXce(R>LOeG*t?|1TT%Q-$S-igEC zPm`xzuBRB1Nzld9G1yIlKAx-v>FmvZi37GXT21V4JI$}_Ka=+5m#X;fxdW2G71!-B z5+M|)D!XomM zv%~cH=HT2u`%$dE3cOv`GCv>t;Fj`rWwv{bZ@@{|gC$zI$Gln$o!1-z-Bd zqFrRR%9Og;bvGt)i_nNGUC8iXz zk~01si6ngjhns%l;Oh6tGAyRhY?bSwnkX_a4`Z;a{%fr!Tsh?&{PU!oSC>~weNjpt z>BhyH{pA;r$T2r*DQU(<(_VIx}GN~gIZCBckQZ_un= z{yqw@&Ke1U;n5KszR2|!k%VK!EmKM0oU@LreN8i-6EmfgK%(A+cXUX~*$XXv-}o~P z?pCTRK9p;Jdpf9CR>~{2pUiq<5A3?gS2s^RJPC`ztjWjAs;22f=Y+%`hj}M&GX>@x z8r?Qo54#Ju%5z4XBjPZtb=9*ebFH?e(--`tdv^R1(Mk9H!8wtb@m*eXH`6rON!_50 zZJFgvzVwhV8TyuCC!gOwL6XjdXKaYSd|m8a{;E`7aW$~an95mq17^L6J06?dcC`IG z-upw8r4>#-bV@o6jr#bp?GjhLt+V+rjYU7P6j7%^l+JDmko+iicH=@&(@HcEk5-QjJV-s;u;Q7e?XfR`41R2H5#-@Bu)jbtr~*OEiRH{1Pu`tUoZl3 z5Cj|2ehhKo+_*kIm+#j;%ftCR=e+N^=Xvfu*E{~D&=~IFCMIzShxmloc!9m9WOZfP zP^*3zkI=&sW)dLRne=;^H{28swE$~)g3+?ILZg|t)_@wwW6bp_E;W~RVkQ&#fD31Y zgnncCJQg|tG0f-rfN4Bv&8Sh-Ekq}uF;Q&(z*T%~c~f{>nc0_^$#|uU^#UN{^-At| zKt?)VrKax{ZzLeQm5n>NSa=cNuH^0pWUI1q1)I2r%eii*Uur7`dmV2&+8;zWqLXdB z`cJ^d>dNwVb7SMKd_5yz2lutE{Q+iiG$0`IZe`txulPOY2ZYRLz7i68iD!KPPc!eI zN=Rt2e(d*!g!XfA#~J_3IQ&!Uf`s1X(FY*@xe=ch{sM3) VQ0-iKD7*jw002ovPDHLkV1g+~z~%q| literal 0 HcmV?d00001 diff --git a/public/mapIcon/sheyang.png b/public/mapIcon/sheyang.png new file mode 100644 index 0000000000000000000000000000000000000000..390cf28e5a4ec40e38cce79e6c1e0b5693a6218d GIT binary patch literal 1363 zcmV-Z1+4msP) zdu-EH6vsas?N}dM*S*^f_h60<#%oNGfuIh^GC(6lWC>wWLKLDVqA?)^G>~Y5{3VJH zL^4d&m`Dhb5OpN5xv-3Fj$s%>*sFWlJzD6xc3Wx9@9wuB8?4>H#LScYa_>3!+}rcL z=bYPfg7)}of&di|3TS|tKrqvnyucvf0^EQ{B?B-3X21j(fe;{Q8p7}aLx2tF1Ui7* zqaHB#)4qKG>#JVw>ZgIR0V$Xn{aRwb(UWjo@`_3hA#*>SZ+gAnAfFdno4aVa*@aI4 z_u=!&pTzsT_@qG^1wXp(Rdl2|V`QT`%INiulLeY9YZA$GQ&NKd>4MeU^(34Fx>Rxw zL`dNy05o;c(%7Y3#6qo!NR^KB_8Svk&Py>%xasVqy5GVQT_S0^cmce;?>a4mwn=X_ zd8UySQFBKEWsI?X?mPT!t(kC7XG=Ri?&@T_XR72RmU4jBroY8E7Qm70*NF~|pvBRN z)8ppThSTK7=g8p+FQ=`czORX*ibI@Tdq~;aGN` z14>S`Zz!guty0nXqU{1(VsjL}`F00KEhS2v7pCVE7NQetak^;Xg@Y^K@^6Ez8;Ame z7&W}kc1v9Pg2>sE9w$l>){WBCZ9cw%HIT(DtEXG{trD%8N{)I5ckLTh)@ zTFja#+6Q_b(7&+iLoy>%aCzKnrulqLV zJF3QcVovxhQo|C^t2Gbke^mD^1?DH&lAbSk=dhbA-3PrP>Z_`RG+S}|_VFSdG&YMlb2d!Uau>W(Qn@q5f1A^&XgPBLRg zF6GGTy?$*dT=+cY?SF96a^cZHyi@f#J7yP<6c*3kny+~wF_$=vG0>JNQ}NAnEKgjF z)!9q&wKEfXBGX7G{M1t`K#ZkCb-3Uh!vl)+y_9tn z%~?M#Cw9$Rtvs<(PL#D(Q|V~tF@u>#o5k<%r$r`iz>N3AD#%|sh%rh>=<^4a2hQDg(vI{N&zU5W#|sA*2|OL+WmC4r!H^-cpqhC zXOWRTZ&WDR?G2V23|kO0oRQJt4{gMMNg0dhk(oV@pdit+`Q*Mrl;To{)S)Hj#Qbbt zk*mXLO~K4?YKT1{H$^TfC)9FDYm&P==?zs+^UlsL15i3Uk1UklM5&SZfA!el`3Gnp Vf8+AjT_OMg002ovPDHLkV1k~BpZx#; literal 0 HcmV?d00001 diff --git a/public/mapIcon/tinghu.png b/public/mapIcon/tinghu.png new file mode 100644 index 0000000000000000000000000000000000000000..2afbe62ec2e077caea53877f2cb1ff9b46d6b2a2 GIT binary patch literal 1321 zcmV+^1=jkBP)+EPJ5SQQW*vPDHeoG+YC1l*jHNhVu-kUe}xW|l2xnk^Pn5&BzxmtU);3M}&v_$JN0_uTV4_kQm^ z_nv#ID%rYM1*m}lKnG|6KY9jSfD^C-4xmM?kO>ANfe4@F5Q<4t#)mnx+vXsNjS#Cbls5JjUN>;F!06Hv<3b;@_Dk*l{lO1j7&@72r%W1nb>YyDZY4}2c65~-ipjxb-N=n9uDdUC2eH9VfgAh zY&CWC(TCk1u-#xXs*B6Har`7Vj-B-QzHxdo$qQ#uYqD_dx3gsCWOHV3p7<(y4_0l%-o%W4v^o+%=mzBZLp3N8!1*UcqXq!P(^S z(U3_6g@zD6^;xbSI_A|^ly4wu?n~HetrY$8C*)+4y7*NecXHSo$@^q8F=IwBbH#ji z8cj5qt4Lq|rsyx&a-d6Ox=iSv!%0YlzC#`3`KzKFJAW2^`-f3qRg2@Uoj#$#L=GQ9 z;+z?xUp_lB!UhiTv2k?6_hfzc9y3=h5$%}7;pA^Sh~-Mr<0I5tABOSVWkLrgnywc}^R7sDnb`q(NloagM}0;Xi8i}tyn zPhj|VUzf>riBR;!XNXN1|45gUq19gqd zpED#QbN%}y%Hg1{o*&n2qRDC_W90&}K7NPm(Hou;kA$6_Q?80_7~;x?LTp9>wZtn+i1AJK}7}P63gT4MP(PQI0 z_T?RsW04%6^iM_-pE_R1+wbD+FIRRJSiK1O`anB0SZc5ol?tJyu#}1`MKsm;2D?JT zUziI^#VuD^SW3#$*+OpEol8KUK*~;EBp^75qZ@Y%`QcBu5}PtknZ*AJtU^)FhXw(Y zn(MUt3jWAb`cz&IK)UhcG$A&Q@uS9|33bi`PWvedk`0y~w>k?j_;1Lgxj!x-w=0^PtnVHBo##ByInVRu zJm)#*_-v9(d;ksL59k0tU<{)deLy$h06KwQjY=R8hyWsiAeD&ED5N2)1Z+SpPzSX3 zuRugQwW~X5c*9AraTEmW6~1Wh=n2~&Kx7WkrBPET(vEdapR-4joe07;H>{Yi*C8uE zSq52lw}p(;-Ii6IV&haM5b}VY!C$9K&t3g^upMS6LX(MzjWVV!S@>oEk;eh6FECa~ zA(=jv04jm{(YOc#wbeIq(q~Xpf2>BVj%yDH)ZD1YT;(FLEk1)8L2;DXu901lM|$97 zKAe)tqBEb2$l3m+cd2ZtX6yAM9`#uh7PH*607k_A$-3~lkl%aiH9_Eq%AW?2aIsiqN@YvhJLDepNoBeDV{jXyPQ^_*|2Ai)?T`p!325NC)I1im)^ z%-P%JVgt?zoyv;%#lj{r*u)9#$E1W$BkxK+>q@^EGH;j^>@l4rKOG~*h)F2u=Kz*y=Of4wI>u*-Kk}1>|D|Q^;QWJjgg|AEJd?1;T0sUKRf^We#n@E)^og6 zbDj+;tB8_9*BGWYyP z7H`Mi-7(=kxA=vz@}3wE%&Vv9(CL$chyPq?7jl@UrVw8fsc8 rr9gRKJoH2GAwqfeD6zWU*wFhAW`kDUmgwrS00000NkvXXu0mjftvpg0 literal 0 HcmV?d00001 diff --git a/public/mapIcon/yandu.png b/public/mapIcon/yandu.png new file mode 100644 index 0000000000000000000000000000000000000000..37502d7c80913e2dbe8277703061f099f06ac7a6 GIT binary patch literal 1367 zcmV-d1*rOoP) z?Qc_c6vscex4m7T2kQ!(DCh#tZ4lYqM$`mFUiiW=!yAZ>ke~?@lbIMo*ndEb(RT!1 zNJ2J-(Z!5NkVKd+KExPDjIs@)bDIqIM7OqEySBIOHNV^2u3HCGF$yQS$@x8<`}^K= zzUQ7JogGR^fEg$PY=8pDJRFh);=lqB1rlZhj0Y$K%7Ik|DCq%*q#0mlfm^^h5X^X{ zESltvc#;DexE_GZ7Az9XDKe*uWIh67W+TkX<4NAE^d=plgr?g%GZy3H8?m%q&3KmR z+M>Q>ZTbANab`WGtuU8+eg!+Je0y8g6uI7R@E$0V`2v_U0ag)a8f3wA3NT~w2hkyU z^2=ltBdP>dtinSkgEP8x-i&ef4q&>sIv5NjXd6m@+X$=-{xd+ zMy2g~R3C45%e>d<#A%V3k82$HKE%xhjg!y2SnJHmLmDfHMs?@(-LMG^CbKcn6TsO! zfYElBWc4QCXswfuYY{dUo0*GiH27?+wVUYrGRVO)3nyMI&e?C{Xro)#JFbSQ@hObV zsx+*#vgh$4T#Cew3L68H_Z<;B26OIA=N&xL@?A*(YHeE_3G92StILYx+i@ts< zoTS2&{=%3230isry53gjWN0?QT8GRPFPGY7 z92N<$UB>4yaq*96_DndQTJnzGV3ObbD*NkP^xTNiH4*3FdMnL!E;{<=_&vIG|9t^! zud(YF^x0)%UQX=t5{akS`RVO~!C+*#d&N{=IV5u=9)zi(y2*C1Bo<;mPu1Z z5%wIfy}Q}|?*lqh@8k)CBO5$sJ@j|x$V~6|(Y)2gx&AOOv`=t#BF$N^VTY}R>{k^Wa!VOLC?8;;Sm!AjK{ zh1O@%C1h)Zi`M%5an<_{u;o+!ux=7X= zyamyMD@Mm!Zgj1p47WTa9jgd4;TZu&bgg>FDkeqV6?sA|i2mrGG4#I|!74!+5oIwz Z{R^FiIlEzz?k@lU002ovPDHLkV1kg~ozMuO17ik-g)Tw4=%$MVK5ob?q zsC&&+__1DL*1^9{5)J2`rNq2mU74%4y!+b|1s;dxZyjzoZ{u!$%Wxo%pDm2p;|OEN z@IbpPa{P{kvA@WvzHlsY=e}9oEEh@_ymh?Y`tbAY^YQij>u>+5{QK(ZgUi#i-qlAc zzF3$mVK({l)596NUc_m;<=g4pVpQjNvHY*Wm3Qo(jSY2Pi7Wo@7iD7n`zb;q>g>m# sHxDMQ$zopr04jeF`v3p{ literal 0 HcmV?d00001 diff --git a/src/App.vue b/src/App.vue index aebc986..897c3a8 100644 --- a/src/App.vue +++ b/src/App.vue @@ -2,14 +2,15 @@
-
2022-12-14 14:30:50    |   星期二
+
{{time}}    |   {{week}}
-
电力行业发展
+
电力行业发展
-
能源发展综述
+
能源发展综述
-
晴转多云   |   -2-5℃  |   东风3级
+
晴转多云   |   -2-5℃  |   东风3级
@@ -63,10 +64,15 @@ import axios from "axios" export default { data(){ return{ + time:'', + handleAction:'', + handleAction1:'', fileType:false, //pdf显示 numPages: 1, //pdf页数 filePdf:'', //pdf文件 - weather:require('./assets/weather/Cloudy .png') + weather:require('./assets/weather/Cloudy .png'), + weekList:['星期日','星期一','星期二','星期三','星期四','星期五','星期六'], + week:'' } }, mounted() { @@ -78,6 +84,11 @@ import axios from "axios" // console.log(err); // }) // }) + let week = new Date(this.$moment().format("YYYY-MM-DD")).getDay() + this.week = this.weekList[week] + window.setInterval(()=>{ + this.time = this.$moment().format("YYYY-MM-DD hh:mm:ss") + },1000) }, methods:{ @@ -85,20 +96,26 @@ import axios from "axios" handleClosePdf(){ this.fileType = false this.filePdf = '' + this.$nextTick(()=>{ + this.handleAction = '' + this.handleAction1 = '' + }) }, powerPdf(){ + this.filePdf = '' let fileUrl = "/pdf/power.pdf"; this.numPages = 20 this.filePdf = pdf.createLoadingTask(fileUrl) this.fileType = true - + this.handleAction = '电力行业发展' }, energyPdf(){ + this.filePdf = '' let fileUrl = "/pdf/energy.pdf"; - this.numPages = 27 this.filePdf = pdf.createLoadingTask(fileUrl) + this.numPages = 27 this.fileType = true - + this.handleAction1 = '能源发展综述' } }, components: { @@ -157,7 +174,7 @@ import axios from "axios" height: 100%; display: flex; justify-content: flex-start; - color:rgb(15,251,251); + color:#ffffff; .leftBtnText{ height: 61%; // width: 56.62%; @@ -166,6 +183,13 @@ import axios from "axios" background-size: 100% 100%; } } + .handleAction{ + width:20%; + height: 100%; + display: flex; + justify-content: flex-start; + color:rgb(15,251,251); + } .middleText{ width:59%; height: 100%; @@ -191,7 +215,7 @@ import axios from "axios" height: 100%; display: flex; justify-content: flex-end; - color:rgb(15,251,251); + color:#ffffff; .rightBtnText{ height: 61%; // width: 56.62%; @@ -200,6 +224,13 @@ import axios from "axios" background-size: 100% 100%; } } + .handleAction1{ + width:24%; + height: 100%; + display: flex; + justify-content: flex-end; + color:rgb(15,251,251); + } } .right{ width: 9%; diff --git a/src/views/index.vue b/src/views/index.vue index 89b797e..8f525ec 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -27,7 +27,7 @@
- 18132.6667MW + {{capacity}}MW 盐城电力生产总装机量
@@ -219,27 +219,29 @@ + > + > + > + show-overflow-tooltip + > + show-overflow-tooltip + >
@@ -280,6 +282,7 @@ import {getData} from '../api/index.js' export default { data(){ return{ + capacity:0, //装机总量 news:[ { Journalism:'' @@ -419,129 +422,10 @@ export default { qiyeshuliang:'12' }, ], - popTableData2:[ - { - diqu:'亭湖区', - dianzhanshu:'13', - jizhongshi:'1', - fenbushi:'12' - }, - { - diqu:'亭湖区', - dianzhanshu:'13', - jizhongshi:'1', - fenbushi:'12' - }, - { - diqu:'亭湖区', - dianzhanshu:'13', - jizhongshi:'1', - fenbushi:'12' - }, - { - diqu:'亭湖区', - dianzhanshu:'13', - jizhongshi:'1', - fenbushi:'12' - }, - { - diqu:'亭湖区', - dianzhanshu:'13', - jizhongshi:'1', - fenbushi:'12' - }, - ], - popTableData3:[ - { - feitongdiao:'集中式光伏', - zuoshu:'13', - taishu:'1', - bingwang:'694.4890' - }, - { - feitongdiao:'集中式光伏', - zuoshu:'13', - taishu:'1', - bingwang:'694.4890' - }, - { - feitongdiao:'集中式光伏', - zuoshu:'13', - taishu:'1', - bingwang:'694.4890' - }, - { - feitongdiao:'集中式光伏', - zuoshu:'13', - taishu:'1', - bingwang:'694.4890' - }, - ], - popTableData4:[ - { - diqu:'开发区', - guangfuhezhun:'70.45000', - guangfushiji:'69.70000' - }, - { - diqu:'开发区', - guangfuhezhun:'70.45000', - guangfushiji:'69.70000' - }, - { - diqu:'开发区', - guangfuhezhun:'70.45000', - guangfushiji:'69.70000' - }, - { - diqu:'开发区', - guangfuhezhun:'70.45000', - guangfushiji:'69.70000' - }, - { - diqu:'开发区', - guangfuhezhun:'70.45000', - guangfushiji:'69.70000' - }, - { - diqu:'开发区', - guangfuhezhun:'70.45000', - guangfushiji:'69.70000' - }, - ], + popTableData2:[], + popTableData3:[], + popTableData4:[], popTableData5:[ - { - fadianchang:'毛竹沙风电', - zhuangji:'300', - fengdian:'风电', - zuigao:'500kv', - date:'2021-11-26 00:00:00', - status:'在运' - }, - { - fadianchang:'毛竹沙风电', - zhuangji:'300', - fengdian:'风电', - zuigao:'500kv', - date:'2021-11-26 00:00:00', - status:'在建' - }, - { - fadianchang:'毛竹沙风电', - zhuangji:'300', - fengdian:'风电', - zuigao:'500kv', - date:'2021-11-26 00:00:00', - status:'退运' - }, - { - fadianchang:'毛竹沙风电', - zhuangji:'300', - fengdian:'风电', - zuigao:'500kv', - date:'2021-11-26 00:00:00', - status:'在运' - }, ], popTableData6:[ { @@ -578,38 +462,6 @@ export default { }, ], popTableData7:[ - { - fadianchang:'毛竹沙风电', - zhuangji:'300', - fengdian:'光热一体', - zuigao:'500kv', - date:'2021-11-26 00:00:00', - status:'在运' - }, - { - fadianchang:'毛竹沙风电', - zhuangji:'300', - fengdian:'光热一体', - zuigao:'500kv', - date:'2021-11-26 00:00:00', - status:'在建' - }, - { - fadianchang:'毛竹沙风电', - zhuangji:'300', - fengdian:'光热一体', - zuigao:'500kv', - date:'2021-11-26 00:00:00', - status:'退运' - }, - { - fadianchang:'毛竹沙风电', - zhuangji:'300', - fengdian:'光热一体', - zuigao:'500kv', - date:'2021-11-26 00:00:00', - status:'在运' - }, ], popTableData8:[ { @@ -754,10 +606,6 @@ export default { } }, mounted(){ - this.echartsTwo(); - this.echartsThree(); - this.echartsFour(); - this.echartsFive(); this.echartsSix(); this.echartsSeven(); this.echartsMap(); @@ -794,37 +642,94 @@ export default { contaminatedData = res.data.data this.echartsOne(contaminatedData); }) + //查询当日上网电量 + getData( + { + action:'one', + key:'当日上网电量' + } + ).then((res)=>{ + let powerData = [] + powerData = res.data.data + this.echartsFive(powerData); + + }) + //查询盐城装机容量 + getData( + { + action:'one', + key:'盐城装机容量' + } + ).then((res)=>{ + let sumCapacity = []; + let capacityData = res.data.data + this.echartsTwo(capacityData); + Object.keys(capacityData).map((item,index)=>{ + for (const key in capacityData[index]) { + sumCapacity.push(Number(capacityData[index][key])) + } + }) + this.capacity = sumCapacity.reduce((x,y)=>x+y) + }) + //查询非统调光伏电站座数 + getData( + { + action:'one', + key:'非统调光伏电站座数' + } + ).then((res)=>{ + this.popTableData2 = res.data.data + let powerStation = res.data.data + this.echartsThree(powerStation); + }) + //查询非统调电厂并网容量 + getData( + { + action:'one', + key:'非统调电厂并网容量' + } + ).then((res)=>{ + this.popTableData3 = res.data.data + this.echartsFour(this.popTableData3); + }) }, methods:{ cityChange(val){ this.popTableShow = 0 this.cityActive = val if (val == 0) { - this.modelOthers = true - this.componentShow = 'pop'; - this.popName = '风电'; - this.popTableShow = 5 + this.popName = '风电'; }else if (val == 1) { - this.modelOthers = true - this.componentShow = 'pop'; this.popName = '光伏'; - this.popTableShow = 5 }else if (val == 2) { - this.modelOthers = true - this.componentShow = 'pop'; this.popName = '光热一体'; - this.popTableShow = 5 }else if (val == 3) { - this.modelOthers = true - this.componentShow = 'pop'; this.popName = '火电'; - this.popTableShow = 5 }else if (val == 4) { - this.modelOthers = true - this.componentShow = 'pop'; this.popName = '水电'; - this.popTableShow = 5 } + getData( + { + action:'one', + key:'装机容量'+this.popName + } + ).then((res)=>{ + this.modelOthers = true + this.componentShow = 'pop'; + this.popTableShow = 5 + if (this.popName == '风电') { + this.popTableData5 = res.data.data + }else if (this.popName == '光伏') { + this.popTableData6 = res.data.data + }else if (this.popName == '光热一体') { + this.popTableData7 = res.data.data + }else if (this.popName == '火电') { + this.popTableData8 = res.data.data + }else if (this.popName == '水电') { + this.popTableData9 = res.data.data + } + }) + }, typeChange(val){ this.popTableShow = 0 @@ -855,7 +760,6 @@ export default { this.mapCityAction = val }, echartsOne(contaminatedData){ - console.log(contaminatedData,'contaminatedData'); let regionData = [ { name:'', @@ -863,9 +767,9 @@ export default { } ] //求企业数量和 - let enterpriseNum = contaminatedData.reduce((sum,e)=> sum + Number(e.企业数量 || 0),0) + // let enterpriseNum = contaminatedData.reduce((sum,e)=> sum + Number(e.企业数量 || 0),0) regionData = Object.keys(contaminatedData).map((item,index)=>{ - return {name:contaminatedData[index].区县,value: Number(contaminatedData[index].企业数量/enterpriseNum*100).toFixed(2)} + return {name:contaminatedData[index].区县,value: contaminatedData[index].企业数量} }) var myChart = this.$echarts.init(document.getElementById("echartsOne")); var option ={ @@ -902,11 +806,7 @@ export default { borderWidth: 1, padding:[5,10,10,5], // borderRadius: [0,0,14,0], - formatter: function (param) { - // return param.name + ': ' + (param.value - number) + ' ' + (((param.value - number) / sum) * 100) - // .toFixed(2) + '%' - return param.name + ':' + param.value + '%' - }, + formatter: [ '{b}','{d}%'].join(':'), }, @@ -1107,7 +1007,19 @@ export default { }; myChart.setOption(option); }, - echartsTwo(){ + echartsTwo(capacityData){ + let capacitySum = null + let capacityList = [] + // for (let i = 0; i < capacityData.length; i++) { + // capacitySum = Number(capacityData[i].风电) + Number(capacityData[i].光伏) + Number(capacityData[i].光热一体) + + // Number(capacityData[i].火电) + Number(capacityData[i].水电) + // } + Object.keys(capacityData).map((item,index)=>{ + for (const key in capacityData[index]) { + capacityList.push({name:key , value:capacityData[index][key]}) + } + + }) var myChart = this.$echarts.init(document.getElementById("echartsTwo")); var option = { tooltip: { @@ -1135,19 +1047,17 @@ export default { radius: [0, '70%'], color: ['#57d1fa','#b6b91d','#8bd2b2','#57d1fa','#ff9374'], roseType: 'area', - data: [ - {value: 25, name: 'A类型'}, - {value: 30, name: 'B类型'}, - {value: 30, name: 'C类型'}, - {value: 25, name: 'D类型'}, - {value: 25, name: 'E类型'}, - ] + data: capacityList } ] } myChart.setOption(option); }, - echartsThree(){ + echartsThree(powerStation){ + let powerStationList = []; + powerStationList = Object.keys(powerStation).map((item,index)=>{ + return {name:powerStation[index].地区, value: powerStation[index].电站数} + }) var myChart = this.$echarts.init(document.getElementById("echartsThree")); var option ={ tooltip: { @@ -1155,7 +1065,7 @@ export default { }, series: [ { - name: "企业污染", + name: "非统调光伏电站座数分布", type: "pie", radius: ["20%", "63%"], center: ["50%", "50%"], @@ -1183,11 +1093,7 @@ export default { borderWidth: 1, padding:[5,10,10,5], // borderRadius: [0,0,14,0], - formatter: function (param) { - // return param.name + ': ' + (param.value - number) + ' ' + (((param.value - number) / sum) * 100) - // .toFixed(2) + '%' - return param.name + ':' + param.value + '%' - }, + formatter: [ '{b}','{d}%'].join(':'), }, @@ -1198,14 +1104,7 @@ export default { // shadowOffsetX: 5, // shadowOffsetY: 5 // }, - data:[{name:'东台市',value:71.03}, - {name:'阜宁县',value:12.66}, - {name:'盐都区',value:6.04}, - {name:'响水县',value:8.04}, - {name:'建湖县',value:8.04}, - {name:'大丰区',value:18.04}, - {name:'射阳县',value:9.04}, - ] + data:powerStationList }, { name: "ring5", @@ -1395,7 +1294,13 @@ export default { }; myChart.setOption(option); }, - echartsFour(){ + echartsFour(powerPlant){ + let powerPlantType = []; + let powerPlantCount = []; + for (let i = 0; i < powerPlant.length; i++) { + powerPlantType.push(powerPlant[i].非统调电源类型) + powerPlantCount.push(powerPlant[i].实际并网容量) + } var myChart = this.$echarts.init(document.getElementById("echartsFour")); var option = { tooltip: { @@ -1414,11 +1319,11 @@ export default { grid: { // top:'20%', // bottom: '10%', - right: '10%', + right: '8%', left: '10%', }, xAxis: { - data: ['00:00', '01:00', '02:00', '03:00', '04:00', '05:00','06:00', '07:00', '08:00', '09:00', '10:00', '11:00'], + data: powerPlantType, axisLine: { lineStyle: { color: '#08c386' @@ -1439,15 +1344,15 @@ export default { axisLabel: { show: true, interval:0, - // rotate:20, + rotate:20, margin: 14, - fontSize: 14, + fontSize: 12, color: 'rgb(78,227,207)', }, }, yAxis: [ { - name: '', + name: '单位:MW', nameTextStyle: { fontSize: 11, color: '#08c386', @@ -1520,7 +1425,7 @@ export default { backgroundColor: 'rgb(5,52,44)', formatter: '{c}', }, - data: [47, 46, 41, 46, 44, 90,47, 46, 41, 46, 44, 90], + data: powerPlantCount, z: 10, zlevel: 0, }, @@ -1539,7 +1444,7 @@ export default { symbolSize: [22, 5], symbolPosition: 'start', symbolOffset: [1, 1], - data: [47, 46, 41, 46, 44, 90,47, 46, 41, 46, 44, 90], + data: powerPlantCount, width: 2, z: 0, zlevel: 1, @@ -1567,7 +1472,13 @@ export default { }; myChart.setOption(option) }, - echartsFive(){ + echartsFive(powerData){ + let powerX = [] + let powerY = [] + for (let i = 0; i < powerData.length; i++) { + powerX.push(powerData[i].类型) + powerY.push(powerData[i].电量) + } var myChart = this.$echarts.init(document.getElementById("echartsFive")); var option = { tooltip: { @@ -1590,7 +1501,7 @@ export default { left: '10%', }, xAxis: { - data: ['光伏发电','风力发电','余电上网光伏','电厂'], + data: powerX, axisLine: { lineStyle: { color: '#08c386' @@ -1619,7 +1530,7 @@ export default { }, yAxis: [ { - name: '', + name: '单位/万kWh', nameTextStyle: { fontSize: 11, color: '#08c386', @@ -1692,7 +1603,7 @@ export default { backgroundColor: 'rgb(5,52,44)', formatter: '{c}', }, - data: [47, 46, 41, 46,], + data: powerY, z: 10, zlevel: 0, }, @@ -1711,7 +1622,7 @@ export default { symbolSize: [22, 2], symbolPosition: 'start', symbolOffset: [1, 25], - data: [47, 46, 41, 46,], + data: powerY, width: 1, z: 0, zlevel: 1, @@ -1747,7 +1658,7 @@ export default { }, series: [ { - name: "企业污染", + name: "非统调光伏电站装机容量分布", type: "pie", radius: ["20%", "63%"], center: ["50%", "50%"], @@ -2029,7 +1940,7 @@ export default { return `{${circle}|}\n{${color}|${params.name}\n${params.value}}`; }, rich: { - yellow: { + purple: { color:'rgb(5,204,148)', fontSize: 18, }, @@ -2041,7 +1952,7 @@ export default { color:'rgb(30,140,189)', fontSize: 18, }, - purple: { + yellow: { color: 'rgb(255,160,98)', fontSize: 18, }, @@ -2123,7 +2034,6 @@ export default { if (params.componentSubType == 'scatter') { return `
${params.name}
-
` } @@ -2160,35 +2070,22 @@ export default { colorStops: [ { offset: 0, - color: "#009DA1", // 0% 处的颜色 + color: "rgb(11,224,181)", // 0% 处的颜色 }, { offset: 1, - color: "#005B9E", // 50% 处的颜色 + color: "rgb(11,224,181)", // 50% 处的颜色 }, ], global: true, // 缺省为 false }, opacity: 0.5, }, - emphasis: { - areaColor: "#2a333d", - }, + // emphasis: { + // areaColor: "#2a333d", + // }, }, - // regions: [ - // { - // name: "南海诸岛", - // itemStyle: { - // areaColor: "rgba(0, 10, 52, 1)", - // borderColor: "rgba(0, 10, 52, 1)", - // }, - // emphasis: { - // areaColor: "rgba(0, 10, 52, 1)", - // borderColor: "rgba(0, 10, 52, 1)", - // }, - // }, - // ], z: 2, }, series: [ @@ -2207,7 +2104,106 @@ export default { show: true, // 是否显示标签。 fontSize: '11', color: 'rgba(0,0,0,0.7)', - + fontSize:15, + // position: [10,20], + color: '#fff', + backgroundColor: 'rgb(5,52,44)', + formatter: (params) => { + let color = "blue"; + if (params.dataIndex === 0) { + var res = "{binhai|}" + return res; + } else if (params.dataIndex === 1) { + var res = "{dafeng|}" + return res; + } else if (params.dataIndex === 2) { + var res = "{dongtai|}" + return res; + } else if (params.dataIndex === 3) { + var res = "{funing|}" + return res; + }else if (params.dataIndex === 4) { + var res = "{jianhu|}" + return res; + }else if (params.dataIndex === 5) { + var res = "{sheyang|}" + return res; + }else if (params.dataIndex === 6) { + var res = "{tinghu|}" + return res; + }else if (params.dataIndex === 7) { + var res = "{xiangshui|}" + return res; + }else if (params.dataIndex === 8) { + var res = "{yandu|}" + return res; + } + }, + rich: { + binhai: { + height: 21, + width: 64, + backgroundColor: { + image: '/mapIcon/binhai.png' + }, + }, + dafeng: { + height: 21, + width: 52, + backgroundColor: { + image: '/mapIcon/dafeng.png' + }, + }, + dongtai: { + height: 21, + width: 49, + backgroundColor: { + image: '/mapIcon/dongtai.png' + }, + }, + funing: { + height: 21, + width: 52, + backgroundColor: { + image: '/mapIcon/funing.png' + }, + }, + jianhu: { + height: 21, + width: 52, + backgroundColor: { + image: '/mapIcon/jianhu.png' + }, + }, + sheyang: { + height: 21, + width: 52, + backgroundColor: { + image: '/mapIcon/sheyang.png' + }, + }, + tinghu: { + height: 21, + width: 52, + backgroundColor: { + image: '/mapIcon/tinghu.png' + }, + }, + xiangshui: { + height: 21, + width: 52, + backgroundColor: { + image: '/mapIcon/xiangshui.png' + }, + }, + yandu: { + height: 21, + width: 52, + backgroundColor: { + image: '/mapIcon/yandu.png' + }, + }, + }, }, itemStyle: { @@ -2283,7 +2279,7 @@ export default { { name: '响水县', value: [120.339948,33.177641] }, { name: '盐都区', value: [120.439991,33.077621] }, ], - symbol: "image:///mapIcon/地标.png", + symbol: "image:///mapIcon/location.png", symbolSize:[16, 20], symbolKeepAspect:"true" // itemStyle: { @@ -4221,10 +4217,16 @@ export default { this.popName = '非统调电厂'; this.popTableShow = val }else if (val == 4) { - this.modelOthers = true - this.componentShow = 'pop'; - this.popName = '非统调光伏电站装机容量分布'; - this.popTableShow = val + getData({ + action:'one', + key:'非统调光伏电站装机容量' + }).then((res)=>{ + this.modelOthers = true + this.componentShow = 'pop'; + this.popName = '非统调光伏电站装机容量分布'; + this.popTableShow = val + this.popTableData4 = res.data.data + }) } } }, @@ -4280,8 +4282,8 @@ export default { background: url("../assets/images/kuang.png") no-repeat; background-size: 100% 100%; color: #ffffff; - text-indent : 40px; - letter-spacing:7px; + text-indent : 32px; + letter-spacing:1px; text-align:left; line-height:25px; overflow: auto; @@ -4404,9 +4406,10 @@ export default { height: 100%; display: flex; flex-wrap: wrap; - justify-content: space-around; + justify-content: center; align-items: center; align-content: center; + flex-direction: column; } } @@ -5091,6 +5094,7 @@ export default { height: 10%; right: 4%; top: 4%; + z-index: 100; .el-select{ ::v-deep .el-input--suffix .el-input__inner{ background: url("../assets/images/selectKuang.png") no-repeat; @@ -5137,7 +5141,7 @@ export default { } /deep/ .el-table__header { height: 48px; - background: url("../assets/images/table.png") no-repeat !important; + background: url("../assets/images/table.png") no-repeat ; background-size: 100% 100%; } /deep/ .el-table__header th { @@ -5230,6 +5234,9 @@ export default { .el-select-dropdown__item{ color: #ffffff !important; } + .el-select-dropdown__item.hover, .el-select-dropdown__item:hover{ + background-color: rgb(8,52,41) !important; + } } diff --git a/src/views/pop.vue b/src/views/pop.vue index 254d241..b9415e4 100644 --- a/src/views/pop.vue +++ b/src/views/pop.vue @@ -51,22 +51,22 @@ @@ -84,23 +84,23 @@ @@ -119,21 +119,18 @@ @@ -150,37 +147,38 @@ @@ -268,9 +266,8 @@ props: { } }, mounted(){ - console.log(this.popTableData2,'popTableData'); this.tableShow = this.popTableShow; - if (this.popTableShow == 1) { + if (this.popTableShow == 1) { this.popData = this.popTableData1; }else if (this.popTableShow == 2) { this.popData = this.popTableData2; @@ -301,7 +298,15 @@ props: { this.popData = this.popTableData13; } } - + }, + watch: { + // //监听内容 + // popData(newVal,oldVal) { + // console.log(newVal,oldVal,"value发生了变化"); + // if (newVal != oldVal && newVal != '') { + // this.popData = newVal + // } + // } }, methods:{ close(){ @@ -347,7 +352,7 @@ props: { } .secondContent{ width: 100%; - height: 100%; + height: calc(100% - 8%); padding-top: 2%; box-sizing: border-box; /deep/ .el-table { @@ -361,7 +366,7 @@ props: { } /deep/ .el-table__header { height: 48px; - background: url("../assets/images/table.png") no-repeat !important; + background: url("../assets/images/table.png") no-repeat ; background-size: 100% 100%; } /deep/ .el-table__header th {