From cb188f65e7c836d8ce65d67edc2b372d5ad0c25b Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Tue, 15 Oct 2019 16:20:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/courses/members/studentsList.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js index 3d8f814ef..db18f9c8e 100644 --- a/public/react/src/modules/courses/members/studentsList.js +++ b/public/react/src/modules/courses/members/studentsList.js @@ -589,15 +589,15 @@ class studentsList extends Component{
是否确认删除?
, onOk: () => { - // const cid = this.props.match.params.coursesId const course_group_id = this.props.match.params.course_group_id + const courseId = this.props.match.params.coursesId const url = `/course_groups/${course_group_id}.json` axios.delete(url) .then((response) => { if (response.data.status == 0) { this.props.showNotification('删除成功') - this.props.history.push(response.data.right_url) + this.props.history.push(`/courses/${coursesId}/course_groups`) } }) .catch(function (error) { From 7a1a05e0dfda3bd1c03e7a4af9beff01fbbc257b Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Tue, 15 Oct 2019 16:31:16 +0800 Subject: [PATCH 2/4] isStudentPage --- public/react/src/modules/courses/members/studentsList.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js index db18f9c8e..15fe7d392 100644 --- a/public/react/src/modules/courses/members/studentsList.js +++ b/public/react/src/modules/courses/members/studentsList.js @@ -107,7 +107,7 @@ const buildColumns = (that,isParent) => { } ]; if (course_groups && course_groups.length) { - columns.push({ + this.isStudentPage && columns.push({ title: '分班', dataIndex: 'course_group_name', key: 'course_group_name', @@ -687,6 +687,7 @@ class studentsList extends Component{ } else { pageType = TYPE_COURSE_GOURP_PARENT } + // 本页面有2个状态，学生列表、具体分班 const isStudentPage = pageType == TYPE_STUDENTS this.isStudentPage = isStudentPage const isGroupChildPage = pageType == TYPE_COURSE_GOURP_CHILD From 684e38e42e76ffc5d9d86964291bd3ea370ab774 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Tue, 15 Oct 2019 16:33:04 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=88=86=E7=8F=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/courses/members/CourseGroupChooser.js | 2 +- public/react/src/modules/courses/members/studentsList.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/members/CourseGroupChooser.js b/public/react/src/modules/courses/members/CourseGroupChooser.js index 125f10b51..655754dc4 100644 --- a/public/react/src/modules/courses/members/CourseGroupChooser.js +++ b/public/react/src/modules/courses/members/CourseGroupChooser.js @@ -89,7 +89,7 @@ function CourseGroupChooser({ course_groups, isAdminOrCreator = true, item, inde

trigger('groupAdd')} - >添加分班 + >新建分班

) diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js index 15fe7d392..61e8945c7 100644 --- a/public/react/src/modules/courses/members/studentsList.js +++ b/public/react/src/modules/courses/members/studentsList.js @@ -836,7 +836,7 @@ class studentsList extends Component{

this.addDir()} - >添加分班... + >新建分班...

} From 0a801217d1bbc28bebf8dda837903762c63155f2 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Tue, 15 Oct 2019 16:39:56 +0800 Subject: [PATCH 4/4] none_group_member_count --- public/react/src/modules/courses/members/CourseGroupList.js | 4 ++-- public/react/src/modules/courses/members/studentsList.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/courses/members/CourseGroupList.js b/public/react/src/modules/courses/members/CourseGroupList.js index 664e0d95a..6c0e915cc 100644 --- a/public/react/src/modules/courses/members/CourseGroupList.js +++ b/public/react/src/modules/courses/members/CourseGroupList.js @@ -210,13 +210,13 @@ function CourseGroupList(props) { onPressEnter={onPressEnter} > -
+ {!!none_group_member_count &&
未分班： {none_group_member_count}个学生 {props.history.push(`/courses/${courseId}/course_groups/0`)}}>查看 -
+
} {course_groups && !!course_groups.length ? diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js index 61e8945c7..3e896c628 100644 --- a/public/react/src/modules/courses/members/studentsList.js +++ b/public/react/src/modules/courses/members/studentsList.js @@ -805,7 +805,7 @@ class studentsList extends Component{ { total_count > 0 || this.state.isSpin == true ?
-
+
{isAdmin && !isStudentPage && 已选 {checkBoxValues.length} 个}
{/* {isAdmin &&
  • 删除
    • } */}