From cc874ca56bb20180ee72f82d95026cefedc22aad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 5 Sep 2019 19:43:46 +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

---
 public/react/config/webpack.config.dev.js     |  2 +-
 .../react/src/modules/courses/css/Courses.css |  2 +-
 .../shixunHomework/Listofworksstudentone.js   |  3 +-
 .../shixunHomework/ShixunWorkReport.js        | 41 +++++++++++--------
 4 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/public/react/config/webpack.config.dev.js b/public/react/config/webpack.config.dev.js
index de3bffa48..15bba890a 100644
--- a/public/react/config/webpack.config.dev.js
+++ b/public/react/config/webpack.config.dev.js
@@ -32,7 +32,7 @@ module.exports = {
   // See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.s
 	// devtool: "cheap-module-eval-source-map",
   // 开启调试
-  devtool: "source-map",  // 开启调试
+  //devtool: "source-map",  // 开启调试
   // These are the "entry points" to our application.
   // This means they will be the "root" imports that are included in JS bundle.
   // The first two entry points enable "hot" CSS and auto-refreshes for JS.
diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css
index 74637571f..bea982aac 100644
--- a/public/react/src/modules/courses/css/Courses.css
+++ b/public/react/src/modules/courses/css/Courses.css
@@ -848,7 +848,7 @@ a.white-btn.use_scope-btn:hover{
     font-family: MicrosoftYaHei;
     font-weight: 400;
     color: rgba(51,51,51,1);
-    cursor: pointer;
+    /*cursor: pointer;*/
     max-width: 825px;
     overflow: hidden;
     text-overflow: ellipsis;
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index b6ad61a40..73fd50e4a 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -2104,7 +2104,8 @@ class Listofworksstudentone extends Component {
 		this.setState({
 			userids: e.myid,
 		})
-		this.viewtrainingt(e.myid);
+		// this.viewtrainingt(e.myid);
+		window.open(`/courses/${this.state.props.match.params.coursesId}/shixun_homeworks/${e.myid}/shixun_work_report`, '_blank');
 	}
 	// 关闭调分
 	cancelModulationModels = () => {
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
index 05586a9ba..48671470e 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
@@ -213,7 +213,7 @@ class ShixunWorkReport extends Component {
 		let homeworkid=this.props.match.params.homeworkid;
 		const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
 
-		let showAppraiseModals=this.props&&this.props.isAdminOrTeacher()===true?work_comment_hidden===true?true:false:work_comment===null?false:true;
+		let showAppraiseModals=this.props&&this.props.isAdminOrTeacher()===true?work_comment_hidden===false?true:false:work_comment===null?false:true;
 
 		return (
 
@@ -291,22 +291,22 @@ class ShixunWorkReport extends Component {
 									margin-bottom: 19px;
 					  	}
 					  	.passfont{
-					  	    display: inline-block;
+					  	    // display: inline-block;
     							margin-right: 72px;
 
 					  	}
 					  	.passfontmid{
-					  	    display: inline-block;
+					  	    // display: inline-block;
     							margin-right: 36px;
 
 					  	}
 					  	.passfontbom{
-  	    					display: inline-block;
+  	    					// display: inline-block;
     							margin-right: 58px;
 
 					  	}
 					  	.passfontbommid{
-  	   						display: inline-block;
+  	   						// display: inline-block;
     							margin-right: 93px;
 
 					  	}
@@ -322,6 +322,10 @@ class ShixunWorkReport extends Component {
 					  	.mt19{
 					  	  margin-top:19px;
 					  	}
+					  	.passbox{
+						   display: inline-block;
+						   height: 50px;
+					  	}
 						`
 					}</style>
 					<div className="stud-class-set">
@@ -333,23 +337,28 @@ class ShixunWorkReport extends Component {
 
 									<div className="fl edu-back-white ml10 ">
 										<img alt="头像" className="radius" height="91" id="nh_user_logo" name="avatar_image"
-												 src={"https://pre-newweb.educoder.net/images/avatars/User/8686"}
+												 src={data&&data.image_url}
 												 width="91"/>
 									</div>
 
 									<div className={"fl edu-back-white ml39 "}>
-										   <p className={"back_font"}>陈晓</p>
+										   <p className={"back_font"}>{data&&data.username}</p>
 
 										   <p className={"mb16"}>
-													<span className={"passfont"}><span className={"color999"}>通过：</span>  <span className={"colorCF3B3B"}>{data&&data.complete_count}/{data&&data.challenges_count}</span></span>
-													<span 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></span>
-													<span><span className={"color999"}>通关时间：</span>  <span className={data&&data.passed_time===null?"color999":"color333"}>{data&&data.passed_time===null?'--':data&&data.passed_time}</span></span>
-											 </p>
-
-									   	 <p>
-												 <span className={"passfontbom"}><span className={"color999"}>经验值：</span>  <span  className={"color333"}>{data&&data.myself_experience}/{data&&data.total_experience}</span></span>
-												 <span className={"passfontbommid"}><span className={"color999"}>完成效率：</span> <span  className={data&&data.efficiency===null?"color999":"color333"}>{data&&data.efficiency===null?'--':data&&data.efficiency}</span></span>
-												 <span><span className={"color999"}>实战耗时：</span> <span className={data&&data.efficiency===null?"color999":"color333"}>{data&&data.time_consuming===null?'--':data&&data.time_consuming}</span></span>
+												 <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={"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>
+												 </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}</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>
 
 									</div>