auto commit

pages/deviceList/deviceListType1/deviceInfo.vue

@@ -80,6 +80,7 @@
 				title:'设备详情',
 				pageData:[],
 				id:'',
+				deviceId:'',
 				downOption:{
 					auto:false // 不自动加载 (mixin已处理第一个tab触发downCallback)
 				},
@@ -126,7 +127,8 @@
 			}
 		},
 		onLoad(page){
-			this.deviceID = page.id;
+			this.id = page.id;
+			this.deviceId = page.id;
 			if(page.roadName){
 				this.roadName = page.roadName;
 				this.title = page.roadName;
@@ -200,7 +202,7 @@
 			upCallback(page) {
 				// console.log('page',page);
 				let params ={
-					deviceId:this.deviceID,
+					deviceId:this.deviceId,
 					pageNum:page.num,
 					pageSize:page.size
 				};

pages/deviceList/deviceListType2/deviceInfo.vue

@@ -80,7 +80,7 @@
 				title:'设备详情',
 				pageData:[],
 				id:'',
-				deviceID:'',
+				deviceId:'',
 				downOption:{
 					auto:false // 不自动加载 (mixin已处理第一个tab触发downCallback)
 				},
@@ -185,7 +185,7 @@
 					if(res.code==200){
 						this.pageData = res.data;
 						this.form.deviceId = res.data.deviceId;
-						this.deviceID = res.data.deviceId;
+						this.deviceId = res.data.deviceId;
 						// console.log('findRoadSpaceVoById',res);
 					}else{
 						uni.showToast({
@@ -202,7 +202,7 @@
 			upCallback(page) {
 				// console.log('page',page);
 				let params ={
-					deviceId:this.deviceID,
+					deviceId:this.deviceId,
 					pageNum:page.num,
 					pageSize:page.size
 				};