diff --git a/public/react/src/modules/courses/busyWork/reply/CommonWorkAppraiseReply.js b/public/react/src/modules/courses/busyWork/reply/CommonWorkAppraiseReply.js index e933bc411..b67266d77 100644 --- a/public/react/src/modules/courses/busyWork/reply/CommonWorkAppraiseReply.js +++ b/public/react/src/modules/courses/busyWork/reply/CommonWorkAppraiseReply.js @@ -112,8 +112,13 @@ class CommonWorkAppraiseReply extends Component{ cancelText: '取消', onOk: () => { let category_id= this.props.match.params.category_id; - const url = `/graduation_works/${category_id}/delete_score.json?comment_id=${item.id}` - axios.delete(url).then((result)=>{ + const task_id = this.props.task_id + // 作业是使用 task_id + const url = `/student_works/${task_id}/destroy_score.json` + axios.delete(url, { data: { + score_id: item.id + } + }).then((result)=>{ if(result.data.status == 0){ this.props.showNotification('删除成功') this.fetchAllComments() diff --git a/public/react/src/modules/courses/common/comments/CCommentItem.js b/public/react/src/modules/courses/common/comments/CCommentItem.js index d9b1b7927..2415dd0b0 100644 --- a/public/react/src/modules/courses/common/comments/CCommentItem.js +++ b/public/react/src/modules/courses/common/comments/CCommentItem.js @@ -258,6 +258,7 @@ class CCommentItem extends Component{ const isAnonymous = homework_status && homework_status.indexOf('匿评中') != -1 const isAppealing = homework_status && homework_status.indexOf('申诉中') != -1 const attachments = item.attachments; + const isAdmin = this.props.isAdmin() return(
@@ -302,23 +303,29 @@ class CCommentItem extends Component{ {item.score !== null && {item.score}分} - {/* !item.is_invalid && */} - {/* { item.delete && + {/* item.is_invalid && */} + {/* { item.delete && isAdmin && this.props.onDelete(item)}> } */} + + + {/* fr */} {/* 回复 */} { item.is_invalid ? 失效 : 回复 - {(isAppealing || isAnonymous) && item.can_appeal && item.appeal_status == 0 && 申诉} - + {(isAppealing || isAnonymous) && item.can_appeal && item.appeal_status == 0 && + 申诉} } + {item.delete && isAdmin + && this.props.onDelete(item)}>删除}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js index e8b076685..6b741f413 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js @@ -151,8 +151,8 @@ class GraduationTasksappraiseMainEditor extends Component{ } this.setState({ score: val }) } - same_score_change = (val) => { - this.setState({ same_score: !this.state.same_score }) + same_score_change = (e) => { + this.setState({ same_score: e.target.checked }) //!this.state.same_score } render(){ let { total_count, comments, pageCount, fileList, score, same_score, errorMessage, numberErrorMessage } = this.state @@ -209,7 +209,7 @@ class GraduationTasksappraiseMainEditor extends Component{ { showSameScore == true &&
- 整组同评 + 整组同评 (选中,则本次评阅对象指小组全部成员,否则仅评阅此成员1人 )
}