From f521ba53909c683b9044f164f39a90f822c7d5d2 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:32:00 +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 | 49 ++++++++++--------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js index 9fa993ea6..12c64adeb 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js @@ -51,6 +51,7 @@ class GraduationTaskssettinglist extends Component{ visibles:false, DownloadType:false, DownloadMessageval:undefined, + commentstate:null } } @@ -247,17 +248,21 @@ class GraduationTaskssettinglist extends Component{ if(listype===false){ this.setState({ teacher_comment:null, - loadingstate:true + loadingstate:true, + commentstate:null }) }else{ this.setState({ teacher_comment:list, - loadingstate:true + loadingstate:true, + commentstate:list.length===0?undefined:parseInt(list[0]), }) } - let newvalue=list.length===0?undefined:parseInt(list[0]) + let newvalue=list.length===0?undefined:parseInt(list[0]); + + 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) // if(list.length===key){ @@ -275,14 +280,14 @@ class GraduationTaskssettinglist extends Component{ funcross_comment=(e)=>{ - let {teacher_comment, task_status, course_group, order, b_order, search} = this.state; + let {teacher_comment, task_status, course_group, order, b_order, search,commentstate} = this.state; this.setState({ 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.props.getsonar(teacher_comment, task_status, course_group, e.target.value===undefined||e.target.value===false?"":e.target.value, search) + this.props.getsonar(commentstate, task_status, course_group, e.target.value===undefined||e.target.value===false?"":e.target.value, search) } inputSearchValue=(e)=>{ @@ -302,24 +307,24 @@ class GraduationTaskssettinglist extends Component{ searchValue=()=>{ - let {teacher_comment, task_status, course_group, cross_comment, order, b_order,search} = this.state; + let {teacher_comment, task_status, course_group, cross_comment, order, b_order,search,commentstate} = this.state; this.setState({ loadingstate:true }) this.seacthdata(teacher_comment, 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) } funorder = (value, newb_order) => { - let {teacher_comment, task_status, course_group, cross_comment, b_order, search,order} = this.state; + let {teacher_comment, task_status, course_group, cross_comment, b_order, search,commentstate} = this.state; this.setState({ order: value, b_order: newb_order, loadingstate: true }) this.seacthdata(teacher_comment, task_status, course_group, cross_comment, value, newb_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) } @@ -327,7 +332,7 @@ class GraduationTaskssettinglist extends Component{ funtaskstatus=(checkedValues,key)=>{ // console.log(checkedValues) - let {teacher_comment, course_group, cross_comment, order, b_order, search} = this.state; + let {teacher_comment, course_group, cross_comment, order, b_order, search,commentstate} = this.state; @@ -340,7 +345,7 @@ class GraduationTaskssettinglist extends Component{ loadingstate:true }) this.seacthdata(teacher_comment, null, course_group, cross_comment, order, b_order, search,this.state.page); - this.props.getsonar(teacher_comment, null, course_group, cross_comment, search) + this.props.getsonar(commentstate, null, course_group, cross_comment, search) } // else if(checkedValues.length ===key){ // // 全部抖选中 自然就是查找全部 就是空 @@ -357,7 +362,7 @@ class GraduationTaskssettinglist extends Component{ loadingstate:true }) this.seacthdata(teacher_comment, checkedValues===key?undefined:checkedValues, course_group, cross_comment, order, b_order, search,this.state.page); - this.props.getsonar(teacher_comment, checkedValues===key?undefined:checkedValues, course_group, cross_comment, search) + this.props.getsonar(commentstate, checkedValues===key?undefined:checkedValues, course_group, cross_comment, search) } @@ -366,7 +371,7 @@ class GraduationTaskssettinglist extends Component{ // console.log(checkedValues); // console.log(key); - let {teacher_comment, task_status, cross_comment, order,b_order, search} = this.state; + let {teacher_comment, task_status, cross_comment, order,b_order, search,commentstate} = this.state; if(JSON.stringify(checkedValues) === "[]"){ // console.log(checkedValues); @@ -376,7 +381,7 @@ class GraduationTaskssettinglist extends Component{ loadingstate:true }) this.seacthdata(teacher_comment, task_status, null, cross_comment, order, b_order, search,this.state.page); - this.props.getsonar(teacher_comment,task_status, null, cross_comment, search) + this.props.getsonar(commentstate,task_status, null, cross_comment, search) } // else if(checkedValues.length ===key){ // // 全部抖选中 自然就是查找全部 就是空 @@ -394,7 +399,7 @@ class GraduationTaskssettinglist extends Component{ loadingstate:true }) this.seacthdata(teacher_comment, task_status, checkedValues===key?undefined:checkedValues, cross_comment, order, b_order, search,this.state.page); - this.props.getsonar(teacher_comment,task_status, checkedValues===key?undefined:checkedValues, cross_comment, search) + this.props.getsonar(commentstate,task_status, checkedValues===key?undefined:checkedValues, cross_comment, search) } @@ -575,7 +580,7 @@ class GraduationTaskssettinglist extends Component{ saveModulationModal=(value,num)=>{ - let{teacher_comment,task_status,course_group,cross_comment,order,b_order,search}=this.state; + let{teacher_comment,task_status,course_group,cross_comment,order,b_order,search,commentstate}=this.state; let {operationId}=this.state; // console.log(value,num) @@ -587,7 +592,7 @@ class GraduationTaskssettinglist extends Component{ // 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.props.getsonar(teacher_comment,task_status, course_group, cross_comment, search) + this.props.getsonar(commentstate,task_status, course_group, cross_comment, search) this.props.showNotification(result.data.message); this.cancelmodel(); this.setState({ @@ -703,15 +708,15 @@ class GraduationTaskssettinglist extends Component{ this.setState({ page: pageNumber, }) - let{teacher_comment,task_status,course_group,cross_comment,order,b_order,search}=this.state; + 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.props.getsonar(teacher_comment,task_status, course_group, cross_comment, search) + this.props.getsonar(commentstate,task_status, course_group, cross_comment, search) } /// 确认是否下载 confirmysl(url){ - let {teacher_comment, task_status, course_group, cross_comment, order, b_order, search,page} =this.state; + let {teacher_comment, task_status, course_group, cross_comment, order, b_order, search,commentstate} =this.state; let params ={ teacher_comment:teacher_comment, @@ -764,8 +769,8 @@ class GraduationTaskssettinglist extends Component{ } render(){ - let {coursename,coursesearch,taskname,taskid,taskslistdata,data,page,limit,teacher_comment,task_status,cross_comment,search,loadingstate, - order, course_group,Modalstype,Modalstopval,ModalCancel,ModalSave,modalname,Modulationtype,operationId,Allocationtype,visibles, + let { taskslistdata,data,page,limit,teacher_comment,task_status,cross_comment,search,loadingstate, + course_group,Modalstype,Modalstopval,ModalCancel,ModalSave,modalname,Modulationtype,Allocationtype,visibles, visible, Topval, Topvalright,