From d8ad34a8625d870fe11509eedbfc37c81669bf63 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Fri, 28 Jun 2019 14:20:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E6=9C=AA=E5=86=99=E8=AF=84=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/busyWork/reply/CommonWorkAppraiseReply.js       | 2 ++
 .../src/modules/courses/common/comments/CCommentItem.js     | 2 +-
 .../graduation/tasks/GraduationTasksappraiseMainEditor.js   | 6 +++---
 .../graduation/tasks/GraduationTasksappraiseReplyChild.js   | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/reply/CommonWorkAppraiseReply.js b/public/react/src/modules/courses/busyWork/reply/CommonWorkAppraiseReply.js
index c41f888ca..146511712 100644
--- a/public/react/src/modules/courses/busyWork/reply/CommonWorkAppraiseReply.js
+++ b/public/react/src/modules/courses/busyWork/reply/CommonWorkAppraiseReply.js
@@ -205,6 +205,7 @@ class CommonWorkAppraiseReply extends Component{
     const isAdmin = this.props.isAdmin()
 
     const isNiPing = homework_status && homework_status.indexOf('匿评中') != -1
+    const isGroup = this.props.isGroup()
     /**
       isAdmin || 评阅入口：超级管理员、老师和助教显示；  -》 改成admin也不显示
       匿评人：匿评期间显示
@@ -276,6 +277,7 @@ class CommonWorkAppraiseReply extends Component{
               showModulationtype={this.showModulationtype}
               addSuccess={this.addSuccess} ref={this.editorRef} totalCount={comment_scores.length}
               onReply={this.onReply} placeholder={"请在此输入对本作品的评语，最大限制2000个字符"}
+              showSameScore={isGroup}
             ></GraduationTasksappraiseMainEditor> }
           </div>
           {/* ${!!comment_scores.length ? 'bor-bottom-greyE' : ''} */}
diff --git a/public/react/src/modules/courses/common/comments/CCommentItem.js b/public/react/src/modules/courses/common/comments/CCommentItem.js
index e4286e456..183ef6ea5 100644
--- a/public/react/src/modules/courses/common/comments/CCommentItem.js
+++ b/public/react/src/modules/courses/common/comments/CCommentItem.js
@@ -329,7 +329,7 @@ class CCommentItem extends Component{
 										<div className="cl"></div>
 									</div>
 								</div>}
-								{!_content && <span className="color656565 mt2 color-grey-9 font-12 mr8">{"暂未写评语"}</span>}
+								{!_content && <span className="color656565 mt2 color-grey-9 font-12 mr8" style={{ display: 'inline-block'}}>{"暂未写评语"}</span>}
 								<div className="mt6">
 									{attachments && attachments.map((attaItem, key)=>{
 										return(
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js
index 15300c628..dc87c9272 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js
@@ -26,7 +26,7 @@ class GraduationTasksappraiseMainEditor extends Component{
   onSubmit = () => {
     const { score, same_score } = this.state
     let category_id= this.props.match.params.category_id;    
-    const url = this.props.replyUrl || `/graduation_works/${category_id}/add_score.json` 
+    const url =  `/graduation_works/${category_id}/add_score.json` 
     const attachment_ids = this.state.fileList.map(item => {
       return item.response ? item.response.id : item.id
     })
@@ -153,7 +153,7 @@ class GraduationTasksappraiseMainEditor extends Component{
   }
   render(){
     let { total_count, comments, pageCount, fileList, score, same_score, errorMessage, numberErrorMessage } = this.state
-    const { current_user, memo, task_type, placeholder } = this.props
+    const { current_user, memo, showSameScore, placeholder } = this.props
     const isAdmin = this.props.isAdmin()
     const commentUploadProp = {
       width: 600,
@@ -205,7 +205,7 @@ class GraduationTasksappraiseMainEditor extends Component{
         {this.props.title && <span className="mainEditorTitle color-grey-6">{this.props.title}</span>}
         <TPMMDEditor ref={this.mdRef} mdID={'appraiseEditor'}  placeholder={placeholder || "请在此输入对本作品的评语，最大限制2000个字符"}
           watch={false} height={160} className={errorMessage ? 'editorInputError' : ''}></TPMMDEditor>
-        { task_type == 2 && <div>
+        { showSameScore == true && <div>
           <Checkbox value={same_score} onChange={this.same_score_change}>整组同评</Checkbox>
           <span className={"font-14 color-grey-9"}>(选中，则本次评阅对象指小组全部成员，否则仅评阅此成员1人 )</span>
         </div> }
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js
index 345a9874d..83d42f9fc 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js
@@ -76,7 +76,8 @@ class GraduationTasksappraiseReplyChild extends Component{
 						</div>}
 
 						{this.props.ultimate===true ? "": isAdmin && <GraduationTasksappraiseMainEditor {...this.props}
-								addSuccess={() => this.props.addSuccess()}																																								
+								addSuccess={() => this.props.addSuccess()}
+								showSameScore={true}																																							
 							></GraduationTasksappraiseMainEditor> }
 				</div>