From 90b9a661d64b19cf92084285590e1ed5513eb0f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 20 Jul 2019 18:08:54 +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

---
 .../shixunHomework/Listofworksstudentone.js   |  3 +--
 .../shixunHomework/ShixunHomeworkPage.js      | 22 ++++++++-----------
 .../shixunHomework/ShixunStudentWork.js       |  7 ++++--
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 7f9ab561f..a83fec2ee 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -1591,7 +1591,6 @@ class Listofworksstudentone extends Component {
 
 	// 设置数据
 	seacthdatat = (teacherdata,student_works,work_efficiency,course_group_info) => {
-	 debugger
 		let {page, limit} = this.state;
 		let datalist = [];
 		let columns = this.state.columns;
@@ -2640,7 +2639,7 @@ class Listofworksstudentone extends Component {
 															</div>
 															:"")
 														:
-														(teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
+														(teacherdata&&teacherdata.time_status!==undefined&&teacherdata.time_status=== 0? "":
 															this.props.isNotMember()===false?
 																<div className={"computeTimes font-13"}>
 																	计算成绩
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
index aa2e32c49..9e731f105 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
@@ -24,7 +24,7 @@ class ShixunHomeworkPage extends Component {
 		super(props);
 		// this.answerMdRef = React.createRef();
 		this.state = {
-			tab: 0,
+			tab: ["0"],
 			jobsettingsdata: undefined,
 			teacherdata: undefined,
 			code_review: false,
@@ -141,9 +141,8 @@ class ShixunHomeworkPage extends Component {
 
 	render() {
 		let {tab, teacherdata,  jobsettingsdata} = this.state;
+
 		const isAdmin = this.props.isAdmin();
-		console.log(tab);
-		console.log("147147147147147147147");
 		return (
 			<div className="newMain clearfix ">
 				<div className={"educontent mb20"} style={{width: "1200px"}}>
@@ -188,8 +187,8 @@ class ShixunHomeworkPage extends Component {
 											onClick={(e) => this.ChangeTab(2)}>
 											代码查重</a> : ""}
 								{parseInt(tab) === 3?
-								<style>{
-									`
+									<style>{
+										`
                                     .poll_list a.active:after {
                                         content: '';
                                         width: 57px;
@@ -200,7 +199,7 @@ class ShixunHomeworkPage extends Component {
                                         position: absolute;
                                         }
                                     `
-								}</style>
+									}</style>
 									:""}
 								<a className={parseInt(tab) === 3 ? "active" : ""}
 									 onClick={(e) => this.ChangeTab(3)}
@@ -280,13 +279,10 @@ class ShixunHomeworkPage extends Component {
 
 					/>
 
-					{parseInt(tab) === 0 ?<Listofworksstudentone    triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Listofworksstudentone>:""}
-
-					{parseInt(tab) === 1 ?<Workquestionandanswer   triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Workquestionandanswer>:""}
-
-					{parseInt(tab) === 2 ?<ShixunStudentWork   triggerRef={this.bindRef} {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></ShixunStudentWork>:""}
-
-					{parseInt(tab) === 3 ?<Trainingjobsetting   triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Trainingjobsetting>:""}
+					{parseInt(tab) === 0 ?<Listofworksstudentone    triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Listofworksstudentone>
+						:parseInt(tab) === 1 ?<Workquestionandanswer   triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Workquestionandanswer>
+							:parseInt(tab) === 2 ?<ShixunStudentWork   triggerRef={this.bindRef} {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></ShixunStudentWork>
+								:parseInt(tab) === 3 ?<Trainingjobsetting   triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Trainingjobsetting>:""}
 
 				</div>
 			</div>
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
index 81b98a854..ed399af98 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
@@ -76,9 +76,12 @@ class ShixunStudentWork extends Component {
 		console.log("ShixunStudentWork");
 		console.log("componentDidMount");
 		this.props.triggerRef(this);
-     this.getupdata();
-     this.getTrainingjobsetting();
+		this.getTrainingjobsettings();
 	}
+	getTrainingjobsettings=()=>{
+		this.getupdata();
+		this.getTrainingjobsetting();
+}
 	// 获取数据地方
 	getTrainingjobsetting = () => {