Merge branch 'jupyter' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_jupyter

public/react/src/AppConfig.js

@@ -53,6 +53,7 @@ export function initAxiosInterceptors(props) {
 			proxy="https://pre-newweb.educoder.net"
 			proxy="https://test-newweb.educoder.net"
 	    proxy="https://test-jupyterweb.educoder.net"
+	     //proxy="http://192.168.2.63:3001"
 
     // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；
     // 如果需要支持重复的请求，考虑config里面自定义一个allowRepeat参考来控制

public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js

@@ -259,7 +259,7 @@ class Challengesjupyter extends Component {
 								<div className="sortinxdirection mt60">
 									<div className="renwuxiangssi sortinxdirection">
 										<div><p className="renwuxiangqdiv">任务详情</p></div>
-										<div><p className="renwuxiangqdivtest ml24">示例</p></div>
+										<div><p className="renwuxiangqdivtest ml24">（请将实训题目写在下方）</p></div>
 									</div>
 									<div className="renwuxiangssit xaxisreverseorder">
 										<div className="challenbaocun" onClick={() => this.modifyjupyter(this.props)}><p

public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css

@@ -52,8 +52,6 @@
     width:32px;
     height:30px;
     font-size:16px;
-    font-family:MicrosoftYaHei;
-    color:#4CACFF;
     line-height:30px;
 }