From 93af3c7872ee51ac0fcc769be698a7020e3af6da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 7 Sep 2019 15:03:56 +0800
Subject: [PATCH 1/4] b
---
public/react/config/webpack.config.prod.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/react/config/webpack.config.prod.js b/public/react/config/webpack.config.prod.js
index 8cab0465f..d5ad7593a 100644
--- a/public/react/config/webpack.config.prod.js
+++ b/public/react/config/webpack.config.prod.js
@@ -62,7 +62,7 @@ module.exports = {
// We generate sourcemaps in production. This is slow but gives good results.
// You can exclude the *.map files from the build during deployment.
// devtool: shouldUseSourceMap ? 'nosources-source-map' : false, //正式版
- devtool: shouldUseSourceMap ? 'source-map' : false,//测试版
+ devtool: shouldUseSourceMap ? 'source-map' : 'source-map',//测试版
// In production, we only want to load the polyfills and the app code.
entry: [require.resolve('./polyfills'), paths.appIndexJs],
output: {
From 9000ee2a3d2647f6de751942983b8e35455b2351 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 7 Sep 2019 15:11:41 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/modules/courses/groupjobbank/GroupPackage2.js | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/public/react/src/modules/courses/groupjobbank/GroupPackage2.js b/public/react/src/modules/courses/groupjobbank/GroupPackage2.js
index da48f3404..f6fa8361a 100644
--- a/public/react/src/modules/courses/groupjobbank/GroupPackage2.js
+++ b/public/react/src/modules/courses/groupjobbank/GroupPackage2.js
@@ -82,11 +82,16 @@ class GroupPackage extends Component {
}
{
- datas&&datas.group_info&&datas.group_info.base_on_project?
+ datas&&datas.group_info&&datas.group_info.base_on_project===1?
基于项目实施
（学生必须在本平台创建项目，项目管理员可以提交作品）
+ :datas&&datas.group_info&&datas.group_info.base_on_project===0?
+
+ 基于项目实施
+ （无需在平台创建项目，任意小组成员均可以提交作品）
+
:""
}
From cbf8412a3cffbf35e018f1791601e16f6ebde921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 7 Sep 2019 15:26:41 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A2=9E=E5=8A=A0tpi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/modules/courses/shixunHomework/ShixunWorkReport.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
index d5ab535e2..5c90d07fe 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
@@ -395,7 +395,10 @@ class ShixunWorkReport extends Component {
通关时间： {data&&data.passed_time===null||data&&data.passed_time=== "--"?'--':moment(data&&data.passed_time).format('YYYY-MM-DD HH:mm')}
- 实战耗时： {data&&data.time_consuming===null?'--':data&&data.time_consuming}
+ 实战耗时：
+ 学员在EduCoder做实训花费的时间
+
}>{data&&data.time_consuming===null?'--':
+ data&&data.time_consuming}
From b7dee6bf82756d89bb30511c0e69c07c139e42b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 7 Sep 2019 15:28:52 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A2=9E=E5=8A=A0tpi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/modules/courses/shixunHomework/ShixunWorkReport.js | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
index 5c90d07fe..d5ab535e2 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
@@ -395,10 +395,7 @@ class ShixunWorkReport extends Component {
通关时间： {data&&data.passed_time===null||data&&data.passed_time=== "--"?'--':moment(data&&data.passed_time).format('YYYY-MM-DD HH:mm')}
- 实战耗时：
- 学员在EduCoder做实训花费的时间
-
}>{data&&data.time_consuming===null?'--':
- data&&data.time_consuming}
+ 实战耗时： {data&&data.time_consuming===null?'--':data&&data.time_consuming}