实训作业返回调整

public/react/src/AppConfig.js

@@ -41,9 +41,9 @@ export function initAxiosInterceptors(props) {
     var proxy = "http://localhost:3000"
         // proxy = "http://testbdweb.trustie.net"
         // proxy = "http://testbdweb.educoder.net"
-        //proxy = "https://pre-newweb.educoder.net"
-        proxy="http://47.96.87.25:48080"
-        
+
+        //proxy="http://47.96.87.25:48080"
+	      proxy = "https://pre-newweb.educoder.net"
         // wy
         // proxy="http://192.168.2.63:3001"
 

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

@@ -113,14 +113,10 @@ class ShixunHomeworkPage extends Component {
 	bindRef = ref => { this.child = ref }
 ///////////////教师截止
   gotohome=()=>{
-		console.log(this.props)
-		// let courseId=this.props.match.params.coursesId;
-		// if(courseId===undefined){
-		// 	this.props.history.push("/courses");
-		// }else{
-		// 	this.props.history.push(this.props.current_user.first_category_url);
-		// }
-	// this.props.history.goBack()
+		// console.log(this.props)
+		let {jobsettingsdatapage}=this.state
+
+		this.props.history.replace(`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.mian ===  1 ? "shixun_homeworks" :"shixun_homework"}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_id === undefined ? "" : jobsettingsdatapage.data.category.category_id}`);
 	}
 	render() {
 		let {tab, teacherdatapage,  jobsettingsdatapage} = this.state;
@@ -128,7 +124,8 @@ class ShixunHomeworkPage extends Component {
 		const isAdmin = this.props.isAdmin();
 		// console.log(119)
 	   console.log(jobsettingsdatapage);
-		console.log(this.props);
+
+
 		return (
 			<div className="newMain clearfix ">
 
@@ -137,11 +134,11 @@ class ShixunHomeworkPage extends Component {
 
 					<div className="educontent mb20">
 						<p className="clearfix mb20 mt10">
-							<Link className="btn colorgrey fl hovercolorblue " to={"/"}></Link>
+							<Link className="btn colorgrey fl hovercolorblue " to={this.props.current_user.first_category_url}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name}</Link>
 							<span className="color-grey-9 fl ml3 mr3">&gt;</span>
 							<a
 								className=" btn colorgrey fl hovercolorblue "
-								href={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_id === undefined ? "" : jobsettingsdatapage.data.category.category_id}`}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_name}</a>
+								href={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.mian ===  1 ? "shixun_homeworks" :"shixun_homework"}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_id === undefined ? "" : jobsettingsdatapage.data.category.category_id}`}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_name}</a>
 							<span className="color-grey-9 fl ml3 mr3">&gt;</span>
 							<WordsBtn className="fl">作业详情</WordsBtn>
 						</p>
@@ -241,14 +238,14 @@ class ShixunHomeworkPage extends Component {
 										<a className="fr color-blue font-16" onClick={(child)=>this.workshowmodels(this.child)}>代码查重</a>
 										: "" : ""}
 								{this.state.view_report === true ? <Link className="fr color-blue font-16" target={"_blank"}
-																												 to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${teacherdatapage&&teacherdatapage.work_id}/shixun_work_report`}>
+																												 to={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.mian ===  1 ? "shixun_homeworks" :"shixun_homework"}/${teacherdatapage&&teacherdatapage.work_id}/shixun_work_report`}>
 									查看实训报告
 								</Link> : ""}
 								{
 									teacherdatapage === undefined ? ""
 										: teacherdatapage.commit_des === null || teacherdatapage.commit_des === undefined ? "" :
 										<a className="fr color-blue font-16"
-											 href={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${teacherdatapage === undefined ? "" : teacherdatapage.id}/commitsummary/${this.props.match.params.homeworkid}`}>{teacherdatapage.commit_des}</a>
+											 href={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.mian ===  1 ? "shixun_homeworks" :"shixun_homework"}/${teacherdatapage === undefined ? "" : teacherdatapage.id}/commitsummary/${this.props.match.params.homeworkid}`}>{teacherdatapage.commit_des}</a>
 								}
 								{teacherdatapage === undefined ? "" : <Startshixuntask
 									{...this.props}

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

@@ -58,7 +58,9 @@ class ShixunWorkDetails extends Component {
 		// }else{
 		// 	window.history.go(-1)
 		// }
-		this.props.history.goBack()
+		// this.props.history.goBack()
+		// "/courses/1545/shixun_homeworks/15220/list?tab=2"
+		this.props.history.replace(`/courses/${this.props.match.params.coursesId}/shixun_homeworks/${this.props.match.params.homeworkid}/list?tab=2`);
 	}
 	render() {
     let{data}=this.state;