From 2f86950a9e7c833c6904ee6068d92b0a90ccd8c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Wed, 17 Jul 2019 17:35:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/shixunHomework/Listofworks.js     | 36 +++++++++++++++++++
 .../shixunHomework/Listofworksstudentone.js   | 25 +------------
 2 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index 1a721f8b3..d5956122c 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -162,6 +162,23 @@ class Listofworks 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}
+        </span>
+					)
+
 				},
 				{
 					title: '更新时间',
@@ -418,6 +435,24 @@ class Listofworks extends Component {
 						<span style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</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}
+        </span>
+					)
+
+				},
 				{
 					title: '完成情况',
 					dataIndex: 'completion',
@@ -763,6 +798,7 @@ class Listofworks 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:"",
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 6d2f5c9c9..1fa89ee74 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -1033,30 +1033,7 @@ class Listofworksstudentone extends Component {
 						/> : ""
 					}
 					<div className={"educontent mb20"}>
-						<div className="educontent mb30">
-							<p className="clearfix mb20 mt10">
-								<ActionBtn className=" fl "
-													 to={`/courses/${this.props.match.params.coursesId}`}>{jobsettingsdata === undefined ? "" : jobsettingsdata.data.course_name}</ActionBtn>
-								<span className="color-grey-9 fl ml3 mr3">&gt;</span>
-								<ActionBtn
-									className=" fl "
-									to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_id === undefined ? "" : jobsettingsdata.data.category.category_id}`}>{jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_name}</ActionBtn>
-								<span className="color-grey-9 fl ml3 mr3">&gt;</span>
-								<WordsBtn className="fl">作业详情</WordsBtn>
-							</p>
-						</div>
-						<div className="educontent mb30">
-							<p className=" fl color-black  summaryname" style={{heigth:"33px"}}>
-								{jobsettingsdata === undefined ? "" : jobsettingsdata.data.homework_name}
-							</p>
-							<CoursesListType
-								typelist={jobsettingsdata === undefined ? [""] : jobsettingsdata.data.homework_status}
-							/>
-							<p className="color-grey-6 fr font-16  summaryname  ml20"
-								 onClick={() => this.props.history.goBack()}>返回</p>
-							<p className="color-grey-6 fr font-16"></p>
-
-						</div>
+						
 						<div className="edu-back-white">