This commit is contained in:
parent
dd703a05d4
commit
c01a806c88
|
|
@ -342,7 +342,7 @@ export default class DrawerComponents extends React.Component {
|
|||
return (
|
||||
<Drawer
|
||||
title="详细信息"
|
||||
width={1000}
|
||||
width={1100}
|
||||
onClose={this.onClose}
|
||||
open={open}
|
||||
bodyStyle={{
|
||||
|
|
@ -397,7 +397,22 @@ export default class DrawerComponents extends React.Component {
|
|||
</Spin>
|
||||
)
|
||||
) : (
|
||||
<Table dataSource={dataSource} columns={columns} />
|
||||
<div style={{ padding: '0 20px' }}>
|
||||
<Table
|
||||
dataSource={dataSource}
|
||||
columns={columns}
|
||||
scroll={{ y: 500 }}
|
||||
pagination={{
|
||||
locale: {
|
||||
// 翻页文本替换
|
||||
items_per_page: '条/页',
|
||||
jump_to: '跳至',
|
||||
page: '页',
|
||||
},
|
||||
showTotal: (total) => `共 ${dataSource.length} 条`,
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
</Drawer>
|
||||
);
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ const { TextArea } = Input;
|
|||
import moment from 'moment';
|
||||
import 'moment/locale/zh-cn';
|
||||
import locale from 'antd/lib/date-picker/locale/zh_CN';
|
||||
import { HomeOutlined } from '@ant-design/icons';
|
||||
moment.locale('zh-cn');
|
||||
|
||||
export class TopBar extends React.Component {
|
||||
|
|
@ -81,7 +82,6 @@ export class TopBar extends React.Component {
|
|||
this.setState({
|
||||
open: false,
|
||||
confirmLoading: false,
|
||||
description: '',
|
||||
});
|
||||
message.success('版本记录成功,请重新刷新页面', 2, 3);
|
||||
} else {
|
||||
|
|
@ -114,6 +114,9 @@ export class TopBar extends React.Component {
|
|||
} else {
|
||||
arr = [...data.companyTree];
|
||||
}
|
||||
arr.map((item, index) => {
|
||||
item.icon = <HomeOutlined />;
|
||||
});
|
||||
this.setState({
|
||||
rootTreeData: arr,
|
||||
});
|
||||
|
|
@ -160,6 +163,9 @@ export class TopBar extends React.Component {
|
|||
fetch(url)
|
||||
.then((res) => res.json())
|
||||
.then((data) => {
|
||||
data.companyTree.map((item, index) => {
|
||||
item.icon = <HomeOutlined />;
|
||||
});
|
||||
this.setState({
|
||||
fclasslist: data.fclasslist,
|
||||
rootTreeData: data.companyTree,
|
||||
|
|
@ -231,6 +237,7 @@ export class TopBar extends React.Component {
|
|||
onChange={this.onRootChange}
|
||||
loadData={this.onRootLoadData}
|
||||
treeData={rootTreeData}
|
||||
treeIcon
|
||||
/>
|
||||
</Col>
|
||||
<Col span={6}>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @Author: Chengliang 1546584672@qq.com
|
||||
* @Date: 2023-09-11 15:33:27
|
||||
* @LastEditors: Chengliang 1546584672@qq.com
|
||||
* @LastEditTime: 2023-09-13 17:49:16
|
||||
* @LastEditTime: 2023-09-15 11:39:05
|
||||
* @FilePath: /org-chart-frant/src/pages/statisticsTable.jsx
|
||||
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||
*/
|
||||
|
|
@ -81,7 +81,20 @@ const StatisticsTable = () => {
|
|||
return (
|
||||
<>
|
||||
<div style={{ padding: '50px' }}>
|
||||
<Table dataSource={dataSource} columns={columns} loading={loading} />;
|
||||
<Table
|
||||
dataSource={dataSource}
|
||||
columns={columns}
|
||||
loading={loading}
|
||||
pagination={{
|
||||
locale: {
|
||||
items_per_page: '条/页',
|
||||
jump_to: '跳至',
|
||||
page: '页',
|
||||
},
|
||||
showTotal: (total) => `共 ${dataSource.length} 条`,
|
||||
}}
|
||||
/>
|
||||
;
|
||||
</div>
|
||||
</>
|
||||
);
|
||||
|
|
|
|||
Loading…
Reference in New Issue