细节处理

config/.env.dev.js

@@ -3,7 +3,7 @@ const UNI_APP = {
 	//BASE_URL: 'http://36.134.122.108/railroad-server/',
 
 	BASE_URL: 'https://charging.xiaoxinda.com/electric-manager-api/', //test
-	//BASE_URL: 'https://dgj.hbjp.com.cn/electric-manager-api/',
+	BASE_URL: 'https://dgj.hbjp.com.cn/electric-manager-api/',
 	
 	//BASE_URL:'http://192.168.77.162:8081/electric-manager-api/', //sz
 	
@@ -16,10 +16,10 @@ const UNI_APP = {
 	//openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",
 	//openId:"oLowyuOJvTszgk96C0f8j0XfcEXg",//zkx
 	
-	//openId:"oLowyuAJ1Ld0ivnLj4qp1k5Vy_l4", //老板
+	openId:"oLowyuAJ1Ld0ivnLj4qp1k5Vy_l4", //老板
 	//openId:"oLowyuFTU3SzpvU4pGNzWk7NC9y0", //wky
 	
-	//openId:"oLowyuHCGgMomNBQEXZSbb5SJxfQ",//杨所
+	openId:"oLowyuHCGgMomNBQEXZSbb5SJxfQ",//杨所
 	
 	//openId:"oLowyuMMjIkA_bLA4MXzRQ3KJB2E",//fjj
 	//openId:"oLowyuB1PliW0qAnJJ56axydeUOM",//zq

pages/statistics/statistics.vue

@@ -56,7 +56,7 @@
 				</span>
 			</view>
 			<view class="title" v-else>
-				能源管理
+				能源管理 
 				<span style="padding-left: 4px;" v-if="companyList.length>1&&current!=0">
 					|
 				</span>
@@ -234,8 +234,8 @@
 				</view>
 
 				<view class="item">
-					<view>
-						<u-circle-progress width="88" borderWidth="12" active-color="#2979ff"  :percent="80">
+					<view  v-if="alarmsForm.okNum||alarmsForm.errorNum">
+						<u-circle-progress width="88" borderWidth="12" active-color="#2979ff"  :percent="(alarmsForm.okNum/(alarmsForm.okNum+alarmsForm.errorNum)*100)">
 								<view class="u-progress-content">
 									<image class="img"  style="width: 32rpx;height: 32rpx;margin-top: 8rpx;"
 									src="@/assets/img/statistics/fa5-bolt-fas.svg"></image>
@@ -266,9 +266,9 @@
 					</view>
 				</view>
 
-				<view class="item">
+				<view class="item" v-if="alarmsFormWater.okNum||alarmsFormWater.errorNum">
 					<view>
-						<u-circle-progress width="88" borderWidth="12" active-color="#00B962"  :percent="80">
+						<u-circle-progress width="88" borderWidth="12" active-color="#00B962"  :percent="alarmsFormWater.okNum/(alarmsFormWater.okNum+alarmsFormWater.errorNum)*100">
 								<view class="u-progress-content">
 									<image class="img"  style="width: 32rpx;height: 32rpx;margin-top: 8rpx;"
 									src="@/assets/img/statistics/fas fa-tint.svg"></image>
@@ -747,7 +747,7 @@
 
 			</view>
 			<!-- 用电量 -->
-			<view class="statistics-e statistics" v-if="!companyId">
+			<view class="statistics-e statistics" v-if="(!companyId)">
 				<view class="title">
 					<view class="icon">
 						<image class="img" src="@/assets/img/circleCopy1@1x.png" mode=""></image>
@@ -852,7 +852,7 @@
 			</view>
 			
 			<!-- 用电量 -->
-			<view class="statistics-e statistics" v-if="!companyId">
+			<view class="statistics-e statistics" v-if="(!companyId)&&kWhListHomeWater.length">
 				<view class="title">
 					<view class="icon">
 						<image class="img" src="@/assets/img/circleCopy1@1x.png" mode=""></image>
@@ -2675,7 +2675,7 @@
 			border-radius: 8px;
 			background-color: rgba(255, 255, 255, 1);
 			box-shadow: 0px 1px 6px 0px rgba(0, 59, 142, 0.05);
-			margin-bottom: 16rpx;
+			margin-bottom: 24rpx;
 			padding: 40rpx;
 
 			.title {