فهرست منبع

用电监控页面原型改版

常志远 1 سال پیش
والد
کامیت
1168aa7123
1فایلهای تغییر یافته به همراه53 افزوده شده و 12 حذف شده
  1. 53 12
      pages/equipmentDataMonitoring/electronicMonitoring.vue

+ 53 - 12
pages/equipmentDataMonitoring/electronicMonitoring.vue

@@ -25,10 +25,10 @@
 
 		<!-- 用电量 -->
 		<view class="electricity-consumption">
-			<view class="title">
+			<!-- <view class="title">
 				用电量统计 (度)
-			</view>
-			<view class="degree">
+			</view> -->
+			<!-- <view class="degree">
 				<view class="item">
 					<view class="item-text">
 						百万
@@ -93,8 +93,26 @@
 						7
 					</view>
 				</view>
-			</view>
-
+			</view> -->
+        <!-- 统计 -->
+		<view class="statistics-content">
+			<view class="statistics-item">
+				<view class="item-title">
+					电量统计(度)
+				</view>
+				<view class="item-value">
+					18,287.23
+				</view>
+			</view>
+			<view class="statistics-item">
+				<view class="item-title">
+					电费统计(度)
+				</view>
+				<view class="item-value">
+					18,287.23
+				</view>
+			</view>
+		</view>
 			<view class="radio">
 				<u-radio-group v-model="value" @change="radioGroupChange">
 					<u-radio @change="radioChange" v-for="(item, index) in list" :key="index" :name="item.id"
@@ -436,23 +454,23 @@
 				},
 				list: [{
 					id: 4,
-					name: '当日用电量',
+					name: '当',
 					disabled: false
 				}, {
 					id: 1,
-					name: '当月用电量',
+					name: '当',
 					disabled: false
 				}, {
 					id: 2,
-					name: '上月用电量',
+					name: '上月',
 					disabled: false
 				}, {
 					id: 3,
-					name: '当年用电量',
+					name: '当年',
 					disabled: false
 				}, {
 					id: 0,
-					name: '总用电量',
+					name: '合计',
 					disabled: false
 				}, {
 					id: 10,
@@ -1049,7 +1067,29 @@
 		padding: 40rpx 32rpx 0rpx;
 		border-radius: 8px;
 		margin: -88rpx 32rpx 0;
-		position: relative;
+		position: relative;
+		// 统计
+		.statistics-content{
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			.statistics-item{
+				width: 300rpx;
+				padding: 24rpx;
+				border-radius: 8px;
+				background: linear-gradient(180deg, rgba(207,227,255,1) 0%,rgba(255,255,255,0) 100%);
+				box-shadow: 0px 1px 1px 0px rgba(0,0,0,0.1);
+			}
+			.item-title{
+				color: #333333;
+			}
+			.item-value{
+				color: rgba(16,16,16,1);
+				font-size: 48rpx;
+				font-weight: bold;
+				margin-top: 8rpx;
+			}
+		}
 
 		.title {
 			color: rgba(16, 16, 16, 1);
@@ -1131,7 +1171,8 @@
 
 			/deep/.u-radio {
 				margin-bottom: 16px;
-				width: 200rpx !important;
+				// width: 160rpx !important;
+				margin-right: 24rpx;
 			}
 
 		}