Joe
/
xie_fang_tong_admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update

Browse Source
master
Joe 1 year ago
parent f7aa4f04ad
commit 1949fe8682
6 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File

13
src/pages/Dashboard/BusinessViews.tsx
Unescape Escape View File

@ -90,8 +90,13 @@ const TableList: React.FC<{}> = () => {
title: '注册日期', title: '注册日期',
dataIndex: 'pbcCreateAt', dataIndex: 'pbcCreateAt',
width: 150, width: 150,
valueType: 'dateTimeRange', search: false
render: (text, record) => record.pbcCreateAt, },
{
title: '注册日期',
dataIndex: 'pbcCreateAt',
hideInTable: true,
valueType: 'dateRange'
}, },
{ {
title: '商户等级', title: '商户等级',
@ -123,7 +128,7 @@ const TableList: React.FC<{}> = () => {
const queryParam = { const queryParam = {
...param, ...param,
startDate: param.pbcCreateAt && param.pbcCreateAt.length > 1 ? param.pbcCreateAt[0] : undefined, startDate: param.pbcCreateAt && param.pbcCreateAt.length > 1 ? param.pbcCreateAt[0] : undefined,
endDate: param.pbcCreateAt && param.pbcCreateAt.length > 1 ? param.pbcCreateAt[1] : undefined, endDate: param.pbcCreateAt && param.pbcCreateAt.length > 1 ? param.pbcCreateAt[1] + ' 23:59:59' : undefined,
pbcCreateAt: undefined pbcCreateAt: undefined
} }
return fetchData(queryParam); return fetchData(queryParam);
@ -143,7 +148,7 @@ const TableList: React.FC<{}> = () => {
const queryParam = { const queryParam = {
pbcBusinessName: values?.pbcBusinessName, pbcBusinessName: values?.pbcBusinessName,
startDate: values?.pbcCreateAt && values?.pbcCreateAt.length > 1 ? moment(values?.pbcCreateAt[0]).format("YYYY-MM-DD HH:mm:ss") : undefined, startDate: values?.pbcCreateAt && values?.pbcCreateAt.length > 1 ? moment(values?.pbcCreateAt[0]).format("YYYY-MM-DD HH:mm:ss") : undefined,
endDate: values?.pbcCreateAt && values?.pbcCreateAt.length > 1 ? moment(values?.pbcCreateAt[1]).format("YYYY-MM-DD HH:mm:ss") : undefined endDate: values?.pbcCreateAt && values?.pbcCreateAt.length > 1 ? moment(values?.pbcCreateAt[1]).format("YYYY-MM-DD") + ' 23:59:59' : undefined
} }
handleExport(queryParam) handleExport(queryParam)
}}>导出</Button> }}>导出</Button>

8
src/pages/Dashboard/ChannelStatistics.tsx
Unescape Escape View File

@ -76,10 +76,8 @@ import moment from 'moment';
{ {
title: '访问时间', title: '访问时间',
dataIndex: 'pbcCreateAt', dataIndex: 'pbcCreateAt',
width: 150,
hideInTable: true, hideInTable: true,
valueType: 'dateTimeRange', valueType: 'dateRange'
render: (text, record: any) => record.pbcCreateAt,
}, },
]; ];
@ -103,7 +101,7 @@ import moment from 'moment';
...param, ...param,
pbcDataSource: param.pbcDataSource, pbcDataSource: param.pbcDataSource,
startDate: param.pbcCreateAt && param.pbcCreateAt.length > 1 ? param.pbcCreateAt[0] : undefined, startDate: param.pbcCreateAt && param.pbcCreateAt.length > 1 ? param.pbcCreateAt[0] : undefined,
endDate: param.pbcCreateAt && param.pbcCreateAt.length > 1 ? param.pbcCreateAt[1] : undefined endDate: param.pbcCreateAt && param.pbcCreateAt.length > 1 ? param.pbcCreateAt[1] + ' 23:59:59' : undefined
} }
return fetchData(queryParam); return fetchData(queryParam);
}} }}
@ -122,7 +120,7 @@ import moment from 'moment';
const queryParam = { const queryParam = {
pbcDataSource: values?.pbcDataSource, pbcDataSource: values?.pbcDataSource,
startDate: values?.pbcCreateAt && values?.pbcCreateAt.length > 1 ? moment(values?.pbcCreateAt[0]).format("YYYY-MM-DD HH:mm:ss") : undefined, startDate: values?.pbcCreateAt && values?.pbcCreateAt.length > 1 ? moment(values?.pbcCreateAt[0]).format("YYYY-MM-DD HH:mm:ss") : undefined,
endDate: values?.pbcCreateAt && values?.pbcCreateAt.length > 1 ? moment(values?.pbcCreateAt[1]).format("YYYY-MM-DD HH:mm:ss") : undefined endDate: values?.pbcCreateAt && values?.pbcCreateAt.length > 1 ? moment(values?.pbcCreateAt[1]).format("YYYY-MM-DD") + ' 23:59:59' : undefined
} }
handleExport(queryParam) handleExport(queryParam)
}}>导出</Button> }}>导出</Button>

