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

---
 public/react/src/AppConfig.js                                   | 1 +
 .../courses/shixunHomework/TraineetraininginformationModal.js   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index bae157ef7..fee5e6df5 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -33,6 +33,7 @@ export function initAxiosInterceptors(props) {
         // proxy = "https://testeduplus2.educoder.net"
         proxy="http://47.96.87.25:48080"
 
+
     // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；
     // 如果需要支持重复的请求，考虑config里面自定义一个allowRepeat参考来控制
     const requestMap = {};
diff --git a/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js b/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
index a0486095e..ace1ebe7b 100644
--- a/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
+++ b/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
@@ -82,7 +82,7 @@ class TraineetraininginformationModal extends Component {
       var columns;
       console.log(83);
       console.log(this.props.boolgalist);
-      if(this.props.boolgalist&&this.props.boolgalist === true) {
+      if(this.props.boolgalist&&this.props.boolgalist === false) {
         columns = [
           {
             title: '关卡',

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 2/3] =?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>
 

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

---
 .../TraineetraininginformationModal.js        | 123 +++++++++++++-----
 .../src/modules/tpm/newshixuns/Newshixuns.js  |   2 +-
 2 files changed, 92 insertions(+), 33 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js b/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
index ace1ebe7b..bc51a273d 100644
--- a/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
+++ b/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
@@ -79,11 +79,9 @@ class TraineetraininginformationModal extends Component {
     return str;
   }
     render() {
-      var columns;
       console.log(83);
       console.log(this.props.boolgalist);
-      if(this.props.boolgalist&&this.props.boolgalist === false) {
-        columns = [
+      const  columns = [
           {
             title: '关卡',
             dataIndex: 'number',
@@ -150,9 +148,8 @@ class TraineetraininginformationModal extends Component {
             ),
           }
         ]
-      }
-      else {
-       columns = [
+
+      const columnss = [
             {
               title: '关卡',
               dataIndex: 'number',
@@ -202,7 +199,7 @@ class TraineetraininginformationModal extends Component {
               ),
             }
           ]
-      }
+
         return (
             <div>
                 <Modal
@@ -246,46 +243,108 @@ class TraineetraininginformationModal extends Component {
 
                         </div>
                     </div>
-                        {
-                            this.props.game_list === undefined?"" : this.props.game_list.length<4?
-                              <div className="edu-table edu-back-white ">
-                            <style>
-                                {
-                                    `  .ant-table-body{
+                  {this.props.boolgalist === false?
+                     <div>
+                       {
+                         this.props.game_list === undefined?"" : this.props.game_list.length<4?
+                           <div className="edu-table edu-back-white ">
+                             <style>
+                               {
+                                 `  .ant-table-body{
+                                 overflow: hidden !important; 
+                                  }`
+                               }
+
+                             </style>
+                             <div className={"both"}></div>
+                             {this.props.game_list === undefined ? "" : <Table
+                               className="mt20"
+                               dataSource={this.props.game_list}
+                               columns={columns}
+                               loading={false}
+                               pagination={false}
+                               onChange={this.TablePagination}
+                             />}
+                           </div>
+                           :
+                           <div className="edu-table edu-back-white ">
+                             <div className={"both"}></div>
+                             {this.props.game_list === undefined ? "" : <Table
+                               className="mt20"
+                               dataSource={this.props.game_list}
+                               columns={columns}
+                               pagination={{  //分页
+                                 total: this.props.game_list.length, //数据总数量
+                                 pageSize:  this.props.game_list.length,  //一页显示几条
+                                 current: 1,
+                               }}
+                               loading={false}
+                               pagination={false}
+                               onChange={this.TablePagination}
+                               scroll={{  y: 300 }}
+                             />}
+                           </div>
+                       }
+
+
+                     </div>
+
+
+
+                    :
+
+
+                  <div>
+                    {
+                      this.props.game_list === undefined?"" : this.props.game_list.length<4?
+                        <div className="edu-table edu-back-white ">
+                          <style>
+                            {
+                              `  .ant-table-body{
                                  overflow: hidden !important; 
                                   }`
-                                }
+                            }
 
-                            </style>
-                              <div className={"both"}></div>
-                        {this.props.game_list === undefined ? "" : <Table
+                          </style>
+                          <div className={"both"}></div>
+                          {this.props.game_list === undefined ? "" : <Table
                             className="mt20"
                             dataSource={this.props.game_list}
-                            columns={columns}
+                            columns={columnss}
                             loading={false}
                             pagination={false}
                             onChange={this.TablePagination}
-                            />}
-                              </div>
-                              :
-                              <div className="edu-table edu-back-white ">
-                              <div className={"both"}></div>
-                        {this.props.game_list === undefined ? "" : <Table
+                          />}
+                        </div>
+                        :
+                        <div className="edu-table edu-back-white ">
+                          <div className={"both"}></div>
+                          {this.props.game_list === undefined ? "" : <Table
                             className="mt20"
                             dataSource={this.props.game_list}
-                            columns={columns}
+                            columns={columnss}
                             pagination={{  //分页
-                            total: this.props.game_list.length, //数据总数量
-                            pageSize:  this.props.game_list.length,  //一页显示几条
-                            current: 1,
-                        }}
+                              total: this.props.game_list.length, //数据总数量
+                              pageSize:  this.props.game_list.length,  //一页显示几条
+                              current: 1,
+                            }}
                             loading={false}
                             pagination={false}
                             onChange={this.TablePagination}
                             scroll={{  y: 300 }}
-                            />}
-                              </div>
-                        }
+                          />}
+                        </div>
+                    }
+
+
+
+
+                  </div>
+
+
+                  }
+
+
 
 
                     </Modal>
diff --git a/public/react/src/modules/tpm/newshixuns/Newshixuns.js b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
index 3dca1ad2b..8d38ac24d 100644
--- a/public/react/src/modules/tpm/newshixuns/Newshixuns.js
+++ b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
@@ -948,7 +948,7 @@ class Newshixuns extends Component {
 
                                                           </Upload>
                                                           :
-                                                          <Upload  disabled={true} >
+                                                          <Upload  {...uploadProps} disabled={true} >
                                                               <Icon type="upload"  className="fl mt5" > </Icon>
                                                               <span className="color-grey-c fl">上传附件</span>
                                                               <span className="color-grey-c fl ml10 ">(单个文件50M以内)</span>