From 7afce937962a6efcd5b0993c2168c126652c2195 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 21 Jun 2019 09:33:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tasks/GraduationTasksappraise.js          |  2 +-
 .../tasks/GraduationTaskssettinglist.js       | 59 ++++++++++---------
 2 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
index a45a105fd..7807e7265 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
@@ -205,7 +205,7 @@ class GraduationTasksappraise extends Component{
                     </div>
 
                     <div className={"ml20"}>
-											<div dangerouslySetInnerHTML={{__html: markdownToHTML(datalist&&datalist.description).replace(/▁/g,"▁▁▁")}}></div>
+											<div dangerouslySetInnerHTML={{__html: markdownToHTML(datalist&&datalist.description===null?"--":datalist&&datalist.description).replace(/▁/g,"▁▁▁")}}></div>
                     </div>
 
                     {/*<div className={"color-grey-6 h20 ml20"}>*/}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index d0b30db93..39068e1e3 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -726,17 +726,19 @@ class GraduationTaskssettinglist extends Component{
                             {this.props.isAdmin()?operation.map((tag,key) => {
                                 return(
 																<div key={key}>
-																	{tag.status===0?"--":<Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>
+																      <Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>
 																					其它历史评分将全部失效</pre>:""}>
 
-                                            {tag.name==="评阅"?<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >{tag.name}</a>
+                                            {tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
+																								{tag.name}
+                                            </a>
                                                 :
-                                                <a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
+																							<a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
                                                    onClick={tag.name==="调分"?()=>this.showModulationtype(tag.id):tag.name==="分配"?()=>this.showAllocationModal(tag.id):""}
-                                                >{tag.name}</a>
+                                                >{tag.status===0?"":tag.name}</a>
                                             }
 
-                                        </Tooltip>}
+                                       </Tooltip>
                                     </div>
                                 )
                             }):""}
@@ -745,9 +747,7 @@ class GraduationTaskssettinglist extends Component{
                                     operation.map((tag,key) => {
                                         return(
 																			     <div key={key}>
-																						 {tag.status===0?"--":
-                                                <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >查看</a>
-																						 }
+                                                <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >{tag.status===0?"":"查看"}</a>
                                             </div>
                                         )}
                                     ):""
@@ -858,19 +858,21 @@ class GraduationTaskssettinglist extends Component{
                             {this.props.isAdmin()?operation.map((tag,key) => {
                                 return(
 														        <div key={key}>
-																			{tag.status===0?"--":
+
 																			<Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>
 																					其它历史评分将全部失效</pre>:""}>
 
-                                            {tag.name==="评阅"?<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >{tag.name}</a>
+                                            {tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
+																								{tag.name}
+                                            </a>
                                                 :
                                                 <a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
                                                    onClick={tag.name==="调分"?()=>this.showModulationtype(tag.id):tag.name==="分配"?()=>this.showAllocationModal(tag.id):""}
-                                                >{tag.name}</a>
+                                                >{tag.status===0?"":tag.name}</a>
                                             }
 
                                         </Tooltip>
-																			}
+
                                     </div>
                                 )
                             }):""}
@@ -879,9 +881,10 @@ class GraduationTaskssettinglist extends Component{
                                     operation.map((tag,key) => {
                                         return(
 																					 <div key={key}>
-																						 {tag.status===0?"--":
-                                                <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >查看</a>
-																						 }
+                                                <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
+																									{tag.status===0?"":"查看"}
+                                                </a>
+
                                             </div>
                                         )}
                                     ):""
@@ -1006,14 +1009,15 @@ class GraduationTaskssettinglist extends Component{
                             {this.props.isAdmin()?operation.map((tag,key) => {
                                 return(
 													  			<div key={key}>
-																		{tag.status===0?"--":
+
 																						<Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>
 																							其它历史评分将全部失效</pre>:""}>
-																								{tag.name==="评阅"?<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >{tag.name}</a>
+																								{tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
+																										{tag.name}</a>
 																										:
 																										<a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
 																											 onClick={tag.name==="调分"?()=>this.showModulationtype(tag.id):tag.name==="分配"?()=>this.showAllocationModal(tag.id):""}
-																										>{tag.name}</a>
+																										>{tag.status===0?"":tag.name}</a>
 																								}
 																						</Tooltip>
 																				}
@@ -1026,9 +1030,9 @@ class GraduationTaskssettinglist extends Component{
                                     operation.map((tag,key) => {
                                         return(
 																				   <div key={key}>
-																						 {tag.status===0?"--":
-                                                <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >查看</a>
-																						 }
+                                                <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
+																									{tag.status===0?"":"查看"}
+                                                </a>
                                             </div>
                                         )}
                                     ):""
@@ -1138,14 +1142,16 @@ class GraduationTaskssettinglist extends Component{
                             {this.props.isAdmin()?operation.map((tag,key) => {
                                 return(
 																     <div key={key}>
-																			 {tag.status===0?"--":
+
                                         <Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>
 																					其它历史评分将全部失效</pre>:""}>
-                                            {tag.name==="评阅"?<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >{tag.name}</a>
+                                            {tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
+																								{tag.name}
+                                            </a>
                                                 :
                                                 <a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
                                                    onClick={tag.name==="调分"?()=>this.showModulationtype(tag.id):tag.name==="分配"?()=>this.showAllocationModal(tag.id):""}
-                                                >{tag.name}</a>
+                                                >{tag.status===0?"":tag.name}</a>
                                             }
                                         </Tooltip>
 																			 }
@@ -1158,9 +1164,8 @@ class GraduationTaskssettinglist extends Component{
                                     operation.map((tag,key) => {
                                         return(
 																				   <div key={key}>
-																						 {tag.status===0?"--":
-																						 <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >查看</a>
-																						 }
+																						 <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
+																							 {tag.status===0?"":"查看"}</a>
                                             </div>
                                         )}
                                     ):""