From 66589908d018a622560973e2a2de0f243383911d Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Wed, 26 Jun 2019 14:14:12 +0800 Subject: [PATCH 1/5] isAdmin --- public/react/src/modules/courses/busyWork/CommonWorkList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js index 8819624aa..28de13fe7 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkList.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js @@ -303,7 +303,7 @@ function buildColumns(that, student_works) { key: 'operation', dataIndex: 'operation', render: (operation, record) => ( - record.work_status === 0 ? --: + record.work_status === 0 && !isAdmin ? --:
{/* 0 未提交 */} {/**/} From 6ab02ed247ffb5fae528e4619dd2b6159182fb55 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Wed, 26 Jun 2019 14:17:41 +0800 Subject: [PATCH 2/5] homework_name --- public/react/src/modules/courses/busyWork/CommonWorkPost.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkPost.js b/public/react/src/modules/courses/busyWork/CommonWorkPost.js index 0193d8659..c9c5c7b45 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkPost.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkPost.js @@ -633,7 +633,7 @@ render(){

-

{homework_name}

+

{homework_name}

返回
From 2dc44d92fc7437facf9facbb983706c6ef6736b2 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Wed, 26 Jun 2019 15:11:48 +0800 Subject: [PATCH 3/5] title --- .../courses/busyWork/CommonWorkAppraise.js | 2 +- .../src/modules/courses/busyWork/commonWork.js | 5 ++++- .../react/src/modules/courses/css/Courses.css | 5 +++++ .../src/modules/courses/members/teacherList.js | 17 ++++++++++------- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js b/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js index 77317792e..472cf57b5 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js @@ -200,7 +200,7 @@ class CommonWorkAppraise extends Component{ + className="mr12 color9B9B" length="58" title={`${item.title && item.title.length > 40 ? item.title : ''}`}> {item.title} {item.filesize} diff --git a/public/react/src/modules/courses/busyWork/commonWork.js b/public/react/src/modules/courses/busyWork/commonWork.js index 78eadc103..cc4aff4f9 100644 --- a/public/react/src/modules/courses/busyWork/commonWork.js +++ b/public/react/src/modules/courses/busyWork/commonWork.js @@ -219,7 +219,10 @@ class commonWork extends Component{ return; } this.props.confirm({ - content: `是否确认公开？`, + content:
+
设为公开后，非课堂成员也可以访问查看
+
是否确认设为公开？
+
, onOk: () => { let coursesId=this.props.match.params.coursesId; const url = `/courses/${coursesId}/homework_commons/set_public.json` diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css index c2eb43242..805fc0f19 100644 --- a/public/react/src/modules/courses/css/Courses.css +++ b/public/react/src/modules/courses/css/Courses.css @@ -1,6 +1,11 @@ i.iconfont { cursor: pointer; } +.overflowHidden1{ + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} /* BASICS */ .editormd-preview ol li { diff --git a/public/react/src/modules/courses/members/teacherList.js b/public/react/src/modules/courses/members/teacherList.js index 19bb74d44..ab70013e4 100644 --- a/public/react/src/modules/courses/members/teacherList.js +++ b/public/react/src/modules/courses/members/teacherList.js @@ -33,24 +33,27 @@ function buildColumns(that) { const { course_groups } = that.state const columns = [{ title: '序号', - width: 28, - // dataIndex: 'name', + dataIndex: 'name', key: 'index', render: (content, item, index) => { - return {(that.state.page - 1) * 20 + index + 1} + return {(that.state.page - 1) * 20 + index + 1}　 } },{ title: '用户ID', - width: 82, + width: 120, dataIndex: 'login', - key: 'login' + key: 'login', + render: (login, record) => { + return 8 ? login : ''}`}>{login} + } }, { title: '姓名', dataIndex: 'name', - width: 140, + width: 120, key: 'name', render: (name, record) => { - return {name} + return 4 ? name : ''}`}>{name} } }, { title: '角色', From a17191b896628a183eb291557a36c95a1bc14452 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Wed, 26 Jun 2019 15:34:52 +0800 Subject: [PATCH 4/5] showNotification --- .../modules/courses/busyWork/common/WorkDetailPageHeader.js | 2 +- .../src/modules/courses/common/comments/CCommentItem.js | 6 +++--- public/react/src/modules/courses/css/Courses.css | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js b/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js index 21bd2f241..c16d285dd 100644 --- a/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js +++ b/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js @@ -103,7 +103,7 @@ class WorkDetailPageHeader extends Component{ /> - {category && 返回} + {category && 返回} {this.props.update_atta && diff --git a/public/react/src/modules/courses/common/comments/CCommentItem.js b/public/react/src/modules/courses/common/comments/CCommentItem.js index 45ebb364b..e4286e456 100644 --- a/public/react/src/modules/courses/common/comments/CCommentItem.js +++ b/public/react/src/modules/courses/common/comments/CCommentItem.js @@ -51,7 +51,7 @@ class CCommentItem extends Component{ }) .then((response) => { if (response.data.status == 0) { - this.showNotification('撤销成功') + this.props.showNotification('撤销成功') this.props.replySuccess() } }) @@ -67,7 +67,7 @@ class CCommentItem extends Component{ let { item, commentIndex }=this.props; if (!this.state.secondReplyContent || !this.state.secondReplyContent.trim()) { - this.showNotification('内容不能为空') + this.props.showNotification('内容不能为空') return; } if (this.state.show_reply) { @@ -313,7 +313,7 @@ class CCommentItem extends Component{ { item.is_invalid ? 失效 : 回复 - {(isAppealing || isAnonymous) && item.can_appeal && item.appeal_status == 0 && 申诉} + {(isAppealing || isAnonymous) && item.can_appeal && item.appeal_status == 0 && 申诉} diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css index 805fc0f19..3579f983b 100644 --- a/public/react/src/modules/courses/css/Courses.css +++ b/public/react/src/modules/courses/css/Courses.css @@ -5,6 +5,7 @@ i.iconfont { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + display: inline-block; } /* BASICS */ From a874798e07377e34e91c09aa15dbd6c9a0d64ced Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Wed, 26 Jun 2019 15:38:29 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=AF=84=E8=AE=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/courses/common/courseMessage.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/react/src/modules/courses/common/courseMessage.css b/public/react/src/modules/courses/common/courseMessage.css index a7bbd8f1a..c219df018 100644 --- a/public/react/src/modules/courses/common/courseMessage.css +++ b/public/react/src/modules/courses/common/courseMessage.css @@ -33,6 +33,10 @@ .course-message .panel-comment_item .editor__resize { left: 47%; } +.course-message .childrenCommentsView .comment_item_cont:first-child { + border-top: 1px solid #e3e3e3; + margin-top: 8px; +} .course-message .comment_item_cont:last-child { /* 作品评阅需要 */ border-bottom: none;