From 4210f684a4d1530d32ddf3e9416d978a33966536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 1 Nov 2019 18:00:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/images/educoder/imperialcrown.png | Bin 0 -> 1405 bytes public/images/educoder/pdfs.png | Bin 0 -> 3499 bytes .../modules/courses/statistics/Statistics.css | 3 ++- .../src/modules/courses/statistics/Statistics.js | 10 +++++++--- public/react/src/modules/tpm/NewHeader.js | 2 +- .../src/modules/user/usersInfo/publicCreatNew.js | 3 +-- 6 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 public/images/educoder/imperialcrown.png create mode 100644 public/images/educoder/pdfs.png diff --git a/public/images/educoder/imperialcrown.png b/public/images/educoder/imperialcrown.png new file mode 100644 index 0000000000000000000000000000000000000000..2ac43787e8c678352d6a9261f242b1399f210417 GIT binary patch literal 1405 zcmV-@1%mpCP)$ zTWl0%7(Hi}0u@+Ejl>`jiK$d+cNRen35rA$Z&4sB>23=`NeCdy8$4*V8hs!>p>hcc z1%d81pi(v75)EER@CNKmi(DE70nun|umvkDJIBnnAf;P6+uiO`o!9x!_nmWg|8M^9 z|A{N$kwjSG<$#v7)8XqdBP&QM-}IPo0&acTp=EHiq7xT#8O`V``R12*gJhN80r5*f z1)a@c9MqjO>%PvXNqIF$KPf2^JP+g4YESpAU$?j@#LE{ zqmTdZ3{tFoA%Ha=g)d^TZmq}ItcK;~A0)e?4067KG}x0G@^8?%oq^g0Pw`m{%DF*0 zvEVBF-ntu7Nm@FH{kYaYi6htjl@>0;;M^M&3)KLc*E`&!PH0T#UHfr8UemC{-ZYiULmL zEs>^-@^k}MQ-vRGDn{8*n_L&C?9fyQTOo~r+YEtvkn2%a`)Rhe`f98mh{VCKAWg`M zC}IzMC6ifNeKs5UlA}&T#XXSb1DKKgc#yw=m_=FTKSCIrqRbdz|6bJS&1$j4$mEqma`#1^C3-4 zyN1E#lpVecj`Mli;PU{tu?ug3s6imI!)@$RwE_FkD#&riiN1e`H3*a}A*-Ea!?nZH zAXI^P)bnmV6-&dIN?EgqKyi0k_GPSuJPyGERR&>9#`)4pz@Gp#f-oVCN(-7gIDrv< zfBQZt7TOCan1!VOp%jcU7@g2=kQH8&v*plVETplPW@J%^L7^ugZR{`HbHbCHOEdaL zyFqrS1djISq;P*JV(?}Lq6a!=vE;2nGoa!9g@51jFQJ{jmvticx!rJ6g1!oeJm?NHe_8T$dCo7;+8AuW#;TP{)Sx z5TIgDyxNyd9Sm$k>9`$a^*K+t90f_$1JHPI8XUM+M&;g@BbykE-gKU3rz2Nc<(nYP zzN`jvFUYkphDTVs`c#heW>iLvi-*EF8HTj5$3r_}GtIg=-53;F3~5zrHhdojUS=S= zDeL3=;fZjZ?=AodL97RTFVWnxC(qilT3%M=tx)1w zFxjjAT}g&9iGj%O)CRfh);i!G+82V{1)s5$rM2H?mDv@ROpO({A>piqG#Nk}%o6{_ z{j|%qkE~D>G~Q#NHgbh&=~FtgE5eZTFwJP_;zBvS7wc1neU$tkm+<-IH5yI_00000 LNkvXXu0mjfpAL>l literal 0 HcmV?d00001 diff --git a/public/images/educoder/pdfs.png b/public/images/educoder/pdfs.png new file mode 100644 index 0000000000000000000000000000000000000000..212c7178c14961e29dcbc97a4708d3cf662df535 GIT binary patch literal 3499 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 Z{~yiD(VOG;i{$_S002ovPDHLkV1mecw?+T} literal 0 HcmV?d00001 diff --git a/public/react/src/modules/courses/statistics/Statistics.css b/public/react/src/modules/courses/statistics/Statistics.css index 0281d3131..0aa70329d 100644 --- a/public/react/src/modules/courses/statistics/Statistics.css +++ b/public/react/src/modules/courses/statistics/Statistics.css @@ -40,7 +40,8 @@ width: 60px; height: 60px; border-radius: 50%; - box-shadow: 0px 0px 12px rgba(0,0,0,0.2); + border:1px solid #F4F4F4; + /*box-shadow: 0px 0px 12px rgba(0,0,0,0.2);*/ } .huangguans{ diff --git a/public/react/src/modules/courses/statistics/Statistics.js b/public/react/src/modules/courses/statistics/Statistics.js index 0166000cf..e951d44ab 100644 --- a/public/react/src/modules/courses/statistics/Statistics.js +++ b/public/react/src/modules/courses/statistics/Statistics.js @@ -6,8 +6,9 @@ import Dropdownbox from './Dropdownbox'; import Dynamiclist from './Dynamiclist'; import NoneData from "../../courses/coursesPublic/NoneData"; import './Statistics.css'; - +const qs = require('qs'); const { TabPane } = Tabs; + class Statistics extends Component{ constructor(props){ super(props); @@ -163,7 +164,10 @@ class Statistics extends Component{ group_id:group_ids } axios.get(url,{params: - data + data, + paramsSerializer: function(params) { + return qs.stringify(params, {arrayFormat: 'brackets'}) + } }).then((response)=>{ if(response === undefined){ return @@ -434,7 +438,7 @@ class Statistics extends Component{ return(
  • - + diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 64d413f88..6bfce6616 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -609,7 +609,7 @@ submittojoinclass=(value)=>{ getUser=(url,type)=>{ if(type==="projects"){ - if(!this.props.user&&this.props.user.email){ + if(this.props.user&&this.props.user.email===undefined||this.props.user&&this.props.user.email===null||this.props.user&&this.props.user.email===""){ this.openNotification("请先绑定邮箱，谢谢"); return } diff --git a/public/react/src/modules/user/usersInfo/publicCreatNew.js b/public/react/src/modules/user/usersInfo/publicCreatNew.js index 09431f540..3da033b9a 100644 --- a/public/react/src/modules/user/usersInfo/publicCreatNew.js +++ b/public/react/src/modules/user/usersInfo/publicCreatNew.js @@ -17,8 +17,7 @@ class publicCreateNew extends Component{ //头部获取是否已经登录了 getUser=(url)=> { - console.log(this.props) - if (!this.props.user && this.props.user.email) { + if (this.props.user&&this.props.user.email===undefined||this.props.user&&this.props.user.email===null||this.props.user&&this.props.user.email==="") { this.props.showNotification("请先绑定邮箱，谢谢"); return }