From a06b169973d6d704a483e0d5b9ee5076a841ace5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 3 Jan 2020 09:21:37 +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 --- .../src/modules/courses/Resource/Fileslistitem.js | 12 ++++++------ .../courses/shixunHomework/Trainingjobsetting.js | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js index 99888e558..e7e31baab 100644 --- a/public/react/src/modules/courses/Resource/Fileslistitem.js +++ b/public/react/src/modules/courses/Resource/Fileslistitem.js @@ -253,22 +253,22 @@ class Fileslistitem extends Component{ {discussMessage.is_publish===false?:""} {this.props.isAdmin? - this.eventStop(event)}> - + this.eventStop(event)}> + this.settingList()}>设置 :""} {this.props.isStudent===true&&this.props.current_user.login===discussMessage.author.login? - this.eventStop(event)}> + this.eventStop(event)}> - + this.settingList()}>设置 - + this.onDelete(discussMessage.id)}>删除 @@ -329,7 +329,7 @@ class Fileslistitem extends Component{ { discussMessage.publish_time===null?"":discussMessage.is_publish===true?moment(discussMessage.publish_time).fromNow():moment(discussMessage.publish_time).format('YYYY-MM-DD HH:mm')} - {discussMessage&&discussMessage.category_name===null?"":this.props.child===false?
所属目录：{discussMessage&&discussMessage.category_name}
:""}

diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index d15e8eaab..58de030d3 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -2678,7 +2678,7 @@ class Trainingjobsetting extends Component { onChange={this.onChangeeffectiveness} checked={this.state.work_efficiencys} style={{color: "#666666"}}>效率分(选中，则学生最终成绩包含效率分) + style={{textAlign: "left"}}>(选中，则学生最终成绩包含效率分。效率分在作业截止或者补交结束后由系统自动生成)
From 8d04fa0c7a6b2fe0c3b95f806fffdc7f7dcdf051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 3 Jan 2020 09:43:36 +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 --- .../courses/shixunHomework/ShixunWorkReport.js | 16 ++++++++-------- .../shixunreport/ConclusionEvaluation.js | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js index 90e6e6a4f..26f32eebd 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js @@ -370,11 +370,11 @@ class ShixunWorkReport extends Component { {this.props.isAdmin() ?this.confirmysl(`/student_works/${homeworkid}/export_shixun_work_report.pdf`)} - > 导出实训报告数据: + > 导出实训报告: parseInt(this.props&&this.props.user.user_id)===parseInt(data&&data.user_id)?this.confirmysl(`/student_works/${homeworkid}/export_shixun_work_report.pdf`)} - > 导出实训报告数据:"" + > 导出实训报告:"" } {/*{this.props.isAdmin() ?work_comment_hidden===true? "":

{data&&data.username}

-

- -

通过关卡： {data&&data.complete_count}/{data&&data.challenges_count}
+

+ +

当前完成关卡： {data&&data.complete_count}/{data&&data.challenges_count}
经验值： {data&&data.myself_experience}/{data&&data.total_experience}
-
课堂最高完成效率： {data&&data.max_efficiency===null?'--':data&&data.max_efficiency}
完成效率： {data&&data.efficiency===null?'--':data&&data.efficiency}
+
课堂最高完成效率： {data&&data.max_efficiency===null?'--':data&&data.max_efficiency}
 -
通关时间： {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}
+
通关时间： {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}
*/}

diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js b/public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js index 8d678f335..aa2da8594 100644 --- a/public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js +++ b/public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js @@ -66,7 +66,7 @@ class ConclusionEvaluation extends Component { ), },{ - title: '最终成绩', + title: '当前成绩', dataIndex: 'grade', key: 'grade', render: (text, record) => ( @@ -81,7 +81,7 @@ class ConclusionEvaluation extends Component { ), }, { - title: '实战耗时', + title: '实战总耗时', key: 'elapsed', dataIndex: 'elapsed', From b52b1a612dfb94c6f5caa2be43e9062a66641160 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 3 Jan 2020 09:47:25 +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 --- .../modules/courses/shixunHomework/ShixunWorkReport.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js index 26f32eebd..22337d7da 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js @@ -465,17 +465,17 @@ class ShixunWorkReport extends Component {
-

{data&&data.username}

+

{data&&data.username}

-

+

当前完成关卡： {data&&data.complete_count}/{data&&data.challenges_count}
经验值： {data&&data.myself_experience}/{data&&data.total_experience}
-
完成效率： {data&&data.efficiency===null?'--':data&&data.efficiency}
-
课堂最高完成效率： {data&&data.max_efficiency===null?'--':data&&data.max_efficiency}
+
完成效率： {data&&data.efficiency===null?'--':data&&data.efficiency}
+
课堂最高完成效率： {data&&data.max_efficiency===null?'--':data&&data.max_efficiency}
 From ec3ab4d6dba56f6d1d64ce4d8effe57e474677f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 3 Jan 2020 09:49:42 +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 --- .../src/modules/courses/shixunHomework/ShixunWorkReport.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js index 22337d7da..3765b2932 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js @@ -469,17 +469,17 @@ class ShixunWorkReport extends Component {

-

当前完成关卡： {data&&data.complete_count}/{data&&data.challenges_count}
+
当前完成关卡： {data&&data.complete_count}/{data&&data.challenges_count}
经验值： {data&&data.myself_experience}/{data&&data.total_experience}
 -
完成效率： {data&&data.efficiency===null?'--':data&&data.efficiency}
+
完成效率： {data&&data.efficiency===null?'--':data&&data.efficiency}
课堂最高完成效率： {data&&data.max_efficiency===null?'--':data&&data.max_efficiency}
 -
通关时间： {data&&data.passed_time===null||data&&data.passed_time=== "--"?'--':moment(data&&data.passed_time).format('YYYY-MM-DD HH:mm')}
+
通关时间： {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}
*/}