From 84722e0d0a19ac86f76eb5f0a789127b2f537da2 Mon Sep 17 00:00:00 2001 From: Lei OT Date: Fri, 27 Oct 2023 09:44:12 +0800 Subject: [PATCH] style: --- src/components/MixTBWithKPI.jsx | 7 ++++++- src/components/kpi/SubjectTable/Profit.jsx | 2 ++ src/stores/Trade.js | 8 ++++---- src/views/Home.jsx | 2 +- src/views/Sale_KPI.jsx | 2 ++ 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/components/MixTBWithKPI.jsx b/src/components/MixTBWithKPI.jsx index 1500eee..5fd1eef 100644 --- a/src/components/MixTBWithKPI.jsx +++ b/src/components/MixTBWithKPI.jsx @@ -107,9 +107,14 @@ export default observer((props) => { // color: '#b32b19', color: '#f58269', smooth: true, + line: { + size: 0.1, + }, areaStyle: () => { return { fill: 'l(270) 0:#ffffff 0.25:#f8e8e7 0.5:#fac9bd 0.75:#f7a593', + // lineWidth: 0.1, + // lineOpacity: 0.5, }; }, label: { @@ -122,7 +127,7 @@ export default observer((props) => { point: { style: { stroke: '#F4664A', - lineWidth: 1.5, + lineWidth: 0.5, }, }, }; diff --git a/src/components/kpi/SubjectTable/Profit.jsx b/src/components/kpi/SubjectTable/Profit.jsx index 93385ee..cf3b75b 100644 --- a/src/components/kpi/SubjectTable/Profit.jsx +++ b/src/components/kpi/SubjectTable/Profit.jsx @@ -84,6 +84,7 @@ export default observer((props) => { dataIndex: 'object_id', editable: false, width: '5em', + fixed: 'left', render: (_, r) => r.object_name, }, { @@ -92,6 +93,7 @@ export default observer((props) => { valueType: 'digit', fieldProps: { style: { width: '100%' }, step: 10000 * 100 }, width: '6em', + fixed: 'left', formItemProps: { style: { width: '100%' }, }, diff --git a/src/stores/Trade.js b/src/stores/Trade.js index 182d411..46108ed 100644 --- a/src/stores/Trade.js +++ b/src/stores/Trade.js @@ -23,7 +23,7 @@ class Trade { loading: false, dataSource: [ { - title: '成团', + title: '成团',col: 6, value: summary?.[0]?.ConfirmOrder, originVal: (summary?.[0]?.ConfirmOrder || 0), valueSuffix: summary?.[0]?.ConfirmRates ? ` / ${summary?.[0]?.ConfirmRates} %` : undefined, @@ -37,7 +37,7 @@ class Trade { biz: { title: '商务', value: biz?.[0]?.ConfirmOrder }, }, { - title: '毛利', + title: '毛利',col: 8, 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)), KPIrate: summary?.[0]?.[dataFieldAlias.SumML.nestkey.p], @@ -48,7 +48,7 @@ class Trade { biz: { title: '商务', value: (biz?.[0]?.SumML || 0) }, }, { - title: '完成率', + title: '完成率',col: 5, originVal: (summary?.[0]?.[dataFieldAlias.SumML.nestkey.p] || 0), value: `${summary?.[0]?.[dataFieldAlias.SumML.nestkey.p] || ''}%`, hasKPI: false, @@ -58,7 +58,7 @@ class Trade { biz: { title: '商务', value: biz?.[0]?.[dataFieldAlias.SumML.nestkey.p] || 0, }, }, { - title: '人数', + title: '人数', col: 5, originVal: (summary?.[0]?.SumPersonNum || 0), value: summary?.[0]?.SumPersonNum, // VSrate: summary?.[0]?.SumPersonNumrate, diff --git a/src/views/Home.jsx b/src/views/Home.jsx index 910b6df..c0ab571 100644 --- a/src/views/Home.jsx +++ b/src/views/Home.jsx @@ -195,7 +195,7 @@ export default observer(() => { ))} */} {summaryData.dataSource.map((item, i) => ( - + ))} diff --git a/src/views/Sale_KPI.jsx b/src/views/Sale_KPI.jsx index 54b2379..84caf2f 100644 --- a/src/views/Sale_KPI.jsx +++ b/src/views/Sale_KPI.jsx @@ -68,11 +68,13 @@ const Sale_KPI = () => { dataIndex: 'groupsLabel', editable: false, width: '7.5em', + fixed: 'left', }, { title: '年度', dataIndex: 'yearValue', width: '10em', + fixed: 'left', render: (_, row) => (