调整

pagesFinance/statistics/index.vue

@@ -341,7 +341,7 @@
 													<view style="
 																width: 50%;margin-bottom: 8rpx;margin-left: 20rpx;
 															">
-														<u-select v-model="sliderNum1Show"  :default-value="[sliderNumTemp1.minValue,sliderNumTemp1.maxValue-sliderNumTemp1.minValue-1] "  mode="mutil-column-auto"  @confirm="handlerDoubleSlider1" :list="sliderNumList" ></u-select>
+														<u-select v-model="sliderNum1Show"  :default-value="sliderDefaultValue1"  mode="mutil-column-auto"  @confirm="handlerDoubleSlider1" :list="sliderNumList" ></u-select>
 														<view @click="sliderNum1Show = true" style="
 															border: 1px solid;
 															padding: 5px;
@@ -357,7 +357,7 @@
 													<view style="
 														width: 50%;margin-bottom: 8rpx;margin-left: 20rpx;
 													">
-														<u-select v-model="sliderNum2Show" :default-value="[sliderNumTemp2.minValue,sliderNumTemp2.maxValue-sliderNumTemp2.minValue-1] "  mode="mutil-column-auto"  @confirm="handlerDoubleSlider2" :list="sliderNumList" ></u-select>
+														<u-select v-model="sliderNum2Show" :default-value="sliderDefaultValue2 "  mode="mutil-column-auto"  @confirm="handlerDoubleSlider2" :list="sliderNumList" ></u-select>
 														<view @click="sliderNum2Show = true" style="
 															border: 1px solid;
 															padding: 5px;
@@ -781,7 +781,7 @@
 				</view>
 			</view>
 			
-			<view class="statisticsChart-head" style="margin-top: 40rpx;" v-show="info.merchantAccountName=='51充电联盟'">
+			<view class="statisticsChart-head" style="margin-top: 40rpx;"  >
 				<h4>充电枪使用情况统计</h4>
 				<!-- <view class="navbar-screen" >
 					 {{startTime}}至{{endTime}}
@@ -792,16 +792,15 @@
 			
 			
 			</view>
-			<view  style="color: rgb(153, 153, 153);    margin: 40rpx;text-align: center;padding: 8px;" v-show="info.merchantAccountName=='51充电联盟'" v-if="!indexData6">
-				加载中，请稍后...
-			</view>
-			<view  v-else style="
+			
+			<view   style="
 				color: #888888;
 			" >
 				<view v-if="selectOne"><!-- [ {{selectShowNumType==1?'百分比':'次数'}} ] --> {{selectOne.name}}</view>
-				<view>{{startTime3}}至{{endTime3}};
-				<span v-if="sliderNum1.ck">{{sliderNum1.minValue}}点-{{sliderNum1.maxValue}}点;</span>
-				<span v-if="sliderNum2.ck">{{sliderNum2.minValue}}点-{{sliderNum2.maxValue}}点;</span>
+				<view>{{startTime3}}至{{endTime3}};</view>
+				<view>
+				<span v-if="sliderNum1.ck" >{{sliderNum1.minValue}}点-{{(sliderNumTemp1.minValue>sliderNumTemp1.maxValue?'次日':'')}}{{sliderNum1.maxValue}}点;</span>
+				<span v-if="sliderNum2.ck">{{sliderNum2.minValue}}点-{{(sliderNumTemp2.minValue>sliderNumTemp2.maxValue?'次日':'')}}{{sliderNum2.maxValue}}点;</span>
 				</view>
 				
 			</view>
@@ -1017,13 +1016,32 @@
 			this.sliderNumList=[]
 			var sz=[]
 			for(var i =0;i<24;i++){
-				var sz2=[]
-				for(var j =i+1;j<=24;j++){
-					sz2.push({
-						value: j,
-						label: j+'点'
-					})
-				}
+				var sz2=[]
+				
+				// for(var j =i+1;j<=24;j++){
+				// 	sz2.push({
+				// 		value: j,
+				// 		label: j+'点'
+				// 	})
+				// }
+				
+				
+				for(var j =i+1;j<i+24;j++){
+					
+					if(j<=24){
+						sz2.push({
+							value: j,
+							label: j+'点'
+						})
+					}else{
+						sz2.push({
+							value: j-24,
+							label:'次日'+ (j-24)+'点'
+						})
+					}
+					
+				}
+				
 				sz.push({
 					value: i,
 					label: i+'点',
@@ -1036,7 +1054,8 @@
 		components: {
 			Tabbar,DoubleSlider
 
-		},
+		},
+		
 		onReady() {
 			var date = new Date();
 			this.nowTime = 7
@@ -1046,14 +1065,14 @@
 			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(6), '{y}-{m}-{d}')
 			this.endTime = parseUnixTime(beforeTimeStamp(0), '{y}-{m}-{d}')
 			//this.startTime2 = parseUnixTime(beforeTimeStamp(6), '{y}-{m}-{d}')
 			this.endTime2 = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}')
 			
 			
-			this.startTime3 = parseUnixTime(beforeTimeStamp(7), '{y}-{m}-{d}')
+			this.startTime3 = parseUnixTime(beforeTimeStamp(31), '{y}-{m}-{d}')
 			this.endTime3 = parseUnixTime(beforeTimeStamp(1), '{y}-{m}-{d}')
 			
 			
@@ -1063,7 +1082,37 @@
 
 			// startTime(){
 			// 	return this.queryTime+'-1'
-			// },
+			// },
+			
+			sliderDefaultValue1(){
+				var min=this.sliderNumTemp1.minValue
+				var max=this.sliderNumTemp1.maxValue
+				var a=min
+				var b=0
+				if(max>min){
+					
+					b=max-min-1
+				
+				}else{
+					b=23-min+max
+							
+				}
+				return [a,b]
+			},
+			sliderDefaultValue2(){
+				var min=this.sliderNumTemp2.minValue
+				var max=this.sliderNumTemp2.maxValue
+				var a=min
+				var b=0
+				if(max>min){
+					
+					b=max-min-1
+				
+				}else{
+					b=23-min+max
+				}
+				return [a,b]
+			},
 			startTime2() {
 				return this.queryTime2 + '-01'
 			},
@@ -1293,15 +1342,10 @@
 					
 					this.stationList =list2
 					if(list2.length){
-						// this.selectOne=list2[0]
-						// this.selectstationNo7=this.selectOne.stationNo.substring(0,1)
-						// this.selectstationId7=this.selectOne.id
-						if(this.info.merchantAccountName=='51充电联盟'){
-							this.getData3()
-						}
-						
+						this.getData()
 					}
-					
+					//
+					this.getData3()
 					// this.stationList.unshift({
 					// 	id: '',
 					// 	name: "全部站点"
@@ -1310,7 +1354,7 @@
 
 					//this.stationListSon = res.data.deviceList
 					this.getDataHome2()
-					this.getData()
+					
 					this.getData2()
 					
 				}).catch(error => {
@@ -1484,7 +1528,7 @@
 				this.endTime3Temp = e.endDate
 				
 			},
-			getData3(bl,stat) {
+			getData3(bl) {
 				this.indexData6=null
 				if(bl){
 					uni.showLoading({
@@ -1558,6 +1602,7 @@
 			},
 			resetBtn7(){
 				this.popupShow7 = true;
+				
 				this.startTime3Temp=this.startTime3;
 				this.endTime3Temp=this.endTime3;
 				this.selectShowNumTypeTemp=this.selectShowNumType;