用电量删除

pages/abnormal/abnormalAlarmRecord.vue

@@ -55,7 +55,7 @@
 		</view>
 		
 		<u-divider :isnone="abnormalRecordsList.length==0" nonetext="暂无异常报警记录" border-color="#CFD2D5">
-			已经到底了</u-divider>
+		</u-divider>
 	</view>
 </template>
 

pages/equipmentConditionMonitoring/equipmentConditionMonitoring.vue

@@ -3,15 +3,15 @@
 		<u-navbar title="设备状态监测" title-color="#101010"></u-navbar>
 
 		<view class="dropdown">
-			<view class="dropdown-item" @click="show1=true">
+			<view class="dropdown-item">
 
 				<view class="text">
 					{{device}}
 				</view>
-				<view class="item-icon">
+				<!-- <view class="item-icon">
 					<u-icon name="arrow-down" color="#999999" v-if="show1==false"></u-icon>
 					<u-icon name="arrow-up" color="#999999" v-else></u-icon>
-				</view>
+				</view> -->
 			</view>
 			<view class="dropdown-item" @click="show2=true">
 				<view class="text">
@@ -100,7 +100,8 @@
 				</view>
 			</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>
 </template>
 
@@ -114,7 +115,7 @@
 				deviceList: [],
 				show1: false,
 				show2: false,
-				device: '全部设备',
+				device: '变压器智能监控及巡检仪',
 				statusName: '全部状态',
 				deviceTypeList: [],
 				statusList: [{
@@ -143,7 +144,7 @@
 			}
 		},
 		onReady() {
-			this.getDeviceStatusMonitoring();
+			
 			this.getDeviceTypeList();
 		},
 		methods: {
@@ -200,11 +201,19 @@
 							value: item.value
 						}
 					})
-					list.unshift({
-						label: '全部设备',
-						value: ''
-					})
+					// list.unshift({
+					// 	label: '全部设备',
+					// 	value: ''
+					// })
 					this.deviceTypeList = list;
