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

---
 .../graduation/tasks/GraduationTaskssetting.js   |  9 ++++++---
 .../tasks/GraduationTaskssettinglist.js          |  9 ++++++---
 .../tasks/GraduationTaskssettingquestions.js     | 16 ++++++++++++----
 public/react/src/modules/tpm/TPMBanner.js        |  8 ++++----
 4 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
index b4aec1355..c2ec26282 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
@@ -989,6 +989,9 @@ class GraduationTaskssettingapp extends Component{
             .ant-input{
               height:40px;
             }
+            .linbox{
+							height: 26px;
+						 }
             `
           }</style>
           <div className="newMain clearfix">
@@ -1010,14 +1013,14 @@ class GraduationTaskssettingapp extends Component{
                 <span className="color-grey-6">任务详情</span>
               </p>
 
-              <div className="clearfix mt20 mb20 lineh-25">
+              <div className="clearfix mt20 mb20 lineh-25 linbox">
                 <p className=" fl color-black lineh-25 summaryname">
-                  <Link to={"/courses/"+courseId+"/graduation"+"/graduation_tasks/"}>{taskname}</Link>
+                  <Link to={"/courses/"+courseId+"/graduation"+"/graduation_tasks/"} className="color-grey-3">{taskname}</Link>
                 </p>
                 <CoursesListType
                   typelist={task_status}
                 />
-                <a className="color-grey-6 fr font-16 ml30 mr20" onClick={this.goback}>返回</a>
+                <a className="color-grey-3 fr font-16 ml30 mr20" onClick={this.goback}>返回</a>
               </div>
 
 
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index 3410b1fa5..63bc79e91 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -862,6 +862,9 @@ class GraduationTaskssettinglist extends Component{
 						text-overflow: ellipsis;
 						white-space: nowrap;
 						 }
+						 .linbox{
+								height: 26px;
+						 }
 						`
 						}
 					</style>
@@ -960,12 +963,12 @@ class GraduationTaskssettinglist extends Component{
 										<span className="color-grey-6 fl">任务详情</span>
 									</p>
 
-									<div className="clearfix lineh-25 mt20 mb20">
-										<p className=" fl color-black summaryname lineh-25"> <Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id} className="color-grey-6">{taskslistdata.task_name}</Link></p>
+									<div className="clearfix lineh-25 mt20 mb20 linbox">
+										<p className=" fl color-black summaryname lineh-25 "> <Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id} className="color-grey-3">{taskslistdata.task_name}</Link></p>
 										<CoursesListType
 											typelist={taskslistdata.task_status}
 										/>
-										<a className="color-grey-6 fr font-16 ml30 mr20" onClick={this.goback}>返回</a>
+										<a className="color-grey-3 fr font-16 ml30 mr20" onClick={this.goback}>返回</a>
 									</div>
 
 
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
index cdaf90ea4..f1a06808c 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
@@ -238,7 +238,15 @@ class GraduationTasksquestions extends Component{
             modaltype={this.state.modaltype}
             getcourse_groupslist={(id) => this.getcourse_groupslist(id)}
           />
-
+					<style>
+						{
+							`
+							 .linbox{
+								height: 26px;
+						   }
+							`
+						}
+					</style>
           {questionslist&&questionslist?<div className="newMain clearfix">
             <div className={"educontent mb20"}>
 
@@ -250,14 +258,14 @@ class GraduationTasksquestions extends Component{
                 <span className="color-grey-6">任务详情</span>
               </p>
 
-              <div className="clearfix mt20 mb20 lineh-25">
+              <div className="clearfix mt20 mb20 lineh-25 linbox">
                 <p className=" fl color-black summaryname">
-                    <Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id} className="color-grey-6">{questionslist.task_name}</Link>
+                    <Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id} className="color-grey-3">{questionslist.task_name}</Link>
                 </p>
                 <CoursesListType
                   typelist={questionslist.task_status}
                 />
-                <a className="color-grey-6 fr font-16 ml30 mr20" onClick={this.goback}>返回</a>
+                <a className="color-grey-3 fr font-16 ml30 mr20" onClick={this.goback}>返回</a>
               </div>
 
 
diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js
index 0def84c98..f28f982b7 100644
--- a/public/react/src/modules/tpm/TPMBanner.js
+++ b/public/react/src/modules/tpm/TPMBanner.js
@@ -875,16 +875,16 @@ class TPMBanner extends Component {
                 <a className="fr user_default_btn edu-greyback-btn mr15 font-18">已关闭</a>
                 }
 
-                <div className="fr user_default_btn user_blue_btn mr20"
+							{this.props.identity < 8?<div className="fr user_default_btn user_blue_btn mr20"
                      style={{display: shixunsDetails.can_copy === false || shixunsDetails.can_copy === null ? "none" : "flex"}}>
-									{this.props.identity < 8?<Tooltip placement="bottom" title={"基于这个实训修改形成新的实训"}>
+									<Tooltip placement="bottom" title={"基于这个实训修改形成新的实训"}>
                        <span className="flex1 edu-txt-center fl font-18"
                              onClick={this.copyForkvisible}
                              style={{display: shixunsDetails.can_copy === false || shixunsDetails.can_copy === null ? "none" : "inline-block"}}
                        >
                               Fork
                         </span>
-                    </Tooltip>:""}
+                    </Tooltip>
 
 									<Modal
                         keyboard={false}
@@ -934,7 +934,7 @@ class TPMBanner extends Component {
                     </Link>
                     }
 
-                </div>
+                </div>:""}
 
             </div>