增加 "营收" 数据显示

feature/2.0-sales-trade
Lei OT 2 years ago
parent d86be0e335
commit a6a21d312d

@ -13,12 +13,12 @@ export default observer((props) => {
// , number -> array // , number -> array
const dataParser = (origin) => { const dataParser = (origin) => {
const { measureField, rangeField, targetField } = extProps; const { measureField, rangeField, targetField } = extProps;
const maxKPI = Math.max(...(origin || []).map((ele) => ele[targetField])); const maxKPI = Math.max(...(origin || []).map((ele) => (ele?.[targetField] || 0)));
const maxValue = Math.max(...(origin || []).map((ele) => ele[measureField])); const maxValue = Math.max(...(origin || []).map((ele) => ele[measureField]));
const _max = Math.max(maxKPI, maxValue); const _max = Math.max(maxKPI, maxValue);
const sortData = origin.sort(sortBy(measureField)).slice(-itemLength); const sortData = origin.sort(sortBy(measureField)).slice(-itemLength);
// //
const _parseData = sortData?.map((ele) => ({ ...ele, [rangeField]: [0, Math.ceil(_max / 0.9)], [measureField]: [ele[measureField]] })); const _parseData = sortData?.map((ele) => ({ ...ele, [rangeField]: [0, Math.ceil(_max / 0.9)], [measureField]: [ele[measureField]], [targetField]: (ele?.targetField || 0) }));
return _parseData; return _parseData;
}; };

@ -13,7 +13,7 @@ export default observer((props) => {
const defaultVal = dataFieldOptions[0].value; const defaultVal = dataFieldOptions[0].value;
const Component = () => const Component = () =>
dataFieldOptions.length < 5 ? ( dataFieldOptions.length < 6 ? (
<Radio.Group options={dataFieldOptions} optionType="button" onChange={(e) => handleChange(e.target.value)} defaultValue={defaultVal} {...extProps} /> <Radio.Group options={dataFieldOptions} optionType="button" onChange={(e) => handleChange(e.target.value)} defaultValue={defaultVal} {...extProps} />
) : ( ) : (
<Select showSearch options={dataFieldOptions} onChange={handleChange} defaultValue={defaultVal} {...extProps} /> <Select showSearch options={dataFieldOptions} onChange={handleChange} defaultValue={defaultVal} {...extProps} />

@ -95,6 +95,7 @@ export const dateTypes = [
* 结果字段 * 结果字段
*/ */
export const dataFieldOptions = [ export const dataFieldOptions = [
{ label: '营收', value: 'transactions', formatter: (v) => `${v / 10000}`, nestkey: { p: 'transactionsKPIrates', v: 'transactionsKPIvalue' } },
{ label: '毛利', value: 'SumML', formatter: (v) => `${v / 10000}`, nestkey: { p: 'MLKPIrates', v: 'MLKPIvalue' } }, { label: '毛利', value: 'SumML', formatter: (v) => `${v / 10000}`, nestkey: { p: 'MLKPIrates', v: 'MLKPIvalue' } },
{ label: '订单数', value: 'SumOrder', formatter: (v) => v, nestkey: { p: 'OrderKPIrates', v: 'OrderKPIvalue' } }, { label: '订单数', value: 'SumOrder', formatter: (v) => v, nestkey: { p: 'OrderKPIrates', v: 'OrderKPIvalue' } },
{ label: '成交数', value: 'ConfirmOrder', formatter: (v) => v, nestkey: { p: 'ConfirmOrderKPIrates', v: 'ConfirmOrderKPIvalue' } }, { label: '成交数', value: 'ConfirmOrder', formatter: (v) => v, nestkey: { p: 'ConfirmOrderKPIrates', v: 'ConfirmOrderKPIvalue' } },

@ -226,7 +226,7 @@ export default observer(() => {
</Spin> </Spin>
</section> </section>
<section> <section>
<h3>目标客户 <h3>英语区目标客户
<Spin spinning={topData?.GuestGroupType?.loading || false}> <Spin spinning={topData?.GuestGroupType?.loading || false}>
<Table {...targetTableProps} pagination={false} /> <Table {...targetTableProps} pagination={false} />
</Spin> </Spin>

Loading…
Cancel
Save