+
}
diff --git a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
index a9495e78d..f7aef34c7 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
@@ -142,6 +142,8 @@ class Coursesleftnav extends Component{
off('editshixunmainname',this.editshixunmainname)
off('videoAdd',this.addVideo)
off('editVideo',this.editVideo)
+ off('addcommon_homeworks',this.addcommon_homeworks)
+ off('editcommon_homeworks',this.editcommon_homeworks)
}
addshixunchild=(e, data)=>{
this.Navmodalnames(e,1,"shixun_homework",data);
@@ -149,6 +151,12 @@ class Coursesleftnav extends Component{
editshixunchild=(e, data)=>{
this.Navmodalnames(e,4,"editSecondname",data.id,data.name);
}
+ addcommon_homeworks=(e, data)=>{
+ this.Navmodalnames(e,1,"common_homework",data);
+ }
+ editcommon_homeworks=(e, data)=>{
+ this.Navmodalnames(e,4,"editSecondname",data.id,data.name);
+ }
editshixunmainname=(e, data)=>{
this.Navmodalnames(e,3,"editname",data.id,data.name);
}
@@ -196,7 +204,8 @@ class Coursesleftnav extends Component{
on('editshixunmainname',this.editshixunmainname);
on('videoAdd',this.addVideo);
on('editVideo',this.editVideo)
-
+ on('addcommon_homeworks',this.addcommon_homeworks)
+ on('editcommon_homeworks',this.editcommon_homeworks)
let courstype=this.props.match.url;
@@ -537,7 +546,7 @@ class Coursesleftnav extends Component{
}
saveNavmodapost=(url,value,positiontype,coursesId,type)=>{
-
+ console.log(positiontype)
axios.post(url,
{name:value}).then((result)=>{
if(result!=undefined){
@@ -548,6 +557,23 @@ class Coursesleftnav extends Component{
description:result.data.message
});
+ if(positiontype==="common_homeworks"||positiontype==="common_homework"||positiontype==="group_homeworks"||positiontype==="group_homework"){
+ if(type===true){
+ this.updasaveNavmoda()
+ trigger('updateNavSuccess')
+ }else{
+ this.updasaveNavmoda()
+ if(positiontype==="common_homeworks"){
+ this.props.history.push(`/classrooms/${coursesId}/common_homework/${result.data.category_id}`);
+ }
+ if(positiontype==="group_homeworks"){
+ this.props.history.push(`/classrooms/${coursesId}/group_homework/${result.data.category_id}`);
+ }
+
+ }
+ return
+ }
+
if(positiontype==="shixun_homeworks"||positiontype==="shixun_homework"){
if(type===true){
this.updasaveNavmoda()
@@ -557,6 +583,7 @@ class Coursesleftnav extends Component{
this.props.history.push(`/classrooms/${coursesId}/shixun_homework/${result.data.category_id}`);
}
+ return
}
if(positiontype==="files"||positiontype==="file"){
@@ -569,22 +596,25 @@ class Coursesleftnav extends Component{
this.updasaveNavmoda()
this.props.history.push(`/classrooms/${coursesId}/file/${result.data.category_id}`);
}
-
+ return
}
if(positiontype==="boards"){
this.updasaveNavmoda()
trigger('updateNavSuccess')
this.props.history.push(`/classrooms/${coursesId}/boards/${result.data.category_id}`);
+ return
}
if(positiontype!="course_groups"&&positiontype!="shixun_homeworks"&&positiontype!="shixun_homework"){
this.updasaveNavmoda()
+ return
}
if(positiontype==="course_groups"){
this.props.updataleftNavfun();
this.props.history.push(`/classrooms/${coursesId}/course_groups/${result.data.group_id}`);
+ return
}
}
@@ -863,6 +893,10 @@ class Coursesleftnav extends Component{
{/*公告栏*/}
{/*作业*/}
{item.type==="shixun_homework"?
this.Navmodalnames(e,1,"shixun_homework",item.id)}>新建目录
:""}
+ {/* 普通作业 */}
+ {item.type==="common_homework"?
this.Navmodalnames(e,1,"common_homeworks",item.id)}>新建目录
:""}
+ {/*/!* 分组作业 *!/*/}
+ {item.type==="group_homework"?
this.Navmodalnames(e,1,"group_homeworks",item.id)}>新建目录
:""}
{/*资源*/}
{item.type==="attachment"?
this.Navmodalnames(e,1,"attachment",item.id)}>新建目录
:""}
{/* 视频 */}
@@ -893,8 +927,8 @@ class Coursesleftnav extends Component{
let {twosandiantypes,twosandiantypenum}=this.state;
return (item.type==="graduation"?"":
{/*作业/资源*/}
- {item.type==="shixun_homework"||item.type==="attachment"||item.type==="graduation"?
this.Navmodalnames(e,4,"editSecondname",iem.category_id,iem.category_name)}>重命名
:""}
- {item.type==="shixun_homework"||item.type==="attachment"?
this.deleteSecondary(e,1,iem.category_id)}>删除
:""}
+ {item.type==="shixun_homework"||item.type==="attachment"||item.type==="graduation"||item.type==="common_homework"||item.type==="group_homework"?
this.Navmodalnames(e,4,"editSecondname",iem.category_id,iem.category_name)}>重命名
:""}
+ {item.type==="shixun_homework"||item.type==="attachment"||item.type==="common_homework"||item.type==="group_homework"?
this.deleteSecondary(e,1,iem.category_id)}>删除
:""}
{/*分班*/}
{item.type==="course_group"?
this.Navmodalnames(e,5,"editSecondname",iem.category_id,iem.category_name)}>重命名
:""}
{item.type==="course_group"?
this.deleteSecondary(e,2,iem.category_id)}>删除
:""}
diff --git a/public/react/src/modules/user/usersInfo/banks/NewGtaskForm.js b/public/react/src/modules/user/usersInfo/banks/NewGtaskForm.js
index 0e60ddcc5..1394ac2f9 100644
--- a/public/react/src/modules/user/usersInfo/banks/NewGtaskForm.js
+++ b/public/react/src/modules/user/usersInfo/banks/NewGtaskForm.js
@@ -110,11 +110,11 @@ class NewGtaskForms extends Component {
}
handleSubmit = () => {
-
- let { contentFileList, min_num, max_num, base_on_project } = this.state;
- let { data } = this.props;
- let task_type = data.task_type
- let topicId = this.props.topicId
+ console.log(this.props)
+ let {contentFileList,min_num,max_num,base_on_project}=this.state;
+ let {data}=this.props;
+ let task_type=data.task_type
+ let topicId=this.props.topicId
let attachment_ids = contentFileList.map(item => {
return item.response ? item.response.id : item.id
})