From f02fda3c599ca8641f423f774198dcdaf6216fd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 23 Aug 2019 14:59:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AF=95=E8=AE=BE=E4=BB=BB=E5=8A=A1=E8=B7=B3?=
=?UTF-8?q?=E8=BD=AC=E5=92=8C=E5=AD=97=E6=95=B0=E9=99=90=E5=88=B6=E8=B0=83?=
=?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../tasks/GraduationTasksSubmitedit.js | 22 +++++++------------
.../tasks/GraduationTasksSubmitnew.js | 6 ++---
.../tasks/GraduationTasksappraise.js | 4 +++-
.../graduation/tasks/GraduationTasksedit.js | 2 +-
.../graduation/tasks/GraduationTasksnew.js | 3 ++-
.../tasks/GraduationTaskssetting.js | 5 ++++-
.../tasks/GraduationTaskssettinglist.js | 5 +++--
.../tasks/GraduationTaskssettingquestions.js | 3 ++-
8 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
index fcbe6b9aa..ce704ef6e 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
@@ -77,16 +77,6 @@ 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;
- // window.location.href="/courses/"+coursesId+"/graduation_tasks/"+task_id+"/"+workId+"/works/edit";
- this.goback()
- }
-
-
handleSelectChange = (value) => {
console.log(value);
@@ -103,7 +93,8 @@ class GraduationTasksSubmitedit extends Component{
// }else{
// this.props.history.push(this.props.current_user.first_category_url);
// }
- this.props.history.goBack()
+ this.props.history.replace(`/courses/${this.state.workslist.course_id}/graduation_tasks/${this.state.workslist.graduation_id}`);
+
}
@@ -378,6 +369,9 @@ class GraduationTasksSubmitedit extends Component{
}
Commoninterface =(fileList,selectmemberslist,workslist)=>{
+ let coursesIds=this.props.match.params.coursesId
+ let workId=this.props.match.params.work_Id;
+
let userids=[];
for(var list of selectmemberslist){
@@ -424,7 +418,7 @@ class GraduationTasksSubmitedit extends Component{
this.setState({
spinnings:true
})
- let workId=this.props.match.params.work_Id;
+
// if(fileList.length===0){
// this.setState({
@@ -444,8 +438,8 @@ class GraduationTasksSubmitedit extends Component{
spinnings:false
})
if(response!== undefined){
- this.setedit()
-
+ // this.goback()
+ window.location.href=`/courses/${coursesIds}/graduation_tasks/${workId}/appraise`
}
// if(response.status===200) {
// GraduationTasksnewtype=false;
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
index dadc621b2..3c8318796 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
@@ -105,7 +105,7 @@ class GraduationTasksSubmitnew extends Component{
// }else{
// this.props.history.push(this.props.current_user.first_category_url);
// }
- this.props.history.goBack()
+ this.props.history.replace(`/courses/${this.state.workslist.course_id}/graduation_tasks/${this.state.workslist.graduation_id}`);
}
@@ -361,9 +361,7 @@ class GraduationTasksSubmitnew extends Component{
return false;
}
}
- gocannel=()=>{
- this.props.history.goBack()
- }
+
//公用数据
Commoninterface = (fileList,selectmemberslist,workslist)=>{
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
index d01be4676..c03ffc1e0 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
@@ -76,7 +76,9 @@ class GraduationTasksappraise extends Component{
// }else{
// this.props.history.push(this.props.current_user.first_category_url);
// }
- this.props.history.goBack()
+
+ this.props.history.replace(`/courses/${this.state.datalist.course_id}/graduation_tasks/${this.state.datalist.graduation_id}/${this.state.datalist.task_id}/list`);
+
}
Cancelvisible=()=>{
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
index 4036a0a99..42a128719 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
@@ -88,7 +88,7 @@ class GraduationTasksedit extends Component{
// }else{
// this.props.history.push(this.props.current_user.first_category_url);
// }
- this.props.history.goBack()
+ this.props.history.replace(`/courses/${this.state.data.course_id}/graduation_tasks/${this.state.data.graduation_id}`);
}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
index 6247f54c2..7c499430a 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
@@ -113,7 +113,8 @@ class GraduationTasksnew extends Component {
// }else{
// this.props.history.push(this.props.current_user.first_category_url);
// }
- this.props.history.goBack()
+ // this.props.history.goBack()
+ this.props.history.replace(`/courses/${this.props.match.params.coursesId}/graduation_tasks/${this.props.match.params.category_id}`);
}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
index e679702da..7e5707695 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
@@ -771,7 +771,10 @@ class GraduationTaskssettingapp extends Component{
// }else{
// this.props.history.push(this.props.current_user.first_category_url);
// }
- this.props.history.goBack()
+ // this.props.history.goBack()
+ // this.props.history.replace(this.props.current_user.first_category_url);
+ this.props.history.replace(`/courses/${this.state.settingdata.course_id}/graduation_tasks/${this.state.settingdata.graduation_id}`);
+
}
isgoback=()=>{
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index 816d53526..9718de28a 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -64,9 +64,10 @@ class GraduationTaskssettinglist extends Component{
// if(courseId===undefined){
// this.props.history.push("/courses");
// }else{
- // this.props.history.push(this.props.current_user.first_category_url);
+ // this.props.history.push(this.props.current_user.first_category_url);
// }
- this.props.history.goBack()
+ // this.props.history.goBack()
+ this.props.history.replace(`/courses/${this.state.taskslistdata.course_id}/graduation_tasks/${this.state.taskslistdata.graduation_id}`);
}
seacthdata=(teacher_comment,task_status,course_group,cross_comment,order,b_order,search,pages)=>{
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
index 22ce6fa04..b8296f9ef 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
@@ -62,7 +62,8 @@ class GraduationTasksquestions extends Component{
// this.props.history.push(this.props.current_user.first_category_url);
// }
- this.props.history.goBack()
+ // this.props.history.goBack()
+ this.props.history.replace(`/courses/${this.state.questionslist.course_id}/graduation_tasks/${this.state.questionslist.graduation_id}`);
}
end=()=>{