14
src/pages/Dashboard/ScanDetail.tsx
Unescape Escape View File

@ -67,8 +67,13 @@ const TableList: React.FC<{}> = () => {
{ {
title: '扫码时间', title: '扫码时间',
dataIndex: 'pbcCreateAt', dataIndex: 'pbcCreateAt',
valueType: 'dateTimeRange', search: false
render: (text, record) => record.pbcCreateAt },
{
title: '扫码时间',
dataIndex: 'pbcCreateAt',
valueType: 'dateRange',
hideInTable: true
}, },
]; ];
return ( return (
@ -86,7 +91,7 @@ const TableList: React.FC<{}> = () => {
...param, ...param,
pbcNewCodeScanState: param.pbcUserType, pbcNewCodeScanState: param.pbcUserType,
startDate: param.pbcCreateAt && param.pbcCreateAt.length > 1 ? param.pbcCreateAt[0] : undefined, startDate: param.pbcCreateAt && param.pbcCreateAt.length > 1 ? param.pbcCreateAt[0] : undefined,
endDate: param.pbcCreateAt && param.pbcCreateAt.length > 1 ? param.pbcCreateAt[1] : undefined endDate: param.pbcCreateAt && param.pbcCreateAt.length > 1 ? param.pbcCreateAt[1] + ' 23:59:59' : undefined
} }
return fetchData(queryParam); return fetchData(queryParam);
}} }}
@ -102,11 +107,10 @@ const TableList: React.FC<{}> = () => {
actions: [ actions: [
<Button type="primary" key="export" onClick={() => { <Button type="primary" key="export" onClick={() => {
const values: any = ref.current?.getFieldsValue(); const values: any = ref.current?.getFieldsValue();
console.log(values)
const queryParam = { const queryParam = {
pbcNewCodeScanState: values.pbcUserType, pbcNewCodeScanState: values.pbcUserType,
startDate: values?.pbcCreateAt && values?.pbcCreateAt.length > 1 ? moment(values?.pbcCreateAt[0]).format("YYYY-MM-DD HH:mm:ss") : undefined, startDate: values?.pbcCreateAt && values?.pbcCreateAt.length > 1 ? moment(values?.pbcCreateAt[0]).format("YYYY-MM-DD HH:mm:ss") : undefined,
endDate: values?.pbcCreateAt && values?.pbcCreateAt.length > 1 ? moment(values?.pbcCreateAt[1]).format("YYYY-MM-DD HH:mm:ss") : undefined endDate: values?.pbcCreateAt && values?.pbcCreateAt.length > 1 ? moment(values?.pbcCreateAt[1]).format("YYYY-MM-DD") + ' 23:59:59' : undefined
} }
handleExport(queryParam) handleExport(queryParam)
}}>导出</Button> }}>导出</Button>

6
src/pages/Dashboard/index.tsx
Unescape Escape View File

@ -46,7 +46,9 @@ const Welcome: React.FC = () => {
}); });
const [pbcScanCodeStatical, setPbcScanCodeStatical] = useState<API.PbcScanCodeStaticalVO>({ const [pbcScanCodeStatical, setPbcScanCodeStatical] = useState<API.PbcScanCodeStaticalVO>({
pbcScanNumber: 0, pbcScanNumber: 0,
pbcScanUserNumber: 0 pbcScanUserNumber: 0,
newCustomerScanCount: 0,
oldCustomerScanCount: 0
}); });
const [pbcInteractStatical, setPbcInteractStatical] = useState<API.PbcInteractStaticalVO>({ const [pbcInteractStatical, setPbcInteractStatical] = useState<API.PbcInteractStaticalVO>({
pbcColectNumber: 0, pbcColectNumber: 0,
@ -263,7 +265,7 @@ const Welcome: React.FC = () => {
<Statistic title="扫码次数" valueStyle={{ color: '#3f8600', fontSize: 30 }} value={pbcScanCodeStatical.pbcScanNumber || 0} /> <Statistic title="扫码次数" valueStyle={{ color: '#3f8600', fontSize: 30 }} value={pbcScanCodeStatical.pbcScanNumber || 0} />
<Statistic title="扫码人数" valueStyle={{ color: '#3f8600', fontSize: 30 }} value={pbcScanCodeStatical.pbcScanUserNumber || 0} /> <Statistic title="扫码人数" valueStyle={{ color: '#3f8600', fontSize: 30 }} value={pbcScanCodeStatical.pbcScanUserNumber || 0} />
<Link to="/dashboard/scan-detail"> <Link to="/dashboard/scan-detail">
<Statistic title="新老客扫码>" valueStyle={{ color: '#3f8600', fontSize: 30 }} value={pbcScanCodeStatical.pbcScanUserNumber || 0} /> <Statistic title="老客扫码/新客扫码>" valueStyle={{ color: '#3f8600', fontSize: 30 }} value={`${pbcScanCodeStatical.oldCustomerScanCount || 0}/${pbcScanCodeStatical.newCustomerScanCount || 0}`} />
</Link> </Link>
</Card> </Card>
</Col> </Col>

12
src/pages/OperationsDashboard/BusinessDetail.tsx
Unescape Escape View File

@ -98,8 +98,12 @@ const TableList: React.FC<{}> = () => {
title: '创建日期', title: '创建日期',
dataIndex: 'pbcCreateAt', dataIndex: 'pbcCreateAt',
width: 150, width: 150,
valueType: 'dateTimeRange', search: false
render: (text, record) => record.pbcCreateAt, },
{
title: '创建日期',
dataIndex: 'pbcCreateAt',
valueType: 'dateRange',
}, },
{ {
title: '商户等级', title: '商户等级',
@ -123,7 +127,7 @@ const TableList: React.FC<{}> = () => {
...param, ...param,
userId: userId ? parseInt(userId) : undefined, userId: userId ? parseInt(userId) : undefined,
startDate: param.pbcCreateAt && param.pbcCreateAt.length > 1 ? param.pbcCreateAt[0] : undefined, startDate: param.pbcCreateAt && param.pbcCreateAt.length > 1 ? param.pbcCreateAt[0] : undefined,
endDate: param.pbcCreateAt && param.pbcCreateAt.length > 1 ? param.pbcCreateAt[1] : undefined endDate: param.pbcCreateAt && param.pbcCreateAt.length > 1 ? param.pbcCreateAt[1] + ' 23:59:59' : undefined
} }
return fetchData(queryParam); return fetchData(queryParam);
}} }}
@ -146,7 +150,7 @@ const TableList: React.FC<{}> = () => {
const queryParam = { const queryParam = {
userId: userId ? parseInt(userId) : undefined, userId: userId ? parseInt(userId) : undefined,
startDate: values?.pbcCreateAt && values?.pbcCreateAt.length > 1 ? moment(values?.pbcCreateAt[0]).format("YYYY-MM-DD HH:mm:ss") : undefined, startDate: values?.pbcCreateAt && values?.pbcCreateAt.length > 1 ? moment(values?.pbcCreateAt[0]).format("YYYY-MM-DD HH:mm:ss") : undefined,
endDate: values?.pbcCreateAt && values?.pbcCreateAt.length > 1 ? moment(values?.pbcCreateAt[1]).format("YYYY-MM-DD HH:mm:ss") : undefined endDate: values?.pbcCreateAt && values?.pbcCreateAt.length > 1 ? moment(values?.pbcCreateAt[1]).format("YYYY-MM-DD") + ' 23:59:59' : undefined
} }
handleExport(queryParam) handleExport(queryParam)
}}>导出</Button> }}>导出</Button>

