吸顶

pages/equipmentDataMonitoring/electronicMonitoring.vue

@@ -112,13 +112,14 @@
 		<!-- 各时段用电量 -->
 		<view class="electricity-chart">
 			<view class="title">
+				<view class="icon">
+				
+				</view>
 				<view class="text">
-					<view class="icon">
-
-					</view> 各时段用电量 (度)
+					 各时段用电量 (度)
 
 				</view>
-				<view @click="tabsFrom.show2=true,params.day=true">
+				<view class="more" @click="tabsFrom.show2=true,params.day=true">
 					{{queryDay}}<u-icon name="arrow-down"></u-icon>
 				</view>
 			</view>
@@ -133,7 +134,7 @@
 			</view>
 		</view>
 		<!-- 异常波动 -->
-		<view class="abnormal" v-if="false">
+		<view class="abnormal"  v-if="false">
 			<view class="headline">
 				<view class="title">
 					<view class="icon">
@@ -173,7 +174,7 @@
 		</view>
 
 		<!-- 能源监测 -->
-		<view class="energy-inspection" v-if="false">
+		<view class="energy-inspection" v-if="false" >
 			<view class="title">
 				<view class="icon">
 
@@ -225,7 +226,7 @@
 			</view>
 		</view>
 		<!-- 数据分析 -->
-		<view class="data-analysis" v-if="false">
+		<view class="data-analysis"  v-if="false">
 			<view class="title">
 				<view class="icon">
 
@@ -761,7 +762,12 @@
 
 	.navbar-c {
 		background-color: rgba(22, 119, 255, 1);
-
+        position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		z-index: 999;
+		
 		.back {
 			z-index: 999;
 			width: 200rpx;
@@ -789,6 +795,7 @@
 
 	.background {
 		background-color: rgba(22, 119, 255, 1);
+		padding-top: 88rpx;
 		padding-bottom: 100rpx;
 
 
@@ -978,25 +985,27 @@
 		.title {
 			display: flex;
 			align-items: center;
-			justify-content: space-between;
+			// justify-content: space-between;
 			padding: 0 12rpx;
 			margin-bottom: 40rpx;
 	
 			.icon {
 				width: 36rpx;
 				height: 36rpx;
-				background-color: rgba(22, 119, 255, 1);
-				border: 6px solid rgba(182, 212, 255, 1);
+				background-color: rgba(182, 212, 255, 1);
+				border: 6px solid rgba(22, 119, 255, 1);
 				border-radius: 100px;
 			}
 	
 			.text {
-				display: flex;
-				align-items: center;
+				
 				color: rgba(51, 51, 51, 1);
 				font-size: 36rpx;
 				margin-left: 16rpx;
 			}
+			.more{
+				margin-left: auto;
+			}
 		}
 	
 		.chart {

pages/equipmentDataMonitoring/equipmentElectricity.vue

@@ -61,7 +61,7 @@
 							361.5
 						</view>
 						<view class="time">
-							本月
+							今日
 						</view>
 					</view>
 					<view class="infos-item">
@@ -261,7 +261,6 @@
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		// padding-top: 44px;
 		padding-right: 32rpx;
 		color: rgba(51, 51, 51, 1);
 		font-size: 32rpx;
@@ -364,6 +363,8 @@
 					   color: rgba(51,51,51,1);
 					   font-size: 32rpx;
 					   font-weight: bold;
+					   height: 40rpx;
+					   line-height: 40rpx;
 				   }
 				   .date{
 					   color: rgba(119,119,119,1);