From 67960d3a1d03175852aab03f9a4e6bd0916c3d4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= Date: Tue, 4 Jan 2022 19:41:37 +0800 Subject: [PATCH 01/29] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/template/专项湖库数据报送表.xlsx | Bin 0 -> 14215 bytes public/template/五象湖水质监测报告表.xlsx | Bin 0 -> 10933 bytes public/template/其它内湖水质监测报告表.xls | Bin 0 -> 121856 bytes .../collect/water-bill.vue | 52 ++++++++++++---- .../drinking-water/collect/water-bill.vue | 58 ++++++++++++++---- src/views/water/lake/collect/index.vue | 27 +++++++- src/views/water/lake/collect/special-bill.vue | 39 +++++++++--- src/views/water/lake/collect/water-bill.vue | 39 +++++++++--- 8 files changed, 175 insertions(+), 40 deletions(-) create mode 100644 public/template/专项湖库数据报送表.xlsx create mode 100644 public/template/五象湖水质监测报告表.xlsx create mode 100644 public/template/其它内湖水质监测报告表.xls diff --git a/public/template/专项湖库数据报送表.xlsx b/public/template/专项湖库数据报送表.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..af09d64e968da21c9976dd7b7f6a59ea818ba64d GIT binary patch literal 14215 zcmb_@Wmp}{(k|}q7TjHeyF0-lKyY_=cXxMpcY?bwf)ktscb8xncD^G!-?`_xKW_h6 z)3c_ktNZQlnw}DQX;3g2p!X6Y_e0?Q`i}zrRxz|Okhiz7bzqQxBSU-p1L`j_>@sLG z5nv!7VGtl7q<<&Vv$dsnwX)2L>y_#kKngzdKSR1*x7HLXv}}eVUWZe^=^#&VCi)KF zZeZH^2$oNQ=uYXXXd`O2F_g#`oB{SRDZAsD_1vPWt@Aufbwmv=7IFw&|R@0E7nGxI6(D zvTis)$IaFFp;@nK!<3vrq6?%D&iLo(XFQ>~p@z$$FY6@hNwxCizeq8~V1nq|8s|le z5+?Gu20d?^JRPO6oUXpAjTSeR?ckrOLQt?p83{~oL1Y99he0pRav(vp0J&uJpbJN7 z{;cG~51(rPVWqGNSg1K0y!6Jkz5%kn$WghzyL({&JK`fV8GFKShzq_Uj{NV48`#(z zy+a-pH!aoAh!%VXzLB@xCA*AJl6N9tq=o=S6YfI9xe_jm6K~p5a^APXJD@G)3Exm% zfeOyh|GGEsB3C~uwa`n0rO8SyZYLrS6waQn7=gEzGJB2(zQ9DLzD7ARjYFG`RziWj zn8*%cEnCpr3S+q`Ii^_c(C8?q6iKJ!Z^(8Dztit#Kwn8wPWL zJM+!M4=ojk;Um0>DC73s#4?Y~%^b8t`*~IkN^+8e`E|RLil$}3yIA`!mF}JoZ<$6D zez4i9fbHaChfgGd3A@W$sa}zD`w!pnHE(m{wTT*gZNFA6OoEk`n918KuY|1)J#yC) z@iyRH0k9XruZ!HIhzIjdoT8#a@f@U>MA#{YGCz^YwyF9{|CHcq!GE+!arBV}|F{bgjQRc4?i~QS^ z(WT;{XMBgKLhg|9kk+cxba4n*8ZnAzuV2@BMT}z;JA3d)AQlLCoy$^Z(u}@t|Nqb5Al-Wwa5?%So zeMZeE7oWWu2eZis6P?uxa{9+f)gor%!&73%9HBlcUYgN{)YhftA~Z^Gf3!Kd5b7gmw;TR)y2i-<(s>)D&@|t#m$K#cZV9h zo}9_7F4cmAl$L%mkNGYcF5Yh~YSnY`eSNkp(NVvOq?72n9b2)FLo%wd;v0m5+mYAr?Tp;tQfp4SS9nuNSk2%48u+$P8}ci-((Tj= zSs0=2c5HI*4);^Q7KF@cn^Y4@2b!E3{0L%WRzN_&oM1uHa`~tN7KqyeA3xTL4fsu` z5GN%CLnb0`?b30(t#>;Jwf!PR`b$w9=~eJ|jcR^q6Cr@cAipX0a9HlsYPil#3y2S{ zKUo^oVbteWMaEsV3X)MKAXjA`wHp2@O*vqS$#z)HbGb21!JT@BB~b>@xErA*2L52a z$9%a-16E&sEXjz;fo7kw4juTR!}*A$6J1P*c)6QBmT8~wh559Lh~&>>0Bgqhi9#jD zjw*SGAh(X$DtB~u-&cxTY97$|u+Gbft!~IZcOU8;{FztaJoFCbAZ1_gKwefjGdV2( z??J)#gyD=I(He}pEumk>lC>c|F)koM6cXL5Vf#-Hn5U=6>P?hWA#*a5DkuID1V#qw z^D~D54IL>l+x08VuTzcUVrMqGsZhRZv<&EU11NpH0A&qwq@EQ{ue)rwcJn?NL1D#kcyMIEC&y96Z@v!Ndo@Px98 z6d1kT&X0t_^G1pqtE9MSQuOQBlu*hxnPRLyrnar;g7CQ3Ro!9cmoFGAgm`qA_F=qI z?~RQTE9&Po_BK}ecm>KCj!%)OL>5d?3Vl<;!%Lvv_d}Ml1SN>z37}9WGI}85_jN5| zf-{Md^TS%Fc~O3bG%*FooF>@_)!r2-nFo2&EbQ6muo;SlW!t2^6k<#O`w=8`s|@JH z#aN~(>)2EI3~unLuGj8I2p(ViEv|7t1#nW`ARFM5%b@Fru5sI&TC$9Di}>0wV^_8U z0c`9HCOPcS8487wnUkrxk=_|hlGvbZ2I0(?YzFDf5LQExx~{RDafZTdMi`XSoQMaU z;vVO*xmO4`HXOp`^CWAW}`>L8l6$u!zGL#|=%y z1%4)Fb|}=tD4W0wOBH2i5vMk;12ALfjfm@I4su;tih$EbI60FVVH_QgjL|N9k4yes z*+9bJpl*_#YC6IBR_A}Ki~H}^0+@xX{FD2I#_^gY)y>3{cN=HCYL!Kg&@0dD7HBs0 zKE&#XQGu6nieXEPgBTH#4O4+0s29SK{s1!~1gD@9KEkBmR7&)_PA!H*D`N52dq4p{ zpq0;$B&NYSAqx4L>LM?X37hzXND`B(h~U8)nsQp;F;4Rx4;?i;w2$HO0scJghq;7{ z)triuR1}3OLlMN5+1Nq837%Pr3M6S8%59I3jAUgzl10BOCx!Pi0zw*^97aA z-<9YEE@W~b-2y^MYnwrOhl9h{&^TIo!XV3tIh{rw|7fBCS*4d}!41&c%f(&K9OL9% zXoUX;%Q(+M8U;B%%Nsa3Zf}4HUa6a;<*5o5(4=C;%J#7&d^S(Go~tB-vt}}&)9Voy zg3BkwDnc8;Du6>H1s@Y2VwS_E6bMiB>of3Yjtxvm%)3FA#xlz7c}D`{9SLaB!8at5 z^pMI}_x6EDSfPClPAta; z8>o&$1+-qW zRF^TWh)wd-q(*IzQ5^>DrXSMtR=d>Fl$Uk$77Q}!N*MW zyiTo`Sb-yIKsD~(Uo9-)O#hx3;IA5JCU`L*{Ym@GgcPOA176MdbC_X4-V{~8d0c7= z+B1?fuo4EektCr;oYAT=I4BuhrM|8#5H{~qL~4DsA3U5T3Q44-DItoVs9%AyF0&jn z1XXxsC@E+!>8Ly-(SbW^JU%)fV9iu>}Y4A(rN zWC;$`1vQDa(M(MmQC0PIWi-N401~-fsJbYSw*CM$$kTHSH3%i5*nFE(xNmNzA{ZW< zEiw`sZyB)_OJMZ~`GmI}vhBxV(H=p;gd7aC1}F&;lj%y4Na9?$ijnLTv=0QZZ^NgQ z2AK}0{mDjyMX9HY4r&3y7y(pVX`l-VnlS)nfWmyq4TDz%f?H4s(mXjtB^m6WHa>Gh z{!tQFPC>$bZln*J8SFqIfJK~RrU*j(>l`&mVVYz4bfjw%atrf;S_Kr;EEiX*BOM*c zxfqWsGLW`1n0#?mxkCvWupnm<6o=&|F(IY9qUf?Q)SA9*>hllcP1EQI-vIvz-`rGD z0b()a*iZ$qL_PGEt9X4hV42UPiDZ7JqRDm{=x~XQwc&oOz^S4@N()T2etxq0flSb8 zqCo5h28qgqg?3W$dAi0Oj-Al5Gr>w|>Es^(NQTLT4q$Qgto3e!ww1&J>2DxUhN@xP z(Ij{`h5IsA6$D5w&JY86eAY(?-V_xDGFmR>a*;wtN_>O3AA%mlKc7OS&?@*_)^y-^ z26~X_-Bu_L%2p_-@XuhRZ`}*S5*5IX4)-m@dh64FSR=;BJ&8_mmb$tLSb8!-Z+DYR zSY+r>W|{GZl&RPZUu=XD8n@7biX}r>z|zP@@C0|E>j{x6ppfDn%Rhrbg|sF~c58?V ze4L%`EwnI0_KlLL3kN#SC-!BwQqJNof`S^O67A6g#RL|dPN2?SGZs>~?;=m!N;u5K zzm4^_CC*mn{{PzBnV;kzMXh8L5KN$$rDHk$Cr}Oj2xm&fhNN?FpzNqgw2fw}RN;}b z4mNdX8X6&boM+Toea{qCW8M})WVr)Z8pMTz;M+QYkjE9?*E?&?-Iqk4vS!Jn?10EU z&QjjHu9bv;d!Hnk2{KvuiZtSykm=6>h3yBXQjCBIVnElE#zr=G$Z*hrQ6U>95n6yS zNds?Hq8bJeW(*)0pv)wgC_t5^j|`c%`};Ol%LE59NstHh1sWoymN9tQ)EDoU7TQE1 zn2aD5+Q0+ww&XXM54FTP#|u5SLeS#q=elLMmazOCZHGLiD8-5zLL?Dq<9jwJ1giV# zKPq4kFoeJfyaJ7MPO3K&L_+XV)0rDa5`z0jq83WTLi@|07)lZ2Yhj5p=!D4orK^&5 zY5uwl(!%i8HaR=WQh-BZW)5&kosdF#+6~Nb!};PoQ8ugX%9S9Qca-Ut;k&}HRB}}& zs2qi11!CP@D7V-5a`hd}y|$qeO5Yc>4DL{OkldBZkypKbs^kJp?c%`^Kk0#W(3e6Z z4j?R15)n>11kH~kC{?o(=tv#)^*do;V~DjaJNh6Vv|9oAikE1|)yd3p<|j6q?c)TCmYL1g;!z5A^3bEg?Ubg-Zoy&) z*Q3o~#gI!Wqi;N`+a{I~a(s`$+bQQION5dsvcynk2SF9j9$TfYgoS`7BUd`Gn2r2W zxBy$0>G^qI-Tb~rj`zMQipyyzpM>rJ-6oOH0E`OBFq2T!Uk1rAo=^!ajr{kP5r`G_ zr$sdkA|&&#L@|sa#DuPwi-q^ML;=%=ffcv7>yg$2QGjGRBog~FP#S~fgi@fbKPMac z3wj+kArGJ!`W00hJ|TE6@7y}IHkneS6RsviQg}SXxm=LESLK6cAgP*DH|u;L*~z%V z%MnLyRUDH)8Wgi!EU_Rt6tiS3mA?$CVKm_t*k{5KV!>qSdZAbpK~?C!ZWLV_=QzS6 zudxJ9cy$Ndc>ALmnNexN>KSB43_sP-e#_OuvS?$%XOV+1q z{IzyS5yX=1J3pXpC&VLo>H?I zYS#<0#M)PO{Km8Ana&q?W+L1BuS4UutU0@w8A5bRg`jueoj+NJs3*s4w3{z)FDlFs zcK?v=A!eD_JOE*(d&0kGfN1cxqF9n8-xMaFw3iQAGvYq4O6jplb{;?X!`wUm0Veu5 z#z0M6N#wHL?eTPgdD60Ryv{jiaOV=dqO*3O?Ne~IPcV(A>yv~`XRCy_K~*w2<)hcF z_3Sfo+>5(r!|#5%KYlu?R+$#I7CPMsv(UKti~FT9bG>%ks{6*^ZrbPTolWu$(hLKx zA29BLDF??%ur|IVUlS@1s9h1U+6z@boO9V=qj6Nd!@ca@Ik(ju4$(1ngxQtL;MUeN zMR!+ONY5T?{uN~N!XRECYu!&88z;Vw^_Pccwn(K9&KrY`PuwMo573H|ZSW{?*+S)q zK$_47(Y@(k9-G=f;q&r%-{~w@?{Ip*X8JZcrS@KpYjc^(2z~!H1gRZNq0Ky_Yhu8F z!Oj2b>bN%!*!p0_`fT5Q%W~{_Ja~N3LV&-)!Q*{Wayo3|Qr(F_lWVpi!M-H^J>r>y ze`DYC-05y;@5JJaz{ehZ$mi*oCWWKIVO7Lwm5UrB6n_f@yPPlX)`Js6!I_quqrH2- z_6EL{bGN5!U#MQYEd!h2>h0Q!oL3ammS(U=oww)DW$6AO+|g`WXB#gXAwZ*rjzq2Y z)pl%%#$CAr^YL8p^HgW(w@$bCsZFU)_6YtbRC@Gi?M}Drg{IS=H8ND2aj8x!gX|J_ z%=>^XUTU#!yS5>Al{@`bk0Yf+fdY-%`-lLQ)R+y{Y7Wb8PT1Ag?fTaNnvNrvWuJ$- z=Vy~F8nO8x@Y2Uonye$B(Qp7JtU8Tu8DsV3HgE56H^^0{sVxHi_*Tt^w~_ZQEgd{} z$Q^f%XEeh`_#Vd8q=;}ZWOrEFDq}|ki7-M~w^t;9hQUK?!^e226`St-i67Wyt^cXh z*kY^0^+B$bZPjQ?qKZD zHEGCUg7vd?@42qW+vzHs&ENuuSL8s0$HNK=GibykR7;Fs0gL6lH!eR5rGX$m^`qM2 z@=xfb_?tNjLvJuzexzyA%_BNpa7j-(`7SkyxDf!-3Ec9-VP{tk{B*nGd{nH}O=c${ ztoWWw-xZF)0ZzeH{#=XKcS^Lp+j*-Zi*I$NNa?(wTKa}-bs>zua1EV*$%YiisP#^> z>`8L<;_3w>U9W-5Q@gS8Xc6WHv=zOQo#uQCaGusDQLkVFF=iHg#RCVb`TJq;kK_I}9sZN-FXF!}QYW83+2D$zb(36t z5c9Axpm0VJcPd}1!!?~13)7tY>B_sFW$bLi$|84&YaSyZ5$fMcX!q0CSE_2D$TM94 z8LdpmkDaCcD9d$*)CvsbM?fd{RmRN#Vqs|fl<^-V$G*nN!2YHnhRskjbt zy5Kd$8d%VtP>!h0wdxgg45X>Wz*2S~hG&t(A4wTIP%1GCJ>d3Bqz?UJ!+2#=?=K3T zzlx2P9W(nOFj_$Nm<=F8Zs)-u^(*#@aF?cis;%|50SzI8+elu%&Ll3B|YlJyi@60rSI`io)hb;&laus zFwaGtX_{GbCEv%4>O|m2_}F&OE1GtOhVld02_tL(Tew+K)-KHqbG6qHk6-;qeIzeoRCz{v7F6zK&)C?cF0vAb>Mbn@^=U z8yRT_Rku1gDlcD|w#n*G!{SVt=pdX<5TBQuW)4YUjCH9mc6JkSrqk^jtljPEe!c%N zU62!v&(G(6T~M?`yV_@_{N?^|W$NYWm%;ULgN-)tLtjja%2N%$=jHfR&ZA$fC`*{O z_rrC|-X|UJn}f3r-isb~FnrZ5&~&6Q>jdG(anx^$1b{DqZDjB{>Q4vt^GidnCOPbUS27zAFttHf=Q^k{@MUI3rnF?r zTfamidUmvPIBBh97|QcTvG-XE$`gcM9B>~r)^v;QmR`Z0n%>j1w=Mw=Dh@h zZC^P=caX|4s=W<$A9Xbax+@oPWWjo<#DS)RxNjGF$;NbAg&6U+jq-O;0o`bN{F7dFRr?arVUvM~yCqYD} zWCCx=&@4(`$Uk~1F&U$k*G2h_>#riP=~`SC4J_25c%q!@sJpUXkggFS9bMs08Lf3z zw)gsUon|MFn^ZM7fWS7Xu_HFKvt`-;ut)@D5yf6nQWCS4oTZRnq80PPnoHPCl^6?9 z!ss{9Uj3j&TKhQwOpQPR{cMmU0KeUuLxh>)gJhx|^d2|MaZy#8P)_ynL2cO-d^5g8 zW%I)b0>i=94_EnkCQUg*KpuDjne1leM6#-Ve(voGV}(T?V4})egrx|urCJWhm#GF1 zA#EXq>7VNYOvBJ0rqvMK0Bvkocw)`I*+;irK6n+>Dlz0LVozY!x#y+KE=R3Ds0AZ% z?CM!KwO;?roFUt1zANJj`3YHnu2og__9?34IX@YRrZ6K* z;eMGNq8`P`(Xs9&um0ct2M&t*VqcsEvUuB`n|YWFZBTW7om+99{Lc`6OV`k)MX zIwM9K^a}y@nq#rHs|tO^7k}ll;EPuo^v;|fr`{O}55mAlEx$OxqH|ABIHz(RZLyw? zz)xLsND)}A(Y}vh=&RHjI)Vt-HItmu{e`TVzvk$pVsmQ=%G8nSL5)U5HmC*;AJ&Z| z>oa4+O2b>38}t!Jf%QPYfTrB6c^g*NESL%64(Qw4ivH`PaCLz-8!{ORZD*BBsd znt7ZHPcA!_&UR+qG#@_sOK7i$cG6Jk@KL9KnA+(-5Lo5%mugQTS*P;{rLv zGVYpria`WEQ!9@~nkbZ8E@Fn>2U#y5_>o%no~7>RGiIj89$?jB*hSlNY9f9Ov3b~G zJ;&j+jp1ii#jvnaTM;)&fAcb#Q>UV$V};2b{88?gUx297Wn)R~w)FW$nU$H9B2+Ks zuV0^c7_6dJQI)#AOOL8SXe$-k9rwSAtBvg_oXHcI7dSmiv}|VhoxrhT@^L}#Ove>i zJR=j~r0tWe;qDazO=(^$AfH=m=E)_mpZEz=;l9AF~ zto7^NqjDp)vs+OU7i06~mZ4+ki|dZK!HSpFq(_^3()w*wMoscqmyDnQi;(Zgmmw}c zCRbz&Z?l)0di*YoJOgP%r>lCC6}1k`UF34Peb`;xa<6@wGm~AafKAk04bP7*m z18a4zm^;}=`6sP$exzL?!W_pJ$KJ@cT8{pKcibZV<-VdvNA3spQB@{~a6CJd#S{i+ zJ-R*Bb`$Q9JOP!>z75Srb4a?VO-d_6pAr?=HgYnLjHJDC#|N_~RM6t2{2ri0%|xZQ z?;(JF8wH|0emq=74Z#uPd7xrPLE2E40c|QOo&*zc3_A&kY#B!l7?}nhiu8t}cNxI! zlexLIij%fhwWyYcxv*_`jGKLYQjw4()to={q}zxQJhHqE9z*};Hsr)& za;=gK1|PksUMiv5*F<5Nes1C$t>JtgQ`crA7jD!sv1CRA@`M=tEZhQ2*{^n4H^jEB$9Z75@HjLM2wQfiMovQ@85QwsB>T~{vuI4c~l{6WDGz!&UXUBN!q z5k+aEPBDt~$K%J`qqSVrZRQ#7s%T{5jDfMI!5-o`o6ik|%`Abf%7496eckc z^;}u1dd^PiS)G|D`kcOf$sP#z)s@a$-B?$;dA0i@rnYfy9*N*}0MXrS55EylSnPf& z6N4H}WokkO40MiV&Ru@Ip7^dD@HWjM5SJ>!mk7zrj=_7UiuRV-F^^WggP=pzQ)E~% ze@~Y5FhN;0g(_&N<9v~P!A%em3|1(@L<};NqCTpKlgkjbN~xpmY$de6JciC;tvH`&pThchEhez0l+Z%DOD+ z*rcoqf8{@|s;$-UP$GLZ^rTAAOp8oJQzj^vlLC=nUF0SUGTAm~yCmCgWFroDWFz)Z ze7iQX3B?*ho%3?eJr21-m0p10eN4^E1}7AHs$HzO}h-qj=mrP5KC z#T5{VqxTIZGy*~v?ZUsA;YvuoIl1U6gA|0tVP0Cw8#jU#mj)oUi76_hnC+4zOAv>B zCZ4ocNciz_gcYU2@Jryz&pF*4Jh6~$>-0rQ?AKF5EMgpLkxN%!xewDW;~6?wEE<;Y}z45q9`jF9C0_=JM2_o$QbBxEb)QE@sj5mPs_kYM+2WzcvbM^1eKz z=fphCWJI4F@}^`LM#88gGON36f6j0Llp{T-^deF^wmJ)_rryiz-c?um{&AP3sf@RF6_6@y=no9Hg zHuVttK}`LY1_>aR%)$ZuQLjN0(AWerOHEBjYKA0w=$WPONVWt|JQpZA%%@$#seSKCSVVc6pO*NE6Hm{SPN4?}vxF(t10m;LM zq-~NsPwe=B+?U)+i+j6uNn)Unrc+D^5qeY~od;z}=6){JNNmye$`C3p8ZZ&`a~`Gx zJ?5U6IAe(w;_GfSd!2dVY26R6R?m5L!pOGv;6!ItxfIz!`n9#o2=lIIyB`vXbfq(n zU%-FzBuO0{1wz#l3#UP``y6+0peLZ-?94N5@Q}eCUyvlNI!K!*QB#Fyi54p!^ks@* zX6u$gf1pD_!~lm?f^l2w{*un)#_VxTuYvQO0GFHxVXNw6Z*K`>@3Bq{`6usRonv=i zIHd`p!F+v~#bv5p<&{(k4177y&wy)}l7wMI0RM~a?f573Qj>L&99jtbUe>cTy;oZ_ zC8yitm+e#G91sa)a7$0o!$TzjA79G-h6p`Tin~)DA9tI}h@2dsb3SHdff&jImNUIE z_xvzJ3y?I4DTUxR89wf-CNi4uPtHrb$x9*gHwPp7bR`9d&LKsXq=!-%dz=YhSKD5@ zJiK4OUoQ%Z?4Qz<#1EYh5@h?il=ygTsHL0+*c1P%l~UgrHOT=0UOZklj|U;o0K0|Z z-{QVH{hI2|%;~}mMau&TRAhBnU6^hU&4FO^yD5;h}!`ppS+sW(Of>;h@F?g!zR6BW~R6AnJ zIgS`G>q5ug!f9q^96!si;^W_YP}&3Gl~UC{AamRPk`zLt;)bGL8~a&*G&3Vq zzId?LRWVZbAyF^4Q{?ja_!9#FAB>dPQTJ6ui1~T@_BsZU;?A49&BNr^G$wFWD89V9 z5boz9zf=`7WQA`D(n}I!Jc!LuG#rS8dYdXqZnz?jevo91vp$(}Hm}2rDW_VOJ+6p@ zQz|JTp8_5S>)@Od$cOq4W8X&~az28GqtE3y`_2qn3bCD+ExIQYrKeYUE zxG-`#{?|jLw}9&22qq-?=zt4pd6d7ZO+@hZi_J8^1D(V6ePz9;Fd%2> zmR+3ivtVig;^O-xP`y0Bwabf;%S(mxPtPs;sFH-~Yd6Jq8zB=SVmm)CR+*Dc&6|vz8~PP8AjzNm-Lk?y@$OO*q``7E$gdCN3>2<;pZ!IRaLs z{J0)F>Qz(Ej>q5jId4bsTaS2M)dBc$k=cB&KkKUO$6p`Rb?uD|`@SHsBvbih=~$$E z3t1c$cKhgWB#)c@dLBg?=9|6A!Bp?9Atgt9 zGi#H-j`U8+3O38CXu}&6C)|X$t4ofOO>%+M4rrpwFiG(UW(>*V9ln89!C7V=0hWpN zNFxwLqc||M(1nwxvcf2sCX+4)o@av_`s^o(a(mjO+V{^>ubCdzHB(Oa>oFQ!=K<-g zO2K@%aI#^&zU35=Nr_!txSp*Ywnq)RJ&kByqLR2@xp1E(Sp)8f34GAlWN8FCzjETr zXsGTw2r{BdswhoRkrW&%KLAF|!$n_>)xcR2RFcqH%F2_IF{~qgd=OMpbZ3lZTyTt7 z=#)OHJ}5g|R6gKGfdMDcV?l@3MD}bJl)L@5Kz{IDuQxm}$l}Fk(g9I|d&;y1*Hk%U z)1yT8ob{LY)f9A>%QBcwQ3!rcL9bHg5t9YgPIXWNk9kw>E@nilm!AvZIg4nnmUrN> z3i<}%Em}Z7wZ-#O{_IRvf+d2|1)8WVCod(XP%+Ryr{c#NOwIPb=PGv(+ia6h{n4UT z_hu}GW~#V)4c2XFIdy;VIsO;N|nf;iCO9YalUN zCcTQ$W@#G?*X9|FeGG{~p~E^{Xokxsa*Fey_8L6jFYOV!X0 zcyUYXL^ecY+hp3~^iD|a>57hb@ID_{I+bZG8CHH3j7~4*lp8>(u`NJ*JFY(xg^OOo z2(*1-sU2DVYP59}f!*YTntLrPfJ zdB^D+7+kgNQ+C5^Jot{b70%CD-{{=|`_DnopXjH$r}nxtvyp}K@53m=UHD1S_Cw6J zb^gAk!4)6<1K*-g_1>aS5r1##_b5nx8yk!F5A>+`PPw;e-yj##_1@Gpax3V>a!E2} zYIXU+vrrk&S#=I)!}dZRpijQKCIb2(sz^L?NHM*#Qh6i^Ue!BOdw6Y&ImYo?{&hkX zv23_}WV!m2K{z4T_ol52c>`R<90?kN5;Z+D-i;k|G>vT>i@*E{1-{1?19rYlHQ2#m zH^65F^d*R7L~^0GRmixW$y_0X`7Ka zL4_h-Wcj6TH!?{gw8g=)P5MCyZb4k`%t>d#NF~gfNpe8!CLQ4+K9Wj}$UHf}&e>Q? z#^pn2hxfg^I~Bim_bEZ$Yk56y2 z7bEEI5@&gSrtF^7D|jX^d2$4+a>FQ zj{Mz`f%sU~(91Vf=JgvnYW(Muu1-M(+PSZgF=-FG85^F4?YL`%+DygK9sW)V{sJ~5 z&Rq)Up04U^{t}g)^Pq0ZwtZmjhnM<~fdRWbiOck)abG+YzcGh!Qze*9A1KQUYLkOZ)GTFYCHU5X9m;LFSM46aj$dbC5>aRhZd*w~aG0XBKl3WTRvXttH(vYaeq z(IW#q3zoW(ZbTsw9jPU=sS^g88JLmaWCvPx*eS;I{ z?fUlG`%U)mJLMnfn)frp4V?va226X|%|tPYWoZxPE>?K}8PNEc>O)FvX0+stP715ZW)!4{s5i3?fH0} zob7*pn@yz)BIp;HA<1>}(Ea+<2`5Hl5l$vDw?1E~bE6I{=U%i{X-tria+!^u8mQFg z3dyPoT0edM%bf8uWRHLOhlNT>DjwVDdSIH`OJKZ78Lvj-X-0r6l0Cg~kBvtsH+`q{ zrec}~JR2TQuQII+b++2I$4^p!K~)}WjONPpFr>(2;y9%)$3tI5YiM+pUDl<2Uv|TQ zi-JJsU6-Eb)2RF~4M8RhrcM}Xw$@8~JTC#c;PP&j=%wq~vSa}qSZQSCZ_SkgNq(e6 zb1d`Sv*~sK`n(HvK0f?Va(4x&?Qf*I8G|_iZ0^wsEqj$8 ztlxCSHFwi?T=iZVusuP@O9O+T{dGS3oka8J%)G5&AYdTEx8E5iAfW#+Prn=Z&yn)) zD(823&&T0n_=j@&Q|O;6=$+@cQ0;&6{IzBNo3Qsi`MbOedoTZ%C-nD0{+TKCPW)RQ z#lN%tPu|d{?^QiQ%2Eyq6lKbzl z{kKlPXPf*k?=u|mdxqbc|CxL8_n!Zmee%xxd)8|H7w^AvQRJn;|Jtm`Z+TphZ*=A? H?|lCU@GTj! literal 0 HcmV?d00001 diff --git a/public/template/五象湖水质监测报告表.xlsx b/public/template/五象湖水质监测报告表.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..27d45d31c6ab76e04025a752c0f21716aaaf7206 GIT binary patch literal 10933 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 literal 0 HcmV?d00001 diff --git a/src/views/water/drinking-water-village/collect/water-bill.vue b/src/views/water/drinking-water-village/collect/water-bill.vue index 1398ce2..4cb7807 100644 --- a/src/views/water/drinking-water-village/collect/water-bill.vue +++ b/src/views/water/drinking-water-village/collect/water-bill.vue @@ -7,33 +7,60 @@ + 市级 县级 + + 已审核 未审核 - + + - - + + + + + + + + + + + + + 查询 重置 + diff --git a/src/views/water/water-function-area/statistic/auto-yoy.vue b/src/views/water/water-function-area/statistic/auto-yoy.vue index 5f4dd07..9a1b57c 100644 --- a/src/views/water/water-function-area/statistic/auto-yoy.vue +++ b/src/views/water/water-function-area/statistic/auto-yoy.vue @@ -1,11 +1,11 @@ @@ -66,6 +74,18 @@ export default { name: "AutoCollectWater", components: {}, + props:{ + // 表格搜索条件 + searchForm:{ + typeof:Object, + default: function () { + return {} + }, + }, + visiable:{ + typeof:Boolean + } + }, data() { return { data: [], @@ -117,8 +137,23 @@ waterSystemList: [], }; }, - + watch: { + searchForm(newV) { + this.where = newV; + }, + // 监听组件显示 + visiable(val){ + if(val && this.where.startTime && this.where.endTime){ + this.reload() + } + } + }, created() { + // 回显并搜素 + this.where = this.searchForm; + if(this.where.startTime && this.where.endTime){ + this.reload() + } listInfo().then((res) => { if (res.data.code == 0) { console.log(res.data.data) @@ -136,6 +171,9 @@ methods: { /* 刷新表格 */ reload() { + // 上传搜索条件给父级 + this.$emit("search", this.where); + this.loading = true; listAutoYoy(this.where).then((res) => { console.log(res.data.data); @@ -174,4 +212,7 @@ diff --git a/src/views/water/water-function-area/statistic/auto.vue b/src/views/water/water-function-area/statistic/auto.vue index 5c236b1..b2fd41b 100644 --- a/src/views/water/water-function-area/statistic/auto.vue +++ b/src/views/water/water-function-area/statistic/auto.vue @@ -6,6 +6,7 @@ + @@ -13,25 +14,33 @@ + + {{ item }} + + + + + + + + + + + + 全因子 纳污红线 - - - - - - - + @@ -70,6 +79,18 @@ export default { name: "RiverCollectWater", components: {}, + props:{ + // 表格搜索条件 + searchForm:{ + typeof:Object, + default: function () { + return {} + }, + }, + visiable:{ + typeof:Boolean + } + }, data() { return { data: [], @@ -90,6 +111,17 @@ waterSystemList: [], }; }, + watch: { + searchForm(newV) { + this.where = newV; + }, + // 监听组件显示 + visiable(val){ + if(val && this.where.startTime && this.where.endTime){ + this.reload() + } + } + }, mounted() { this.loading = true; this.$refs.table.reload({ @@ -174,6 +206,9 @@ }, /* 刷新表格 */ reload() { + // 上传搜索条件给父级 + this.$emit("search", this.where); + this.loading = true; listAutonomyWaterFunctionTotal(this.where).then((res) => { this.datasource = []; @@ -256,4 +291,7 @@ diff --git a/src/views/water/water-function-area/statistic/national-standard.vue b/src/views/water/water-function-area/statistic/national-standard.vue index 7e31078..e16f466 100644 --- a/src/views/water/water-function-area/statistic/national-standard.vue +++ b/src/views/water/water-function-area/statistic/national-standard.vue @@ -1,11 +1,11 @@ @@ -63,6 +68,18 @@ export default { name: "AutoCollectWater", components: {}, + props:{ + // 表格搜索条件 + searchForm:{ + typeof:Object, + default: function () { + return {} + }, + }, + visiable:{ + typeof:Boolean + } + }, data() { return { data: [], @@ -163,8 +180,23 @@ waterSystemList: [], }; }, - + watch: { + searchForm(newV) { + this.where = newV; + }, + // 监听组件显示 + visiable(val){ + if(val && this.where.startTime){ + this.reload() + } + } + }, created() { + // 回显并搜素 + this.where = this.searchForm; + if(this.where.startTime){ + this.reload() + } listInfo().then((res) => { if (res.data.code == 0) { console.log(res.data.data) @@ -182,8 +214,15 @@ methods: { /* 刷新表格 */ reload() { + // 上传搜索条件给父级 + this.$emit("search", this.where); + this.loading = true; - listNationalStandard(this.where).then((res) => { + + let search = {...this.where} + delete search.endTime; + + listNationalStandard(search).then((res) => { this.datasource = []; console.log(res.data.data); if (res.data.code == 0) { @@ -289,4 +328,7 @@ diff --git a/src/views/water/water-function-area/statistic/national-yoy.vue b/src/views/water/water-function-area/statistic/national-yoy.vue index c6656be..9d45598 100644 --- a/src/views/water/water-function-area/statistic/national-yoy.vue +++ b/src/views/water/water-function-area/statistic/national-yoy.vue @@ -1,11 +1,11 @@ @@ -66,6 +74,18 @@ export default { name: "AutoCollectWater", components: {}, + props:{ + // 表格搜索条件 + searchForm:{ + typeof:Object, + default: function () { + return {} + }, + }, + visiable:{ + typeof:Boolean + } + }, data() { return { data: [], @@ -116,8 +136,23 @@ waterSystemList: [], }; }, - + watch: { + searchForm(newV) { + this.where = newV; + }, + // 监听组件显示 + visiable(val){ + if(val && this.where.startTime && this.where.endTime){ + this.reload() + } + } + }, created() { + // 回显并搜素 + this.where = this.searchForm; + if(this.where.startTime && this.where.endTime){ + this.reload() + } listInfo().then((res) => { if (res.data.code == 0) { console.log(res.data.data) @@ -135,6 +170,9 @@ methods: { /* 刷新表格 */ reload() { + // 上传搜索条件给父级 + this.$emit("search", this.where); + this.loading = true; listNationalYoy(this.where).then((res) => { console.log(res.data.data); @@ -178,4 +216,8 @@ + diff --git a/src/views/water/water-function-area/statistic/national.vue b/src/views/water/water-function-area/statistic/national.vue index 872f7a4..4710f8a 100644 --- a/src/views/water/water-function-area/statistic/national.vue +++ b/src/views/water/water-function-area/statistic/national.vue @@ -1,11 +1,11 @@ @@ -70,6 +77,18 @@ export default { name: "RiverCollectWater", components: {}, + props:{ + // 表格搜索条件 + searchForm:{ + typeof:Object, + default: function () { + return {} + }, + }, + visiable:{ + typeof:Boolean + } + }, data() { return { data: [], @@ -92,6 +111,17 @@ waterSystemList: [], }; }, + watch: { + searchForm(newV) { + this.where = newV; + }, + // 监听组件显示 + visiable(val){ + if(val && this.where.startTime && this.where.endTime){ + this.reload() + } + } + }, mounted() { this.loading = true; this.$refs.table.reload({ @@ -179,6 +209,9 @@ }, /* 刷新表格 */ reload() { + // 上传搜索条件给父级 + this.$emit("search", this.where); + this.loading = true; listNationalWaterFunctionTotal(this.where).then((res) => { console.log(res.data.data); @@ -255,4 +288,7 @@ From bed8b170915c5ed821839747af33968fc6d1ac41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= Date: Mon, 10 Jan 2022 14:28:47 +0800 Subject: [PATCH 08/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B0=B4=E8=B4=A8?= =?UTF-8?q?=E8=BE=BE=E6=A0=87=E6=83=85=E5=86=B5=E6=8E=A5=E5=8F=A3=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=8E=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../water/drinking-water/dict/cityWaterDict.vue | 3 +++ .../drinking-water/dict/countyBottomWaterDict.vue | 3 +++ .../drinking-water/dict/countyTopWaterDict.vue | 3 +++ .../drinking-water/dict/villageBottomDict.vue | 3 +++ .../water/drinking-water/dict/villageTopDict.vue | 3 +++ .../statistic/city/waterQualityUp.vue | 14 +++++++------- .../statistic/countryside/waterQualityUp.vue | 12 ++++++------ .../statistic/county/waterQualityUp.vue | 12 ++++++------ 8 files changed, 34 insertions(+), 19 deletions(-) diff --git a/src/views/water/drinking-water/dict/cityWaterDict.vue b/src/views/water/drinking-water/dict/cityWaterDict.vue index cd959df..d93c782 100644 --- a/src/views/water/drinking-water/dict/cityWaterDict.vue +++ b/src/views/water/drinking-water/dict/cityWaterDict.vue @@ -109,6 +109,9 @@ + + + diff --git a/src/views/water/drinking-water/dict/countyBottomWaterDict.vue b/src/views/water/drinking-water/dict/countyBottomWaterDict.vue index 4790c8b..83791a7 100644 --- a/src/views/water/drinking-water/dict/countyBottomWaterDict.vue +++ b/src/views/water/drinking-water/dict/countyBottomWaterDict.vue @@ -109,6 +109,9 @@ + + + diff --git a/src/views/water/drinking-water/dict/countyTopWaterDict.vue b/src/views/water/drinking-water/dict/countyTopWaterDict.vue index e80cda2..e0f5779 100644 --- a/src/views/water/drinking-water/dict/countyTopWaterDict.vue +++ b/src/views/water/drinking-water/dict/countyTopWaterDict.vue @@ -106,6 +106,9 @@ + + + diff --git a/src/views/water/drinking-water/dict/villageBottomDict.vue b/src/views/water/drinking-water/dict/villageBottomDict.vue index 3e342e8..d2f1f15 100644 --- a/src/views/water/drinking-water/dict/villageBottomDict.vue +++ b/src/views/water/drinking-water/dict/villageBottomDict.vue @@ -100,6 +100,9 @@ + + + diff --git a/src/views/water/drinking-water/dict/villageTopDict.vue b/src/views/water/drinking-water/dict/villageTopDict.vue index 0899895..8b72f38 100644 --- a/src/views/water/drinking-water/dict/villageTopDict.vue +++ b/src/views/water/drinking-water/dict/villageTopDict.vue @@ -100,6 +100,9 @@ + + + diff --git a/src/views/water/drinking-water/statistic/city/waterQualityUp.vue b/src/views/water/drinking-water/statistic/city/waterQualityUp.vue index 5f2f5b2..e6043be 100644 --- a/src/views/water/drinking-water/statistic/city/waterQualityUp.vue +++ b/src/views/water/drinking-water/statistic/city/waterQualityUp.vue @@ -111,13 +111,13 @@ export default { this.$message.error(res.data.msg); this.datasource = [] }else{ - let newData = [] - const resData = res.data.data || {} - for(let i in resData){ - newData.push(...resData[i]) - } - console.log('newData',newData) - this.datasource = newData + // let newData = [] + const resData = res.data.data || [] + // for(let i in resData){ + // newData.push(...resData[i]) + // } + // console.log('newData',newData) + this.datasource = resData } }).catch(()=>{ this.loading = false; diff --git a/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue b/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue index 14cb4ea..69436e4 100644 --- a/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue +++ b/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue @@ -105,12 +105,12 @@ export default { this.$message.error(res.data.msg); this.datasource = [] }else{ - let newData = [] - const resData = res.data.data || {} - for(let i in resData){ - newData.push(...resData[i]) - } - this.datasource = newData + // let newData = [] + const resData = res.data.data || [] + // for(let i in resData){ + // newData.push(...resData[i]) + // } + this.datasource = resData } }).catch(()=>{ this.loading = false; diff --git a/src/views/water/drinking-water/statistic/county/waterQualityUp.vue b/src/views/water/drinking-water/statistic/county/waterQualityUp.vue index f193215..1e83b05 100644 --- a/src/views/water/drinking-water/statistic/county/waterQualityUp.vue +++ b/src/views/water/drinking-water/statistic/county/waterQualityUp.vue @@ -111,12 +111,12 @@ export default { this.$message.error(res.data.msg); this.datasource = [] }else{ - let newData = [] - const resData = res.data.data || {} - for(let i in resData){ - newData.push(...resData[i]) - } - this.datasource = newData + // let newData = [] + const resData = res.data.data || [] + // for(let i in resData){ + // newData.push(...resData[i]) + // } + this.datasource = resData } }).catch(()=>{ this.loading = false; From 2ff5176a3b6a94e4c86d8c219cce996dd69012ed Mon Sep 17 00:00:00 2001 From: hey7845 Date: Wed, 12 Jan 2022 16:48:42 +0800 Subject: [PATCH 09/29] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E7=A9=BA=E6=B0=94?= =?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 --- .env.development | 2 +- src/api/ecology/atmosphere/air.js | 12 +- .../atmosphere/acid-rain/trend/index.vue | 29 ++ src/views/atmosphere/air/trend/index.vue | 473 +++++++++--------- 4 files changed, 269 insertions(+), 247 deletions(-) diff --git a/.env.development b/.env.development index ece64a9..f1ec8de 100644 --- a/.env.development +++ b/.env.development @@ -1 +1 @@ -VUE_APP_API_BASE_URL=http://1.14.132.108:10002/api \ No newline at end of file +VUE_APP_API_BASE_URL=http://localhost:10001/api \ No newline at end of file diff --git a/src/api/ecology/atmosphere/air.js b/src/api/ecology/atmosphere/air.js index 703a0a4..4e040b1 100644 --- a/src/api/ecology/atmosphere/air.js +++ b/src/api/ecology/atmosphere/air.js @@ -71,11 +71,15 @@ const statisticArea = "/ambientAir/ambientAir/statistic/area"; const getPlaceGis = function(data){ return axios.get("/ambientAir/ambientAir/gis/place",{params:data}) } +const getYearOptions = () => axios.get("/ambientAir/ambientAir/yearOptions") const getTrendChart = function(data){ return axios.post("/ambientAir/ambientAir/trend/chart",data) } -const getPlaceByRegionLevel = function(column){ - return axios.get("/ambientAir/ambientAir/place/region",{params:{column}}) +const getCityPlace = function(column){ + return axios.get("/ambientAir/airPlaceBasicInfoDict/place/city",{params:{column}}) +} +const getCountryPlace = function(column){ + return axios.get("/ambientAir/airPlaceBasicInfoDict/place/country",{params:{column}}) } // 排行 const airDayRankUrl = "/zhenQiWang/ambientAirZhenqiCityDayAqiRankData"; @@ -112,6 +116,8 @@ export { airYearProvincialCapitalRankUrl, airPm25YearProvincialCapitalRankUrl, airMonthProvincialCapitalRankUrl, + getYearOptions, getTrendChart, - getPlaceByRegionLevel + getCityPlace, + getCountryPlace } diff --git a/src/views/atmosphere/acid-rain/trend/index.vue b/src/views/atmosphere/acid-rain/trend/index.vue index 2b609f3..ad25f0b 100644 --- a/src/views/atmosphere/acid-rain/trend/index.vue +++ b/src/views/atmosphere/acid-rain/trend/index.vue @@ -85,6 +85,7 @@ return { queryParams: { yearList: ["2020", "2021"], + monthList: [], areaList: ['南宁市'], placeList: [], regionLevel: '市级', // 区域等级 @@ -124,6 +125,34 @@ } ], yOptions: [ + { + label: '达标天数', + value: '达标天数', + }, + { + label: '达标率', + value: '达标率', + }, + { + label: '浓度', + value: '浓度', + }, + { + label: '首要污染天数', + value: '首要污染天数', + }, + { + label: '空气质量指数', + value: '空气质量指数', + }, + { + label: '优良率', + value: '优良率', + }, + { + label: '多项首要污染物天数', + value: '多项首要污染物天数', + }, ] }; }, diff --git a/src/views/atmosphere/air/trend/index.vue b/src/views/atmosphere/air/trend/index.vue index ec4fe26..5498474 100644 --- a/src/views/atmosphere/air/trend/index.vue +++ b/src/views/atmosphere/air/trend/index.vue @@ -1,284 +1,271 @@ From 64f9674891905090783903afb9615f038e1f28f3 Mon Sep 17 00:00:00 2001 From: hey7845 Date: Wed, 12 Jan 2022 16:50:07 +0800 Subject: [PATCH 10/29] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.development b/.env.development index f1ec8de..ece64a9 100644 --- a/.env.development +++ b/.env.development @@ -1 +1 @@ -VUE_APP_API_BASE_URL=http://localhost:10001/api \ No newline at end of file +VUE_APP_API_BASE_URL=http://1.14.132.108:10002/api \ No newline at end of file From c27071780dd3a4033327db0075205f9364bf5c4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= Date: Fri, 14 Jan 2022 12:13:17 +0800 Subject: [PATCH 11/29] =?UTF-8?q?=E6=B9=96=E5=BA=93=E5=9B=BE=E8=A1=A8?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ecology/new-lake.js | 7 + src/views/water/lake/trend/index.vue | 659 +++++++++++++++++++++++++++ 2 files changed, 666 insertions(+) create mode 100644 src/views/water/lake/trend/index.vue diff --git a/src/api/ecology/new-lake.js b/src/api/ecology/new-lake.js index 36d5d3a..4a3da10 100644 --- a/src/api/ecology/new-lake.js +++ b/src/api/ecology/new-lake.js @@ -75,4 +75,11 @@ export const specialAverageNutrition = function (data) { export const specialYearContrastUrl = '/lakeLibrary/wateAnalysis/special/yearContrast'; export const specialYearContrastData = function (data) { return axios.post(specialYearContrastUrl,data) +} + +// 湖库统计图表 + +export const lakeLibraryUrl = '/lakeLibrary/trendChart/data'; +export const lakeLibrary = function (data) { + return axios.post(lakeLibraryUrl,data) } \ No newline at end of file diff --git a/src/views/water/lake/trend/index.vue b/src/views/water/lake/trend/index.vue new file mode 100644 index 0000000..f5666ab --- /dev/null +++ b/src/views/water/lake/trend/index.vue @@ -0,0 +1,659 @@ + + + + From 7bb3f32af0dce04af98a88de56f4bfd07411858c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= Date: Fri, 14 Jan 2022 18:06:56 +0800 Subject: [PATCH 12/29] =?UTF-8?q?=E8=B6=8B=E5=8A=BF=E5=9B=BE=E6=9F=B1?= =?UTF-8?q?=E7=8A=B6=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/water/lake/trend/index.vue | 604 +++++++++++++++++++-------- 1 file changed, 422 insertions(+), 182 deletions(-) diff --git a/src/views/water/lake/trend/index.vue b/src/views/water/lake/trend/index.vue index f5666ab..eb5de25 100644 --- a/src/views/water/lake/trend/index.vue +++ b/src/views/water/lake/trend/index.vue @@ -107,20 +107,18 @@ @@ -998,4 +878,12 @@ export default { .mb-20 { margin-bottom: 20px; } +.empty{ + height: 100%; + line-height: 400px; + color: #ccc; + font-size: 16px; + text-align: center; +} + From 5b2c0c7bea90eae3213d1484e4a3ebd5c7f2b547 Mon Sep 17 00:00:00 2001 From: art_station Date: Mon, 17 Jan 2022 20:54:38 +0800 Subject: [PATCH 16/29] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/atmosphere/air/trend/index.vue | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/views/atmosphere/air/trend/index.vue b/src/views/atmosphere/air/trend/index.vue index 766cc58..e4e05dd 100644 --- a/src/views/atmosphere/air/trend/index.vue +++ b/src/views/atmosphere/air/trend/index.vue @@ -201,7 +201,7 @@ export default { if (value.includes('main')) { this.queryParams.ycoList = ['main'] this.queryParams.indicatorList = ['main'] - + } if (value.includes('aqi')) { this.queryParams.ycoList = ['aqi'] @@ -240,10 +240,18 @@ export default { this.$message.warning('横坐标为监测指标时，区域不能多选') return false } + if (this.queryParams.xco === '监测指标' && this.queryParams.placeList.length > 1) { + this.$message.warning('横坐标为监测指标时，测点名称不能多选') + return false + } if (this.queryParams.xco === '测点名称' && this.queryParams.placeList.length === 0) { this.$message.warning('横坐标为测点名称时，测点名称选择不能为空') return false } + if (this.queryParams.xco === '测点名称' && this.queryParams.indicatorList.length > 1) { + this.$message.warning('横坐标为测点名称时，监测指标不能多选') + return false + } if (this.queryParams.areaList.length > 0 && this.queryParams.placeList.length > 0) { this.$message.warning('区域与测点名称不能同时选择') return false From 2496e4448562bb2486453e845a123830db32d223 Mon Sep 17 00:00:00 2001 From: hey7845 Date: Tue, 18 Jan 2022 19:29:59 +0800 Subject: [PATCH 17/29] =?UTF-8?q?=E9=85=B8=E9=9B=A8=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ecology/atmosphere/acid.js | 5 + .../atmosphere/acid-rain/trend/index.vue | 470 ++++++++---------- 2 files changed, 205 insertions(+), 270 deletions(-) diff --git a/src/api/ecology/atmosphere/acid.js b/src/api/ecology/atmosphere/acid.js index 0d40941..9ca15d8 100644 --- a/src/api/ecology/atmosphere/acid.js +++ b/src/api/ecology/atmosphere/acid.js @@ -60,9 +60,12 @@ const getColumnOptions = function(column){ const getPlaceGis = function(data){ return axios.get("/acidRain/acidRain/gis/place",{params:data}) } +const getPlaceOptions = (regionLevel) => axios.get("/acidRain/acidRain/placeOptions", {params:{regionLevel}}) + const getTrendChart = function(data){ return axios.post("/acidRain/acidRain/trend/chart",data) } +const getYearOptions = () => axios.get("/acidRain/acidRain/yearOptions") const getPlaceByRegionLevel = function(column){ return axios.get("/acidRain/acidRain/place/region",{params:{column}}) } @@ -90,6 +93,8 @@ export { statisticIon, statisticCounty, getPlaceGis, + getYearOptions, + getPlaceOptions, getTrendChart, getPlaceByRegionLevel } diff --git a/src/views/atmosphere/acid-rain/trend/index.vue b/src/views/atmosphere/acid-rain/trend/index.vue index ad25f0b..8675ec2 100644 --- a/src/views/atmosphere/acid-rain/trend/index.vue +++ b/src/views/atmosphere/acid-rain/trend/index.vue @@ -1,313 +1,243 @@ From 72407cc3ef1f12e53c0d91a9f35cd942250a8997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= Date: Wed, 19 Jan 2022 08:48:28 +0800 Subject: [PATCH 18/29] =?UTF-8?q?=E6=B9=96=E5=BA=93=E5=9B=BE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/water/lake/trend/index.vue | 105 ++++++++++++++++++--------- 1 file changed, 69 insertions(+), 36 deletions(-) diff --git a/src/views/water/lake/trend/index.vue b/src/views/water/lake/trend/index.vue index 07a076c..898befd 100644 --- a/src/views/water/lake/trend/index.vue +++ b/src/views/water/lake/trend/index.vue @@ -315,7 +315,7 @@ export default { let palceOptions = {}; let newPlace = []; res.data.data.forEach((item) => { - palceOptions[item.regionName] = item.regionName; + palceOptions[item.sectionName] = item.sectionName; }); for (let i in palceOptions) { newPlace.push({ @@ -323,13 +323,7 @@ export default { value: palceOptions[i], }); } - this.palceOptions = [...newPlace]; - return res.data.data.map((item) => { - return { - label: item.sectionName, - value: item.sectionName, - }; - }); + return [...newPlace]; }, initChart() { @@ -405,6 +399,9 @@ export default { x: "center", //可设定图例在左、右、居中 y: "bottom", //可设定图例在上、下、居中 padding: [0, 50, 0, 0], //可设定图例[距上方距离，距右方距离，距下方距离，距左方距离] + // formatter: function (name) { + // return name; + // } }, xAxis: this.xAxis, yAxis: { @@ -420,6 +417,7 @@ export default { series: this.series, }; + trendChart.setOption(option); }, @@ -585,22 +583,52 @@ export default { this.indicatorOptions.forEach(single=>{ if(single.value == item){ this.buildYMax(single.limit); - singleLine.push( + + + const name = single.label+'Ⅱ类标准' + singleLine.push( { - name: item, - yAxis: single.limit, + name:name, + type:'line', + symbol:'path://M30.9,53.2C16.8,53.2,5.3,41.7,5.3,27.6S16.8,2,30.9,2C45,2,56.4,13.5,56.4,27.6S45,53.2,30.9,53.2z M30.9,3.5C17.6,3.5,6.8,14.4,6.8,27.6c0,13.3,10.8,24.1,24.101,24.1C44.2,51.7,55,40.9,55,27.6C54.9,14.4,44.1,3.5,30.9,3.5z M36.9,35.8c0,0.601-0.4,1-0.9,1h-1.3c-0.5,0-0.9-0.399-0.9-1V19.5c0-0.6,0.4-1,0.9-1H36c0.5,0,0.9,0.4,0.9,1V35.8z M27.8,35.8 c0,0.601-0.4,1-0.9,1h-1.3c-0.5,0-0.9-0.399-0.9-1V19.5c0-0.6,0.4-1,0.9-1H27c0.5,0,0.9,0.4,0.9,1L27.8,35.8L27.8,35.8z', + markLine:{ + data:[ + { + name:name, + yAxis: single.limit, + } + ], lineStyle: { type: "dashed", // dotted,solid,dashed - color: single.color, + // color: single.color, width: 2, opacity: 0.9, }, label: { - color: single.color, + // color: single.color, formatter: single.label+"Ⅱ类标准", + position:'insideEndBottom' }, - } - ) + } + } + ) + + // singleLine.push( + // { + // name: item, + // yAxis: single.limit, + // lineStyle: { + // type: "dashed", // dotted,solid,dashed + // color: single.color, + // width: 2, + // opacity: 0.9, + // }, + // label: { + // color: single.color, + // formatter: single.label+"Ⅱ类标准", + // }, + // } + // ) } }) }) @@ -809,32 +837,37 @@ export default { }) } - series[0].markLine = { - lineStyle: { - normal: { - type: "line", - width: 3, - opacity: 0.9, - }, - }, - label: { - padding: [1, 10], - lineHeight: 30, - show: true, - position: this.queryParams.yco=='Yco_1' ? "insideEndBottom" : "end", - borderType: "dashed", - borderWidth: 1, - }, - data: [...this.buildLine()], - symbol: ["none", "none"], - }; + if(this.queryParams.yco=='Yco_1'){ + series = [...series,...this.buildLine()] + }else{ + series[0].markLine = { + lineStyle: { + normal: { + type: "line", + width: 3, + opacity: 0.9, + }, + }, + label: { + padding: [1, 10], + lineHeight: 30, + show: true, + position: this.queryParams.yco=='Yco_1' ? "insideEndBottom" : "end", + borderType: "dashed", + borderWidth: 1, + }, + data: [...this.buildLine()], + symbol: ["none", "none"], + }; + } + // 对指标的名字转成中文 if(singleType){ series = series.map(item=>{ - let name = ''; + let name = item.name; this.indicatorOptions.forEach(single=>{ if(single.value == item.name){ - name = single.label + name = single.label } }) return { From 6504d7aaf9f215acfd4c18554b5d7b720e16ea6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= Date: Wed, 19 Jan 2022 09:09:54 +0800 Subject: [PATCH 19/29] =?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/views/water/lake/trend/index.vue | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/views/water/lake/trend/index.vue b/src/views/water/lake/trend/index.vue index 898befd..02a87f4 100644 --- a/src/views/water/lake/trend/index.vue +++ b/src/views/water/lake/trend/index.vue @@ -107,12 +107,8 @@ + + diff --git a/src/views/water/drinking-water/statistic/county/waterQualityCount.vue b/src/views/water/drinking-water/statistic/county/waterQualityCount.vue index 93df842..36c79a5 100644 --- a/src/views/water/drinking-water/statistic/county/waterQualityCount.vue +++ b/src/views/water/drinking-water/statistic/county/waterQualityCount.vue @@ -32,7 +32,7 @@ import XLSX from "xlsx"; import { - waterQualityCountData + countyWaterQualityCountData as waterQualityCountData } from "@/api/ecology/new-drinking-water"; import locale from "ant-design-vue/es/date-picker/locale/zh_CN"; From 75588861255e8701c8aeef1f3c1f52f80c4a4a6f Mon Sep 17 00:00:00 2001 From: hey7845 Date: Thu, 20 Jan 2022 21:58:58 +0800 Subject: [PATCH 28/29] =?UTF-8?q?=E9=85=B8=E9=9B=A8=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E7=A9=BA=E6=B0=94=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../atmosphere/acid-rain/trend/index.vue | 67 ++++++++++++++----- src/views/atmosphere/air/trend/index.vue | 27 +++++--- 2 files changed, 69 insertions(+), 25 deletions(-) diff --git a/src/views/atmosphere/acid-rain/trend/index.vue b/src/views/atmosphere/acid-rain/trend/index.vue index 8675ec2..3b10fa0 100644 --- a/src/views/atmosphere/acid-rain/trend/index.vue +++ b/src/views/atmosphere/acid-rain/trend/index.vue @@ -23,7 +23,7 @@ - + @@ -135,9 +135,29 @@ export default { }, // 纵坐标变化 handleYcoChange(value) { - if (value.length > 2) { - this.$message.warning('纵坐标最多只能选择两个') - this.queryParams.ycoList.splice(this.queryParams.ycoList.length - 1) + if (value.includes('rate') && !this.queryParams.categoryList.includes('酸雨频率')) { + this.queryParams.categoryList.push('酸雨频率') + } + if (!value.includes('rate') && this.queryParams.categoryList.includes('酸雨频率')) { + let index = this.queryParams.categoryList.indexOf('酸雨频率') + this.queryParams.categoryList.splice(index, 1) + } + }, + // 项目类别变化 + handleCategoryChange(value) { + if (value.includes('酸雨频率') && !this.queryParams.ycoList.includes('rate')) { + this.queryParams.ycoList.push('rate') + } + if (!value.includes('酸雨频率') && this.queryParams.ycoList.includes('rate')) { + let index = this.queryParams.ycoList.indexOf('rate') + this.queryParams.ycoList.splice(index, 1) + } + if ((value.includes('酸雨PH') || value.includes('降水PH')) && !this.queryParams.ycoList.includes('ph')) { + this.queryParams.ycoList.push('ph') + } + if (!value.includes('酸雨PH') && !value.includes('降水PH') && this.queryParams.ycoList.includes('ph')) { + let index = this.queryParams.ycoList.indexOf('ph') + this.queryParams.ycoList.splice(index, 1) } }, validParams() { @@ -166,6 +186,18 @@ export default { this.$message.warning('纵坐标不能为空') return false } + if (this.queryParams.xco === '年月' && this.queryParams.monthList.length === 0) { + this.$message.warning('横坐标为年月时，月份选择不能为空') + return false + } + if (this.queryParams.ycoList.includes('rate') && !this.queryParams.categoryList.includes('酸雨频率')) { + this.$message.warning('纵坐标选择酸雨频率时，项目类别也应选择酸雨频率') + return false + } + if (this.queryParams.categoryList.includes('酸雨频率') && !this.queryParams.ycoList.includes('rate')) { + this.$message.warning('项目类别选择酸雨频率时，纵坐标也应选择酸雨频率') + return false + } return true }, // 趋势图 @@ -184,11 +216,11 @@ export default { }); }, initChart() { - this.trendData.yAxis[0].axisLabel = { - formatter: function(value) { - return value.toFixed(1); - } - }; + // this.trendData.yAxis[0].axisLabel = { + // formatter: function(value) { + // return value.toFixed(1); + // } + // }; if (trendChart != null && trendChart != '' && trendChart != undefined) { trendChart.dispose(); // 销毁 } @@ -216,19 +248,22 @@ export default { series: this.trendData.series }; //添加一个新的刻度线 实现折线在柱状图的中间显示 - option.xAxis[1] = { - type: 'value', - max: option.xAxis[0].data.length, - show: false - }; + // option.xAxis[1] = { + // type: 'value', + // max: option.xAxis[0].data.length, + // show: false + // }; let lineArray = option.series.filter(item => item.type === 'line'); lineArray.forEach((item, index) => { - item.xAxisIndex = 1; + // item.xAxisIndex = 1; item.lineStyle = { type: 'dashed' }; - item.data = item.data.map((x, i) => [i + (1 / (option.legend.data.length + 1)) * (index + 1), x]); + if (index === 0) { + item.label.offset = [20,30] + } + // item.data = item.data.map((x, i) => [i + (1 / (option.legend.data.length + 1)) * (index + 1), x]); }); console.log('option', option); trendChart.setOption(option); diff --git a/src/views/atmosphere/air/trend/index.vue b/src/views/atmosphere/air/trend/index.vue index e4e05dd..24ce4fe 100644 --- a/src/views/atmosphere/air/trend/index.vue +++ b/src/views/atmosphere/air/trend/index.vue @@ -130,15 +130,18 @@ export default { }, // 区域下拉列表 getArea() { - getDictData({ dictName: '城区行政区划代码' }).then(res => { - this.areaOptions = res.data.data.map(item => { - return { - label: item.dictDataName, - value: item.dictDataName - }; - }); - this.areaOptions.unshift({ label: '南宁市', value: '南宁市' }); - }); + this.areaOptions = [ + { label: '邕宁区', value: '邕宁区' }, + { label: '青秀区', value: '青秀区' }, + { label: '五象新区', value: '五象新区' }, + { label: '高新区', value: '高新区' }, + { label: '良庆区', value: '良庆区' }, + { label: '经开区', value: '东盟经开区' }, + { label: '江南区', value: '江南区' }, + { label: '西乡塘区', value: '西乡塘区' }, + { label: '兴宁区', value: '兴宁区' }, + { label: '南宁', value: '南宁市' } + ] }, // 县级 getCounty() { @@ -283,6 +286,12 @@ export default { return value.toFixed(1); } }; + this.trendData.yAxis && this.trendData.yAxis.forEach(item=>{ + console.log("item", item); + if (item.name === '浓度') { + item.name = '浓度 单位：微克/立方米（一氧化碳：毫克/立方米）' + } + }) if (trendChart != null && trendChart != '' && trendChart != undefined) { trendChart.dispose(); // 销毁 } From c4c750ceb79e91adaccd6e2d33aff0698c0baaba Mon Sep 17 00:00:00 2001 From: 710356044 <710356044@qq.com> Date: Fri, 21 Jan 2022 13:35:40 +0800 Subject: [PATCH 29/29] =?UTF-8?q?=E9=A5=AE=E7=94=A8=E6=B0=B4=E5=8E=BF?= =?UTF-8?q?=E7=BA=A7=E5=AD=97=E5=85=B8=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/water/drinking-water/dict/countyBottomWaterDict.vue | 3 ++- src/views/water/drinking-water/dict/countyTopWaterDict.vue | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/water/drinking-water/dict/countyBottomWaterDict.vue b/src/views/water/drinking-water/dict/countyBottomWaterDict.vue index 83791a7..2636a21 100644 --- a/src/views/water/drinking-water/dict/countyBottomWaterDict.vue +++ b/src/views/water/drinking-water/dict/countyBottomWaterDict.vue @@ -253,7 +253,7 @@ export default { // 是否显示编辑弹窗 showEdit: false, // 表单数据 - form: {}, + form: {waterSourceType:''}, loading: false, rules: { // year: [{required: true, message: '请输入年份'}], @@ -296,6 +296,7 @@ export default { await this.$refs.form.validate(); const hide = this.$message.loading('请求中..', 0); const form = this.form; + form.waterSourceType='2'; console.log(form); if (form.drinkingWaterDictId) { updateDrinkingWaterCountyBottomDict(form) diff --git a/src/views/water/drinking-water/dict/countyTopWaterDict.vue b/src/views/water/drinking-water/dict/countyTopWaterDict.vue index e0f5779..78f23c7 100644 --- a/src/views/water/drinking-water/dict/countyTopWaterDict.vue +++ b/src/views/water/drinking-water/dict/countyTopWaterDict.vue @@ -248,7 +248,7 @@ export default { // 是否显示编辑弹窗 showEdit: false, // 表单数据 - form: {}, + form: {waterSourceType:''}, loading: false, rules: { // year: [{required: true, message: '请输入年份'}], @@ -291,6 +291,7 @@ export default { await this.$refs.form.validate(); const hide = this.$message.loading('请求中..', 0); const form = this.form; + form.waterSourceType='1'; console.log(form); if (form.drinkingWaterDictId) { updateDrinkingWaterCountyDict(form)