css

pages/equipmentDataMonitoring/electricityDetails.vue

@@ -29,7 +29,7 @@
 							{{kwhMap.fee}}元
 						</view>
 					</view>
-					<view class="infos-item" v-if="kwhMap.fengKwh">
+					<view class="infos-item" v-if="meterPhase=='3'">
 						<view class="item-title">
 							峰时用电 ({{kwhMap.fengPrice}}元/度)
 
@@ -39,7 +39,7 @@
 
 						</view>
 					</view>
-					<view class="infos-item"  v-if="kwhMap.guKwh">
+					<view class="infos-item"  v-if="meterPhase=='3'">
 						<view class="item-title">
 							谷时用电 ({{kwhMap.guPrice}}元/度)
 
@@ -49,7 +49,7 @@
 
 						</view>
 					</view>
-					<view class="infos-item" v-if="kwhMap.pingKwh">
+					<view class="infos-item" v-if="meterPhase=='3'">
 						<view class="item-title">
 							平时用电 ({{kwhMap.pingPrice}}元/度)
 
@@ -59,7 +59,7 @@
 
 						</view>
 					</view>
-					<view class="infos-item" v-if="kwhMap.jianKwh" >
+					<view class="infos-item" v-if="meterPhase=='3'" >
 						<view class="item-title">
 							尖时用电 ({{kwhMap.jianPrice}}元/度)
 						</view>
@@ -75,14 +75,6 @@
 							{{name}}
 						</view>
 					</view>
-					<!-- <view class="infos-item">
-						<view class="item-title">
-							户号
-						</view>
-						<view class="item-value">
-							00101010
-						</view>
-					</view> -->
 				</view>
 				<!-- 折线图 -->
 				<view class="chat-box">
@@ -93,7 +85,6 @@
 						<view id="barEcharts" style="min-height:322rpx;">
 
 						</view>
-						<!-- <image src="@/assets/img/chart@1x.png" mode=""></image> -->
 					</view>
 				</view>
 			</view>
@@ -116,7 +107,8 @@
 				graphMap: {},
 				kwhMap: {},
 				month: '',
-				name: ''
+				name: '',
+				meterPhase: ''
 			}
 		},
 		onLoad(op) {
@@ -141,6 +133,7 @@
 					this.graphMap = res.data.graphMap;
 					this.kwhMap = res.data.kwhMap;
 					this.name = res.data.name;
+					this.meterPhase = res.data.meterPhase;
 					this.getBarCharts(this.graphMap);
 				}).catch(error => {
 					uni.showToast({

pages/statistics/statistics.vue

@@ -1100,7 +1100,7 @@
 					border-bottom: 1px solid rgba(245, 245, 245, 1);
 
 					.equipment {
-						width: 45%;
+						width: 30%;
 
 						// .equipment-text-overflow {
 						// 	display: -webkit-box;
@@ -1119,7 +1119,7 @@
 							display: flex;
 
 							.companyName {
-								width: 60%;
+								width: 45%;
 								// 	white-space: nowrap;
 								//overflow: hidden;
 								// text-overflow: ellipsis;