调整

pages/statistics/statistics.vue

@@ -8,21 +8,21 @@
 		<!-- 导航栏 -->
 		<view class="navbar">
 			<view class="title">
-				能源管理
-				<template v-if="companyList.length==1">
-					<span style="padding-left: 4px;">-</span>
-					<span style="padding-left: 4px;">{{companyList[0].name}}</span>
-				</template>
-				<template v-else >
-					
-					<span style="padding-left: 4px;" v-if="companyList.length>=1&&current!=0">
-						-
-					</span>
-					<span style="padding-left: 4px;" v-if="companyList.length>=1&&current!=0">	
-						
-						{{merchantList1[current].name}}
-					</span>
-				</template>
+				能源管理
+				<span style="padding-left: 4px;" v-if="companyList.length>=1&&current!=0">
+					-
+				</span>
+				<span style="padding-left: 4px;" v-if="companyList.length>=1&&current!=0">	
+					
+					
+					<template v-if="kWhList.length==1">
+						{{kWhList[0].name}}
+					</template>
+					<template v-else>
+						{{merchantList1[current].name}}
+					</template>
+				</span>
+			
 				
 				
 			</view>
@@ -1279,6 +1279,8 @@
 
 	// 导航栏
 	.navbar {
+		
+		
 		background-color: rgba(22, 119, 255, 1);
 		color: #fff;
 		line-height: 88rpx;
@@ -1294,6 +1296,11 @@
 		top: 0;
 		z-index: 999999;
 		    font-weight: bold;
+			.title{
+				    overflow: hidden;
+				    white-space: nowrap;
+				    text-overflow: ellipsis;
+			}
 		.img {
 			width: 48rpx;
 			height: 48rpx;