Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into newopenshixun0316

public/react/src/AppConfig.js

@@ -132,7 +132,7 @@ export function initAxiosInterceptors(props) {
 			// proxy = "https://testeduplus2.educoder.net"
 			//proxy="http://47.96.87.25:48080"
 			proxy="https://pre-newweb.educoder.net"
-      //proxy="https://test-newweb.educoder.net"
+      proxy="https://test-newweb.educoder.net"
       // proxy="https://test-jupyterweb.educoder.net"
       // proxy="https://test-newweb.educoder.net"
       // proxy="https://test-jupyterweb.educoder.net"

public/react/src/modules/courses/signin/Signinstatistics/Signinstatistics.js

@@ -109,11 +109,12 @@ class Signinstatistics extends Component {
 
     const cols = {
       month: {
-        type: 'linear',
+        type: 'pow',
-        nice:[1,10],
+        // nice: true,
-        min:1,
+        exponent:1,
-        minLimit:1,
+        // minLimit:1,
-        minTickInterval:2
+        // tickInterval:1,
+        // minTickInterval:2
       },
       temperature:{
         type: 'linear',

public/react/src/modules/courses/signin/student/Signindetails.js

@@ -44,9 +44,9 @@ class Signindetails extends Component{
 					position: "relative",
 				}}>
 					<div className="ws100s mb20">
-						<p className="sortinxdirection xiaoshou" onClick={()=>this.props.qiandaoxiangq(false)}>
+						<p className="sortinxdirection" >
-							<i className="iconfont icon-zuojiantou  posiivsiconmyss mr5 colorbluesigin"></i>
+							<i className="iconfont icon-zuojiantou  posiivsiconmyss mr5 colorbluesigin xiaoshou" onClick={()=>this.props.qiandaoxiangq(false)}></i>
-						  <p className="fh mr20 colorbluesigin">正在签到</p>
+						  <p className="fh mr20 colorbluesigin xiaoshou" onClick={()=>this.props.qiandaoxiangq(false)}>正在签到</p>
 						</p>
 
 					</div>