From 9bc4c9bc8a68dd1763ace8726118d5ebbfe4c8b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 8 Jan 2020 19:58:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tasks/GraduationTaskssettinglist.js | 52 ++++++++++++------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js index 12c64adeb..75d2a4481 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js @@ -89,13 +89,13 @@ class GraduationTaskssettinglist extends Component{ course_groupslist:[], checkAllValue:false }) - 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); + let {commentstate, task_status, course_group, cross_comment, order, b_order, search} = this.state; + this.seacthdata(commentstate, task_status, course_group, cross_comment, order, b_order, search,this.state.page); - this.props.getsonar(teacher_comment, task_status, course_group, cross_comment, search) + this.props.getsonar(commentstate, task_status, course_group, cross_comment, search) } - seacthdata=(teacher_comment,task_status,course_group,cross_comment,order,b_order,search,pages)=>{ + seacthdata=(commentstate,task_status,course_group,cross_comment,order,b_order,search,pages)=>{ let{page,limit}=this.state; // console.log(teacher_comment,task_status,course_group,cross_comment,order,b_order,search) @@ -105,7 +105,7 @@ class GraduationTaskssettinglist extends Component{ //get 数组 axios.get(url,{ params: { - teacher_comment:teacher_comment===null?undefined:teacher_comment, + teacher_comment:commentstate===null||commentstate===undefined?undefined:commentstate, task_status:task_status===null?undefined:task_status, course_group:course_group===null?undefined:course_group, cross_comment:cross_comment===null?undefined:cross_comment, @@ -230,7 +230,8 @@ class GraduationTaskssettinglist extends Component{ } funteachercomment=(list,key)=> { - // console.log(e.target.value) + + let asum=undefined let {teacher_comment, task_status, course_group, cross_comment, order, b_order, search} = this.state; if(this.state.teacher_comment!=null&&list.length>0){ if(this.state.teacher_comment.length>0){ @@ -252,19 +253,30 @@ class GraduationTaskssettinglist extends Component{ commentstate:null }) }else{ + + if(list.length>0){ + list.map((item,key)=>{ + if(key===0){ + asum=item; + } + }) + }else{ + asum=undefined + } this.setState({ teacher_comment:list, loadingstate:true, - commentstate:list.length===0?undefined:parseInt(list[0]), + commentstate:asum, }) } - let newvalue=list.length===0?undefined:parseInt(list[0]); + console.log(list) + console.log(asum) - this.seacthdata(newvalue, task_status, course_group, cross_comment, order, b_order, search,this.state.page); - this.props.getsonar(newvalue, task_status, course_group, cross_comment, search) + this.seacthdata(asum, task_status, course_group, cross_comment, order, b_order, search,this.state.page); + this.props.getsonar(asum, task_status, course_group, cross_comment, search) // if(list.length===key){ // this.seacthdata(undefined, task_status, course_group, cross_comment, order, b_order, search,this.state.page); // this.props.getsonar(undefined, task_status, course_group, cross_comment, search) @@ -286,7 +298,7 @@ class GraduationTaskssettinglist extends Component{ cross_comment:e.target.value===undefined||e.target.value===false?null:e.target.value, loadingstate:true }) - this.seacthdata(teacher_comment, task_status, course_group, e.target.value===undefined||e.target.value===false?"":e.target.value, order, b_order, search,this.state.page); + this.seacthdata(commentstate, task_status, course_group, e.target.value===undefined||e.target.value===false?"":e.target.value, order, b_order, search,this.state.page); this.props.getsonar(commentstate, task_status, course_group, e.target.value===undefined||e.target.value===false?"":e.target.value, search) } @@ -311,7 +323,7 @@ class GraduationTaskssettinglist extends Component{ this.setState({ loadingstate:true }) - this.seacthdata(teacher_comment, task_status, course_group, cross_comment, order, b_order, search,this.state.page); + this.seacthdata(commentstate, task_status, course_group, cross_comment, order, b_order, search,this.state.page); this.props.getsonar(commentstate, task_status, course_group, cross_comment, search) } @@ -323,7 +335,7 @@ class GraduationTaskssettinglist extends Component{ b_order: newb_order, loadingstate: true }) - this.seacthdata(teacher_comment, task_status, course_group, cross_comment, value, newb_order, search,this.state.page); + this.seacthdata(commentstate, task_status, course_group, cross_comment, value, newb_order, search,this.state.page); this.props.getsonar(commentstate, task_status, course_group, cross_comment, search) } @@ -344,7 +356,7 @@ class GraduationTaskssettinglist extends Component{ task_status:undefined, loadingstate:true }) - this.seacthdata(teacher_comment, null, course_group, cross_comment, order, b_order, search,this.state.page); + this.seacthdata(commentstate, null, course_group, cross_comment, order, b_order, search,this.state.page); this.props.getsonar(commentstate, null, course_group, cross_comment, search) } // else if(checkedValues.length ===key){ @@ -361,7 +373,7 @@ class GraduationTaskssettinglist extends Component{ task_status:checkedValues===key?null:checkedValues, loadingstate:true }) - this.seacthdata(teacher_comment, checkedValues===key?undefined:checkedValues, course_group, cross_comment, order, b_order, search,this.state.page); + this.seacthdata(commentstate, checkedValues===key?undefined:checkedValues, course_group, cross_comment, order, b_order, search,this.state.page); this.props.getsonar(commentstate, checkedValues===key?undefined:checkedValues, course_group, cross_comment, search) } @@ -380,7 +392,7 @@ class GraduationTaskssettinglist extends Component{ course_group:undefined, loadingstate:true }) - this.seacthdata(teacher_comment, task_status, null, cross_comment, order, b_order, search,this.state.page); + this.seacthdata(commentstate, task_status, null, cross_comment, order, b_order, search,this.state.page); this.props.getsonar(commentstate,task_status, null, cross_comment, search) } // else if(checkedValues.length ===key){ @@ -398,7 +410,7 @@ class GraduationTaskssettinglist extends Component{ course_group:checkedValues===key?null:checkedValues, loadingstate:true }) - this.seacthdata(teacher_comment, task_status, checkedValues===key?undefined:checkedValues, cross_comment, order, b_order, search,this.state.page); + this.seacthdata(commentstate, task_status, checkedValues===key?undefined:checkedValues, cross_comment, order, b_order, search,this.state.page); this.props.getsonar(commentstate,task_status, checkedValues===key?undefined:checkedValues, cross_comment, search) } @@ -591,7 +603,7 @@ class GraduationTaskssettinglist extends Component{ }).then((result)=>{ // console.log(result) if(result.data.status===0){ - this.seacthdata(teacher_comment,task_status,course_group,cross_comment,order,b_order,search,this.state.page); + this.seacthdata(commentstate,task_status,course_group,cross_comment,order,b_order,search,this.state.page); this.props.getsonar(commentstate,task_status, course_group, cross_comment, search) this.props.showNotification(result.data.message); this.cancelmodel(); @@ -709,7 +721,7 @@ class GraduationTaskssettinglist extends Component{ page: pageNumber, }) let{teacher_comment,task_status,course_group,cross_comment,order,b_order,search,commentstate}=this.state; - this.seacthdata(teacher_comment,task_status,course_group,cross_comment,order,b_order,search,pageNumber); + this.seacthdata(commentstate,task_status,course_group,cross_comment,order,b_order,search,pageNumber); this.props.getsonar(commentstate,task_status, course_group, cross_comment, search) } @@ -719,7 +731,7 @@ class GraduationTaskssettinglist extends Component{ let {teacher_comment, task_status, course_group, cross_comment, order, b_order, search,commentstate} =this.state; let params ={ - teacher_comment:teacher_comment, + teacher_comment:commentstate, task_status:task_status, course_group:course_group, cross_comment:cross_comment,