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{

{/* {workslist&&workslist.course_name}*/} {/*>*/} - 毕设任务 + 毕设任务 > 任务详情 > @@ -825,7 +827,7 @@ class GraduationTasksSubmitedit extends Component{

- 取消 + 取消
{/**/} diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js index 50f2a4fde..dddb11e53 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js @@ -100,9 +100,12 @@ class GraduationTasksSubmitnew extends Component{ goback=()=>{ let courseId=this.props.match.params.coursesId; - let category_id=this.props.match.params.category_id; + if(courseId===undefined){ + this.props.history.push("/courses"); + }else{ + this.props.history.push(this.props.current_user.first_category_url); + } - window.location.href="/courses/"+courseId+"/graduation_tasks/"+category_id; } @@ -438,7 +441,7 @@ class GraduationTasksSubmitnew extends Component{ spinnings:false }) if(response!==undefined){ - this.setedit(response.data.work_id) + this.goback() } // if(response.status===200) { // GraduationTasksnewtype=false; @@ -567,7 +570,7 @@ render(){

{/* {workslist&&workslist.course_name}*/} {/*>*/} - 毕设任务 + 毕设任务 > 任务详情 > @@ -802,7 +805,7 @@ render(){

- 取消 + 取消
{/**/} diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js index 971152781..7aa1530af 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js @@ -70,7 +70,13 @@ class GraduationTasksappraise extends Component{ // let category_id=this.props.match.params.category_id; // // window.location.href="/courses/"+courseId+"/graduation_tasks/"+datalist.graduation_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); + } + } Cancelvisible=()=>{ diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js index 2e9efba0c..2b55e0737 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js @@ -81,10 +81,13 @@ class GraduationTasksedit extends Component{ goback=()=>{ - // let courseId=this.props.match.params.coursesId; - // window.location.href="/courses/"+courseId+"/graduation_tasks/"+this.state.data.graduation_id; - // goback = () => { - 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); + } } @@ -233,8 +236,8 @@ class GraduationTasksedit extends Component{ // console.log(response) // GraduationTasksedittype=false; // window.location.href="/courses/"+course_id+"/graduation/"+graduationId+"/graduation_tasks/"+category_id+"/questions"; - // this.goback() - this.props.history.push("/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+graduation_id+"/"+this.props.match.params.category_id +"/setting"); + this.goback() + //this.props.history.push("/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+graduation_id+"/"+this.props.match.params.category_id +"/setting"); } }).catch((error) => { console.log(error) @@ -333,7 +336,7 @@ class GraduationTasksedit extends Component{

- {this.props.current_user&&this.props.current_user.course_name} + {this.props.current_user&&this.props.current_user.course_name} > 毕设任务 > diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js index 90f67a984..e27d8382b 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js @@ -91,7 +91,7 @@ class GraduationTasksnew extends Component { // GraduationTasksnewtype = false; // this.goback(); if(response!==undefined){ - this.props.history.push("/courses/" + this.props.match.params.coursesId + "/graduation_tasks/" + this.props.match.params.category_id + "/" + response.data.task_id + "/setting"); + this.goback() } // } }).catch((error) => { @@ -108,9 +108,11 @@ class GraduationTasksnew extends Component { goback = () => { 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); + } } @@ -307,8 +309,7 @@ class GraduationTasksnew extends Component {

- {this.props.current_user && this.props.current_user.course_name} + {this.props.current_user && this.props.current_user.course_name} > 毕设任务 diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js index 983231167..5bbbe1a14 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js @@ -761,9 +761,11 @@ class GraduationTaskssettingapp extends Component{ goback=()=>{ 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); + } } isgoback=()=>{ @@ -1046,7 +1048,7 @@ class GraduationTaskssettingapp 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 ( diff --git a/public/react/src/modules/home/shixunsHome.js b/public/react/src/modules/home/shixunsHome.js index 92f3c9f44..9c166f43f 100644 --- a/public/react/src/modules/home/shixunsHome.js +++ b/public/react/src/modules/home/shixunsHome.js @@ -93,7 +93,7 @@ class ShixunsHome extends Component { const CustomNextArrow = props => { return (

- +
); }; @@ -101,7 +101,7 @@ class ShixunsHome extends Component { const CustomPrevArrow = props => { return (
- +
); }; @@ -374,7 +374,7 @@ class ShixunsHome extends Component {
  • - + {item.username}
  • @@ -388,7 +388,7 @@ class ShixunsHome extends Component {
  • - + {item.username}
  • @@ -402,7 +402,7 @@ class ShixunsHome extends Component {
  • - + {item.username}
  • @@ -418,7 +418,7 @@ class ShixunsHome extends Component { return (
  • - + {item.username}
  • @@ -450,7 +450,7 @@ class ShixunsHome extends Component {
  • - + {item.username}
  • @@ -464,7 +464,7 @@ class ShixunsHome extends Component {
  • - + {item.username}
  • @@ -478,7 +478,7 @@ class ShixunsHome extends Component {
  • - + {item.username}
  • @@ -494,7 +494,7 @@ class ShixunsHome extends Component { return (
  • - + {item.username}
  • diff --git a/public/react/src/modules/paths/ShixunPathCard.js b/public/react/src/modules/paths/ShixunPathCard.js index 9260b9f46..1b0759d1f 100644 --- a/public/react/src/modules/paths/ShixunPathCard.js +++ b/public/react/src/modules/paths/ShixunPathCard.js @@ -38,7 +38,7 @@ class ShixunPathCard extends Component{
    {/*target="_blank"*/} - 13?1543211263 + 13?1543211263