调整

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) {
+      const  columns = [
-        columns = [
           {
             title: '关卡',
             dataIndex: 'number',
@@ -150,9 +148,8 @@ class TraineetraininginformationModal extends Component {
             ),
           }
         ]
-      }
+
-      else {
+      const columnss = [
-       columns = [
             {
               title: '关卡',
               dataIndex: 'number',
@@ -202,7 +199,7 @@ class TraineetraininginformationModal extends Component {
               ),
             }
           ]
-      }
+
         return (
             <div>
                 <Modal
@@ -246,6 +243,8 @@ class TraineetraininginformationModal extends Component {
 
                         </div>
                     </div>
+                  {this.props.boolgalist === false?
+                     <div>
                        {
                          this.props.game_list === undefined?"" : this.props.game_list.length<4?
                            <div className="edu-table edu-back-white ">
@@ -288,6 +287,66 @@ 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{
+                                 overflow: hidden !important; 
+                                  }`
+                            }
+
+                          </style>
+                          <div className={"both"}></div>
+                          {this.props.game_list === undefined ? "" : <Table
+                            className="mt20"
+                            dataSource={this.props.game_list}
+                            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
+                            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>
+                    }
+
+
+
+
+                  </div>
+
+
+                  }
+
+
+
+
                     </Modal>
 
 

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>