|
|
@@ -59,12 +59,11 @@ const option1 = {
|
|
|
type: 'bar',
|
|
|
color: '#41be92',
|
|
|
tooltip: {
|
|
|
- // valueFormatter: function (value) {
|
|
|
- // return value + ' ml';
|
|
|
- // }
|
|
|
+ valueFormatter: (value)=> {
|
|
|
+ return '¥' + getWAmount(value/divisor)
|
|
|
+ }
|
|
|
},
|
|
|
data: [
|
|
|
- 2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4, 3.3
|
|
|
]
|
|
|
},
|
|
|
{
|
|
|
@@ -73,12 +72,11 @@ const option1 = {
|
|
|
color: '#efc25b',
|
|
|
yAxisIndex: 1,
|
|
|
tooltip: {
|
|
|
- // valueFormatter: function (value) {
|
|
|
- // return value + ' ml';
|
|
|
- // }
|
|
|
+ valueFormatter: (value)=> {
|
|
|
+ return value + '%'
|
|
|
+ }
|
|
|
},
|
|
|
data: [
|
|
|
- 2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3
|
|
|
]
|
|
|
}
|
|
|
]
|
|
|
@@ -281,6 +279,7 @@ const getOpData = (data,labelKey,valueKey,optionType)=>{
|
|
|
options.xAxis[0].data = data.map(it=>it[labelKey])
|
|
|
options.series[0].data = data.map(it=>it.profit)
|
|
|
options.series[1].data = data.map(it=>it.profitRate)
|
|
|
+ console.log(options)
|
|
|
return options;
|
|
|
}
|
|
|
if(optionType === 2){
|