调整

apis/pagejs/index.js

@@ -29,10 +29,11 @@ export function alarmRecordDetails(id) {
 }
 
 // 异常报警记录-异常查询条件
-export function alarmConfiguration() {
+export function alarmConfiguration(data) {
 	var url='/mobile/employee/alarmConfiguration';
 	return request({
 		method: 'post',
+		data: data,
 		url: url
 	})
 }

pages/abnormal/abnormalAlarmRecord.vue

@@ -181,7 +181,8 @@
 					configId: this.configId,
 					pageIndex: this.pageIndex,
 					pageSize: 10,
-					companyId: this.companyId
+					companyId: this.companyId,
+					classify: '2'
 				}).then((res) => {
 					uni.hideLoading();
 					this.abnormalRecordsList = [
@@ -206,7 +207,7 @@
 					title: "加载中",
 					mask: true,
 				})
-				API.alarmConfiguration().then((response) => {
+				API.alarmConfiguration({classify: '2'}).then((response) => {
 					uni.hideLoading();
 					var list1 = [];
 					var list2 = [];

pages/equipmentConditionMonitoring/equipmentConditionMonitoring.vue

@@ -140,12 +140,12 @@
 					}
 				],
 				status: '',
-				deviceType: ''
+				deviceType: '1'
 			}
 		},
 		onReady() {
-			
-			this.getDeviceTypeList();
+			this.getDeviceStatusMonitoring();
+			// this.getDeviceTypeList();
 		},
 		methods: {
 			//设备查询
@@ -201,19 +201,12 @@
 							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/equipmentInformation/equipmentInformation.vue

@@ -72,7 +72,7 @@
 		data() {
 			return {
 				companyId: '',
-				deviceType: '',
+				deviceType: '1',
 				pageIndex: 1,
 				recordsTotal: 0,
 				materList: [],
@@ -95,9 +95,9 @@
 			
 		},
 		onReady() {
-			
+			this.getMaterList();
 			this.getfindByOpenId();
-			this.getDeviceList();
+			// this.getDeviceList();
 			this.getCompanyInfoList();
 		},
 		onReachBottom() {
@@ -200,19 +200,12 @@
 							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/statistics/statistics.vue

@@ -493,20 +493,20 @@
 			console.log("组件销毁前清除定时器")
 		},
 		methods: {
-			clearTimer() {
-				if (this.intervalId) {
-					clearInterval(this.intervalId); // 清除定时器  
-					this.intervalId = null; // 重置定时器ID  
-				}
-			},
-			startInterval() {
-				this.clearTimer(); // 组件销毁前清除定时器 
-				this.intervalId = setInterval(() => {
-					// 每隔5秒运行的代码  
-					// console.log('这段代码每隔5秒运行一次');
-					this.getPowerConsumption(0, true)
-				}, 60000);
-			},
+			// clearTimer() {
+			// 	if (this.intervalId) {
+			// 		clearInterval(this.intervalId); // 清除定时器  
+			// 		this.intervalId = null; // 重置定时器ID  
+			// 	}
+			// },
+			// startInterval() {
+			// 	this.clearTimer(); // 组件销毁前清除定时器 
+			// 	this.intervalId = setInterval(() => {
+			// 		// 每隔5秒运行的代码  
+			// 		// console.log('这段代码每隔5秒运行一次');
+			// 		this.getPowerConsumption(0, true)
+			// 	}, 60000);
+			// },
 			merchantChange(item, index) {
 				var m = item;
 				var n = this.merchantList1[this.current];