调整

pagesFinance/statistics/index.vue

@@ -1030,7 +1030,7 @@
 					children:sz2
 				})
 			}
-			console.log(sz)
+			 
 			this.sliderNumList=sz
 		},
 		components: {
@@ -1086,7 +1086,7 @@
 				this.sliderNumTemp2.ck=e.detail.value.length
 			},
 			handlerDoubleSlider1(e) {
-				console.log(e)
+				 
 				// var a=e.minValue.toFixed(0)
 				// var b=e.maxValue.toFixed(0)
 				
@@ -1103,7 +1103,7 @@
 			// 	this.sliderNumTemp2.maxValue=b
 				this.sliderNumTemp2.minValue=e[0].value
 				this.sliderNumTemp2.maxValue=e[1].value
-						//			console.log('e'+JSON.stringify(e))
+						 
 						//this.preference.obc_power = e;
 						//this.preference.obc_power.minValue = e.minValue;
 						//this.preference.obc_power.maxValue = e.maxValue;
@@ -1129,7 +1129,7 @@
 						return true
 					}else{
 						var no2=this.stationList[i-1].stationNo
-						//console.log(no2,no)
+						 
 						if(no2){
 							return no2.substring(0,1)!=no.substring(0,1)
 						}else{
@@ -1484,7 +1484,7 @@
 				this.endTime3Temp = e.endDate
 				
 			},
-			getData3(bl) {
+			getData3(bl,stat) {
 				this.indexData6=null
 				if(bl){
 					uni.showLoading({
@@ -1496,25 +1496,11 @@
 			
 				
 				this.form3.startDate = this.startTime3
-				this.form3.endDate = this.endTime3
+				this.form3.endDate = this.endTime3
+				
 				this.form3.stationId=this.stationId3;
-				
-				if(this.sliderNum1.ck==1||this.sliderNum2.ck==1){
-					var str="";
-					if(this.sliderNum1.ck==1){
-						str+=this.sliderNum1.minValue+"-"+this.sliderNum1.maxValue
-						if(this.sliderNum2.ck==1){
-							str+=","
-						}
-					}
-					if(this.sliderNum2.ck==1){
-						str+=this.sliderNum2.minValue+"-"+this.sliderNum2.maxValue
-						
-					}
-					 this.form3.timeArray=str
-				}else{
-					delete this.form3.timeArray
-				}
+				//var str="";
+		
 				
 				API.usageStatistics(this.form3).then((res) => {
 					this.indexData6 = res.data
@@ -1667,15 +1653,46 @@
 				this.okbtn2()
 
 			},
-			getPie2(obj) {
-				
+			getPie2(obj,str) {
+			 
 				var data=[]
+				var dataAll=[]
 				var data1=[]
 				var data2=[]
-				var top='6%'
+				
 				var usageFastMap=obj.usageFastMap;
 				for(var i in usageFastMap){
-					data.push(i)
+					var str1=parseInt( i.split('-')[0])
+					var str2=parseInt(i.split('-')[1])
+					 
+					dataAll.push(i)
+					if(this.sliderNum1.ck==1||this.sliderNum2.ck==1){
+						// str+=this.sliderNum1.minValue+"-"+this.sliderNum1.maxValue
+						// if(this.sliderNum2.ck==1){
+						// 	str+=","
+						// }
+						if(this.sliderNum2.ck==1){
+							//str+=this.sliderNum2.minValue+"-"+this.sliderNum2.maxValue
+							if(this.sliderNum2.minValue<=str1&&this.sliderNum2.maxValue>str1){
+								data.push(i)
+								continue
+							}
+							
+						}
+						 if(this.sliderNum1.ck==1){
+							//str+=this.sliderNum2.minValue+"-"+this.sliderNum2.maxValue
+							if(this.sliderNum1.minValue<=str1&&this.sliderNum1.maxValue>str1){
+								data.push(i)
+								continue
+							}
+						}
+					}else{
+						data.push(i)
+					}
+					
+					
+					
+					
 				}
 				var height=1680;
 				
@@ -1687,8 +1704,10 @@
 				}else{
 					if(data.length!=24){
 						height=1680*data.length/24+200
-						console.log(data.length)
-						top='10%'
+						if(data.length<=10){
+							//top='12%'
+						}
+						//top=(30-data.length*2)+'%'
 					}
 					this.myChart2.resize({
 						height:uni.upx2px(height),width:uni.upx2px(700)
@@ -1703,10 +1722,10 @@
 				data.reverse()
 				var num1=0;
 				var num2=0;
-				for(var i in data){
+				for(var i in dataAll){
 					
-					num1+=usageFastMap[data[i]]
-					num2+=usageSlowMap[data[i]]
+					num1+=usageFastMap[dataAll[i]]
+					num2+=usageSlowMap[dataAll[i]]
 					
 				}
 				
@@ -1738,7 +1757,8 @@
 					series.push({
 					      name: '快充桩',
 					      type: 'bar',
-					      data: data1,
+					      data: data1,
+						    barWidth:10,
 						  label: {  
 						              show: true, // 开启数据标签显示  
 						              position: 'right', // 数据标签位置，这里设置为顶部  
@@ -1752,7 +1772,8 @@
 					series.push( {
 					      name: '慢充桩',
 					      type: 'bar',
-					      data: data2,
+					      data: data2,
+						  barWidth:10,
 						  label: {  
 						              show: true, // 开启数据标签显示  
 						              position: 'right', // 数据标签位置，这里设置为顶部  
@@ -1768,7 +1789,7 @@
 						 // formatter: '{b}点<br />{a0}: {c0}%<br />{a1}: {c1}%',
 						  formatter: (value) => {
 							  var name = value[0].axisValueLabel;
-							  console.log(value)
+							   
 							  var text1=""
 							  var style = "float: right;margin-left: 3px;"
 							  for (var i in value) {
@@ -1786,10 +1807,10 @@
 					  },
 					  legend: {},
 					 grid: {
-					 	top: top,
-					 	left: '3%',
-					 	right: '8%',
-					 	bottom: '3%',
+					 	top: 30,
+					 	left: 2,
+					 	right: 30,
+					 	bottom: 20,
 					 	containLabel: true
 					 },
 					  xAxis: {
@@ -1797,7 +1818,7 @@
 					    type: 'value',
 					    boundaryGap: [0, 0.01]
 					  },
-					  yAxis: {name:'时',
+					  yAxis: {
 						  
 					    type: 'category',
 					    data: data,
@@ -2268,7 +2289,7 @@
 					//timelist.push(i)
 				}
 
-				//console.log(option)
+				 
 				// 使用刚指定的配置项和数据显示图表。
 				this.myChart.setOption(option);