Merge branch 'dev_aliyun' into dev_tj

merge aliyun

app/controllers/hack_user_lastest_codes_controller.rb

@@ -172,7 +172,7 @@ class HackUserLastestCodesController < ApplicationController
       # 编程题已经发布，且之前未通关奖励积分
       @hack.increment!(:pass_num)
       if @hack.status == 1 && !@my_hack.passed?
-        reward_attrs = { container_id: game.id, container_type: 'Hack', score: @hack.score }
+        reward_attrs = { container_id: @hack.id, container_type: 'Hack', score: @hack.score }
         RewardGradeService.call(@my_hack.user, reward_attrs)
         RewardExperienceService.call(@my_hack.user, reward_attrs)
         # 评测完成更新通过数

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

@@ -152,8 +152,8 @@ function JupyterTPI (props) {
         title: '更新通知',
         content: (<div className="update_notice">
           {stopposttpip(1)}
-          <p className="update_txt">该实训已更新，更新后您编写的实训代码将会丢失</p>
+          <p className="update_txt">该实训已更新，您选择更新后之前编写的实训代码将会丢失</p>
-          <p className="update_txt">如有需要请先导出代码再进行更新</p>
+          <p className="update_txt">如有需要请先使用【jupyter中-文件-下载】保存代码，再进行更新</p>
           {/*<p className="update_txt">还未完成评测的任务代码，请自行保存</p>*/}
         </div>),
         okText: '立即更新',
@@ -332,12 +332,12 @@ function JupyterTPI (props) {
         </p>
         <p className="jupyter_btn">
            {/*sync | poweroff */}
-          {/*<Button*/}
+          <Button
-          {/*  className="btn_common"*/}
+            className="btn_common"
-          {/*  type="link"*/}
+            type="link"
-          {/*  icon="history"*/}
+            icon="history"
-          {/*  onClick={handleClickResetTpi}*/}
+            onClick={handleClickResetTpi}
-          {/*>重置实训</Button>*/}
+          >重置实训</Button>
 
           <Button
             className="btn_common"

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

@@ -424,7 +424,22 @@ class Challengesjupyter extends Component {
 		};
 		return (
 			<React.Fragment>
-				<div className="">
+				<div >
+					<style>
+						{
+						`
+						.ant-notification{
+						
+						    position: fixed;
+                z-index: 3000;
+						}
+						.ant-modal-content{
+						 position: fixed;
+             z-index: 3000;
+						}
+						`
+						}
+					</style>
 					<p className="clearfix mb20 edu-back-white">
 						<div className={"shixunjianjie"}>
 							<span className="font-16 fl">简介</span>
@@ -579,7 +594,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>
 

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

@@ -198,7 +198,7 @@
     position: fixed;
     top: 0px;
     left: 0px;
-    z-index: 999999;
+    z-index: 2800;
     right: 0px;
 }
 
@@ -210,7 +210,7 @@
     margin-top: 63px;
     bottom: 0px;
     left: 0px;
-    z-index: 999999;
+    z-index: 2800;
     right: 0px;
 }