From 3c40720339f36cbc77e05db8018aba3d8338b391 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 10:09:33 +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

---
 .../graduation/tasks/GraduationTasksedit.js   |  2 +-
 .../tasks/GraduationTaskssettinglist.js       | 27 +++++++++----------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
index 36c2f9d3f..9874b26fa 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
@@ -125,7 +125,7 @@ class GraduationTasksedit extends Component{
               GraduationTasksedittype=false;
               // window.location.href="/courses/"+course_id+"/graduation/"+graduationId+"/graduation_tasks/"+category_id+"/questions";
               // this.goback()
-              this.props.history.push("/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+graduation_id+"/"+this.props.match.params.category_id +"/setting");
+							window.location.href="/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+graduation_id+"/"+this.props.match.params.category_id +"/setting";
             }
           }).catch((error) => {
             console.log(error)
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index 39068e1e3..ecfd21257 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -730,7 +730,7 @@ class GraduationTaskssettinglist extends Component{
 																					其它历史评分将全部失效</pre>:""}>
 
                                             {tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
-																								{tag.name}
+																								tag.name
                                             </a>
                                                 :
 																							<a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
@@ -747,7 +747,7 @@ class GraduationTaskssettinglist extends Component{
                                     operation.map((tag,key) => {
                                         return(
 																			     <div key={key}>
-                                                <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >{tag.status===0?"":"查看"}</a>
+																						 {tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >查看</a>}
                                             </div>
                                         )}
                                     ):""
@@ -863,7 +863,7 @@ class GraduationTaskssettinglist extends Component{
 																					其它历史评分将全部失效</pre>:""}>
 
                                             {tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
-																								{tag.name}
+																								tag.name
                                             </a>
                                                 :
                                                 <a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
@@ -881,10 +881,9 @@ class GraduationTaskssettinglist extends Component{
                                     operation.map((tag,key) => {
                                         return(
 																					 <div key={key}>
-                                                <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
-																									{tag.status===0?"":"查看"}
-                                                </a>
-
+																						 {tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
+																									查看
+                                                </a>}
                                             </div>
                                         )}
                                     ):""
@@ -1013,7 +1012,7 @@ class GraduationTaskssettinglist extends Component{
 																						<Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>
 																							其它历史评分将全部失效</pre>:""}>
 																								{tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
-																										{tag.name}</a>
+																										tag.name</a>
 																										:
 																										<a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
 																											 onClick={tag.name==="调分"?()=>this.showModulationtype(tag.id):tag.name==="分配"?()=>this.showAllocationModal(tag.id):""}
@@ -1030,9 +1029,9 @@ class GraduationTaskssettinglist extends Component{
                                     operation.map((tag,key) => {
                                         return(
 																				   <div key={key}>
-                                                <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
-																									{tag.status===0?"":"查看"}
-                                                </a>
+																						 {tag.status===0?"--": <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
+																									 查看
+                                                </a>}
                                             </div>
                                         )}
                                     ):""
@@ -1146,7 +1145,7 @@ class GraduationTaskssettinglist extends Component{
                                         <Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>
 																					其它历史评分将全部失效</pre>:""}>
                                             {tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
-																								{tag.name}
+																								tag.name
                                             </a>
                                                 :
                                                 <a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
@@ -1164,8 +1163,8 @@ class GraduationTaskssettinglist extends Component{
                                     operation.map((tag,key) => {
                                         return(
 																				   <div key={key}>
-																						 <a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
-																							 {tag.status===0?"":"查看"}</a>
+																						 {tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
+																							 查看</a>}
                                             </div>
                                         )}
                                     ):""