调整

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

@@ -370,11 +370,11 @@ class ShixunWorkReport extends Component {
 						{this.props.isAdmin() ?<a
 							className=" color-blue font-14 fr  ml20 mt15"
 							onClick={()=>this.confirmysl(`/student_works/${homeworkid}/export_shixun_work_report.pdf`)}
-						> <Spin size="small" spinning={this.state.isspinning}>导出实训报告数据</Spin></a>:
+						> <Spin size="small" spinning={this.state.isspinning}>导出实训报告</Spin></a>:
 							parseInt(this.props&&this.props.user.user_id)===parseInt(data&&data.user_id)?<a
 								className=" color-blue font-14 fr  ml20 mt15"
 								onClick={()=>this.confirmysl(`/student_works/${homeworkid}/export_shixun_work_report.pdf`)}
-							> <Spin size="small" spinning={this.state.isspinning}>导出实训报告数据</Spin></a>:""
+							> <Spin size="small" spinning={this.state.isspinning}>导出实训报告</Spin></a>:""
 						}
 						{/*{this.props.isAdmin() ?work_comment_hidden===true? "":<a*/}
 							{/*className=" color-blue font-14 fr  ml20 mt15"*/}
@@ -467,20 +467,20 @@ class ShixunWorkReport extends Component {
 									<div className={"fl edu-back-white ml39 "}>
 										   <p className={"back_font"}>{data&&data.username}</p>
 
-										   <p className={"mb16"}>
+										   <p className={"mb16 mt20"}>
-												 <span className={"passbox"}>
+												 <span className={"passbox "}>
-													  <div className={"passfont"}><span className={"color999"}>通过关卡：</span>  <span className={"colorCF3B3B"}>{data&&data.complete_count}/{data&&data.challenges_count}</span></div>
+													  <div className={"passfont mb10"}><span className={"color999"}>当前完成关卡：</span>  <span className={"colorCF3B3B"}>{data&&data.complete_count}/{data&&data.challenges_count}</span></div>
 												    <div className={"passfontbom"}><span className={"color999"}>经验值：</span>  <span  className={"color333"}>{data&&data.myself_experience}/{data&&data.total_experience}</span></div>
 												 </span>
 
 												 <span className={"passbox"}>
-												  	<div className={"passfontmid"}><span className={"color999"}>课堂最高完成效率：</span>  <span className={data&&data.max_efficiency===null?"color999":"color333"}>{data&&data.max_efficiency===null?'--':data&&data.max_efficiency}</span></div>
 													  <div className={"passfontbommid"}><span className={"color999"}>完成效率：</span> <span  className={data&&data.efficiency===null?"color999":"color333"}>{data&&data.efficiency===null?'--':data&&data.efficiency}</span></div>
+												  	<div className={"passfontmid mb10"}><span className={"color999"}>课堂最高完成效率：</span>  <span className={data&&data.max_efficiency===null?"color999":"color333"}>{data&&data.max_efficiency===null?'--':data&&data.max_efficiency}</span></div>
 												 </span>
 
 												 <span className={"passbox"}>
-												   	<div><span className={"color999"}>通关时间：</span>  <span className={data&&data.passed_time===null?"color999":"color333"}>{data&&data.passed_time===null||data&&data.passed_time=== "--"?'--':moment(data&&data.passed_time).format('YYYY-MM-DD HH:mm')}</span></div>
+												   	<div className={"mb10"}><span className={"color999"}>通关时间：</span>  <span className={data&&data.passed_time===null?"color999":"color333"}>{data&&data.passed_time===null||data&&data.passed_time=== "--"?'--':moment(data&&data.passed_time).format('YYYY-MM-DD HH:mm')}</span></div>
-												    <div><span className={"color999"}>实战耗时：</span> <span className={data&&data.efficiency===null?"color999":"color333"}>{data&&data.time_consuming===null?'--':data&&data.time_consuming}</span></div>
+												    {/*<div><span className={"color999"}>实战耗时：</span> <span className={data&&data.efficiency===null?"color999":"color333"}>{data&&data.time_consuming===null?'--':data&&data.time_consuming}</span></div>*/}
 												 </span>
 									   	 </p>
 

public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js

@@ -66,7 +66,7 @@ class ConclusionEvaluation extends Component {
 				</span>
 				),
 			},{
-			title: '最终成绩',
+			title: '当前成绩',
 			dataIndex: 'grade',
 			key: 'grade',
 			render: (text, record) => (
@@ -81,7 +81,7 @@ class ConclusionEvaluation extends Component {
 				</span>
 			),
 		}, {
-			title: '实战耗时',
+			title: '实战总耗时',
 			key: 'elapsed',
 			dataIndex: 'elapsed',