From 14a3aacd46e08055b6772d30373c65abf85ad0b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 31 Dec 2019 16:37:18 +0800
Subject: [PATCH 1/2] =?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/Listofworksstudentone.js  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index e1c55625a..71510178e 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -1294,11 +1294,11 @@ class Listofworksstudentone extends Component {
 						record.submitstate === "未开启" ?
 							<a style={{textAlign: "center",width: '40px'}} className="color-blue"
 								 onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)}
-								 onClick={() => this.Viewstudenttraininginformationt(record)}>{record.has_comment===false?"评阅":"详情"}</a> :
+								 onClick={() => this.Viewstudenttraininginformationt(record)}>{record.has_comment===true?"详情":"评阅 "}</a> :
 							<span>
                        <a style={{textAlign: "center"}} className="color-blue maxnamewidth120"
 													onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)}
-													onClick={() => this.Viewstudenttraininginformationt(record)}>{record.has_comment===false?"评阅":"详情"}</a>
+													onClick={() => this.Viewstudenttraininginformationt(record)}>{record.has_comment===true?"详情":"评阅 "}</a>
         </span>
 					)
 				},
@@ -1656,11 +1656,11 @@ class Listofworksstudentone extends Component {
 						record.submitstate === "未开启" ?
 							<a style={{textAlign: "center",width: '40px'}} className="color-blue"
 								 onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)}
-								 onClick={() => this.Viewstudenttraininginformationt(record)}>{record.has_comment===false?"评阅":"详情"}</a> :
+								 onClick={() => this.Viewstudenttraininginformationt(record)}>{record.has_comment===true?"详情":"评阅"}</a> :
 							<span>
                        <a style={{textAlign: "center"}} className="color-blue"
 													onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)}
-													onClick={() => this.Viewstudenttraininginformationt(record)}>{record.has_comment===false?"评阅":"详情"}</a>
+													onClick={() => this.Viewstudenttraininginformationt(record)}>{record.has_comment===true?"详情":"评阅"}</a>
         </span>
 					)
 				},
@@ -2125,7 +2125,7 @@ class Listofworksstudentone extends Component {
 					stduynumber: student_works[i].student_id,
 					classroom: student_works[i].group_name,
 					cost_time: student_works[i].cost_time,
-					has_comment:teacherdata[i].has_comment,
+					has_comment:student_works[i].has_comment,
 					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:"",
@@ -2650,7 +2650,7 @@ class Listofworksstudentone extends Component {
 					stduynumber: student_works[i].student_id,
 					classroom: student_works[i].group_name,
 					cost_time: student_works[i].cost_time,
-					has_comment:teacherdata[i].has_comment,
+					has_comment:student_works[i].has_comment,
 					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:"",

From 84bbb2b78909a4266655275c22a0ea01f91c9bac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 31 Dec 2019 16:45:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shixunHomework/Listofworksstudentone.js   | 26 ++-----------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 438df7b05..975088862 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -1673,35 +1673,13 @@ class Listofworksstudentone extends Component {
 	}
 
 	componentDidCatch(error, info) {
-		// console.log("-----------------------------905错误信息");
-		// console.log(error);
-		// console.log(info);
+
 
 	}
 
-	// componentWillReceiveProps(nextProps) {
-	// 	console.log("+++++++++916");
-	// 	console.log(nextProps);
-	// 	console.log(this.props)
-	// 	// console.log(this.props.isAdmin());
-	// 	if (nextProps.code_review != this.props.code_review) {
-	// 		if (nextProps.code_review !== undefined) {
-	// 			console.log("diaoyonglwangluo1");
-	// 			if(this.props.isAdmin() === true){
-	// 				this.tearchar();
-	// 			}else{
-	// 				this.student();
-	// 			}
-	// 		}
-	// 		}
-	//
-	// }
+
 
 	componentDidMount() {
-		// console.log("componentDidMount ");
-		// console.log("调用子组件 ");
-		// console.log(this.props);
-		// console.log(this.props.isAdmin())
 		this.student();
 	}