zhengkaixin 1 سال پیش
والد
کامیت
5bf70183f9

+ 1 - 1
pages/equipmentConditionMonitoring/equipmentConditionMonitoring.vue

@@ -100,7 +100,7 @@
 				</view>
 			</view>
 		</view>
-
+		        <u-divider :isnone="deviceList.length==0" nonetext="暂无数据" border-color="#CFD2D5">已经到底了</u-divider>
 	</view>
 </template>
 

+ 4 - 2
pages/equipmentDataMonitoring/dataMonitoring-list.vue

@@ -5,7 +5,9 @@
 				<u-icon name="arrow-left" color="#101010" size="36"></u-icon>
 			</view>
 			<view class="title">
-				设备数据监测<image class="img" src="@/assets/img/refresh-line.svg"></image>
+				设备数据监测
+				<image class="img" @click="getList(true)"
+				 src="@/assets/img/refresh-line.svg"></image>
 			</view>
 			<view class="right" @click="toDataMonitoringMap" v-if="false">
 				<image class="img" src="@/assets/img/riLine-road-map-line.svg" mode=""></image>地图
@@ -147,7 +149,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>

+ 6 - 2
pages/equipmentDataMonitoring/electronicMonitoring.vue

@@ -13,7 +13,8 @@
 				</view>
 				<view class="title" @click="titleCk">
 					{{tabsFrom.title}}
-					<u-icon name="arrow-down" color="#fff" size="24"></u-icon>
+					<u-icon name="arrow-down" color="#fff" v-if="tabsFrom.selector1.length"
+					 size="24"></u-icon>
 				</view>
 			</view>
 		</view>
@@ -642,7 +643,10 @@
 				})
 			},
 			titleCk() {
-				this.tabsFrom.show1 = true
+				if(this.tabsFrom.selector1.length){
+					this.tabsFrom.show1 = true
+				}
+				
 			},
 			selector1confirm(e) {
 				console.log(e)

+ 2 - 2
pages/equipmentDataMonitoring/equipmentElectricity.vue

@@ -82,9 +82,9 @@
 			</view>
 		</view> -->
 
-		<view class="main" v-for="(item, index) in kWhList" :key="item.index"
+		<view class="main" >
+			<view class="item" v-for="(item, index) in kWhList" :key="item.index"
 			@click="toElectronicMonitoring(item)">
-			<view class="item">
 				<view class="item-content">
 					<view class="equipment">
 						<view class="equipment1 ">