diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js index 36c2f9d3f..9874b26fa 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js @@ -125,7 +125,7 @@ class GraduationTasksedit extends Component{ 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"); + window.location.href="/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+graduation_id+"/"+this.props.match.params.category_id +"/setting"; } }).catch((error) => { console.log(error) diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js index 39068e1e3..ecfd21257 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js @@ -730,7 +730,7 @@ class GraduationTaskssettinglist extends Component{ 其它历史评分将全部失效:""}> {tag.name==="评阅"?tag.status===0?"--": - {tag.name} + tag.name : { return(
- {tag.status===0?"":"查看"} + {tag.status===0?"--":查看}
)} ):"" @@ -863,7 +863,7 @@ class GraduationTaskssettinglist extends Component{ 其它历史评分将全部失效:""}> {tag.name==="评阅"?tag.status===0?"--": - {tag.name} + tag.name : { return(
- - {tag.status===0?"":"查看"} - - + {tag.status===0?"--": + 查看 + }
)} ):"" @@ -1013,7 +1012,7 @@ class GraduationTaskssettinglist extends Component{ 调整学生最终成绩
其它历史评分将全部失效:""}> {tag.name==="评阅"?tag.status===0?"--": - {tag.name} + tag.name : this.showModulationtype(tag.id):tag.name==="分配"?()=>this.showAllocationModal(tag.id):""} @@ -1030,9 +1029,9 @@ class GraduationTaskssettinglist extends Component{ operation.map((tag,key) => { return(
- - {tag.status===0?"":"查看"} - + {tag.status===0?"--": + 查看 + }
)} ):"" @@ -1146,7 +1145,7 @@ class GraduationTaskssettinglist extends Component{ 调整学生最终成绩
其它历史评分将全部失效:""}> {tag.name==="评阅"?tag.status===0?"--": - {tag.name} + tag.name : { return(
- - {tag.status===0?"":"查看"} + {tag.status===0?"--": + 查看}
)} ):""