From 08119e95da0f61cf792616fa15d7fad474b93380 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Wed, 10 Jul 2019 15:26:47 +0800 Subject: [PATCH 1/3] wo --- .../src/modules/courses/busyWork/CommonWorkDetailIndex.js | 4 +++- public/react/src/modules/courses/busyWork/CommonWorkList.js | 2 +- .../modules/courses/busyWork/common/WorkDetailPageHeader.js | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js index ac8f91b74..1986ddd43 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js @@ -150,7 +150,9 @@ class CommonWorkDetailIndex extends Component{ ]}>
- 36 ? homework_name : ''}`}> + 36 ? homework_name : ''}`} + style={{height: 'auto'}} + > {homework_name} {/* {homework_name} */} diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js index 67da6c549..5938d037a 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkList.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js @@ -70,7 +70,7 @@ function buildColumns(that, student_works) { render: (text, record, index) => { return ( - {record.isMine == true ? '我' : (that.state.page - 1) * PAGE_SIZE + index + 1} + {record.isMine == true && (student_works && student_works.length) ? '我' : (that.state.page - 1) * PAGE_SIZE + index + 1} )}, }, { diff --git a/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js b/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js index 782a1c07d..76d9d3727 100644 --- a/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js +++ b/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js @@ -97,7 +97,7 @@ class WorkDetailPageHeader extends Component{ ]}>
- + {homework_name} {/* {homework_name} */} From f5b5315ec188fc55f7c0bca9be227fdf1f96c649 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Wed, 10 Jul 2019 15:27:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/busyWork/CommonWorkPost.js | 78 ------------------- 1 file changed, 78 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkPost.js b/public/react/src/modules/courses/busyWork/CommonWorkPost.js index d96df9275..d29b9119b 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkPost.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkPost.js @@ -420,84 +420,6 @@ class CommonWorkPost extends Component{ }).catch((error)=>{ console.log(error) }) - return - const member = { - "members": [ - { - "user_id": 8686, - "user_name": "陈晓婷", - "group_name": "未分班", - "student_id": "2018201801106004", - "commit_status": false - }, - { - "user_id": 46220, - "user_name": "刘恩", - "group_name": "未分班", - "student_id": "173139241573", - "commit_status": false - }, - { - "user_id": 57106, - "user_name": "曾啸笛", - "group_name": "未分班", - "student_id": "184962010005", - "commit_status": false - }, - { - "user_id": 57110, - "user_name": "王玉龙", - "group_name": "未分班", - "student_id": "184962710013", - "commit_status": false - }, - { - "user_id": 57280, - "user_name": "陈涛", - "group_name": "未分班", - "student_id": "184962020046", - "commit_status": false - }, - { - "user_id": 57341, - "user_name": "何仁杰", - "group_name": "未分班", - "student_id": "18496232002036", - "commit_status": false - }, - { - "user_id": 57386, - "user_name": "王震东", - "group_name": "未分班", - "student_id": "1849620100012", - "commit_status": false - }, - { - "user_id": 58337, - "user_name": "李游", - "group_name": "未分班", - "student_id": null, - "commit_status": false - }, - { - "user_id": 58787, - "user_name": "彭然", - "group_name": "未分班", - "student_id": null, - "commit_status": false - }, - { - "user_id": 59553, - "user_name": "李明霞", - "group_name": "未分班", - "student_id": null, - "commit_status": false - } - ] - } - this.setState({ - members: member.members - }) } From 9a2b31312b069e2ed3f7318cbab0edc7d7f4b193 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Wed, 10 Jul 2019 16:00:12 +0800 Subject: [PATCH 3/3] default --- .../courses/busyWork/CommonWorkPost.js | 32 +++++-------------- 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkPost.js b/public/react/src/modules/courses/busyWork/CommonWorkPost.js index d29b9119b..ae51d04a0 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkPost.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkPost.js @@ -92,8 +92,16 @@ class CommonWorkPost extends Component{ } else { axios.get(url).then((response)=>{ if(response.data.course_id){ + const mine = { + user_id: response.data.user_id, + user_name: response.data.user_name, + student_id: response.data.user_student_id, + group_name: response.data.group_name, + + } this.setState({ ...response.data, + selectmemberslist: [mine], memberNumMin: response.data.min_num, memberNumMax: response.data.max_num, }) @@ -102,30 +110,6 @@ class CommonWorkPost extends Component{ console.log(error) }) } - return - - const responseData = { - "course_id": 1309, - "course_name": "计算机开发实战课-示例", - "category": { - "category_id": 11551, - "category_name": "分组作业" - }, - "homework_status": [ - "申诉中" - ], - "homework_name": "小米便签的功能改进", - "homework_id": 7013, - "homework_type": "group", - "user_id": 15582, - "user_name": "胡莎莎", - "user_student_id": null, - "group_name": "示例A班" - } - this.setState({ - ...responseData - }) - }