wkyy 1 ano atrás
pai
commit
60f791d627

+ 10 - 6
pages/equipmentDataMonitoring/equipmentElectricity.vue

@@ -100,7 +100,7 @@
 						</view>
 					</view>
 					<view class="electricity">
-						<view class="electricity-item">
+						<view class="electricity-item electricity-item-day">
 							<view class="number">
 								{{item.thisDayKwh}}
 							</view>
@@ -403,8 +403,8 @@
 			}
 
 			.equipment {
-				width: 40%;
-				margin-left: 16rpx;
+				width: 35%;
+				margin-left: 8rpx;
 
 				// .equipment-text-overflow {
 				// 	display: -webkit-box;
@@ -423,7 +423,7 @@
 					display: flex;
 					color: rgba(119, 119, 119, 1);
 					.companyName{
-						width: 60%;
+						width: 45%;
 					// 	white-space: nowrap;
 					// overflow: hidden;
 					// text-overflow: ellipsis;
@@ -460,11 +460,11 @@
 				justify-content: space-between;
 				align-items: center;
 				flex: 1;
-				margin-left: 8rpx;
+				// margin-left: 8rpx;
 				text-align: center;
 
 				.electricity-item {
-					width: 33%;
+					width: 33.33%;
 
 					.number {
 						color: rgba(51, 51, 51, 1);
@@ -479,6 +479,10 @@
 						margin-top: 4rpx;
 					}
 				}
+				
+				.electricity-item-day{
+					width: 25%;
+				}
 			}
 		}
 	}

+ 1 - 1
pages/statistics/statistics.vue

@@ -1100,7 +1100,7 @@
 					border-bottom: 1px solid rgba(245, 245, 245, 1);
 
 					.equipment {
-						width: 30%;
+						width: 40%;
 
 						// .equipment-text-overflow {
 						// 	display: -webkit-box;