常志远 1 년 전
부모
커밋
7dd4ee946d
1개의 변경된 파일22개의 추가작업 그리고 6개의 파일을 삭제
  1. 22 6
      pages/equipmentDataMonitoring/electronicMonitoring.vue

+ 22 - 6
pages/equipmentDataMonitoring/electronicMonitoring.vue

@@ -133,7 +133,7 @@
 
 				</view>
 				<view class="more" @click="tabsFrom.show2=true,params.day=true">
-					{{queryDay}}<u-icon name="arrow-down"></u-icon>
+					{{queryDay}}<u-icon name="arrow-down" color="#bbbbbb"></u-icon>
 				</view>
 			</view>
 			<view class="chart">
@@ -141,7 +141,14 @@
 
 				</view>
 			</view>
-			<view style="text-align: left;background: white;">当日电量合计:{{sumQuantity}}度</view>
+			<view class="total" >
+				<view class="total-item">
+					当日电量合计:{{sumQuantity}}度
+				</view>
+				<view class="total-item">
+					当日电费合计: 1.28元
+				</view>
+			</view>
 		</view>
 		<!-- 异常波动 -->
 		<view class="abnormal" v-if="abnormalRecordsList.length != 0">
@@ -1189,15 +1196,14 @@
 	//各时段用电量
 	.electricity-chart {
 		margin: 24rpx 32rpx;
-		padding: 40rpx 0rpx;
+		padding: 40rpx 32rpx;
 		background-color: #fff;
 		border-radius: 8px;
 
 		.title {
 			display: flex;
 			align-items: center;
-			// justify-content: space-between;
-			padding: 0 12rpx;
+			
 			margin-bottom: 40rpx;
 
 			.icon {
@@ -1216,8 +1222,18 @@
 			}
 
 			.more {
-				margin-left: auto;
+				margin-left: auto;
+				border: 1px solid rgba(187,187,187,1);
+				border-radius: 4px;
+				padding: 8rpx;
 			}
+		}
+		.total{
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			color: rgba(51,51,51,1);
+			font-weight: bold;
 		}
 
 		.chart {