|
@@ -1162,7 +1162,7 @@
|
|
|
|
|
|
this.showlist1 = ['收入', '利润', '电量', '新电途', '快电'];
|
|
|
var sz2 = ['todayAmount', 'todayProfit', 'todayEQAmount2', 'todayXDTAmount', 'todayKDAmount'];
|
|
|
- if(this.showMonthlyCard){
|
|
|
+ if(this.showMonthlyCard&&this.type_head == 2){
|
|
|
var sz2 = ['todayAmountC', 'todayProfitC', 'todayEQAmount2', 'todayXDTAmount', 'todayKDAmount'];
|
|
|
}
|
|
|
|
|
@@ -1338,14 +1338,14 @@
|
|
|
num = (num / 10000).toFixed(2)
|
|
|
}
|
|
|
if(value[i].seriesName == "利润"){
|
|
|
-
|
|
|
+ //u = "万元"
|
|
|
if(this.showMonthlyCard){
|
|
|
markerU = "(含卡)"
|
|
|
//num = info.todayProfitC
|
|
|
}
|
|
|
}
|
|
|
if(value[i].seriesName == "收入"){
|
|
|
-
|
|
|
+ u = "万元"
|
|
|
num = info.todayAmountW
|
|
|
|
|
|
if(this.showMonthlyCard){
|
|
@@ -1353,6 +1353,10 @@
|
|
|
num = info.todayAmountCW
|
|
|
}
|
|
|
}
|
|
|
+ if (!num) {
|
|
|
+ num = 0;
|
|
|
+ }
|
|
|
+ num=parseFloat(num)
|
|
|
num = num.toFixed(2)
|
|
|
}
|
|
|
|