Merge remote-tracking branch 'origin/jupyter' into jupyter

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

@@ -125,15 +125,21 @@ class Challengesjupyter extends Component {
 		console.log("propsysl");
 		console.log(propsysl);
 		let id=this.props.match.params.shixunId;
+     var jupyter_port="";
+			 try{
+				 jupyter_port= parseInt(propsysl.shixunsDetails.jupyter_port);
+			 }catch (e) {
+				 jupyter_port=propsysl.shixunsDetails.jupyter_port;
 
+			 }
 		const url=`/shixuns/${id}/update_jupyter.json`;
 		const data={
 			identifier:id,
-			jupyter_port:propsysl.shixunsDetails.jupyter_port
+			jupyter_port:jupyter_port,
 		}
 		axios.post(url, data)
 			.then((result) => {
-				if (result.data.status == 0) {
+				if (result.data.status === 0) {
 					this.props.showNotification(`应用成功`);
 				}
 			}).catch((error) => {