Commit c99d1fed by fengzhaoyu

Merge branch 'ISV' of http://gitlab.roboming.com/Simon/mingPay-web into ISV

parents 4ecd4865 a5b57749
...@@ -90,7 +90,7 @@ export default { ...@@ -90,7 +90,7 @@ export default {
fontSize: 14, fontSize: 14,
fontWeight: 'normal' fontWeight: 'normal'
}, },
left: '5%', left: '5%'
}, },
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',
...@@ -143,9 +143,9 @@ export default { ...@@ -143,9 +143,9 @@ export default {
this.RechargeDataList.map(item => { this.RechargeDataList.map(item => {
xAxisData.push(parseInt(item.abscissaKey)) xAxisData.push(parseInt(item.abscissaKey))
data1.push(item.externalRechargeAmount ? item.externalRechargeAmount : 0) data1.push(item.externalRechargeAmount ? item.externalRechargeAmount : 0)
data1Amount = (data1Amount * 100 + item.externalRechargeAmount * 100) / 100 data1Amount = (data1Amount * 100 + item.externalRechargeAmount * 100) / 100
data2.push(item.internalRechargeAmount ? item.internalRechargeAmount : 0) data2.push(item.internalRechargeAmount ? item.internalRechargeAmount : 0)
data2Amount = (item.internalRechargeAmount * 100 + data2Amount * 100) /100 data2Amount = (item.internalRechargeAmount * 100 + data2Amount * 100) / 100
}) })
let unit = this.month === undefined ? '月' : '日' let unit = this.month === undefined ? '月' : '日'
myChart.setOption({ myChart.setOption({
...@@ -156,7 +156,7 @@ export default { ...@@ -156,7 +156,7 @@ export default {
fontSize: 14, fontSize: 14,
fontWeight: 'normal' fontWeight: 'normal'
}, },
left: '5%', left: '5%'
}, },
legend: { legend: {
data: ['支付宝充值', '现金充值'], data: ['支付宝充值', '现金充值'],
...@@ -241,7 +241,7 @@ export default { ...@@ -241,7 +241,7 @@ export default {
fontSize: 14, fontSize: 14,
fontWeight: 'normal' fontWeight: 'normal'
}, },
left: '5%', left: '5%'
}, },
legend: { legend: {
data: [`员工现金消费`, `员工津贴消费`, `访客消费`], data: [`员工现金消费`, `员工津贴消费`, `访客消费`],
...@@ -277,7 +277,7 @@ export default { ...@@ -277,7 +277,7 @@ export default {
name: `(${this.month === undefined ? '月' : '日'})`, // 给X轴加单位 name: `(${this.month === undefined ? '月' : '日'})`, // 给X轴加单位
// nameLocation: 'middle', // nameLocation: 'middle',
type: 'category', type: 'category',
data: xAxisData, data: xAxisData
}, },
yAxis: { yAxis: {
name: '(元)', name: '(元)',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment