1

pagesFinance/statistics/index.vue

@@ -1500,7 +1500,22 @@
 				
 				this.form3.stationId=this.stationId3;
 				//var str="";
-		
+				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
+				}
 				
 				API.usageStatistics(this.form3).then((res) => {
 					this.indexData6 = res.data
@@ -1656,41 +1671,41 @@
 			getPie2(obj,str) {
 			 
 				var data=[]
-				var dataAll=[]
+				//var dataAll=[]
 				var data1=[]
 				var data2=[]
 				
 				var usageFastMap=obj.usageFastMap;
 				for(var i in usageFastMap){
-					var str1=parseInt( i.split('-')[0])
-					var str2=parseInt(i.split('-')[1])
+					// 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
-							}
+					// //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)
-					}
-					
+					// 	}
+					// 	 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)
 					
 					
 				}
@@ -1722,10 +1737,10 @@
 				data.reverse()
 				var num1=0;
 				var num2=0;
-				for(var i in dataAll){
+				for(var i in data){
 					
-					num1+=usageFastMap[dataAll[i]]
-					num2+=usageSlowMap[dataAll[i]]
+					num1+=usageFastMap[data[i]]
+					num2+=usageSlowMap[data[i]]
 					
 				}
 				
@@ -2308,6 +2323,9 @@
 </style>
 
 <style lang="scss" scoped>
+	/deep/.u-drawer{
+		    z-index: 9999999 !important;
+	}
 	.contentBodyName {
 		padding: 0 36rpx 12rpx 36rpx;
 	}