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

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

@@ -332,12 +332,12 @@ function JupyterTPI (props) {
         </p>
         <p className="jupyter_btn">
            {/*sync | poweroff */}
-          {/*<Button*/}
-          {/*  className="btn_common"*/}
-          {/*  type="link"*/}
-          {/*  icon="history"*/}
-          {/*  onClick={handleClickResetTpi}*/}
-          {/*>重置实训</Button>*/}
+          <Button
+            className="btn_common"
+            type="link"
+            icon="history"
+            onClick={handleClickResetTpi}
+          >重置实训</Button>
 
           <Button
             className="btn_common"

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

@@ -590,7 +590,7 @@ class Challengesjupyter extends Component {
 															<p className="challenbaocuntest" type="upload" >导入</p>
 														</div>
 													</Upload>
-													{/*<button type="button" className="ant-btn deletebuttom chongzhistyles"  onClick={this.handleClickResetTpi}><span>重置环境</span></button>*/}
+													<button type="button" className="ant-btn deletebuttom chongzhistyles"  onClick={this.handleClickResetTpi}><span>重置环境</span></button>
 
 												</div>