瀏覽代碼

设备数据监测修改

常志远 1 年之前
父節點
當前提交
5987c34406
共有 1 個文件被更改,包括 86 次插入24 次删除
  1. 86 24
      pages/equipmentConditionMonitoring/equipmentConditionMonitoring.vue

+ 86 - 24
pages/equipmentConditionMonitoring/equipmentConditionMonitoring.vue

@@ -42,20 +42,24 @@
 						</view>
 						</view>
 					</view>
 					</view>
 					<view class="content2">
 					<view class="content2">
-						费控电量计量仪
-					</view>
-				</view>
-				<view class="item-state">
-					<view class="dot off-line">
+						<view class="text">
+							费控电量计量仪
+						</view>
 						
 						
-					</view>
-					<view class="text">
-						离线
-					</view>
-					<view class="more">
-						<u-icon name="arrow-right" size="24" color="#acacac"></u-icon>
+						<view class="item-state">
+							<view class="dot on-line">
+								
+							</view>
+							<view class="text">
+								在线
+							</view>
+							<view class="more">
+								<u-icon name="arrow-right" size="24" color="#acacac"></u-icon>
+							</view>
+						</view>
 					</view>
 					</view>
 				</view>
 				</view>
+				
 		  	</view>
 		  	</view>
 			
 			
 			<view class="item">
 			<view class="item">
@@ -72,20 +76,50 @@
 						</view>
 						</view>
 					</view>
 					</view>
 					<view class="content2">
 					<view class="content2">
-						费控电量计量仪
-					</view>
-				</view>
-				<view class="item-state">
-					<view class="dot on-line">
+						<view class="text">
+							费控电量计量仪
+						</view>
 						
 						
+						<view class="item-state">
+							<view class="dot on-line">
+								
+							</view>
+							<view class="text">
+								在线
+							</view>
+							<view class="more">
+								<u-icon name="arrow-right" size="24" color="#acacac"></u-icon>
+							</view>
+						</view>
 					</view>
 					</view>
-					<view class="text">
-						在线
-					</view>
-					<view class="more">
-						<u-icon name="arrow-right" size="24" color="#acacac"></u-icon>
+					<view class="content3">
+						<view class="state-item">
+							<view class="state-title">
+								运行状态:
+							</view>
+							<view class="state-value">
+								正常
+							</view>
+						</view>
+						<view class="state-item">
+							<view class="state-title">
+								温度状态:
+							</view>
+							<view class="state-value">
+								正常
+							</view>
+						</view>
+						<view class="state-item">
+							<view class="state-title">
+								烟感状态:
+							</view>
+							<view class="state-value2">
+								异常
+							</view>
+						</view>
 					</view>
 					</view>
 				</view>
 				</view>
+				
 			</view>
 			</view>
 		  </view>
 		  </view>
 	   
 	   
@@ -148,7 +182,7 @@
 	   .item{
 	   .item{
 		   padding: 32rpx 0;
 		   padding: 32rpx 0;
 		   display: flex;
 		   display: flex;
-		   align-items: center;
+		   
 		   border-bottom: 1px solid rgba(245,245,245,1);
 		   border-bottom: 1px solid rgba(245,245,245,1);
 		   .item-icon{
 		   .item-icon{
 			   width: 72rpx;
 			   width: 72rpx;
@@ -164,6 +198,7 @@
 			   }
 			   }
 		   }
 		   }
 		   .item-content{
 		   .item-content{
+			   flex: 1;
 			   margin-left: 16rpx;
 			   margin-left: 16rpx;
 			   .content1{
 			   .content1{
 				   display: flex;
 				   display: flex;
@@ -179,8 +214,35 @@
 				   }
 				   }
 			   }
 			   }
 			   .content2{
 			   .content2{
-				   color: rgba(119,119,119,1);
-				   font-size: 12px;
+				   margin-top: 4rpx;
+				 
+				   display: flex;
+				   align-items: center;
+				   justify-content: space-between;
+				   .text{
+					   color: rgba(119,119,119,1);
+					   font-size: 24rpx;
+				   }
+				   
+			   }
+			   .content3{
+				   margin-top: 8rpx;
+				   display: flex;
+				   align-items: center;
+				   justify-content: space-between;
+				   padding-right: 16rpx;
+				   .state-item{
+					   display: flex;
+					   
+					   color: rgba(51,51,51,1);
+					   font-size: 24rpx;
+					   .state-value{
+						   color: #00B962 ;
+					   }
+					   .state-value2{
+					    color: #FF6923;
+					   }
+				   }
 			   }
 			   }
 		   }
 		   }
 	   }
 	   }