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] =?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>