Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

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) === 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) === 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) === 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>

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.getTrainingjobsettings();
-     this.getTrainingjobsetting();
 	}
+	getTrainingjobsettings=()=>{
+		this.getupdata();
+		this.getTrainingjobsetting();
+}
 	// 获取数据地方
 	getTrainingjobsetting = () => {