|
|
@@ -45,7 +45,7 @@
|
|
|
|
|
|
|
|
|
<div class="trend-summary">
|
|
|
- 总收益金额:
|
|
|
+ 总订单实收金额:
|
|
|
<el-tag type="success">{{ u.fmt.fmtMoney(state.homeOneExtra.totalIncome||0) }}元</el-tag>
|
|
|
总订单数量:
|
|
|
<el-tag type="danger">{{ state.homeOneExtra.totalWashOrders||0 }}笔</el-tag>
|
|
|
@@ -228,13 +228,13 @@ const initLineChart = (dataList: Array<any>) => {
|
|
|
trigger: 'axis',
|
|
|
formatter: (params: any) => {
|
|
|
const bar = params.find((p: any) => p.seriesName === '洗车量');
|
|
|
- const line = params.find((p: any) => p.seriesName === '总金额');
|
|
|
+ const line = params.find((p: any) => p.seriesName === '订单实收金额');
|
|
|
const barVal = bar ? `${bar.value} 次` : '';
|
|
|
const lineVal = line ? `¥${line.value}` : '';
|
|
|
return `${params[0].axisValue}<br/>${barVal}<br/>${lineVal}`;
|
|
|
}
|
|
|
},
|
|
|
- legend: {data: ['洗车量','总金额',], right: 20},
|
|
|
+ legend: {data: ['洗车量','订单实收金额',], right: 20},
|
|
|
xAxis: {
|
|
|
data: xAxis,
|
|
|
// data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
|
|
|
@@ -271,13 +271,13 @@ const initLineChart = (dataList: Array<any>) => {
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
- name: '总金额',
|
|
|
+ name: '订单实收金额',
|
|
|
type: 'line',
|
|
|
symbolSize: 6,
|
|
|
symbol: 'circle',
|
|
|
smooth: true,
|
|
|
yAxisIndex: 1,
|
|
|
- data: dataList.map(k => (k.totalAmount / 100).toFixed(2)),
|
|
|
+ data: dataList.map(k => (k.amountReceived / 100).toFixed(2)),
|
|
|
lineStyle: {color: '#3770ff'},
|
|
|
itemStyle: {color: '#3770ff', borderColor: '#3770ff'},
|
|
|
areaStyle: {
|