Merge branches 'dev_new_shixunsrepository' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_new_shixunsrepository

public/react/src/modules/tpm/jupyter/index.js

@@ -343,10 +343,10 @@ function JupyterTPI (props) {
   }
   const endonFinish= () =>{
     Modal.confirm({
-      title: '命令行连接时长提醒',
+      title: '服务中断提醒',
       content: (
         <p style={{ lineHeight: '24px' }}>
-         命令行即将中断，需要延长使用时间吗？
+         jupyter将于<Countdown value={jupytertime} format="HH:mm"/>分钟后服务中断，是否需要延长使用时间？
         </p>
       ),
       okText: '立即延长',

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

@@ -444,7 +444,7 @@ class Challengesjupyter extends Component {
 		let id=this.props.match.params.shixunId;
 		let that=this;
 		Modal.confirm({
-			title: '命令行连接时长提醒',
+			title:"jupyter将于"+<Countdown value={this.state.jupytertime} format="HH:mm" onFinish={this.onFinish}/>+"分钟后服务中断，是否需要延长使用时间？",
 			content: (
 				<p style={{ lineHeight: '24px' }}>
 					命令行即将中断，需要延长使用时间吗？