|
@@ -107,8 +107,14 @@
|
|
|
对比统计年份 {{byYearText}}
|
|
|
<u-icon name="arrow-down" color="#b0b8c8" size="32" v-show="!popupShow8"></u-icon>
|
|
|
<u-icon name="arrow-up" color="#b0b8c8" size="32" v-show="popupShow8"></u-icon>
|
|
|
- </p>
|
|
|
- <view id="pieEcharts" style="min-height:240px;">
|
|
|
+ </p>
|
|
|
+
|
|
|
+ <view id="pieEcharts-bar" v-show="type_head==3"
|
|
|
+ style="min-height:240px;">
|
|
|
+
|
|
|
+ </view>
|
|
|
+ <view id="pieEcharts" v-show="type_head!=3"
|
|
|
+ style="min-height:240px;">
|
|
|
|
|
|
</view>
|
|
|
|
|
@@ -970,7 +976,8 @@
|
|
|
changeitemBl: false,
|
|
|
myChart3: null,
|
|
|
myChart2: null,
|
|
|
- myChart: null,
|
|
|
+ myChart: null,
|
|
|
+ myChartbar:null,
|
|
|
myChartReady: true,
|
|
|
myChartTime: false,
|
|
|
subsection: [{
|
|
@@ -1588,8 +1595,10 @@
|
|
|
this.indexData3 = res.data;
|
|
|
uni.hideLoading()
|
|
|
|
|
|
- if (this.type_head == 3) {
|
|
|
+ if (this.type_head == 3) {
|
|
|
+
|
|
|
this.getBar(this.info.accountType)
|
|
|
+
|
|
|
} else {
|
|
|
if (this.type_head == 1) {
|
|
|
var weeks = new Array("星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六");
|
|
@@ -2032,7 +2041,7 @@
|
|
|
},
|
|
|
series: series
|
|
|
}
|
|
|
- console.log(option)
|
|
|
+
|
|
|
this.myChart3.setOption(option);
|
|
|
|
|
|
},
|
|
@@ -2225,15 +2234,15 @@
|
|
|
var getData = this.indexData3.graphMap;
|
|
|
getData.nowYearRechargeFee=getData.rechargeFee
|
|
|
getData.nowYearRechargeNum=getData.rechargeNum
|
|
|
+ this.myChartbar = echarts.init(document.getElementById('pieEcharts-bar'));
|
|
|
|
|
|
- if (!this.myChart) {
|
|
|
- this.myChart = echarts.init(document.getElementById('pieEcharts'));
|
|
|
- this.myChart.on("dataZoom", (res) => {
|
|
|
- showkey = "";
|
|
|
- this.headitemby = "";
|
|
|
- });
|
|
|
- }
|
|
|
- this.myChart.clear();
|
|
|
+ // if (!this.myChartbar) {
|
|
|
+ // // this.myChartbar.on("dataZoom", (res) => {
|
|
|
+ // // showkey = "";
|
|
|
+ // // this.headitemby = "";
|
|
|
+ // // });
|
|
|
+ // }
|
|
|
+ // this.myChartbar.clear();
|
|
|
var key = ["AmountCard", "ProfitCard", "EQAmount", "RechargeNum", "RechargeFee"]
|
|
|
var keyStr = ['收入\n(含卡)', '利润\n(含卡)', '充电量', '充值\n人次', '充值\n金额']
|
|
|
var keyStrN = ['收入(含卡)', '利润(含卡)', '充电量', '充值人次', '充值金额']
|
|
@@ -2413,7 +2422,7 @@
|
|
|
|
|
|
]
|
|
|
};
|
|
|
- this.myChart.setOption(option);
|
|
|
+ this.myChartbar.setOption(option);
|
|
|
},
|
|
|
getNum(num, j) {
|
|
|
var str = {
|
|
@@ -2985,10 +2994,10 @@
|
|
|
//timelist.push(i)
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
// 使用刚指定的配置项和数据显示图表。
|
|
|
this.myChart.setOption(option);
|
|
|
-
|
|
|
+ console.log(option)
|
|
|
|
|
|
|
|
|
}
|