|
|
@@ -1938,9 +1938,10 @@
|
|
|
}
|
|
|
this.myChart.clear();
|
|
|
var key = ["AmountCard", "ProfitCard", "EQAmount", "DiscountCardBuyNum", "MonthCardBuyNum"]
|
|
|
- var keyStr = ['收入\n(含卡)', '利润\n(含卡)', '电量', '6折卡', '月卡']
|
|
|
- var keyStrN = ['收入（含卡）', '利润（含卡）', '电量', '6折卡', '月卡']
|
|
|
-
|
|
|
+ var keyStr = ['收入\n(含卡)', '利润\n(含卡)', '充电量', '6折卡', '月卡']
|
|
|
+ var keyStrN = ['收入（含卡）', '利润（含卡）', '充电量', '6折卡', '月卡']
|
|
|
+ var keyStrT = ['收入', '利润', '充电量', '6折卡', '月卡']
|
|
|
+
|
|
|
var sz1 = []
|
|
|
var sz2 = []
|
|
|
key.forEach(item => {
|
|
|
@@ -1992,7 +1993,7 @@
|
|
|
var name =keyStrN[dataIndex];
|
|
|
var style = "float: right;margin-left: 20px;"
|
|
|
var prefix = ["lastYear", "lastSamePeriod", "nowYear"]
|
|
|
- var prefixStr = ["去年全年数据", "去年同期数据", "今年同期数据"]
|
|
|
+ var prefixStr = ["去年全年", "去年同期", "今年同期"]
|
|
|
var u = ['元', '元', '度', '张', '张']
|
|
|
var keytool = ["AmountCard", "ProfitCard", "EQAmount", "DiscountCardBuyNum",
|
|
|
"MonthCardBuyNum"
|
|
|
@@ -2018,7 +2019,7 @@
|
|
|
}
|
|
|
var showNum=(num / uu.num).toFixed(uu.num>100?2:0)
|
|
|
|
|
|
- text1 += "<p>" + prefixStr[j] +
|
|
|
+ text1 += "<p>" + prefixStr[j] +keyStrT[dataIndex]+
|
|
|
'<span style="' + style +
|
|
|
'">' + (u[dataIndex]=='张'?num:showNum) + uu.u + u[dataIndex] + '</span></p>';
|
|
|
|
zkx