6
src/pages/OperationsDashboard/ProductDetail.tsx
Unescape Escape View File

@ -82,7 +82,7 @@ const TableList: React.FC<{}> = () => {
title: '创建日期', title: '创建日期',
dataIndex: 'pbcCreateAt', dataIndex: 'pbcCreateAt',
hideInTable: true, hideInTable: true,
valueType: 'dateTimeRange' valueType: 'dateRange'
}, },
{ {
title: '状态', title: '状态',
@ -107,7 +107,7 @@ const TableList: React.FC<{}> = () => {
...param, ...param,
userId: userId ? parseInt(userId) : undefined, userId: userId ? parseInt(userId) : undefined,
startDate: param.pbcCreateAt && param.pbcCreateAt.length > 1 ? param.pbcCreateAt[0] : undefined, startDate: param.pbcCreateAt && param.pbcCreateAt.length > 1 ? param.pbcCreateAt[0] : undefined,
endDate: param.pbcCreateAt && param.pbcCreateAt.length > 1 ? param.pbcCreateAt[1] : undefined endDate: param.pbcCreateAt && param.pbcCreateAt.length > 1 ? param.pbcCreateAt[1] + ' 23:59:59' : undefined
} }
return fetchData(queryParam); return fetchData(queryParam);
}} }}
@ -130,7 +130,7 @@ const TableList: React.FC<{}> = () => {
const queryParam = { const queryParam = {
userId: userId ? parseInt(userId) : undefined, userId: userId ? parseInt(userId) : undefined,
startDate: values?.pbcCreateAt && values?.pbcCreateAt.length > 1 ? moment(values?.pbcCreateAt[0]).format("YYYY-MM-DD HH:mm:ss") : undefined, startDate: values?.pbcCreateAt && values?.pbcCreateAt.length > 1 ? moment(values?.pbcCreateAt[0]).format("YYYY-MM-DD HH:mm:ss") : undefined,
endDate: values?.pbcCreateAt && values?.pbcCreateAt.length > 1 ? moment(values?.pbcCreateAt[1]).format("YYYY-MM-DD HH:mm:ss") : undefined endDate: values?.pbcCreateAt && values?.pbcCreateAt.length > 1 ? moment(values?.pbcCreateAt[1]).format("YYYY-MM-DD") + ' 23:59:59' : undefined
} }
handleExport(queryParam) handleExport(queryParam)
}}>导出</Button> }}>导出</Button>

Write Preview
Loading…
Cancel
Save