From b419b2add64d70bf1bdb2f491c3eb090dda2cfa3 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Wed, 27 May 2020 11:44:34 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/huge/frontEnd/hugeOA
---
src/components/common/TopListTableView/index.jsx | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/components/common/TopListTableView/index.jsx b/src/components/common/TopListTableView/index.jsx
index edb1878..d607e53 100644
--- a/src/components/common/TopListTableView/index.jsx
+++ b/src/components/common/TopListTableView/index.jsx
@@ -31,7 +31,8 @@
this.setState({
topList: [
{ ...tag['latenessRanking'], dataSource: res['latenessRanking'] },
- { ...tag['meritsRanking'], dataSource: res['meritsRanking'] },
+ { ...tag['earlyRanking'], dataSource: res['earlyRanking'] },
+ // { ...tag['meritsRanking'], dataSource: res['meritsRanking'] },
{ ...tag['defectRanking'], dataSource: res['defectRanking'] },
]
})
@@ -42,11 +43,12 @@
componentDidMount() { }
renderDom = ({ name, columns, dataSource }) => {
- return <div className="top-list-table-view-main-table">
+ return <div className="top-list-table-view-main-table h-100">
<div className="top-list-table-view-main-table-title">{name}
- <span className="top-list-table-view-main-table-title-fuc">查看</span>
+ {/* <span className="top-list-table-view-main-table-title-fuc">查看</span> */}
</div>
<Table
+ scroll={{ y: 130 }}
dataSource={dataSource ? dataSource.map((a, idx) => ({ ...a, key: idx })) : []}
columns={columns}
size="small"
@@ -63,7 +65,7 @@
<Row type="flex" gutter={12}>
{
topList.map((item, idx) => {
- return <Col span={24 / 3} key={idx}>{this.renderDom(item)}</Col>;
+ return <Col span={24 / topList.length} key={idx} >{this.renderDom(item)}</Col>;
})
}
</Row>
--
Gitblit v1.8.0