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

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

@@ -175,7 +175,7 @@ class Listofworks extends Component {
 								"color": '#747A7F',
 								"text-align": "center"
 							}
-						}>{record.cost_time}
+						}>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time }
         </span>
 					)
 
@@ -442,13 +442,12 @@ class Listofworks extends Component {
 					align: 'center',
 					className:'font-14',
 					render: (text, record) => (
-
 						<span style={
 							{
 								"color": '#747A7F',
 								"text-align": "center"
 							}
-						}>{record.cost_time}
+						}>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time }
         </span>
 					)
 

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

@@ -187,6 +187,23 @@ class Listofworksstudentone extends Component {
         </span>
 					),
 				},
+				{
+					title: '实战耗时',
+					dataIndex: 'cost_time',
+					key: 'cost_time',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span style={
+							{
+								"color": '#747A7F',
+								"text-align": "center"
+							}
+						}>{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time }
+        </span>
+					)
+
+				},
 				{
 					title: '更新时间',
 					dataIndex: 'updatetime',
@@ -499,6 +516,7 @@ class Listofworksstudentone extends Component {
 						name: teacherdata.user_name,
 						stduynumber: teacherdata.student_id,
 						classroom: teacherdata.group_name,
+						cost_time: teacherdata.cost_time,
 						submitstate: teacherdata.work_status === 0 ? "未提交" : teacherdata.work_status === 1 ? "按时提交" : teacherdata.work_status === 2 ? "延时提交" : "未提交",
 						// updatetime:this.state.teacherdata.student_works[i].update_time,
 						// updatetime:"",
@@ -542,6 +560,7 @@ class Listofworksstudentone extends Component {
 					name: student_works[i].user_name,
 					stduynumber: student_works[i].student_id,
 					classroom: student_works[i].group_name,
+					cost_time: student_works[i].cost_time,
 					submitstate: student_works[i].work_status === 0 ? "未提交" : student_works[i].work_status === 1 ? "按时提交" : student_works[i].work_status === 2 ? "延时提交" : "未提交",
 					// updatetime:this.state.teacherdata.student_works[i].update_time,
 					// updatetime:"",
@@ -619,6 +638,7 @@ class Listofworksstudentone extends Component {
 					name: teacherdata.user_name,
 					stduynumber: teacherdata.student_id,
 					classroom: teacherdata.group_name,
+					cost_time: teacherdata.cost_time,
 					submitstate: teacherdata.work_status === 0 ? "未提交" : teacherdata.work_status === 1 ? "按时提交" : teacherdata.work_status === 2 ? "延时提交" : "未提交",
 					// updatetime:this.state.teacherdata.student_works[i].update_time,
 					// updatetime:"",