From f395b238474602e902a0840c8e4556330dc539ca Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 26 Dec 2019 19:57:08 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=80=9A=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/hack_user_lastest_codes_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/hack_user_lastest_codes_controller.rb b/app/controllers/hack_user_lastest_codes_controller.rb index ff0af5958..d5405fd71 100644 --- a/app/controllers/hack_user_lastest_codes_controller.rb +++ b/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) # 评测完成更新通过数 From cf6511f9dd91e3414d2c6071ca25e0b069947953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 26 Dec 2019 20:32:36 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/tpm/jupyter/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/tpm/jupyter/index.js b/public/react/src/modules/tpm/jupyter/index.js index 8c20ac4ac..8ac58fe8d 100644 --- a/public/react/src/modules/tpm/jupyter/index.js +++ b/public/react/src/modules/tpm/jupyter/index.js @@ -152,8 +152,8 @@ function JupyterTPI (props) { title: '更新通知', content: (
{stopposttpip(1)} -

该实训已更新，更新后您编写的实训代码将会丢失

-

如有需要请先导出代码再进行更新

+

该实训已更新，您选择更新后之前编写的实训代码将会丢失

+

如有需要请先使用【jupyter中-文件-下载】保存代码，再进行更新

{/*

还未完成评测的任务代码，请自行保存

*/}
), okText: '立即更新', From bf6d94ee32197d3de953dd15865d87eaf521b939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 27 Dec 2019 09:40:40 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/tpm/jupyter/index.js | 12 ++++++------ .../tpm/shixunchild/Challenges/Challengesjupyter.js | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/public/react/src/modules/tpm/jupyter/index.js b/public/react/src/modules/tpm/jupyter/index.js index 8ac58fe8d..5efe5c729 100644 --- a/public/react/src/modules/tpm/jupyter/index.js +++ b/public/react/src/modules/tpm/jupyter/index.js @@ -332,12 +332,12 @@ function JupyterTPI (props) {

{/*sync | poweroff */} - {/*重置实训*/} + */} + From 0850d09d62041b7c2e1ce949bbd0c1184db18425 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 27 Dec 2019 09:40:56 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tpm/shixunchild/Challenges/Challengesjupyter.js | 13 ++++++++++++- .../tpm/shixunchild/shixunchildCss/Challenges.css | 4 ++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js index 2717ba6b8..4dea3edfa 100644 --- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js +++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js @@ -424,7 +424,18 @@ class Challengesjupyter extends Component { }; return ( -

+
+

简介 diff --git a/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css b/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css index 6b055be56..f4f68cdba 100644 --- a/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css +++ b/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; } From 01f8797c845011718168465d2891855ccaedbce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 27 Dec 2019 09:41:56 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/tpm/shixunchild/Challenges/Challengesjupyter.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js index 7be68d6dc..92492f7a7 100644 --- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js +++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js @@ -432,6 +432,10 @@ class Challengesjupyter extends Component { position: fixed; z-index: 3000; + } + .ant-modal-content{ + position: fixed; + z-index: 3000; } ` }