From 79ba63b0b79339d49de02257eb73ef39c772a321 Mon Sep 17 00:00:00 2001
From: Mr Ke <kelq@hugeinfo.com.cn>
Date: Sat, 16 May 2020 13:46:09 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/huge/frontEnd/hugeOA
---
src/components/common/TopListTableView/index.jsx | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/components/common/TopListTableView/index.jsx b/src/components/common/TopListTableView/index.jsx
index 859bf83..edb1878 100644
--- a/src/components/common/TopListTableView/index.jsx
+++ b/src/components/common/TopListTableView/index.jsx
@@ -7,7 +7,7 @@
/** 榜单table列表 */
import React, { ReactNode, ReactEventHandler, Component } from 'react';
import { Table, Row, Col } from 'antd';
-import { tagList } from './tagList';
+import { tagList, tag } from './tagList';
import fetch from '../../../api/request';
import './index.scss';
@@ -27,22 +27,27 @@
fetch({
url: `api/merits/queryMerits`
}).then(res => {
- console.log('res', res);
- })
- this.setState({
- topList: tagList
+ if( res) {
+ this.setState({
+ topList: [
+ { ...tag['latenessRanking'], dataSource: res['latenessRanking'] },
+ { ...tag['meritsRanking'], dataSource: res['meritsRanking'] },
+ { ...tag['defectRanking'], dataSource: res['defectRanking'] },
+ ]
+ })
+ }
})
}
componentDidMount() { }
- renderDom = ({ name, columns }) => {
+ renderDom = ({ name, columns, dataSource }) => {
return <div className="top-list-table-view-main-table">
<div className="top-list-table-view-main-table-title">{name}
<span className="top-list-table-view-main-table-title-fuc">查看</span>
</div>
<Table
- dataSource={[{ age: 1 }]}
+ dataSource={dataSource ? dataSource.map((a, idx) => ({ ...a, key: idx })) : []}
columns={columns}
size="small"
bordered={false}
--
Gitblit v1.8.0