From 9f69aafe2ded6ed92344a65ced67dbd41b98b701 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, 10 Jul 2019 09:00:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/graduation/tasks/GraduationTaskssetting.js | 4 ++-- .../courses/graduation/tasks/GraduationTaskssettinglist.js | 4 ++-- .../graduation/tasks/GraduationTaskssettingquestions.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js index e01dfbb68..27aa34e21 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js @@ -1103,8 +1103,8 @@ class GraduationTaskssettingapp extends Component{ {this.props.isAdmin()?
  • 导出
    • :""} diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js index 517c2ec0b..2ad892e64 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js @@ -1079,8 +1079,8 @@ class GraduationTaskssettinglist extends Component{ {this.props.isAdmin()?
  • 导出
    • :""} diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js index abe4c0804..d4708b209 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js @@ -352,8 +352,8 @@ class GraduationTasksquestions extends Component{ {this.props.isAdmin()?
  • 导出
    • :""} From b8d7473c3efb0dbfd7c2f56b7a8c997aad98dafd 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, 10 Jul 2019 09:31:45 +0800 Subject: [PATCH 2/3] =?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 | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js index 2ad892e64..5a02169e7 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js @@ -73,14 +73,14 @@ class GraduationTaskssettinglist extends Component{ //get 数组 axios.get(url,{ params: { - teacher_comment:teacher_comment, - task_status:task_status, - course_group:course_group, - cross_comment:cross_comment, - order:order, - b_order:b_order, - search:search, - page:pages, + teacher_comment:teacher_comment===null?undefined:teacher_comment, + task_status:task_status===null?undefined:task_status, + course_group:course_group===null?undefined:course_group, + cross_comment:cross_comment===null?undefined:cross_comment, + order:order===null?undefined:order, + b_order:b_order===null?undefined:b_order, + search:search===null?undefined:search, + page:pages===null?undefined:pages, limit:20, }, paramsSerializer: function(params) { @@ -148,7 +148,12 @@ class GraduationTaskssettinglist extends Component{ loadingstate:true }) - this.seacthdata(list.length===key?undefined:list, task_status, course_group, cross_comment, order, b_order, search,this.state.page); + if(list.length===key){ + + }else{ + this.seacthdata(list, task_status, course_group, cross_comment, order, b_order, search,this.state.page); + + } } From b46b2b84eba636688a06a41120b2b706b43d9b23 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, 10 Jul 2019 10:08:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/graduation/tasks/GraduationTaskssettinglist.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js index 5a02169e7..a28ae2fa1 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js @@ -144,14 +144,14 @@ class GraduationTaskssettinglist extends Component{ let {teacher_comment, task_status, course_group, cross_comment, order, b_order, search} = this.state; this.setState({ - teacher_comment:list.length===key?null:list, + teacher_comment:list.length===key?undefined:list[0], loadingstate:true }) if(list.length===key){ }else{ - this.seacthdata(list, task_status, course_group, cross_comment, order, b_order, search,this.state.page); + this.seacthdata(list[0], task_status, course_group, cross_comment, order, b_order, search,this.state.page); }