调整充电使用率

pagesFinance/statistics/list.vue

@@ -39,19 +39,32 @@
 						
 					</view>
 				</view>
-				<view class="detailsline detailsline0 " v-if="stationFlowList.length>1">
+				<view class="detailsline1 " v-if="stationFlowList.length>1">
 
-
-					<view class="details-row " style="    padding-left: 0px !important;" >
-
-						<view class="span1">总收入</view>
-						<view class="span2">{{(allMoneySum).toFixed(2)}}<span>元</span></view>
+					<view class="detailsline detailsline0 ">
+						<view class="details-row " style="    padding-left: 0px !important;" >
+						
+							<view class="span1">总收入</view>
+							<view class="span2">{{(allMoneySum).toFixed(2)}}<span>元</span></view>
+						</view>
+						<view class="details-row">
+							<view class="span1">总利润<span>(服务费+折扣卡)</span></view>
+							<view class="span2">{{(serviceMoneySum).toFixed(2)}}<span>元</span></view>
+						</view>
 					</view>
-					<view class="details-row">
-						<view class="span1">总利润<span>(服务费+折扣卡)</span></view>
-						<view class="span2">{{(serviceMoneySum).toFixed(2)}}<span>元</span></view>
+					
+					<view class="details-row " style="margin-top: 0px;    padding: 0 16px;padding-bottom: 10px;" >
+					
+						<span style="font-size: 28rpx; font-weight: normal;">充电使用率</span>
+						<span  style="float:right;font-size: 28rpx;">
+							<span style="margin-right: 8rpx;font-weight: normal;" >快充枪:</span>{{allFastUsageRate}}%
+							<span style="margin:0 8rpx;font-weight: normal;"  >|</span>
+							<span style="margin-right: 8rpx;font-weight: normal;" >慢充枪:</span>{{allSlowUsageRate}}%
+						</span>
 					</view>
-				</view>
+				</view>
+				
+				
 			</view>
 			<view class="details detailstable"  
 					
@@ -92,7 +105,7 @@
 								
 							</view>
 							<view  style="    margin-top: 10px;" v-if="item.station.stationNo&&item.station.stationNo.indexOf('D')!=0" >
-								<span style="font-size: 24rpx; font-weight: normal;">充电使用率（枪/天）</span>
+								<span style="font-size: 24rpx; font-weight: normal;">充电使用率</span>
 								<span  style="float:right;">
 									<span style="font-size: 24rpx;margin-right: 8rpx;font-weight: normal;" v-if="item.fastNum" >快充枪:</span>{{item.fastNum?(item.fastUsageRate)+'%':''}} 
 									<span style="font-size: 24rpx;margin:0 8rpx;font-weight: normal;"  v-if="item.fastNum&&item.slowNum">|</span>
@@ -197,9 +210,9 @@
 						
 								<view class="span1">快充枪充电使用率</view>
 								<view class="span2" v-if="item.fastNum">
-									{{(item.fastUsageRate)}}%<span>枪/天</span>
+									{{(item.fastUsageRate)}}%
 								</view>
-								<view class="span2" v-else>0%<span>枪/天</span></view>
+								<view class="span2" v-else>0%</view>
 							</view>
 							<view class="details-row " 
 							 :class="{
@@ -210,9 +223,9 @@
 						
 								<view class="span1">慢充枪充电使用率</view>
 								<view class="span2" v-if="item.slowNum">
-									{{(item.slowUsageRate)}}%<span>枪/天</span>
+									{{(item.slowUsageRate)}}%
 								</view>
-								<view class="span2" v-else>0%<span>枪/天</span></view>
+								<view class="span2" v-else>0%</view>
 							</view>
 							
 						</view>
@@ -251,6 +264,8 @@
 				form: {},
 				selectName:"全部充电站",
 				selectValue: 0,
+				allFastUsageRate:0,
+				allSlowUsageRate:0,
 				valueList: [{
 						name: '全部充电站',
 						value:'0'
@@ -392,7 +407,10 @@
 
 				API.homeFlowStatistics(this.form).then((res) => {
 					this.serviceMoneySum=res.data.allProfit;
-					this.allMoneySum=res.data.allAmount;
+					this.allMoneySum=res.data.allAmount;
+					
+					this.allSlowUsageRate=res.data.allSlowUsageRate;
+					this.allFastUsageRate=res.data.allFastUsageRate;
 					this.stationFlowList = res.data.stationFlowList;
 					this.nowTime = daysDistance(this.startTime, this.endTime) + 1;
 					
@@ -495,19 +513,27 @@
 			padding: 10px 0;
 
 		}
-
-		.detailsline0 {
+		.detailsline1 {
 			border-bottom: 0px !important;
 			background : linear-gradient(90deg, rgba(27,126,242,1) 0%,rgba(0,90,217,1) 100%);
 			color: #FFFFFF;
-			padding: 0 16px;
+			//padding: 0 16px;
+			.span1,.span2,.span{
+				color: #FFFFFF !important;
+			}
+		}
+		.detailsline0 {
+			border-bottom: 0px !important;
+			//background : linear-gradient(90deg, rgba(27,126,242,1) 0%,rgba(0,90,217,1) 100%);
+			color: #FFFFFF;
+			
 			.span1,.span2,.span{
 				color: #FFFFFF !important;
 			}
 		}
 
 		.detailsline {
-			border-top: 1px solid #ededed;
+			//border-top: 1px solid #ededed;
 			padding: 0px 16px;
 		}