From 17bdcd61ee923816e219838aa2b3ba34f5f971fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= Date: Fri, 25 Mar 2022 17:42:18 +0800 Subject: [PATCH] =?UTF-8?q?S=E6=9F=90M=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/military/qz2022/apply/index.jsx | 12 +- src/military/qz2022/editTable/index.jsx | 2 +- src/military/qz2022/image/statistics-sum.png | Bin 0 -> 5127 bytes src/military/qz2022/image/statistics-work.png | Bin 0 -> 7322 bytes src/military/qz2022/management/index.jsx | 2 +- src/military/qz2022/notice/detail.jsx | 2 +- src/military/qz2022/notice/index.jsx | 2 +- src/military/qz2022/static.js | 10 +- .../qz2022/statistics/EchartPie/index.jsx | 104 ++++++++++++++++++ src/military/qz2022/statistics/index.jsx | 36 +++--- src/military/qz2022/statistics/index.scss | 60 +--------- 11 files changed, 144 insertions(+), 86 deletions(-) create mode 100644 src/military/qz2022/image/statistics-sum.png create mode 100644 src/military/qz2022/image/statistics-work.png create mode 100644 src/military/qz2022/statistics/EchartPie/index.jsx diff --git a/src/military/qz2022/apply/index.jsx b/src/military/qz2022/apply/index.jsx index 0ce323e7e..1a5424a9f 100644 --- a/src/military/qz2022/apply/index.jsx +++ b/src/military/qz2022/apply/index.jsx @@ -78,22 +78,22 @@ export default Form.create()(({ match, history, showNotification, form, current_ { max: 32, message: '长度不能超过32个字符' }], )} - {helper('JX', + {helper('JXJXJX', 'expertName', - [{ required: true, message: "JX不能为空" }, + [{ required: true, message: "JXJXJX不能为空" }, { max: 32, message: '长度不能超过32个字符' }], - + )} {helper('赛区', 'expertName', - [{ required: true, message: "JX不能为空" }], + [{ required: true, message: "JXJXJX不能为空" }], )} {helper('赛项', 'expertName', - [{ required: true, message: "JX不能为空" }], + [{ required: true, message: "JXJXJX不能为空" }], @@ -123,7 +123,7 @@ export default Form.create()(({ match, history, showNotification, form, current_
参赛单位 :
参赛团队负责人姓名 :
职务 :
-
JX :
+
JXJXJX :
赛区 :
赛项 :
课题来源 :
diff --git a/src/military/qz2022/editTable/index.jsx b/src/military/qz2022/editTable/index.jsx index c415ccfca..b293506c1 100644 --- a/src/military/qz2022/editTable/index.jsx +++ b/src/military/qz2022/editTable/index.jsx @@ -86,7 +86,7 @@ class EditableTable extends React.Component { editable: true, }, { - title: 'JX', + title: 'JXJXJX', dataIndex: 'militaryRank', editable: true, }, diff --git a/src/military/qz2022/image/statistics-sum.png b/src/military/qz2022/image/statistics-sum.png new file mode 100644 index 0000000000000000000000000000000000000000..35ba7c25ad00983d3e36b7ddfc47c96717773f62 GIT binary patch literal 5127 zcmV+i6!`0jP)kQ9Jb~8XvSJCbm

kX9{+8%(8u6gzK0a<`*)!0SYTN&zXe3?JRXM}|H68p>WIQ+^=I zFgoQ8(b3sSw%G6UwGNPL$NiJUXr$i>uRK4__s>n$b}85Eu?qG9GV*u#7#&L=F6Z>* z{FFCVdPghVf!%=Qe77!rxKCFwMi=PTx1k@v*Zb7CwGkSnwzvGH7VUnDAM%@+P~ z1i4+YLentQEu&Fl{B8$GGvw52#Q`!wHU~&83>mFt3XnH^gMXst(d9-5S9N2IZUKk< zQN$sSLWkT`^$@D=&uSgAh{)~>K$5?eJhn9e1@vj`vL~trNY(xIEg-KS=Qpq7bXnB| zHQS#9q*;1uv}Q_VJ3wj>--0TA%OTfp;p<^wztjR67Z`%$kOhcmrm86p=>TbFJ*sZS zamcDEuGF97kV@n#qp;(UNvb+P7RFfNXdOmP(*{rcu0FD>phKQ7S?yKg^bCH^N|vvv zm;+>CLicdA&ZFeB2MQCwXaf$Ag~^!|xrG`Fa$HpKL|QbuTVOs5ydw5I4v>Y{A_>TE zZ`N<_wKs|0{$II!uGjxf^vrQih^T?Ic7W7hEps)EuXqxW#}4Q>|NKcJ0m?F;6R!~6 z_d9z5$r<0(2tV`LW@L?HgZVr@jY0e zHDY`|V;dI^uo)XbQ|1^38jy1@68-jQ#36lph7k*54{doIAPua9DGs^tccRzN7#L8O zCLaGQ(c@1?yC6F4+ zA_qF#0mgb^12+I9<7|J|Hj;n@(7=@^yO;MCm+CbA!eOQ|Hic=}Rn!48(jj#svXMV% zU5)Wc5b?&wvW6mj4@CGsGnaY*b3Up--T|@zAO)esfC@fD|8szeL-iYK(!atZUp{ z0ks4D&N9ZPd+{m}#~}-H$Rq%T2wz2f8sNAl@%Q=2#u;YCC3&*7N;QTq$x37WZ25x5&D>SQ}>7+73zw z$Vgv!IlNcgb3epuJL@x$!bN^MkBxKu!X=T`mZUws|BL{z`|2BLSZR-?u% zuOXEgIBeeY*i+SU$apLwq3ckMPlw(ecE{X7wy)bbN5_33?!z5B?y6yRZ;E^Lk-WLJ zzej367T$ToIr|e5SA9{vjq+>gBc{XHjOK^LN?iFqqHSL$x(ff5eSU~<|G)3Zm99!; z%Z;YJ6cWImitU=h5Ow8rCnkErK!I<*oRg^am$Z=mN+s$2N zky&sI5B~@bdFvRob8ySNC(LLjOdZe-^9slBEsmy1e&F5^yV!pR*Ub?P$xf|NE=X@3 zguMk1qKBl(quf`43dRQ&dMkVrck+eNGz4%5$#($A>qBnY?P&l~Y*wiEqiF^jkfY-q z;Z%Hk;2Xsg_(X|KLeF`q0O+-=wnWoJ+){|}+n`Zh^4{!blYm5t++D2d;KGdw-H2qO zp$|Ex6K6AmUh`AzsA`+t%9kRtiJe%OV)lycFk*!t0fEP|hyy~;)P~sRl`s{wMAIZh z__i+*t^Hv8Xv+d*#CDoGvO18P8cceoVYuaVMgUL{I^Y0Npn&+> z{6TM{$**6ft-$=j!)O{IjD-{*`&g)3CZ93@ndJrye8u=z>@$uyW#~T^sxM~~b5m@$ z${e%G3aJHC(SyM|fc>3icI)a@VOCw~Couca-HdqPA+p-+lbo=yi^1QyDai?wive@N zPKcyQX+jt-*b+?>Ac4_`t_nqXY#K5R$Tl#F50>*sxaXZ{^&fNGZOuLp)HLtLVfkjA zJQ782L$T8iH;P3K3y z%>k4Gi~^JboF)Mod;p9;7mruWA8xyQ!J#rwgTb6~DY%(PR3C6KQK(MEGfoVY>kwcI z%rqc&#~bStddwnRY!?>+l&QLnMGBx1nuosfNum#29hrSFAv}dPHKW^nZ0f?}2?C64 zne8MAaT$0;Vo-8=e*TarVX*2fRqQ@9d+Jp_tx+*MU)86vEFu z+=idEl{*G2DGA6>#{?IJ{i?02u}?jZIPX{Jm|RW zlCC;@$j?D+!zNJt2|1;Y;|pw8u15@<9Wcca25(<4fKgB<_@G+MKH!wXz#F|3hTlL$ z%Wy|gZlwSj%p;1X0Uj@mOfuSlj8z%Yu9nL#;i?1Iehb!#3yQ$FVA+O;CIF#7b>?(6pQ|1EL zDzeL*vkh$<53aCbQYOY=h z(|dmCS7`R(BFB$0vyTlxGBt*HpOLlUb%5+bED-gXT^78D!=5IupZQ6$zSofQj?gDersw#2>!2?uAJgftx z)`~PMDTkj0Sj>*}i6WMcWP>m<(4^a?;P?wy7vR)%1B(p|&V}EZH-^BC;j?><>yTCY zvhyZs@_lA5$czqz?G?W39a#ao(MCzcHs&RXYV`w}oJfJTWIT20=4AmX>LE_kJRqy~ zWf!2YR@Lx>^Vh-q(t3n}_zdUXY$v;G5D3DNC`$TSVUgWooZM%di`tee71=B4I+R}P z6)1=g^||!%2a!g)&b@smjyst4kO`01u;=59RXSl-b`XvVNgW_ns8vGQOdZs4^nF<# zvUIi$K_2lT%^$4o&?S`vq%P$Q)dTlB*|Ld2INRJ*O(Y!ci6qbkwsR6OwX|Bf2J~jeU+V&@ji0DW_qjZ#5BeQmxJE%!!9n*=-u*$Y> zq^$(9@v$;vPnIzc$V76am57H-6CiT`33E%n?N5?=fdeI?T=Ms<>go5gsiVcXhllBu zY=EsUBLHXJ05i^$GE-0WQAm%hj6;^S+mj(!R+%hw3-q|tK-50uuzPv@da2H?&AXK=xe1a5uqq$}vra8I;wwJX%=1*~DXI3Mvu4IQq|PA9s*{;` z-oOr5Wnomx3OcljMoANkYCq|nvy3W{Jk}w`D)Vuvu5F(Kven#D)P5EdS7q^4%4Pym zGBLhtKkXSg_->e@Cb|I#eY}}eeZ$xu02 zAn14?WZPC1??nKqs=K$TG!njPm3iwfW8aEwS>p8#AQjXI0hUzy9I4xIWofDlMp4fJ zG8M@!oz2Mv&_bajAKrC7o8)&Mef)n1;XKu3kpA(aE94%G_Ou?3Lng+Ir;-^!p1NYxku z2gm~8(y3}IAZ6kkWyhYRi-sLi+LIOcqcbkmwKHz^QT!BFj-;|M zRdFJfF%6a-GGTtG;ueNZ0F?!T17t|SvN*Ra1BuHS=a8yjs_KAc%gX|?&6kaE{=Cbf zROTo)`{#s5!tGq8rdTrF&NvAdeCXy^gB|JZ?si+fb17QDwv{F zxx6T^<3P{>s{^D1WPqEz4T=M#&gYe=qoO1AgAS?csZpJ?1Ed3Fg93TnOB7V~)HpyE z1ej{|LF16B^l^YxrC7o84v^gmm5-DeN#_Ry80Z7#i#OSvAByLsRo?4(q0AR=b6gwK&1x3Ou#wYM=GZ%V^ zSBQkyqwrazinyj_T%1jK!?a&~EPe*}Rw~9ZFo5iIuS&2m%UmRz zY5+kddRpb{54g-Sp8>INRH;|wE*P19)bC#uY?Mwz|A^P6o;>cDhU``uH^Z+8|Y5B449aJ2{0$$8l#j)xTJEk99H1=SC^-=ks4!IXCm3g&pfp_= zzY`mnI_?aGGnX0%YE8VNx546#`@4;tb+@ z0M?2@_RK2v;SaKgX~F}ceo4pl16EN|R6AZ?y+7-Wha pHTMJE(f7QWs&pfp>0;B^{tw_(9GPDl^`8I$002ovPDHLkV1i(vmO%gj literal 0 HcmV?d00001 diff --git a/src/military/qz2022/image/statistics-work.png b/src/military/qz2022/image/statistics-work.png new file mode 100644 index 0000000000000000000000000000000000000000..a7986978fc4173442107d7e0aacc7cec1e311810 GIT binary patch literal 7322 zcmV;L9A)E)P)M-MaVObN@Q`+;h)4mqfMnIu0B=m50liJX?@Bmxa&; z)6H!y;&w;@{4?C83apUM4?y*EA^0{Yc|g>{&$d#-2hY&Xkdm&*ssbxyvoorJzY-yS zm`EI(i!^|%P3xiwE9TStAtT=+rwXi)%*?Uh;e%=t`n^OnErTTHM_JG}0k#8e&pu8H z`c_9X{W&BPtg_DvQ+=E z9gN-~bZpZT;y=WEN}A8=FXeqW$qO)HXQ$O?e(2L}+I8j8yO`=4^w|LTBs)z^6x9R| z0I(AHeXIEllJ}|h7I8%o8<0K+toloMBpRU{oG;)S?I(^ox4f6w|=-@@9M zwQ9+{CT${FtY@93w9lo#1R)KaeT-<}f3W`+B{42ayg=8*k}g5#o6pv^(x*Yu*Jpq= zYAT-)(fB4X_Iya4v~gpZ*bH;Rm2EBbv>V2cY2;}n_+hjXwdyPBK)1y{fJtI8Nl8(* zQq{2nVEvc|K2vD?Ga%{fnTojt1JA@#c5|Ui*{DVy8x=ec;2Q3bddozFz8!m%HUu!d ztX))r32bQxza8LApv&-u)o?R zwAgk-lB;5)Z7LPhCYcUDPXMr||)LTue)_SiG`@mKW7Xi7!<= zu%zNzOQI3Gpr$N4Jd-`0Fc&o)tF0w+ zgPZm$rH(Ja8q$e}gdB>0 z55?~X7r?xBDVYGgW*n{jt$_CeuL_0!2t1gufmF_2599 zb}ooLPVGSt-E&}#x|ENM>b$APfw1@l&pWX;egVdOg0J^|Cha}a#RuTdrrim#eBFGK zb^2@>)2PEjQTm53yo}f|fkJGAPdN+FU2Uv~C-@+MANhts;24Ec@U`Uv*7<3CxC%nta$=Lwj$W zL-4o=uJ{A2CcX*QX0?5WKJZyvvzFEB9NaMbR!=a--T?mJsYcD>i&%>$jnRP?Uw~ED z$d|#v-`WYrx^N<9^B)g%gnh8HF^$Owv10sN3RoQgR$b6+@C8`-VkY2=dCnXRj$Mv{ z^0+?e!MW{E`Y$EB#F=2mSR66o>n64FNKH&9F|ES0-Mf?GH5^BM9)+TeW2)USN$yBQ z#Lj+OAQfH=&p|S5U^3{#@O5YL0)X`mx4iJGo-e?vYv6iK;}sT>L|=_PMz48Av{&sQ ztn0h*)0%`yaPMU)11CtxGs=Y;i;qoOlCXe7pZplU&L6F96`z&U?+WG~YgZ0r{U+8N z`My^?bK8zDz>)!=wMn)jLXu1k9W6B1Em3~glYqjm;uiZ^U2%O&d)vzPZDy79@-t`4ok`R0~ank`0$5+?2H`9H^5a{JQ zGQCetgny4gk9W2!L+6FgONrpHBZNH=Vjmp94TbgkXn1Ixl7*ffn7r8l*Gu+iItv{V zZBs%QYlHL&JFbz3*ATBYX@O)di`Rs2z`{EJfB0&SRv!)X{qQ%s)=Q8S+Lnr{Azp;{ zx_3y}G07;M1Z(pFf`b96{qnX;;#5RVPXy!A6k?e$g!Ig#t7KAa+3~S>XXD~vw)=1b zm;~eKQ|37KBsVt``8O$4%thb?lldpsi+)7sh2h` zrpq&cg`|^Pc8Zq^4e577t8+()-T1lKjlbyTU9ao-Cb498yr{;OQ8baH6Iae9Wb*aD z7?Hp%O$KTQh%NVYSpMgjJ;R?vuD1m`7Zm5;q0#;ZxRfHFW`*9U53;)&I z&Q(MZ5}xn^vt8<?z>+S?^|frJ^FjWo ze{E}}-@2r$q-xNuHkej*r?je{!Y2wXJ;y>xojG5YQcLhG%M8JE2c*_gXEo%mTIaQo zl-WL3`PvcAN1dSy(!)1guq=uB~ zjQrh5Xs~YyF)>BwLSzWc@cD<~bbH4O3*S zYcxqGmn*}d@4&(&V@V(dCImB0!8UuI&r=EoR$mM-pQ*sC(*;<5EoHWTGLOXfjG%-7 zil%nNN{L5O*~{&o5N7WH)(QY?vlrCB;*KzW9IUI4SnNhr4*D+NWe2`WETt%un5t`H z1)@Y2d%?hbZP;yBh)y}n-Y<-zW1~@VM7}n>c%E*0$Zpd@9Oar7kCSy^TuQ$f_e)rR z)CmB9^%71x(v$F((s&W?`UwM;_3m-e*|4~0+RuU+xay?}EZ>+N9I$Z8@l%{~+>u%a^<7)2KWt=sd>fjJh64kZ zv1<|IkhJ0nDAY)7;ZNy{OCiiUFJK~7R%qw}e};bLycEG7X7|u)AizpXZG?m%+v7Cc zFW)5luCOmC?;|Jje*N}iTV`gy4?gbK1&$;~hk*dg8C(H3-ydQ-{A)i3pJr}woDl|W zZjf#>Dz}24<_4LP66b@K83!ho@mLXF@q@R8v>6DnBta0@o6y;jDRI3H;yOL?ej!x% zP#1v`S7SlA-{_}o2GUbuLXtV=b9y<*M_w36;rE7&hSZee>(;j6G*H|ELq?fPfWWdv z=gL9*6cU!Y57`Wc=!D6^mcO)@9qGusect8IF^L0GAJStuX}Gk^m{Q#b2CUJO`M^jG zBR#fxmc^~m1(XY|*9FExWCIjODP}vD!ypc!jVN$)8N3>smW*IsFAkwcH}YAyxbx+1 z{?X)eUvp>D5*V;#hdAPCg`}FAS|Sq3I1Tb6p})gzW+OaDPcS@3;e{6xx0yXV#Ntx3 zJ7b(P!OyFV4@h)vtEK&ePX3WgCDWuPRs6iY~x8{mLq%myA)b`y3#elOn*6j+jQDDm&2QC z%TZ*)^QvD2Q(OhF3M+>@Obl6dE4U?Z@FI(`J)?|FV7o`BK|x-0nU8OQ14|n8YWL+& z%qvTv8~AqhS!zj?io9_?$YMES3a2Z{HJ+oR4-sd05&q=_RjwsaMn!kb6G&BFqB{#{ zuRok+R%s)uo5i#67CkTDWC!^?aA3*7LFt?grSr1XlA*(>cNk9jKk{SXX&$9U2c76| zy7beM*Q>yd<}3KEIFC}t@~6hb;$;M^&UB8&%YaqnAG;8`+!JOW&{Z#nt~%cj{uSG1 z8n9&CKN8xXk4RcGG3|1}+S7JtxneuAzn6J?g}=uTDxU$Vi^VO^2DnPkiR;=7u}5q} zDA>sbgG-aXPb`B$t<1%_KqW)$<2%ICQg?wS53$5Qjfpc|pF3mk)4}DwF4&0+1uP@+ z7_zYB$P)#IEr`_8baTt@1-QVRx6!$rP$|lHbw%lj)qf!5mGY;guG(E-?G#hpz&byZ zlbZb6Yx5-qF?M~38)V#z(FOS$bo<%}E-M(K;z0?OZ$I5nRZv<%oAX(Zp z!o7yb)Q3mwF?CWJsa+oElTL!h-_zei5Uv7MMkEemls2}_r;KRmVrVztfeZ3gP|>WV z7R&nSSWytRAFd*kbXl2LWNw3ak|vouCk48uwA7xi2)`rPTYRYR5t~;(<Xl&ryh;8lA zd=pm4bM*gLOzH_iOD!jj#_kcB{#Yir6$ikzM{Zy`A(djFZ$DgRw*g9xynAuCrimy% zvbg*M=@gIDimkCO@pr#7LxWe(gBIKasmjho7Y*_%e5{Z;b5mCWt5fclda@^3I+zbR z!!t81^WDAewox||k+072Q+NbNd5u{Q()~Xn-HnvnAuRT#Fzv9`q%~z^lv#L(c)b*w zeL!z`6MBOYND5sG9;S!-r8&mIwiBt< zt}*p2V;80051nF~L6ART+t9VnhMnn8=AdB$xC?$oKMjfrVecokoBgOe?^U=CoU`%I zFgMuG)Nr#YCU&uc5mG8z$u+QJ#DQ^lVttQi12ilGG2@lcVzGTkoCa5=mce94UQwJ3 z`ggwS)wC*LNyQbr4VV?I1KYIrvzZ~hBEW1%1(Qa&+ZM!p2kcrZB~M>2hn>g$58994 zgS1lF2l3IZ$Ikqiu=6DCNJl!zVK+41%6$Oy0-HVH4H?{iG4rN`+gKO6zW zJ}GwkoYKna5nHaYq+Gz40qKtbABZzZFJ(D|&c%!@QtKfQ{eyBbuiX6(YvKX@nKzqf zoQAX___CGg9pS;i%4#&QH)vf1t?^5SWrk&4qV>v4J)JL{g0O*0(DZhtj%6kHQSPf}~0jlc|lVtZB!(%Aol!>aczZIV z*dt+zorrvWWJpOPF|f3<8&cb6Q;(Z*jc(xU;aqq<)D)E_3je9WMoXU9#POSTl?#4{ zOrU#1r(>CeR9C+VIOnAbY-_)OE@b3w&r{^rl&_9_j!5KfYMua-riNtdx)H)8PUMj-QGB`ABWr279i?qNtYnwHrG^t6 zR?6%1FZc!`l4g7zZ$gpx{6>k=;owaR@_rvgi?72HW2Uo=Q-bQk_%T(aj%A-FDDrn> z(eC!q3R(P|H;^(~$uuwUJy`yK;$%J`qKBfCcYgvhQhldCADz(G7a-9s>dtF z7urthCJ(#9{^7P78XA_6dFOa49#~4(x`fZbIw&vJR0Vp+i`dDT4sV6dVJPdTxeiGR zLuOv+mB3QqYD_+iZLIA!Eq5+FhMp$Ul*@pT)!C(sr+eCc);I8vg~s<-bg@_jPhIPB z&4B53-JLv@i0fi;wy}j;dAE-+6+zu$Dz-Aa3U-NK>gl-03mcScF6XJJ)zHAK@dQ)2 zjwAez&DRPMLUb(B5&g}pzRS^0#Q;l5Ex6WT5|)@TbyyPDAVcu+xiSRX(?*tqx%NJ@ zS>C1o*tLV(Y*9BE`MkftfnG5+?y?xb;`P`FIx`IEsB=w< zJ!L^k+Ad4P>C}9l8>LKgIo_>kU@6Jfl*GM&G^Lw){$*n>b%HXo8A7iDsOkZ#4@+%3 zZ0}b*u;jsQv2%!QIOE%`|Zv2n=sJl2MxUfSjLjbgJE5K z3!lni*5ol=1()XTM7n-(Fi)F`F2V1h+976D=T$6aAj|hIdkwH8r;cmn;WeaER9lk4 zuUztOW+s~?#S-{->;oDXw$zSp##2b0UIi>U@Vcpdk`_^y6sU{7WkJ5toYwh5m{mw! znbL9J8f8`(ZN10hU4(F*5_*$JAp^}(x7Ptnjx&{9|3$mxf~0s7l442_l495d?zi`W z{2G{RAy~LCYM)CoUeC7zU;QT_ zsV=l6rVt+@1?OpQ0ylgkD&U5DEwB{0jH4e3E_KC@9dM2I{!Lh+7j~+O=LUP4ZF#1Vn6x>0_V-F~X$Iz-_Xg zW=<|EVqA9K>w#tR0Ui-I5c6%8fl>)Cu@#AJZ;Fi&4|sVDq;3}@{al^3CvmVGb2%5i zs#-+=3sJatVxlI(!$boxavpyGBnx_S16Bb5I?qQNR(zbXIIwe#uqFwj*94WS3taZ`CpO@whCm{O5s40jJy=QBPkmlfhaX5@I6f#V_J z27uK)MqTWRwQ82>q>#xiXWfvnGB*nxDX5Li0X+fBMJ{@E1FO((4oTvcyz`Gs0zyAe z&OwBp;JSw7OieScr&T4dWXT`BW8Mg+vRfEAE`TwxBBb1?0xR#gS9pcA`<*2Wbbf>* z+MH}HWlO*@`eM!%f4DD2vfPbRIEkLWq1i*h(0UbEp0ilR6Cy1Ub!VAjo>53nRCt<( z>VimDEYdjb7O^U@Tyd?iN>yN0C01dGaap?xtSYcvLZz^3RbW+tRTyGi)~*7p3M`jU zDXdx*SXE#Zh8UN%tH7!P%Oz9_t5yY86egl)0-i$cZ0KGpIjE0aUV0y27PI6$2y5a zaNGUm@RYFfcNNYU!{Z{O;PzXbo6bTS$(e<>8SEQAalQCK*zc$gHLw)u0WL&ar;V1x zM1abcgtr)8^K% ALI3~& literal 0 HcmV?d00001 diff --git a/src/military/qz2022/management/index.jsx b/src/military/qz2022/management/index.jsx index fac39c09e..b668b55a6 100644 --- a/src/military/qz2022/management/index.jsx +++ b/src/military/qz2022/management/index.jsx @@ -40,7 +40,7 @@ function Introduce({ form, showNotification, match, history:{location:{pathname} key: 'reviewEndOn', }, { - title: 'JX', + title: 'JXJXJX', dataIndex: 'surplus', key: 'surplus', }, diff --git a/src/military/qz2022/notice/detail.jsx b/src/military/qz2022/notice/detail.jsx index 2217b3bf1..cd78b67bd 100644 --- a/src/military/qz2022/notice/detail.jsx +++ b/src/military/qz2022/notice/detail.jsx @@ -25,7 +25,7 @@ function NoticeDetail({ form, showNotification, match, history }) {

启智2022大赛即将开始报名!
发布时间: 2021年3月31日
-
“启智 2022 创意征集行动”为JW联合参谋部、科学技术委员会联合举办,JS科学院、航天科技集团协手创办的大型竞赛。现竞赛已临近报名阶段,报名安排如下:
+
“启智 2022 创意征集行动”为JWJWJWJWJWJWJW联合参谋部、科学技术委员会联合举办,JSJSJS科学院、航天科技集团协手创办的大型竞赛。现竞赛已临近报名阶段,报名安排如下:
【报名时间】
2022年4月1日~2022年4月30日
diff --git a/src/military/qz2022/notice/index.jsx b/src/military/qz2022/notice/index.jsx index b87a501f3..2a11ed259 100644 --- a/src/military/qz2022/notice/index.jsx +++ b/src/military/qz2022/notice/index.jsx @@ -19,7 +19,7 @@ function Notice({ form, showNotification, match, history }) {
启智2022大赛即将开始报名!
-
“启智 2022 创意征集行动”为JW联合参谋部、科学技术委员会联合举办,JS科学院、航天科技集团协手创办的大型竞赛。现竞赛已临近报名阶段,报名安排如下...
+
“启智 2022 创意征集行动”为JWJWJWJWJWJWJW联合参谋部、科学技术委员会联合举办,JSJSJS科学院、航天科技集团协手创办的大型竞赛。现竞赛已临近报名阶段,报名安排如下...

2022-03-31

diff --git a/src/military/qz2022/static.js b/src/military/qz2022/static.js index abf6c6ffb..b63bdfdee 100644 --- a/src/military/qz2022/static.js +++ b/src/military/qz2022/static.js @@ -2,13 +2,13 @@ // 赛项*(必填项,placeholder:请选择赛项,下拉列表选择,选项为:战略方向,作战领域,前沿技术) // 赛区配置 export const competitionArea = [ - { value: '0', title: "LJ分赛区"}, - { value: '1', title: "HJ分赛区"}, - { value: '2', title: "KJ分赛区"}, - { value: '3', title: "HJJ分赛区"}, + { value: '0', title: "LJLJLJ分赛区"}, + { value: '1', title: "HJHJHJ分赛区"}, + { value: '2', title: "KJKJKJ分赛区"}, + { value: '3', title: "HJHJHJJHJJHJJ分赛区"}, { value: '4', title: "战略支援部队分赛区"}, { value: '5', title: "联勤保障分赛区"}, - { value: '6', title: "WJ部队分赛区"} + { value: '6', title: "WJWJWJ部队分赛区"} ]; // 赛项配置 export const competitionType = [ diff --git a/src/military/qz2022/statistics/EchartPie/index.jsx b/src/military/qz2022/statistics/EchartPie/index.jsx new file mode 100644 index 000000000..2a3df0ec7 --- /dev/null +++ b/src/military/qz2022/statistics/EchartPie/index.jsx @@ -0,0 +1,104 @@ +import React, { useEffect } from 'react'; +import * as echarts from 'echarts'; + +let fontSizeText = 16; +let clientWidth = document.body.clientWidth; +if (clientWidth < 1000) { + fontSizeText = 16 +} else if (clientWidth >= 1000 && clientWidth <= 2000) { + fontSizeText = 14 + (clientWidth - 1000) / 500; +} else if (clientWidth > 2000) { + fontSizeText = 16 + (clientWidth - 2000) / 500; +} else if (clientWidth > 3000) { + fontSizeText = 18 + (clientWidth - 3000) / 2000; +} +let fontSizeTitle = 1.25 * fontSizeText; + + +export default ({ id,className, title, xData, yData }) => { + + useEffect(() => { + let newEchartBar = document.getElementById(id) && echarts.init(document.getElementById(id)); + let textColor = "#7988a5"; + let normalColor = "#e8e8ed"; + + let option = { + color: ["#FC4567", "#2F8DF4", "#C25EC4"], + title: { + text: "", + // left: "center", + // top: "50%", + // textStyle: { + // fontSize: 22, + // color: textColor, + // fontWeight: "normal", + // }, + }, + tooltip: { + trigger: "item", + }, + legend: { + orient: "vertical", + right: 20, + top: 20, + }, + series: [ + { + type: "pie", + roseType: "radius", + radius: ["30%", "60%"], + data: [ + { + value: 220, + name: "战略方向", + }, + { + value: 120, + name: "前沿技术", + }, + { + value: 189, + name: "作战领域", + }, + ], + label: { + normal: { + formatter: "{font|{c}}\n{hr|}\n{font|{d}%}", + rich: { + font: { + fontSize: 20, + padding: [5, 0], + color: "#fff", + }, + hr: { + height: 0, + borderWidth: 1, + width: "100%", + borderColor: "#fff", + }, + }, + }, + }, + labelLine: { + lineStyle: { + color: "#fff", + }, + }, + emphasis: { + itemStyle: { + shadowBlur: 10, + shadowOffsetX: 0, + shadowColor: "rgba(0,0,0,0.5)", + }, + }, + }, + ], + }; + newEchartBar && newEchartBar.setOption(option); + }, [id, title, xData, yData]) + + return ( +
+
+ ) +} \ No newline at end of file diff --git a/src/military/qz2022/statistics/index.jsx b/src/military/qz2022/statistics/index.jsx index c6cb66f28..1f2c9649a 100644 --- a/src/military/qz2022/statistics/index.jsx +++ b/src/military/qz2022/statistics/index.jsx @@ -1,29 +1,33 @@ import React from "react"; -import btn from "../image/btn-right.png"; import './index.scss'; import '../../index.scss'; +// import EchartBar from './EchartBar'; +import EchartPie from './EchartPie'; + function Statistics({ form, showNotification, match, history }) { return ( -
+
-
交流互动
-
-

集萃群智体会

-

与论坛成员交流比赛经验,分享参赛心得

-

汇聚赛事资讯

-

助您第一时间解读竞赛动态,把握赛事脉搏

-
-
- 了解详情 - +
+
竞赛总报名数
+
竞赛总报名数
- + {/*
*/} + + {/* */} + {/*
*/}
) } diff --git a/src/military/qz2022/statistics/index.scss b/src/military/qz2022/statistics/index.scss index f42818ac7..cf0b9a520 100644 --- a/src/military/qz2022/statistics/index.scss +++ b/src/military/qz2022/statistics/index.scss @@ -1,61 +1,11 @@ .statistics { - margin: 9rem auto; - padding: 0 1.5rem; - background: #fff; - .statistics-left { - float: left; - position: relative; - top: -5rem; - width: 56.6%; - box-shadow: 0px 3px 8px rgba(219, 227, 255, 0.7) inset; - margin-bottom: -3.5rem; - padding: 1.25rem; - } + display: flex; .statistics-words { - display: inline-block; - padding: 1.5rem; + width: 16.25%; + margin-right: 1rem; } - .statistics-tit { - display: inline-block; - font-weight: 700; - color: #2e3341; - font-size: 1.25rem; - line-height: 1rem; - - &::after { - content: ""; - display: inline-block; - width: 100%; - height: 1px; - background-color: #2e5bfe; - } - } - .statistics-conten { - font-size: 1rem; - line-height: 1.625rem; - } - - .statistics-btn { - margin-top:1.5rem; - width: 9.5rem; - height: 2.5rem; - display: flex; - justify-content: space-between; - align-items: center; - border: 2px solid #2e5bfe; - background-color: #2e5bfe; - } - - .detail1 { - white-space: nowrap; - color: #ffffff; - font-size: 1rem; - font-weight: 400; - margin-left:1em; - } - - .iconPlay1 { - height: 100%; + .echart-box { + width: 50vw; } }