diff --git a/src/components/drawer/index.jsx b/src/components/drawer/index.jsx index e102ee1..bb17ffb 100644 --- a/src/components/drawer/index.jsx +++ b/src/components/drawer/index.jsx @@ -342,7 +342,7 @@ export default class DrawerComponents extends React.Component { return ( ) ) : ( - +
+
`共 ${dataSource.length} 条`, + }} + /> + )} ); diff --git a/src/components/topBar/index.jsx b/src/components/topBar/index.jsx index 06b3f73..b0f0fb6 100644 --- a/src/components/topBar/index.jsx +++ b/src/components/topBar/index.jsx @@ -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 = ; + }); 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 = ; + }); 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 /> diff --git a/src/pages/statisticsTable.jsx b/src/pages/statisticsTable.jsx index 79b5c73..5c90376 100644 --- a/src/pages/statisticsTable.jsx +++ b/src/pages/statisticsTable.jsx @@ -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 ( <>
-
; +
`共 ${dataSource.length} 条`, + }} + /> + ; );