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',
{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',
+ + 当前完成关卡: {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}*/}