diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js index 044d0a3ae..fbaa5b7c3 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js @@ -78,12 +78,12 @@ class GraduationTasksSubmitedit extends Component{ } setedit=()=>{ - let coursesId=this.props.match.params.coursesId; - let workId=this.props.match.params.work_Id; - let {workslist}=this.state - let task_id=workslist&&workslist.task_id; + // let coursesId=this.props.match.params.coursesId; + // let workId=this.props.match.params.work_Id; + // let {workslist}=this.state + // let task_id=workslist&&workslist.task_id; // window.location.href="/courses/"+coursesId+"/graduation_tasks/"+task_id+"/"+workId+"/works/edit"; - window.location.href="/courses/"+coursesId+"/graduation_tasks/"+workId+"/appraise"; + this.goback() } @@ -96,11 +96,13 @@ class GraduationTasksSubmitedit extends Component{ } goback=()=>{ - let courseId=this.props.match.params.coursesId; - let work_Id=this.props.match.params.work_Id; - // window.location.href="/courses/"+courseId+"/graduation/graduation_tasks/"+category_id; - window.location.href="/courses/"+courseId+"/graduation_tasks/"+work_Id+"/appraise"; + 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); + } } @@ -568,7 +570,7 @@ class GraduationTasksSubmitedit extends Component{
{/*
{/*
-
-
- {coursename} + {coursename} > 毕设任务 > diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js index 291095008..d773d8411 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js @@ -57,11 +57,15 @@ class GraduationTaskssettinglist extends Component{ let{teacher_comment,task_status,course_group,cross_comment,order,b_order,search}=this.state; this.seacthdata(teacher_comment,task_status,course_group,cross_comment,order,b_order,search,this.state.page); } + goback=()=>{ // window.history.back(-1) let courseId=this.props.match.params.coursesId; - let category_id=this.props.match.params.category_id; - window.location.href="/courses/"+courseId+"/graduation_tasks/"+category_id; + if(courseId===undefined){ + this.props.history.push("/courses"); + }else{ + this.props.history.push(this.props.current_user.first_category_url); + } } @@ -1058,7 +1062,7 @@ class GraduationTaskssettinglist extends Component{
- {taskslistdata.course_name} + {taskslistdata.course_name} > {taskslistdata.graduation_name} > diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js index dee8f0c91..1bf6eb962 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js @@ -55,7 +55,12 @@ class GraduationTasksquestions extends Component{ // let courseId=this.props.match.params.coursesId; // let category_id=this.props.match.params.category_id; // window.location.href="/courses/"+courseId+"/graduation_tasks/"+category_id; - window.history.go(-1) + 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); + } } end=()=>{ @@ -300,7 +305,7 @@ class GraduationTasksquestions extends Component{
- {questionslist.course_name}
+ {questionslist.course_name}
>
{questionslist.graduation_name}
>
diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js
index 6e996297b..fce6cd732 100644
--- a/public/react/src/modules/courses/new/CoursesNew.js
+++ b/public/react/src/modules/courses/new/CoursesNew.js
@@ -28,6 +28,7 @@ function disabledDateTime() {
};
}
+
class CoursesNew extends Component {
constructor(props) {
@@ -191,17 +192,7 @@ class CoursesNew extends Component {
).then((response) => {
// debugger
if (response.data.status === 0) {
- // this.setState({
- // Modalstype: true,
- // Modalstopval: response.data.message,
- // ModalSave: this.cancelmodel,
- // Loadtype: true,
- // checkBoxValues: [],
- // checkAllValue: false,
- // // Realnamecertification : authentication,
- // // professional_certification: values.Professionalcertification
- // })
- window.location.href = "/courses/" + coursesId+"/students";
+ this.goback
}
}).catch((error) => {
console.log(error)
@@ -262,7 +253,7 @@ class CoursesNew extends Component {
if(this.props.match.params.coursesId===undefined){
this.props.history.push("/courses");
}else{
- this.props.history.push(`/courses/${this.props.match.params.coursesId}`);
+ this.props.history.push(this.props.current_user.first_category_url);
}
// window.history.go(-1)
}
@@ -390,7 +381,7 @@ class CoursesNew extends Component {
const optionschool = this.state.searchlistscholl&&this.state.searchlistscholl.map(z => );
// console.log(this.props.current_user.user_school)
// form合并了
- console.log(options)
+
return (