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/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 未提交 */}
{/*
*/}
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}
返回
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/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/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/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;
diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css
index c2eb43242..3579f983b 100644
--- a/public/react/src/modules/courses/css/Courses.css
+++ b/public/react/src/modules/courses/css/Courses.css
@@ -1,6 +1,12 @@
i.iconfont {
cursor: pointer;
}
+.overflowHidden1{
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ display: inline-block;
+}
/* 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 3c642e34f..10e646590 100644
--- a/public/react/src/modules/courses/members/teacherList.js
+++ b/public/react/src/modules/courses/members/teacherList.js
@@ -34,24 +34,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: '角色',