feature/pivot
Lei OT 2 years ago
parent 1c2c7c28c6
commit 84722e0d0a

@ -107,9 +107,14 @@ export default observer((props) => {
// color: '#b32b19', // color: '#b32b19',
color: '#f58269', color: '#f58269',
smooth: true, smooth: true,
line: {
size: 0.1,
},
areaStyle: () => { areaStyle: () => {
return { return {
fill: 'l(270) 0:#ffffff 0.25:#f8e8e7 0.5:#fac9bd 0.75:#f7a593', fill: 'l(270) 0:#ffffff 0.25:#f8e8e7 0.5:#fac9bd 0.75:#f7a593',
// lineWidth: 0.1,
// lineOpacity: 0.5,
}; };
}, },
label: { label: {
@ -122,7 +127,7 @@ export default observer((props) => {
point: { point: {
style: { style: {
stroke: '#F4664A', stroke: '#F4664A',
lineWidth: 1.5, lineWidth: 0.5,
}, },
}, },
}; };

@ -84,6 +84,7 @@ export default observer((props) => {
dataIndex: 'object_id', dataIndex: 'object_id',
editable: false, editable: false,
width: '5em', width: '5em',
fixed: 'left',
render: (_, r) => r.object_name, render: (_, r) => r.object_name,
}, },
{ {
@ -92,6 +93,7 @@ export default observer((props) => {
valueType: 'digit', valueType: 'digit',
fieldProps: { style: { width: '100%' }, step: 10000 * 100 }, fieldProps: { style: { width: '100%' }, step: 10000 * 100 },
width: '6em', width: '6em',
fixed: 'left',
formItemProps: { formItemProps: {
style: { width: '100%' }, style: { width: '100%' },
}, },

@ -23,7 +23,7 @@ class Trade {
loading: false, loading: false,
dataSource: [ dataSource: [
{ {
title: '成团', title: '成团',col: 6,
value: summary?.[0]?.ConfirmOrder, value: summary?.[0]?.ConfirmOrder,
originVal: (summary?.[0]?.ConfirmOrder || 0), originVal: (summary?.[0]?.ConfirmOrder || 0),
valueSuffix: summary?.[0]?.ConfirmRates ? ` / ${summary?.[0]?.ConfirmRates} %` : undefined, valueSuffix: summary?.[0]?.ConfirmRates ? ` / ${summary?.[0]?.ConfirmRates} %` : undefined,
@ -37,7 +37,7 @@ class Trade {
biz: { title: '商务', value: biz?.[0]?.ConfirmOrder }, biz: { title: '商务', value: biz?.[0]?.ConfirmOrder },
}, },
{ {
title: '毛利', title: '毛利',col: 8,
originVal: (summary?.[0]?.SumML || 0), originVal: (summary?.[0]?.SumML || 0),
value: dataFieldAlias.SumML.formatter(summary?.[0]?.SumML || 0) + '=' + dataFieldAlias.SumML.formatter((traditional?.[0]?.SumML || 0)) + '+' + dataFieldAlias.SumML.formatter((biz?.[0]?.SumML || 0)), value: dataFieldAlias.SumML.formatter(summary?.[0]?.SumML || 0) + '=' + dataFieldAlias.SumML.formatter((traditional?.[0]?.SumML || 0)) + '+' + dataFieldAlias.SumML.formatter((biz?.[0]?.SumML || 0)),
KPIrate: summary?.[0]?.[dataFieldAlias.SumML.nestkey.p], KPIrate: summary?.[0]?.[dataFieldAlias.SumML.nestkey.p],
@ -48,7 +48,7 @@ class Trade {
biz: { title: '商务', value: (biz?.[0]?.SumML || 0) }, biz: { title: '商务', value: (biz?.[0]?.SumML || 0) },
}, },
{ {
title: '完成率', title: '完成率',col: 5,
originVal: (summary?.[0]?.[dataFieldAlias.SumML.nestkey.p] || 0), originVal: (summary?.[0]?.[dataFieldAlias.SumML.nestkey.p] || 0),
value: `${summary?.[0]?.[dataFieldAlias.SumML.nestkey.p] || ''}%`, value: `${summary?.[0]?.[dataFieldAlias.SumML.nestkey.p] || ''}%`,
hasKPI: false, hasKPI: false,
@ -58,7 +58,7 @@ class Trade {
biz: { title: '商务', value: biz?.[0]?.[dataFieldAlias.SumML.nestkey.p] || 0, }, biz: { title: '商务', value: biz?.[0]?.[dataFieldAlias.SumML.nestkey.p] || 0, },
}, },
{ {
title: '人数', title: '人数', col: 5,
originVal: (summary?.[0]?.SumPersonNum || 0), originVal: (summary?.[0]?.SumPersonNum || 0),
value: summary?.[0]?.SumPersonNum, value: summary?.[0]?.SumPersonNum,
// VSrate: summary?.[0]?.SumPersonNumrate, // VSrate: summary?.[0]?.SumPersonNumrate,

@ -195,7 +195,7 @@ export default observer(() => {
</Col> </Col>
))} */} ))} */}
{summaryData.dataSource.map((item, i) => ( {summaryData.dataSource.map((item, i) => (
<Col {...layoutProps} key={item.title}> <Col {...layoutProps} key={item.title} lg={{span: ((item?.col || layoutProps.lg.span))}}>
<StatisticCard2 {...item} showProgress={item.hasKPI} icon={iconSets[i]} /> <StatisticCard2 {...item} showProgress={item.hasKPI} icon={iconSets[i]} />
</Col> </Col>
))} ))}

@ -68,11 +68,13 @@ const Sale_KPI = () => {
dataIndex: 'groupsLabel', dataIndex: 'groupsLabel',
editable: false, editable: false,
width: '7.5em', width: '7.5em',
fixed: 'left',
}, },
{ {
title: '年度', title: '年度',
dataIndex: 'yearValue', dataIndex: 'yearValue',
width: '10em', width: '10em',
fixed: 'left',
render: (_, row) => ( render: (_, row) => (
<Space direction={'vertical'}> <Space direction={'vertical'}>
<div> <div>

Loading…
Cancel
Save