调整，首部分显示

pagesFinance/statistics/index.vue

@@ -50,12 +50,14 @@
 
 						<view class="span1">昨日收入</view>
 						<view class="span2">
-							{{indexData.yesterdayAmount?indexData.yesterdayAmount.toFixed(2):0}}<span>元</span></view>
+							{{indexData.yesterdayAmount?indexData.yesterdayAmount.toFixed(2):0}}<span>元</span>
+						</view>
 					</view>
 					<view class="details-row details-row-head-2">
 						<view class="span1">昨日利润</view>
 						<view class="span2">
-							{{indexData.yesterdayProfit?indexData.yesterdayProfit.toFixed(2):0}}<span>元</span></view>
+							{{indexData.yesterdayProfit?indexData.yesterdayProfit.toFixed(2):0}}<span>元</span>
+						</view>
 					</view>
 					<view class="details-row details-row-head-3">
 						<view class="span1">昨日笔数</view>
@@ -67,12 +69,14 @@
 
 						<view class="span1">本月收入</view>
 						<view class="span2">
-							{{indexData.thisMonthAmount?indexData.thisMonthAmount.toFixed(2):0}}<span>元</span></view>
+							{{indexData.thisMonthAmount?indexData.thisMonthAmount.toFixed(2):0}}<span>元</span>
+						</view>
 					</view>
 					<view class="details-row details-row-head-2">
 						<view class="span1">本月利润</view>
 						<view class="span2">
-							{{indexData.thisMonthProfit?indexData.thisMonthProfit.toFixed(2):0}}<span>元</span></view>
+							{{indexData.thisMonthProfit?indexData.thisMonthProfit.toFixed(2):0}}<span>元</span>
+						</view>
 					</view>
 					<view class="details-row details-row-head-3">
 						<view class="span1">本月笔数</view>
@@ -183,14 +187,16 @@
 
 								<view class="span1">快充枪平均充电量</view>
 								<view class="span2" v-if="item.fastNum">
-									{{(item.averageFast/10000).toFixed(1)}}<span>度/枪/天</span></view>
+									{{(item.averageFast/10000).toFixed(1)}}<span>度/枪/天</span>
+								</view>
 								<view class="span2" v-else>0<span>度/枪/天</span></view>
 							</view>
 							<view class="details-row">
 
 								<view class="span1">慢充枪平均充电量</view>
 								<view class="span2" v-if="item.slowNum">
-									{{(item.averageSlow/10000).toFixed(1)}}<span>度/枪/天</span></view>
+									{{(item.averageSlow/10000).toFixed(1)}}<span>度/枪/天</span>
+								</view>
 								<view class="span2" v-else>0<span>度/枪/天</span></view>
 							</view>
 						</view>
@@ -304,7 +310,8 @@
 					hour: false,
 					minute: false,
 					second: false
-				},
+				},
+				headitemby:"",
 				isinit: true,
 				form: {},
 				form2: {},
@@ -415,7 +422,7 @@
 			this.queryTime2 = parseUnixTime(currentTimeStamp(), '{y}-{m}'),
 
 
-				this.startDate_head = parseUnixTime(beforeTimeStamp(30 ), '{y}-{m}-{d}')
+				this.startDate_head = parseUnixTime(beforeTimeStamp(30), '{y}-{m}-{d}')
 			this.startTime = parseUnixTime(beforeTimeStamp(7), '{y}-{m}-{d}')
 			this.endTime = parseUnixTime(beforeTimeStamp(1), '{y}-{m}-{d}')
 			//this.startTime2 = parseUnixTime(beforeTimeStamp(6), '{y}-{m}-{d}')
@@ -616,8 +623,9 @@
 
 				this.current = e
 				this.type_head = e;
+
 				if (e == 1) {
-					this.startDate_head = parseUnixTime(beforeTimeStamp(30 ), '{y}-{m}-{d}')
+					this.startDate_head = parseUnixTime(beforeTimeStamp(30), '{y}-{m}-{d}')
 				} else {
 					this.startDate_head = parseUnixTime(beforeTimeStamp(365), '{y}-{m}-01')
 				}
@@ -672,8 +680,9 @@
 
 			},
 
