diff --git a/src/components/StatisticCard.jsx b/src/components/StatisticCard.jsx index 5847223..e6fe898 100644 --- a/src/components/StatisticCard.jsx +++ b/src/components/StatisticCard.jsx @@ -9,7 +9,6 @@ export default observer((props) => { return ( { } prefix={} // title={{props.title}} + {...props} + value={props.valueSuffix ? `${props.value} ${props.valueSuffix}` : props.value} /> {props.showProgress !== false && `${props.KPIrate}%`} />} diff --git a/src/libs/ht.js b/src/libs/ht.js index 2c0bbaf..b8b1cbf 100644 --- a/src/libs/ht.js +++ b/src/libs/ht.js @@ -96,7 +96,7 @@ export const dataFieldOptions = [ { 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: 'ConfirmOrder', formatter: (v) => v, nestkey: { p: 'ConfirmOrderKPIrates', v: 'ConfirmOrderKPIvalue' } }, - { label: '成交率', value: 'ConfirmRates', formatter: (v) => v, nestkey: { p: 'ConfirmRatesKPIrates', v: 'ConfirmRatesKPIvalue' } }, + { label: '成交率', value: 'ConfirmRates', formatter: (v) => `${v} %`, nestkey: { p: 'ConfirmRatesKPIrates', v: 'ConfirmRatesKPIvalue' } }, // { label: '人数', value: 'CJPersonNum', formatter: (v) => v }, // todo: more... ]; diff --git a/src/stores/Trade.js b/src/stores/Trade.js index e165dae..0806e18 100644 --- a/src/stores/Trade.js +++ b/src/stores/Trade.js @@ -26,6 +26,7 @@ class Trade { { title: '成团', value: summary?.ConfirmOrder, + valueSuffix: summary?.ConfirmRates ? ` / ${summary.ConfirmRates} %` : undefined, // VSrate: summary?.ConfirmOrderrate, KPIrate: summary?.[dataFieldAlias.ConfirmOrder.nestkey.p], // hasKPI: !isEmpty(summary?.[dataFieldAlias.ConfirmOrder.nestkey.p]), diff --git a/src/views/Home.jsx b/src/views/Home.jsx index 07a9b72..409955b 100644 --- a/src/views/Home.jsx +++ b/src/views/Home.jsx @@ -102,6 +102,13 @@ export default observer(() => { targetField: 'MLKPIvalue', // xField: 'groupsLabel', layout: 'vertical', + xAxis: { + line: null, + label: { + autoHide: true, + autoRotate: false, + }, + } }; const lineConfigSet = {