diff --git a/src/components/Data.jsx b/src/components/Data.jsx index 35106ff..5d1904d 100644 --- a/src/components/Data.jsx +++ b/src/components/Data.jsx @@ -35,7 +35,7 @@ export const TableExportBtn = (props) => { const output_name = `${props.label}`; const [columnsMap, setColumnsMap] = useState([]); useEffect(() => { - const flatCols = props.columns.flatMap((v, k) => (v.children ? v.children.map((vc) => ({ ...vc, title: `${v.title}-${vc.title || ''}` })) : v)).filter(c => c.title); + const flatCols = props.columns.flatMap((v, k) => (v.children ? v.children.map((vc) => ({ ...vc, title: `${v?.titleX || v.title}-${vc.title || ''}` })) : v)).filter(c => c.title); // console.log('flatCols', flatCols); setColumnsMap(flatCols); diff --git a/src/views/Distribution.jsx b/src/views/Distribution.jsx index 44dddc6..84d7ec3 100644 --- a/src/views/Distribution.jsx +++ b/src/views/Distribution.jsx @@ -1,12 +1,12 @@ import { useContext, useEffect } from 'react'; import { observer } from 'mobx-react'; import { stores_Context } from '../config'; -import { Row, Col, Spin, Tabs, Table, Space, Typography } from 'antd'; +import { Row, Col, Spin, Tabs, Table, Space, Typography, Divider } from 'antd'; import { RingProgress } from '@ant-design/plots'; import SearchForm from './../components/search/SearchForm'; import { empty } from '../utils/commons'; import { dataFieldAlias } from '../libs/ht'; -import { VSTag } from './../components/Data'; +import { VSTag, TableExportBtn } from './../components/Data'; import MixYnQ from './../components/MixYnQ'; import './kpi.css'; @@ -73,7 +73,7 @@ export default observer(() => { innerRadius: 0.90, }; const columns = [ - { title: '', dataIndex: 'label' }, + { title: '#', dataIndex: 'label' }, { title: '团数', dataIndex: 'ConfirmOrder', @@ -132,36 +132,38 @@ export default observer(() => { }, { title: () => <>