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

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: {

public/react/src/modules/courses/groupjobbank/GroupPackage2.js

@@ -82,11 +82,16 @@ class GroupPackage extends Component {
 								</p>
 					}
 					{
-						datas&&datas.group_info&&datas.group_info.base_on_project?
+						datas&&datas.group_info&&datas.group_info.base_on_project===1?
 							<p>
 								<span className="ysltextcolor66">基于项目实施</span>
 								<span className="ysltextcolor05">（学生必须在本平台创建项目，项目管理员可以提交作品）</span>
 							</p>
+							:datas&&datas.group_info&&datas.group_info.base_on_project===0?
+							<p>
+								<span className="ysltextcolor66">基于项目实施</span>
+								<span className="ysltextcolor05">（无需在平台创建项目，任意小组成员均可以提交作品）</span>
+							</p>
 							:""
 					}
 				</div>

public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

@@ -251,16 +251,19 @@ class Listofworksstudentone extends Component {
 								textAlign: "center"
 							}
 						}>
-							{record.cost_time === null? "--":record.cost_time === undefined?"--":
-								<a style={
-									{
-										color: '#747A7F',
-										textAlign: "center"
+							{record.cost_time === null? "--":record.cost_time === undefined?"--":record.cost_time === "--"?"--":
+								<Tooltip  placement="bottom" title={<div>
+									学员在EduCoder做实训花费的时间
+								</div>}>
+									<span style={
+										{
+											color: '#747A7F',
+											textAlign: "center"
+										}
 									}
-								}
-									 title={"学员在EduCoder做实训花费的时间"}
-								>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
-								</a>
+									>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
+									</span>
+								</Tooltip>
 							}
 						</span>
 					)
@@ -524,16 +527,19 @@ class Listofworksstudentone extends Component {
 								textAlign: "center"
 							}
 						}>
-							{record.cost_time === null? "--":record.cost_time === undefined?"--":
+							{record.cost_time === null? "--":record.cost_time === undefined?"--":record.cost_time === "--"?"--":
+								<Tooltip  placement="bottom" title={<div>
+									学员在EduCoder做实训花费的时间
+								</div>}>
 								<a style={
 									{
 										color: '#747A7F',
 										textAlign: "center"
 									}
 								}
-									 title={"学员在EduCoder做实训花费的时间"}
 								>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
 								</a>
+								</Tooltip>
 							}
 						</span>
 				// 		<a style={
@@ -847,16 +853,19 @@ class Listofworksstudentone extends Component {
 								textAlign: "center"
 							}
 						}>
-							{record.cost_time === null ? "--":record.cost_time === undefined ?"--":
+							{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time === "--" ?"--":
+								<Tooltip  placement="bottom" title={<div>
+									学员在EduCoder做实训花费的时间
+								</div>}>
 								<a style={
 									{
 										color: '#747A7F',
 										textAlign: "center"
 									}
 								}
-									 title={"学员在EduCoder做实训花费的时间"}
 								>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
 								</a>
+								</Tooltip>
 							}
 						</span>
 					)