|
@@ -703,11 +703,15 @@
|
|
this.headitemby="";
|
|
this.headitemby="";
|
|
var showkey = "";
|
|
var showkey = "";
|
|
var getData = this.indexData3.graphMap;
|
|
var getData = this.indexData3.graphMap;
|
|
-
|
|
|
|
|
|
+ for(var i in getData){
|
|
|
|
+ var item=getData[i]
|
|
|
|
+ item.todayEQAmount2=(item.todayEQAmount/10000)
|
|
|
|
+ }
|
|
|
|
+ this.indexData3.graphMap=getData
|
|
//var unit = this.current ? '笔' : '元'
|
|
//var unit = this.current ? '笔' : '元'
|
|
var colorName = "#333"
|
|
var colorName = "#333"
|
|
- this.showlist1 = ['收入', '利润', '次数','新电途'];
|
|
|
|
- var sz2 = ['todayAmount', 'todayProfit', 'todayEQNum','todayXDTAmount'];
|
|
|
|
|
|
+ this.showlist1 = ['收入', '利润', '电量','新电途'];
|
|
|
|
+ var sz2 = ['todayAmount', 'todayProfit', 'todayEQAmount2','todayXDTAmount'];
|
|
// var showlistColor = ['#5872c0', '#9ec97f', '#de6e6a','#f3c96b'];
|
|
// var showlistColor = ['#5872c0', '#9ec97f', '#de6e6a','#f3c96b'];
|
|
|
|
|
|
var showlistColor = ['#5872c0', '#de6e6a','#f3c96b', '#69be8d'];
|
|
var showlistColor = ['#5872c0', '#de6e6a','#f3c96b', '#69be8d'];
|
|
@@ -820,9 +824,16 @@
|
|
var text1 = ""
|
|
var text1 = ""
|
|
for (var i in value) {
|
|
for (var i in value) {
|
|
var u = "元"
|
|
var u = "元"
|
|
- if (value[i].seriesName == '次数') {
|
|
|
|
|
|
+ if (value[i].seriesName == '电量') {
|
|
|
|
+ u = '度'
|
|
|
|
+ num=num.toFixed(2)
|
|
|
|
+ }else if (value[i].seriesName == '次数') {
|
|
u = '次'
|
|
u = '次'
|
|
|
|
+ }else{
|
|
|
|
+ num=num.toFixed(2)
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+
|
|
text1 += "<p>" + value[i].marker + value[i].seriesName + '<span style="' + style +
|
|
text1 += "<p>" + value[i].marker + value[i].seriesName + '<span style="' + style +
|
|
'">' + value[i].data[1] + u + '</span></p>';
|
|
'">' + value[i].data[1] + u + '</span></p>';
|
|
}
|
|
}
|
|
@@ -1003,14 +1014,20 @@
|
|
this.headitemby="";
|
|
this.headitemby="";
|
|
var showkey = "";
|
|
var showkey = "";
|
|
var getData = this.indexData3.graphMap;
|
|
var getData = this.indexData3.graphMap;
|
|
-
|
|
|
|
|
|
+ for(var i in getData){
|
|
|
|
+ var item=getData[i]
|
|
|
|
+ item.todayEQAmount2=(item.todayEQAmount/10000)
|
|
|
|
+ }
|
|
|
|
+ this.indexData3.graphMap=getData
|
|
//var unit = this.current ? '笔' : '元'
|
|
//var unit = this.current ? '笔' : '元'
|
|
var colorName = "#333"
|
|
var colorName = "#333"
|
|
|
|
|
|
- this.showlist1 = ['收入', '利润', '次数','新电途'];
|
|
|
|
- var showlistColor = ['#5872c0', '#de6e6a','#f3c96b', '#69be8d'];
|
|
|
|
- var zLevel=[1,4,2,3];
|
|
|
|
- var sz2 = ['todayAmount', 'todayProfit', 'todayEQNum','todayXDTAmount'];
|
|
|
|
|
|
+ // this.showlist1 = ['收入', '利润', '次数','新电途'];
|
|
|
|
+ var showlistColor = ['#5872c0', '#de6e6a','#f3c96b', '#69be8d'];
|
|
|
|
+ this.showlist1 = ['收入', '利润', '电量','新电途'];
|
|
|
|
+ var sz2 = ['todayAmount', 'todayProfit', 'todayEQAmount2','todayXDTAmount'];
|
|
|
|
+ var zLevel=[2,4,1,3];
|
|
|
|
+ //var sz2 = ['todayAmount', 'todayProfit', 'todayEQNum','todayXDTAmount'];
|
|
if (!this.myChart) {
|
|
if (!this.myChart) {
|
|
this.myChart = echarts.init(document.getElementById('pieEcharts'));
|
|
this.myChart = echarts.init(document.getElementById('pieEcharts'));
|
|
this.myChart.on("dataZoom", (res) => {
|
|
this.myChart.on("dataZoom", (res) => {
|
|
@@ -1133,7 +1150,10 @@
|
|
var u = "元"
|
|
var u = "元"
|
|
var num=info[sz2[value[i].seriesIndex]];
|
|
var num=info[sz2[value[i].seriesIndex]];
|
|
|
|
|
|
- if (value[i].seriesName == '次数') {
|
|
|
|
|
|
+ if (value[i].seriesName == '电量') {
|
|
|
|
+ u = '度'
|
|
|
|
+ num=num.toFixed(2)
|
|
|
|
+ }else if (value[i].seriesName == '次数') {
|
|
u = '次'
|
|
u = '次'
|
|
}else{
|
|
}else{
|
|
num=num.toFixed(2)
|
|
num=num.toFixed(2)
|