|
|
@@ -908,7 +908,7 @@
|
|
|
endDate: endtime
|
|
|
}).then((res) => {
|
|
|
this.indexData3 = res.data;
|
|
|
-
|
|
|
+ uni.hideLoading()
|
|
|
// if( this.info.accountType==3){
|
|
|
// //getPie2
|
|
|
// this.getPie2()
|
|
|
@@ -991,7 +991,10 @@
|
|
|
|
|
|
this.current = e
|
|
|
this.type_head = e;
|
|
|
-
|
|
|
+ uni.showLoading({
|
|
|
+ title: "加载中",
|
|
|
+ mask: true,
|
|
|
+ })
|
|
|
if (e == 1) {
|
|
|
this.startDate_head = parseUnixTime(beforeTimeStamp(30), '{y}-{m}-{d}')
|
|
|
} else {
|
|
|
@@ -1085,10 +1088,10 @@
|
|
|
var colorName = "#333"
|
|
|
|
|
|
// this.showlist1 = ['收入', '利润', '次数','新电途'];
|
|
|
- var showlistColor = ['#5872c0', '#de6e6a', '#f3c96b', '#69be8d'];
|
|
|
- this.showlist1 = ['收入', '利润', '电量', '新电途'];
|
|
|
- var sz2 = ['todayAmount', 'todayProfit', 'todayEQAmount2', 'todayXDTAmount'];
|
|
|
- var zLevel = [2, 4, 1, 3];
|
|
|
+ var showlistColor = ['#5872c0', '#de6e6a', '#f3c96b', '#69be8d', '#c661b4'];
|
|
|
+ this.showlist1 = ['收入', '利润', '电量', '新电途', '快电'];
|
|
|
+ var sz2 = ['todayAmount', 'todayProfit', 'todayEQAmount2', 'todayXDTAmount','todayKDAmount'];
|
|
|
+ var zLevel = [20, 40, 10, 30,9];
|
|
|
//var sz2 = ['todayAmount', 'todayProfit', 'todayEQNum','todayXDTAmount'];
|
|
|
if (!this.myChart) {
|
|
|
this.myChart = echarts.init(document.getElementById('pieEcharts'));
|
|
|
@@ -1211,7 +1214,9 @@
|
|
|
for (var i in value) {
|
|
|
var u = "元"
|
|
|
var num = info[sz2[value[i].seriesIndex]];
|
|
|
-
|
|
|
+ if(!num){
|
|
|
+ num=0;
|
|
|
+ }
|
|
|
if (value[i].seriesName == '电量') {
|
|
|
u = '度'
|
|
|
num = num.toFixed(2)
|
|
|
@@ -1245,14 +1250,16 @@
|
|
|
color: "#333"
|
|
|
}
|
|
|
},
|
|
|
- legend: {
|
|
|
+ legend: {
|
|
|
+
|
|
|
+ itemGap :1,
|
|
|
data: this.showlist1,
|
|
|
textStyle: {
|
|
|
color: "#333"
|
|
|
}
|
|
|
},
|
|
|
grid: {
|
|
|
- top: '13%',
|
|
|
+ top: '16%',
|
|
|
left: '3%',
|
|
|
right: '8%',
|
|
|
bottom: '8%',
|
zhengkaixin