|
|
@@ -1547,19 +1547,23 @@
|
|
|
this.okbtn2()
|
|
|
},
|
|
|
getDataHome2(bl) {
|
|
|
-
|
|
|
+
|
|
|
if (bl) {
|
|
|
|
|
|
}
|
|
|
uni.showLoading()
|
|
|
|
|
|
- var endtime = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}')
|
|
|
+ var endtime = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}')
|
|
|
+ var startDate=this.startDate_head
|
|
|
+ if (this.type_head == 1){
|
|
|
+ var startDate=parseUnixTime(beforeTimeStamp(20), '{y}-{m}-{d}')
|
|
|
+ }
|
|
|
if (this.type_head == 3 && this.startDate_head != new Date().getFullYear() + "-01-01") {
|
|
|
endtime = this.byYear[1].value + "-12-31"
|
|
|
}
|
|
|
API.homeHeadChargingStatistics({
|
|
|
type: this.type_head,
|
|
|
- startDate: this.startDate_head,
|
|
|
+ startDate: startDate,
|
|
|
endDate: endtime
|
|
|
}).then((res) => {
|
|
|
this.indexData3 = res.data;
|
|
|
@@ -1868,7 +1872,7 @@
|
|
|
if (!this.myChart3) {
|
|
|
this.myChart3 = echarts.init(document.getElementById('pieEcharts3'), null, {
|
|
|
width: uni.upx2px(700),
|
|
|
- height: uni.upx2px(500)
|
|
|
+ height: uni.upx2px(400)
|
|
|
});
|
|
|
}
|
|
|
var salesData = this.indexData7.graphMap;
|
|
|
@@ -1878,22 +1882,26 @@
|
|
|
const dates = Object.keys(salesData);
|
|
|
|
|
|
const cardTypes = Object.keys(salesData[dates[0]]);
|
|
|
- var series = []
|
|
|
+ var series = []
|
|
|
+
|
|
|
+ var obj = {
|
|
|
+
|
|
|
+ type: 'bar',
|
|
|
+
|
|
|
+ data: []
|
|
|
+ }
|
|
|
for (var i in cardTypes) {
|
|
|
var item = cardTypes[i]
|
|
|
- var obj = {
|
|
|
- name: item,
|
|
|
- type: 'line',
|
|
|
-
|
|
|
- data: []
|
|
|
- }
|
|
|
+ var sum=0
|
|
|
+
|
|
|
for (var j in dates) {
|
|
|
|
|
|
var num = salesData[dates[j]][item]
|
|
|
- obj.data.push(num)
|
|
|
+ sum+=num
|
|
|
}
|
|
|
- series.push(obj)
|
|
|
- }
|
|
|
+ obj.data.push(sum)
|
|
|
+ }
|
|
|
+ series.push(obj)
|
|
|
|
|
|
|
|
|
var data1 = []
|
|
|
@@ -1934,13 +1942,13 @@
|
|
|
type: 'shadow'
|
|
|
},
|
|
|
grid: {
|
|
|
- top: 80,
|
|
|
+ top: 20,
|
|
|
left: 2,
|
|
|
right: 5,
|
|
|
bottom: 20,
|
|
|
containLabel: true
|
|
|
},
|
|
|
- legend: {},
|
|
|
+
|
|
|
xAxis: {
|
|
|
type: 'category',
|
|
|
|
|
|
@@ -2143,7 +2151,9 @@
|
|
|
},
|
|
|
getBar(type) {
|
|
|
var getData = this.indexData3.graphMap;
|
|
|
-
|
|
|
+ getData.nowYearRechargeFee=getData.rechargeFee
|
|
|
+ getData.nowYearRechargeNum=getData.rechargeNum
|
|
|
+
|
|
|
if (!this.myChart) {
|
|
|
this.myChart = echarts.init(document.getElementById('pieEcharts'));
|
|
|
this.myChart.on("dataZoom", (res) => {
|
|
|
@@ -2152,10 +2162,12 @@
|
|
|
});
|
|
|
}
|
|
|
this.myChart.clear();
|
|
|
- var key = ["AmountCard", "ProfitCard", "EQAmount", "DiscountCardBuyNum", "MonthCardBuyNum"]
|
|
|
- var keyStr = ['收入\n(含卡)', '利润\n(含卡)', '充电量', '6折卡', '月卡']
|
|
|
- var keyStrN = ['收入（含卡）', '利润（含卡）', '充电量', '6折卡', '月卡']
|
|
|
- var keyStrT = ['收入', '利润', '充电量', '6折卡', '月卡']
|
|
|
+ var key = ["AmountCard", "ProfitCard", "EQAmount", "RechargeNum", "RechargeFee"]
|
|
|
+ var keyStr = ['收入\n(含卡)', '利润\n(含卡)', '充电量', '充值\n人次', '充值\n金额']
|
|
|
+ var keyStrN = ['收入（含卡）', '利润（含卡）', '充电量', '充值人次', '充值金额']
|
|
|
+ var keyStrT = ['收入', '利润', '充电量', '充值人次', '充值金额']
|
|
|
+
|
|
|
+
|
|
|
var key1 = new Date().getFullYear() + "-01-01" == this.byYearStart ? "今年" : "去年"
|
|
|
var key2 = new Date().getFullYear() + "-01-01" == this.byYearStart ? "去年" : "前年"
|
|
|
var key3 = ['去年同期数据', '今年同期完成']
|
|
|
@@ -2227,9 +2239,9 @@
|
|
|
prefix = ["lastYear", "nowYear"]
|
|
|
prefixStr = [key2 + "", key1 + ""]
|
|
|
}
|
|
|
- var u = ['元', '元', '度', '张', '张']
|
|
|
- var keytool = ["AmountCard", "ProfitCard", "EQAmount", "DiscountCardBuyNum",
|
|
|
- "MonthCardBuyNum"
|
|
|
+ var u = ['元', '元', '度', '次', '元']
|
|
|
+ var keytool = ["AmountCard", "ProfitCard", "EQAmount", "RechargeNum",
|
|
|
+ "RechargeFee"
|
|
|
]
|
|
|
var text1 = ""
|
|
|
//去年全年数据、去年同期数据、今年当前数据和同期完成比。
|
|
|
@@ -2407,20 +2419,19 @@
|
|
|
var colorName = "#333"
|
|
|
|
|
|
// this.showlist1 = ['收入', '利润', '次数','新电途'];
|
|
|
- var showlistColor = ['#5872c0', '#de6e6a', '#f3c96b', '#69be8d', '#c661b4', '#009688', '#4CAF50',
|
|
|
- '#00BCD4', '#2196F3'
|
|
|
+ var showlistColor = ['#2196F3', '#f3c96b','red','#5872c0', '#69be8d', '#c661b4', '#009688', '#4CAF50',
|
|
|
+ '#00BCD4'
|
|
|
];
|
|
|
// this.showlist1 = ['收入', '利润', '电量', '新电途'];
|
|
|
// var sz2 = ['todayAmount', 'todayProfit', 'todayEQAmount2', 'todayXDTAmount'];
|
|
|
|
|
|
- this.showlist1 = ['收入', '利润', '电量', '新电途', '快电', '星星'];
|
|
|
- var sz2 = ['todayAmount', 'todayProfit', 'todayEQAmount2', 'todayXDTAmount', 'todayKDAmount',
|
|
|
- 'todayXXAmount'
|
|
|
+ this.showlist1 = ['收入', '利润', '电量'];
|
|
|
+ var sz2 = ['todayAmount', 'todayProfit', 'todayEQAmount2'
|
|
|
];
|
|
|
-
|
|
|
+
|
|
|
+ //, 'todayXDTAmount', 'todayKDAmount','todayXXAmount' , '新电途', '快电', '星星'
|
|
|
if (this.showMonthlyCard && this.type_head == 2) {
|
|
|
- var sz2 = ['todayAmountC', 'todayProfitC', 'todayEQAmount2', 'todayXDTAmount', 'todayKDAmount',
|
|
|
- 'todayXXAmount'
|
|
|
+ var sz2 = ['todayAmountC', 'todayProfitC', 'todayEQAmount2'
|
|
|
];
|
|
|
}
|
|
|
if (typebl) {
|
|
|
@@ -2470,8 +2481,9 @@
|
|
|
}
|
|
|
if (this.type_head == 1) {
|
|
|
|
|
|
- ap.symbolSize = 3;
|
|
|
- }
|
|
|
+ ap.symbolSize = 2;
|
|
|
+ }
|
|
|
+
|
|
|
var bl = true;
|
|
|
for (var i in getData) {
|
|
|
//var time=this.queryDate.replace("-","/").replace("-","/")
|
|
|
@@ -2686,7 +2698,9 @@
|
|
|
info.todayProfitYOY = info.todayProfitCYOY
|
|
|
info.todayProfitQOQ = info.todayProfitCQOQ
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
if (name != this.queryTime2) {
|
|
|
if (info.todayProfitYOY != null) {
|
|
|
text1 += "<p>" + value[i].marker + "利润同比" + (info.todayProfitYOY <
|
|
|
@@ -2720,7 +2734,8 @@
|
|
|
}
|
|
|
|
|
|
|
|
|
- }
|
|
|
+ }
|
|
|
+
|
|
|
if (i == value.length - 1 && this.showMonthlyCard) {
|
|
|
|
|
|
text1 +=
|
|
|
@@ -2738,7 +2753,18 @@
|
|
|
'">' + (info.cardBuyFee ? info.cardBuyFee : 0).toFixed(2) + '元</span></p>';
|
|
|
}
|
|
|
|
|
|
- }
|
|
|
+ }
|
|
|
+ var sz001=[ 'todayXDTAmount', 'todayKDAmount','todayXXAmount' ]
|
|
|
+ var sz002=['新电途', '快电', '星星']
|
|
|
+
|
|
|
+ for(var i in sz001){
|
|
|
+ var k1=sz001[i]
|
|
|
+ var k2=sz002[i]
|
|
|
+ text1 += "<p><span style='display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:#FF3D00;'></span>" + k2+ '<span style="' +
|
|
|
+ style +
|
|
|
+ '">' + info[k1].toFixed(2) + '元</span></p>';
|
|
|
+ }
|
|
|
+
|
|
|
if (this.type_head == 2) {
|
|
|
text1 +=
|
|
|
"<p><span style='display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:#19be6b;'></span>设备完好率" +
|
zhengkaixin