-			getPie() {
-
+			getPie() {
+				this.headitemby="";
+				var showkey = "";
 				var getData = this.indexData3.graphMap;
 
 				//var unit = this.current ? '笔' : '元'
@@ -682,9 +691,10 @@
 				var sz2 = ['todayAmount', 'todayProfit', 'todayEQNum'];
 				if (!this.myChart) {
 					this.myChart = echarts.init(document.getElementById('pieEcharts'));
-					this.myChart.on("dataZoom", function(res){
-						console.log(res)
-					}); 
+					this.myChart.on("dataZoom", (res) => {
+						showkey = "";
+						this.headitemby ="";
+ 					});
 				}
 				this.myChart.clear();
 				var timelist = []
@@ -698,12 +708,12 @@
 				}
 				var list = [];
 				for (var j in this.showlist1) {
-					
+
 					var ap = {
 						name: this.showlist1[j],
 						type: 'line',
-						
-						  
+
+
 						// label: {
 						// 	show: true,
 						// 	position: 'top'
@@ -711,15 +721,15 @@
 						data: []
 					}
 					if (this.type_head == 1) {
-						// ap.symbol='circle'
-						ap.symbolSize=3;
+
+						ap.symbolSize = 3;
 					}
 					for (var i in getData) {
 						//var time=this.queryDate.replace("-","/").replace("-","/")
 						//time+' '+i
 						var obj = getData[i][sz2[j]];
 						//'todayAmount', 'todayProfit', 'todayEQNum'
-						if(getData[i].todayAmount==0&&getData[i].todayProfit==0&&getData[i].todayEQNum==0){
+						if (getData[i].todayAmount == 0 && getData[i].todayProfit == 0 && getData[i].todayEQNum == 0) {
 							continue;
 						}
 						var time = i
@@ -735,30 +745,31 @@
 
 
 				}
-
+				
 				// 指定图表的配置项和数据
 				var option = {
-						
-						tooltip: {
-							
-							formatter: (value) => {
-								var info = value;
-								
-								var name=value[0].data[0];
-								var style="float: right;margin-left: 3px;"
-								var text1=""
-								for(var i in value){
-									var u="元"
-									if(value[i].seriesName=='次数'){
-										u='次'
-									}
-									text1+="<p>"+value[i].marker+value[i].seriesName+'<span style="'+style+'">'+value[i].data[1]+u+'</span></p>';
-								}
-								
-								return `<p>${name}</p>`+text1
 
-							},
-						
+					tooltip: {
+
+						formatter: (value) => {
+							var info = value;
+
+							var name = value[0].data[0];
+							var style = "float: right;margin-left: 3px;"
+							var text1 = ""
+							for (var i in value) {
+								var u = "元"
+								if (value[i].seriesName == '次数') {
+									u = '次'
+								}
+								text1 += "<p>" + value[i].marker + value[i].seriesName + '<span style="' + style +
+									'">' + value[i].data[1] + u + '</span></p>';
+							}
+
+							return `<p>${name}</p>` + text1
+
+						},
+
 						trigger: 'axis',
 						borderColor: "#F0F0F0",
 						borderWidth: 1,
@@ -777,7 +788,7 @@
 						top: '13%',
 						left: '3%',
 						right: '8%',
-						bottom: '16%',
+						bottom: '18%',
 						containLabel: true
 					},
 
@@ -788,12 +799,39 @@
 						boundaryGap: false,
 
 						axisLabel: {
+							formatter: (value) => {
+ 								if(this.headitemby==""){
+									this.headitemby=value
+								}
+								var i = 0
+								if (this.type_head == 1) {
+									i = 3;
+								} else {
+									i = 5;
+								}
+								var showvalue = "";
+								var key = value.substring(0, i);
+								if (showkey == ""||value==this.headitemby) {
+									showkey = key
+								
+									showvalue = value
+								} else {
+									if (key != showkey) {
+										showkey = key
+										showvalue = value
+									} else {
+										showvalue = value.substring(i)
+									}
+								}
+ 								return showvalue.replace("-",".");
 
+							},
 							textStyle: {
 								color: "#333"
 							}
 						},
 						axisLine: {
+
 							show: true,
 							lineStyle: {
 								color: "#333"
@@ -818,33 +856,33 @@
 					},
 
 					series: list
-			};
+				};
 
-			if (this.type_head == 1) {
-				option.dataZoom = [{
-						type: 'inside',
-						start: 0,
-						end: 100
-					},
-					{
-						start: 0,
-						end: 100
-					}
-				]
-				
-				 
-			} else {
-				//timelist.push(i)
-			}
-			console.log(option)
-			// 使用刚指定的配置项和数据显示图表。
-			this.myChart.setOption(option);
+				
+					option.dataZoom = [{
+							type: 'inside',
+							start: 0,
+							end: 100
+						},
+						{
+							start: 0,
+							end: 100
+						}
+					]
+
+				if (this.type_head == 1) {
+				} else {
+					//timelist.push(i)
+				}
+
+				// 使用刚指定的配置项和数据显示图表。
+				this.myChart.setOption(option);
 
 
 
+			}
 		}
 	}
-	}
 </script>
 <style>
 	page {