css

pages/equipmentDataMonitoring/dataMonitoring-list.vue

@@ -147,8 +147,7 @@
 				</view>
 			</view>
 			
-			<u-divider :isnone="deviceList.length==0" nonetext="暂无设备数据" border-color="#CFD2D5">
-				已经到底了</u-divider>
+			<u-divider :isnone="deviceList.length==0" nonetext="暂无数据" border-color="#CFD2D5"></u-divider>
 		</view>
 	</view>
 </template>
@@ -394,15 +393,22 @@
 
 				.equipment {
 					margin-left: 16rpx;
+					width: 35%;
 
 					.name1 {
 						color: rgba(51, 51, 51, 1);
+						white-space: nowrap;
+						overflow: hidden;
+						text-overflow: ellipsis;
 					}
 
 					.name2 {
 						color: rgba(119, 119, 119, 1);
 						font-size: 24rpx;
 						margin-top: 4rpx;
+						white-space: nowrap;
+						overflow: hidden;
+						text-overflow: ellipsis;
 					}
 				}
 

pages/equipmentDataMonitoring/equipmentElectricity.vue

@@ -38,8 +38,8 @@
 		</u-popup>
 		<view class="tatol-main" v-for="(m, i) in kWhList" :key="i" style="margin-bottom: 15px;">
 			<!-- 用电量合计 -->
-			<!-- <view class="total" v-if="kWhList.length > 1"> -->
-			<view class="total">
+			<view class="total" v-if="kWhList.length > 1">
+			<!-- <view class="total"> -->
 				<view class="company">
 					<view class="name">
 						{{m.companyName}}
@@ -373,11 +373,12 @@
 			justify-content: space-between;
 			align-items: center;
 			margin-top: 4rpx;
+			width: 93%;
 
 			.infos-item {
 				
 				display: flex;
-				
+				width: 33.3%;
 				
 
 				.number {

pages/statistics/statistics.vue

@@ -40,7 +40,7 @@
 		<view class="main">
 			<!-- 统计1 -->
 			<view class="statistics-1">
-				<view class="item" @click="toDataMonitoringList">
+				<view class="item">
 					<view class="item-top">
 						<view class="img-box">
 							<u-circle-progress active-color="#2979ff" :percent="alarmsPercent" width="88">