From e3670b0027f0b95cb32ce2fd7dadd9375813b19e 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 15:48:25 +0800 Subject: [PATCH 1/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 --- public/react/src/modules/user/account/ChangeHeaderPicModal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/user/account/ChangeHeaderPicModal.js b/public/react/src/modules/user/account/ChangeHeaderPicModal.js index 294916393..abb3d0e12 100644 --- a/public/react/src/modules/user/account/ChangeHeaderPicModal.js +++ b/public/react/src/modules/user/account/ChangeHeaderPicModal.js @@ -190,7 +190,7 @@ class ChangeHeaderPicModal extends Component{ From df35d2afbfae62d998f308070eac1d5a4d30a8c7 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 16:16:23 +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 --- .../shixunHomework/ShixunhomeWorkItem.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js index 6998ab93a..b09d9f533 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js @@ -294,20 +294,23 @@ class ShixunhomeWorkItem extends Component{ {/*/courses/1309/9373/listofworks*/} {/*to={`/courses/${this.props.match.params.coursesId}/${discussMessage.homework_id}/jobsettings`}*/} { - this.props.isAdmin?{discussMessage.name}:"" + this.props.isAdmin?{discussMessage.name}:"" } { - this.props.isStudent? {discussMessage.name}:"" + this.props.isStudent? {discussMessage.name}:"" } { this.props.isNotMember===true? this.props.discussMessage.private_icon===true? - {discussMessage.name} - : {discussMessage.name}:"" + {discussMessage.name} + : {discussMessage.name}:"" } From b6bf56e093b3dd3b85f9d3d2e4a4d064957e536e 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:01:13 +0800 Subject: [PATCH 3/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 --- .../shixunHomework/ShixunhomeWorkItem.js | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js index b09d9f533..e026ad622 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js @@ -336,9 +336,27 @@ class ShixunhomeWorkItem extends Component{ {discussMessage.commit_count===undefined?"":{discussMessage.commit_count} 已交} {discussMessage.uncommit_count===undefined?"":{discussMessage.uncommit_count} 未交} {/*{discussMessage.replies_count} 3 未评*/} - - {discussMessage.status_time} - + + { + discussMessage.time_status===1? + + {discussMessage.status_time} + + :discussMessage.time_status===2? + + {discussMessage.status_time} + + :discussMessage.time_status===3? + + {discussMessage.status_time} + + :discussMessage.time_status===4? + + {discussMessage.status_time} + + : + {discussMessage.status_time} + } {/* { discussMessage.replies_count != 0 && {discussMessage.replies_count} 回复 } { discussMessage.praise_num != 0 && {discussMessage.praise_num} 点赞 } 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 4/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 --- .../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 { ) + }, + { + title: '实战耗时', + dataIndex: 'cost_time', + key: 'cost_time', + align: 'center', + className:'font-14', + render: (text, record) => ( + {record.cost_time} + + ) + }, { title: '更新时间', @@ -418,6 +435,24 @@ class Listofworks extends Component { {record.updatetime} ), }, + { + title: '实战耗时', + dataIndex: 'cost_time', + key: 'cost_time', + align: 'center', + className:'font-14', + render: (text, record) => ( + + {record.cost_time} + + ) + + }, { 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 { /> : "" }
-
-

- {jobsettingsdata === undefined ? "" : jobsettingsdata.data.course_name} - > - {jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_name} - > - 作业详情 -

-
-
-

- {jobsettingsdata === undefined ? "" : jobsettingsdata.data.homework_name} -

- -

this.props.history.goBack()}>返回

-

- -
+