+					
+					for (var i = 0; i < list.length; i++) {
+						if(list[i].label == this.device) {
+							this.deviceType = list[i].value;
+						}
+					}
+					
+					this.getDeviceStatusMonitoring();
 				}).catch(error => {
 					uni.showToast({
 						title: error,

pages/equipmentDataMonitoring/dataMonitoring-list.vue

@@ -149,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>

pages/equipmentDataMonitoring/electronicMonitoring.vue

@@ -717,16 +717,17 @@
 							return {
 								label: item.name,
 								value: item.id,
-								children: [{
-										label: '抄表',
-										value: '1',
-										children: item.remoteReadingMeterList.map(item => {
-											return {
-												label: item.name,
-												value: item.id,
-											}
-										})
-									},
+								children: [
+									// {
+									// 	label: '抄表',
+									// 	value: '1',
+									// 	children: item.remoteReadingMeterList.map(item => {
+									// 		return {
+									// 			label: item.name,
+									// 			value: item.id,
+									// 		}
+									// 	})
+									// },
 									{
 										label: '监控表',
 										value: '1',
@@ -740,20 +741,20 @@
 								]
 							}
 						} else if (item.remoteReadingMeterList.length != 0 && item.remoteMonitorMeterList.length == 0) {
-							return {
-								label: item.name,
-								value: item.id,
-								children: [{
-									label: '抄表',
-									value: '1',
-									children: item.remoteReadingMeterList.map(item => {
-										return {
-											label: item.name,
-											value: item.id,
-										}
-									})
-								}]
-							}
+							// return {
+							// 	label: item.name,
+							// 	value: item.id,
+							// 	children: [{
+							// 		label: '抄表',
+							// 		value: '1',
+							// 		children: item.remoteReadingMeterList.map(item => {
+							// 			return {
+							// 				label: item.name,
+							// 				value: item.id,
+							// 			}
+							// 		})
+							// 	}]
+							// }
 						} else if (item.remoteReadingMeterList.length == 0 && item.remoteMonitorMeterList.length != 0) {
 							return {
 								label: item.name,

pages/equipmentInformation/equipmentInformation.vue

@@ -3,15 +3,15 @@
 		<u-navbar title="设备信息" title-color="#101010"></u-navbar>
 		<!-- 下拉框 -->
 		<view class="dropdown">
-			<view class="dropdown-item" @click="show1=true">
+			<view class="dropdown-item">
 				
 				<view class="text">
 					{{device}} 
 				</view>
-				<view class="item-icon">
+				<!-- <view class="item-icon">
 					<u-icon name="arrow-down" color="#999999" v-if="show1==false"></u-icon>
 					<u-icon name="arrow-up" color="#999999" v-else></u-icon>
-				</view>
+				</view> -->
 			</view>
 			<view class="dropdown-item" @click="show2=true">
 				<view class="text">
@@ -51,8 +51,7 @@
 				</view>
 			</view>
 		</view>
-		<u-divider :isnone="materList.length==0" nonetext="暂无记录" border-color="#CFD2D5" style="margin-top: 10px">
-			已经到底了</u-divider>
+		<u-divider :isnone="materList.length==0" nonetext="暂无记录" border-color="#CFD2D5"></u-divider>
 			
 		<!-- 底部 -->
 		<view class="bottom" v-if="type == '1'">
@@ -78,7 +77,7 @@
 				recordsTotal: 0,
 				materList: [],
 				type: '', //绑定权限
-				device: '全部设备',
+				device: '变压器智能监控及巡检仪',
 				company: '全部公司',
 				show1: false, // 设备选择
 				show2: false, // 状态选择
@@ -96,7 +95,7 @@
 			
 		},
 		onReady() {
-			this.getMaterList();
+			
 			this.getfindByOpenId();
 			this.getDeviceList();
 			this.getCompanyInfoList();
@@ -201,11 +200,19 @@
 							value: item.value
 						}
 					})
-					list.unshift({
-						label: '全部设备',
-						value: ''
-					})
+					// list.unshift({
+					// 	label: '全部设备',
+					// 	value: ''
+					// })
 					this.deviceList = list;
+					
+					for (var i = 0; i < list.length; i++) {
+						if(list[i].label == this.device) {
+							this.deviceType = list[i].value;
+						}
+					}
+					
+					this.getMaterList();
 				}).catch(error => {
 					uni.showToast({
 						title: error,

pages/mine/myApps.vue

@@ -16,7 +16,7 @@
 						设备数据监控
 					</view>
 				</view>
-				<view class="item" @click="gotoUrl('/pages/equipmentDataMonitoring/equipmentElectricity')"
+				<!-- <view class="item" @click="gotoUrl('/pages/equipmentDataMonitoring/equipmentElectricity')"
 					v-if="codes.indexOf('reading')!=-1">
 					<view class="item-icon item-icon2">
 						<image class="img" src="@/assets/img/iconPark-order.svg" mode=""></image>
@@ -24,7 +24,7 @@
 					<view class="item-name">
 						设备用电量
 					</view>
-				</view>
+				</view> -->
 				<view class="item" @click="gotoUrl('/pages/equipmentInformation/equipmentInformation')">
 					<view class="item-icon item-icon3">
 						<image class="img" src="@/assets/img/iconPark-wallet.svg" mode=""></image>

pages/statistics/statistics.vue

@@ -475,7 +475,7 @@
 			var month = date.getMonth() + 1 >= 10 ? date.getMonth() + 1 : '0' + (date.getMonth() + 1);
 			this.queryDate = year + '-' + month;
 
-			this.getPowerConsumption(0);
+			// this.getPowerConsumption(0);
 			this.getEquipmentDataMonitoring(0);
 			this.getCompanyInfoList();
 			this.getAccumulatedAlarms();
@@ -514,7 +514,7 @@
 				this.merchantList2[index] = n;
 
 				this.companyId = item.id;
-				this.getPowerConsumption(0);
+				// this.getPowerConsumption(0);
 				this.getEquipmentDataMonitoring(0);
 				this.getAccumulatedAlarms();
 				this.getHomePageDeviceStatus();
@@ -919,7 +919,7 @@
 			change(index) {
 				this.current = index;
 				this.companyId = this.merchantList1[index].id;
-				this.getPowerConsumption(0);
+				// this.getPowerConsumption(0);
 				this.getEquipmentDataMonitoring(0);
 				this.getAccumulatedAlarms();
 				this.getHomePageDeviceStatus();

pages/workOrderManagement/workOrderManagement.vue

@@ -110,8 +110,7 @@
 				</view>
 			</view>
 			
-			<u-divider :isnone="workOrderList.length==0" nonetext="暂无工单" border-color="#CFD2D5">
-				已经到底了</u-divider>
+			<u-divider :isnone="workOrderList.length==0" nonetext="暂无工单" border-color="#CFD2D5"></u-divider>
 		</view>
 
 		<!-- 关闭原因 -->