wkyy 1 yıl önce
ebeveyn
işleme
efd46e7dba

+ 10 - 4
pages/equipmentDataMonitoring/equipmentElectricity.vue

@@ -11,7 +11,7 @@
 			
 			
 		</view>
 		</view>
 		<!-- 标签 -->
 		<!-- 标签 -->
-		<view class="tabs-box" >
+		<view class="tabs-box" v-if="false">
 			<view class="tabs">
 			<view class="tabs">
 				<u-tabs :list="list" :is-scroll="false" inactive-color="#999999"  active-color="#666666" :current="current" @change="change"></u-tabs>
 				<u-tabs :list="list" :is-scroll="false" inactive-color="#999999"  active-color="#666666" :current="current" @change="change"></u-tabs>
 			</view>
 			</view>
@@ -38,7 +38,7 @@
 		</u-popup>
 		</u-popup>
 		<view class="tatol-main">
 		<view class="tatol-main">
 			<!-- 用电量合计 -->
 			<!-- 用电量合计 -->
-			<view class="total">
+			<view class="total" v-if="false">
 				<view class="company">
 				<view class="company">
 					<view class="name">
 					<view class="name">
 						荆鹏集团
 						荆鹏集团
@@ -81,10 +81,10 @@
 						<image class="img" src="@/assets/img/energyMeter.svg" mode=""></image>
 						<image class="img" src="@/assets/img/energyMeter.svg" mode=""></image>
 					</view>
 					</view>
 					<view class="equipment">
 					<view class="equipment">
-						<view class="equipment1">
+						<view class="equipment1 equipment-text-overflow">
 							{{item.name}}
 							{{item.name}}
 						</view>
 						</view>
-						<view class="equipment2">
+						<view class="equipment2 equipment-text-overflow">
 							{{item.companyName}}
 							{{item.companyName}}
 						</view>
 						</view>
 					</view>
 					</view>
@@ -342,6 +342,12 @@
 		   .equipment{
 		   .equipment{
 				 width: 30%;
 				 width: 30%;
 			   margin-left: 16rpx;
 			   margin-left: 16rpx;
+				 .equipment-text-overflow {
+				 	display: -webkit-box;
+				 	-webkit-box-orient: vertical;
+				 	-webkit-line-clamp: 1;
+				 	overflow: hidden;
+				 }
 			   .equipment1{
 			   .equipment1{
 				   color: rgba(51,51,51,1);
 				   color: rgba(51,51,51,1);
 				   font-size: 32rpx;
 				   font-size: 32rpx;

+ 1 - 1
pages/statistics/statistics.vue

@@ -270,7 +270,7 @@
 		
 		
 		</view>
 		</view>
 
 
-		<energyCenterTabbar :current="0"></energyCenterTabbar>
+		<energyCenterTabbar :current="0" v-if="false"></energyCenterTabbar>
 	</view>
 	</view>
 </template>
 </template>