m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

调整

Browse Source
dev_forum
杨树林 5 years ago
parent acdf0245e9
commit a5b14fc4a2
2 changed files with 92 additions and 33 deletions
Show Stats Download Patch File Download Diff File

123
public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
Unescape View File

@ -79,11 +79,9 @@ class TraineetraininginformationModal extends Component {
return str; return str;
} }
render() { render() {
var columns;
console.log(83); console.log(83);
console.log(this.props.boolgalist); console.log(this.props.boolgalist);
if(this.props.boolgalist&&this.props.boolgalist === false) { const columns = [
columns = [
{ {
title: '关卡', title: '关卡',
dataIndex: 'number', dataIndex: 'number',
@ -150,9 +148,8 @@ class TraineetraininginformationModal extends Component {
), ),
} }
] ]
}
else { const columnss = [
columns = [
{ {
title: '关卡', title: '关卡',
dataIndex: 'number', dataIndex: 'number',
@ -202,7 +199,7 @@ class TraineetraininginformationModal extends Component {
), ),
} }
] ]
}
return ( return (
<div> <div>
<Modal <Modal
@ -246,46 +243,108 @@ class TraineetraininginformationModal extends Component {
</div> </div>
</div> </div>
{ {this.props.boolgalist === false?
this.props.game_list === undefined?"" : this.props.game_list.length<4? <div>
<div className="edu-table edu-back-white "> {
<style> this.props.game_list === undefined?"" : this.props.game_list.length<4?
{ <div className="edu-table edu-back-white ">
` .ant-table-body{ <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; overflow: hidden !important;
}` }`
} }
</style> </style>
<div className={"both"}></div> <div className={"both"}></div>
{this.props.game_list === undefined ? "" : <Table {this.props.game_list === undefined ? "" : <Table
className="mt20" className="mt20"
dataSource={this.props.game_list} dataSource={this.props.game_list}
columns={columns} columns={columnss}
loading={false} loading={false}
pagination={false} pagination={false}
onChange={this.TablePagination} onChange={this.TablePagination}
/>} />}
</div> </div>
: :
<div className="edu-table edu-back-white "> <div className="edu-table edu-back-white ">
<div className={"both"}></div> <div className={"both"}></div>
{this.props.game_list === undefined ? "" : <Table {this.props.game_list === undefined ? "" : <Table
className="mt20" className="mt20"
dataSource={this.props.game_list} dataSource={this.props.game_list}
columns={columns} columns={columnss}
pagination={{ //分页 pagination={{ //分页
total: this.props.game_list.length, //数据总数量 total: this.props.game_list.length, //数据总数量
pageSize: this.props.game_list.length, //一页显示几条 pageSize: this.props.game_list.length, //一页显示几条
current: 1, current: 1,
}} }}
loading={false} loading={false}
pagination={false} pagination={false}
onChange={this.TablePagination} onChange={this.TablePagination}
scroll={{ y: 300 }} scroll={{ y: 300 }}
/>} />}
</div> </div>
} }
</div>
}
</Modal> </Modal>

2
public/react/src/modules/tpm/newshixuns/Newshixuns.js
Unescape View File

@ -948,7 +948,7 @@ class Newshixuns extends Component {
</Upload> </Upload>
: :
<Upload disabled={true} > <Upload {...uploadProps} disabled={true} >
<Icon type="upload" className="fl mt5" > </Icon> <Icon type="upload" className="fl mt5" > </Icon>
<span className="color-grey-c fl">上传附件</span> <span className="color-grey-c fl">上传附件</span>
<span className="color-grey-c fl ml10 ">(单个文件50M以内)</span> <span className="color-grey-c fl ml10 ">(单个文件50M以内)</span>

Write Preview
Loading…
Cancel
Save