From 12388a1f7b98fd9d9b9cbed167183cdf375edfe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 10 Aug 2019 14:50:02 +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        | 98 +++++++++++++------
 1 file changed, 67 insertions(+), 31 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js b/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
index 53f960872..c7acf23a4 100644
--- a/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
+++ b/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
@@ -79,14 +79,14 @@ class TraineetraininginformationModal extends Component {
     return str;
   }
     render() {
-      console.log(83);
-      console.log(this.props.boolgalist);
+      // console.log(83);
+      // console.log(this.props.boolgalist);
       const  columns = [
           {
             title: '关卡',
             dataIndex: 'number',
             key: 'number',
-            width: 92,
+            width:"91px",
             align: "center",
             render: (text, record) => (
               <span>
@@ -98,7 +98,7 @@ class TraineetraininginformationModal extends Component {
             title: '完成时间',
             dataIndex: 'name',
             key: 'name',
-            width: 130,
+            width:"150px",
             align: "center",
             render: (text, record) => (
               <span>
@@ -113,7 +113,7 @@ class TraineetraininginformationModal extends Component {
             title: '',
             dataIndex: 'complete_status',
             key: 'complete_status',
-            width: 100,
+            width:"87px",
             align: "center",
             render: (text, record) => (
               <span>
@@ -127,7 +127,7 @@ class TraineetraininginformationModal extends Component {
             title: '耗时',
             dataIndex: 'stduynumber',
             key: 'stduynumber',
-            width: 92,
+            width:"150px",
             align: "center",
             render: (text, record) => (
               <span>
@@ -138,7 +138,7 @@ class TraineetraininginformationModal extends Component {
           {
             title: '经验值',
             key: 'classroom',
-            width: 92,
+
             dataIndex: 'classroom',
             align: "center",
             render: (text, record) => (
@@ -147,7 +147,7 @@ class TraineetraininginformationModal extends Component {
         </span>
             ),
           }
-        ]
+        ];
 
       const columnss = [
             {
@@ -155,7 +155,7 @@ class TraineetraininginformationModal extends Component {
               dataIndex: 'number',
               key: 'number',
               align: "center",
-              width: "117px",
+              width:"119px",
               render: (text, record) => (
                 <span >
             <a style={{"color":'#07111B', "text-align": "center"}}>{record.number}</a>
@@ -166,7 +166,7 @@ class TraineetraininginformationModal extends Component {
               title: '完成时间',
               dataIndex: 'name',
               key: 'name',
-              width: "203px",
+              width:"174px",
               align: "center",
               render: (text, record) => (
                 <span >
@@ -179,7 +179,7 @@ class TraineetraininginformationModal extends Component {
               dataIndex: 'stduynumber',
               key: 'stduynumber',
               align: "center",
-              width: "117px",
+              width:"119px",
               render: (text, record) => (
                 <span>
              <a style={{"color":'#989898', "text-align": "center"}}>{record.stduynumber}</a>
@@ -191,14 +191,14 @@ class TraineetraininginformationModal extends Component {
               key: 'classroom',
               dataIndex: 'classroom',
               align: "center",
-              width: "117px",
+
               render: (text, record) => (
                 <span>
              <a style={{"color":'#29BD8B', "text-align": "center"}}>{record.classroom}</a>
         </span>
               ),
             }
-          ]
+          ];
 
         return (
             <div>
@@ -246,13 +246,24 @@ class TraineetraininginformationModal extends Component {
                   {this.props.boolgalist === false?
                      <div>
                        {
-                         this.props.game_list === undefined?"" : this.props.game_list.length<5?
+                         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; 
-                                  }`
+                                  }
+                                   .edu-table .ant-table-tbody > tr > td {
+														height: 85px;
+															}
+														.edu-table .ant-table-thead > tr > th{
+																 	height: 85px;
+														 }
+														 
+														 .edu-table .ant-table-header {
+														   overflow: hidden !important;
+														   }
+                                  `
                                }
 
                              </style>
@@ -263,24 +274,33 @@ class TraineetraininginformationModal extends Component {
                                columns={columns}
                                loading={false}
                                pagination={false}
-                               onChange={this.TablePagination}
                              />}
                            </div>
                            :
                            <div className="edu-table edu-back-white ">
+                             <style>
+                               {
+                                 `
+                                     .edu-table .ant-table-tbody > tr > td {
+														height: 85px;
+															}
+														.edu-table .ant-table-thead > tr > th{
+																 	height: 85px;
+														 }
+														  .edu-table .ant-table-header {
+														   overflow: hidden !important;
+														   }
+                                 `
+
+                               }
+                             </style>
                              <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>
@@ -296,13 +316,21 @@ class TraineetraininginformationModal extends Component {
 
                   <div>
                     {
-                      this.props.game_list === undefined?"" : this.props.game_list.length<5?
+                      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; 
-                                  }`
+                                  }
+                                         .edu-table .ant-table-tbody > tr > td {
+														height: 85px;
+															}
+														.edu-table .ant-table-thead > tr > th{
+																 	height: 85px;
+														 }
+                                  
+                                  `
                             }
 
                           </style>
@@ -313,24 +341,32 @@ class TraineetraininginformationModal extends Component {
                             columns={columnss}
                             loading={false}
                             pagination={false}
-                            onChange={this.TablePagination}
                           />}
                         </div>
                         :
                         <div className="edu-table edu-back-white ">
+                          <style>
+                            {
+                              `
+                                     .edu-table .ant-table-tbody > tr > td {
+														height: 85px;
+															}
+														.edu-table .ant-table-thead > tr > th{
+																 	height: 85px;
+														 }
+														 .edu-table .ant-table-header {
+														   overflow: hidden !important;
+														   }
+                              `
+                            }
+                          </style>
                           <div className={"both"}></div>
                           {this.props.game_list === undefined ? "" : <Table
                             className="mt20"
                             dataSource={this.props.game_list}
                             columns={columnss}
-                            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>