定位逻辑修正，上报增加防抖

pages/index/index.vue

@@ -83,7 +83,7 @@
 								// this.url = 'http://192.168.3.109:89#lat=' + _data[0].latitude + '&lng=' + _data[0].longitude;
 								// this.url = 'http://171.16.8.51:8080#lat=' + _data[0].latitude + '&lng=' + _data[0].longitude;
 								// this.url = 'http://192.169.9.252:1883/#lat=' + _data[0].latitude + '&lng=' + _data[0].longitude;
-								this.url = 'http://171.16.8.53:1883/#lat=' + _data[0].latitude + '&lng=' + _data[0].longitude;
+								this.url = 'http://171.16.8.53:1883/#lat=' + _data[0].longitude + '&lng=' + _data[0].latitude;
 								console.log('url=====>',this.url)
 							}
 							this.lat = _data[0].latitude;

pages/map/map.vue

@@ -21,7 +21,7 @@
 				// this.url = 'http://192.168.3.109:89/map.html?floorNo=' + options.floorNo + '&lat=' + options.lat + '&lng=' + options.lng
 				// this.url = 'http://171.16.8.51:8080/map.html?floorNo=' + options.floorNo + '&lat=' + options.lat + '&lng=' + options.lng
 				// this.url = 'http://192.169.9.252:1883/map.html?floorNo=' + options.floorNo + '&lat=' + options.lat + '&lng=' + options.lng
-				this.url = 'http://171.16.8.53:1883/map.html?floorNo=' + options.floorNo + '&lat=' + options.lat + '&lng=' + options.lng
+				this.url = 'http://171.16.8.53:1883/map.html?floorNo=' + options.floorNo + '&lng=' + options.lng + '&lat=' + options.lat
 			}
 		},
 		onUnload() {

pages/message/detail.vue

@@ -55,7 +55,7 @@
 			//报警位置地图定位
 			mapView() {
 				uni.navigateTo({
-					url: '/pages/map/map?floorNo=' + this.detailInfo.floorNo + '&lat=' + this.detailInfo.longidute + '&lng=' + this.detailInfo.latidute
+					url: '/pages/map/map?floorNo=' + this.detailInfo.floorNo + '&lng=' + this.detailInfo.longidute + '&lat=' + this.detailInfo.latidute
 					// url: '/pages/map/map?floorNo=6&lat=120.42052985815123&lng=36.112617268776845'
 				})
 			},

pages/patrolRecord/report.vue

@@ -79,6 +79,17 @@
 			uni.$off('mapData');
 		},
 		onShow() {
+			uni.$on('mapData',(data) => {
+				let obj = JSON.parse(data.data[0].detail);
+				console.log('监听到事件来自返回的参数：', obj);
+				this.position = obj;
+				this.form.buildId = obj.buildId;
+				if(obj.floorNo) {
+					this.form.floorNo = obj.floorNo > 3 ? obj.floorNo - 3 : obj.floorNo > 0 && obj.floorNo <= 3 ? obj.floorNo - 4 : obj.floorNo;
+				}
+				this.form.latidute = obj.y;
+				this.form.longidute = obj.x;
+			})
 			let userInfo = uni.getStorageSync('mobileInfo');
 			let locationInfo = uni.getStorageSync('locationInfo');
 			if (userInfo) {
@@ -98,15 +109,6 @@
 			}
 		},
 		onLoad() {
-			uni.$on('mapData', (data) => {
-				let obj = JSON.parse(data.data[0].detail);
-				console.log('监听到事件来自返回的参数：', obj);
-				this.position = obj;
-				this.form.buildId = obj.buildId;
-				this.form.floorNo = obj.floorNo && obj.floorNo > 3 ? obj.floorNo - 3 : obj.floorNo && obj.floorNo < 4 ? obj.floorNo - 4 : '';
-				this.form.latidute = obj.y;
-				this.form.longidute = obj.x;
-			});
 			this.queryPlanTypeList();
 			// this.getDeviceSn()
 		},
@@ -248,9 +250,14 @@
 					'';
 				let floorNo = '';
 				if(this.positionType == 1) {
-					floorNo = this.locationInfo.floorNo;
+					floorNo = this.locationInfo.floorNo ? this.locationInfo.floorNo : '';
 				}else{
-					floorNo = this.position.floorNo && this.position.floorNo > 3 ? this.position.floorNo - 3 : this.position.floorNo && this.position.floorNo < 4 ? this.position.floorNo - 4 : '';
+					if(this.position && this.position.floorNo) {
+						floorNo = this.position.floorNo > 3 ? this.position.floorNo - 3 :  this.position.floorNo > 0 && this.position.floorNo <= 3 ? this.position.floorNo - 4 : this.position.floorNo;
+					}
+					else{
+						floorNo = '';
+					}
 				}
 				this.form.floorNo = floorNo;
 				this.form.latidute = this.positionType == 1 ? this.locationInfo.latidute : this.position ? this.position.y : '';
@@ -266,6 +273,10 @@
 						})
 						return;
 					}
+					uni.showLoading({
+						title: '请求中'
+					});
+					console.log(this.photoList)
 					uni.uploadFile({
 						url: getApp().globalData.apiUrl + '/appData/putFile',
 						files: this.photoList,
@@ -287,6 +298,11 @@
 						},
 						fail: (err) => {
 							console.log(err)
+						},
+						complete: () => {
+							setTimeout(() => {
+								uni.hideLoading();
+							}, 2000)
 						}
 					})
 				}).catch(err => {
@@ -311,12 +327,12 @@
 						let fileList = [];
 						res.tempFiles.forEach((item, index) => {
 							fileList.push({
-								name: 'file' + index,
+								name: 'file' + (new Date().getTime()) + '_' + index,
 								uri: res.tempFilePaths[index],
 								file: item
 							});
 						})
-						this.photoList = this.photoList.concat(fileList)
+						this.photoList = this.photoList.concat(fileList);
 					}
 				});
 			},

pages/positionRecord/report.vue

@@ -60,6 +60,17 @@
 			}
 		},
 		onShow() {
+			uni.$on('mapData',(data) => {
+				let obj = JSON.parse(data.data[0].detail);
+				console.log('监听到事件来自返回的参数：', obj);
+				this.position = obj;
+				this.form.buildId = obj.buildId;
+				if(obj.floorNo) {
+					this.form.floorNo = obj.floorNo > 3 ? obj.floorNo - 3 : obj.floorNo > 0 && obj.floorNo <= 3 ? obj.floorNo - 4 : obj.floorNo;
+				}
+				this.form.latidute = obj.y;
+				this.form.longidute = obj.x;
+			})
 			//当前用户设置和常用报警点信息渲染
 			let userInfo = uni.getStorageSync('mobileInfo');
 			let locationInfo = uni.getStorageSync('locationInfo');
@@ -83,15 +94,6 @@
 			uni.$off('mapData');
 		},
 		onLoad() {
-			uni.$on('mapData',(data) => {
-				let obj = JSON.parse(data.data[0].detail);
-				console.log('监听到事件来自返回的参数：', obj);
-				this.position = obj;
-				this.form.buildId = obj.buildId;
-				this.form.floorNo = obj.floorNo && obj.floorNo > 3 ? obj.floorNo - 3 : obj.floorNo && obj.floorNo < 4 ? obj.floorNo - 4 : '';
-				this.form.latidute = obj.y;
-				this.form.longidute = obj.x;
-			})
 			this.queryPlanTypeList();
 		},
 		methods: {
@@ -114,9 +116,14 @@
 				this.form.buildId = this.positionType == 1 ? this.locationInfo.buildId : this.position ? this.position.buildId : '';
 				let floorNo = '';
 				if(this.positionType == 1) {
-					floorNo = this.locationInfo.floorNo;
+					floorNo = this.locationInfo.floorNo ? this.locationInfo.floorNo : '';
 				}else{
-					floorNo = this.position.floorNo && this.position.floorNo > 3 ? this.position.floorNo - 3 : this.position.floorNo && this.position.floorNo < 4 ? this.position.floorNo - 4 : '';
+					if(this.position && this.position.floorNo) {
+						floorNo = this.position.floorNo > 3 ? this.position.floorNo - 3 :  this.position.floorNo > 0 && this.position.floorNo <= 3 ? this.position.floorNo - 4 : this.position.floorNo;
+					}
+					else{
+						floorNo = '';
+					}
 				}
 				this.form.floorNo = floorNo;
 				this.form.latidute = this.positionType == 1 ? this.locationInfo.latidute : this.position ? this.position.y : '';
@@ -168,7 +175,9 @@
 					},
 					complete: (data) => {
 						console.log(data)
-						uni.hideLoading();
+						setTimeout(() => {
+							uni.hideLoading();
+						},2000)
 					}
 				})
 			},

pages/setting/other.vue

@@ -52,21 +52,25 @@
 				userInfo: {}
 			}
 		},
+		onShow() {
+				uni.$on('mapData',(data) => {
+					let obj = JSON.parse(data.data[0].detail);
+					console.log('监听到事件来自返回的参数：', JSON.stringify(obj));
+					this.form.xy = obj.x + ',' + obj.y;
+					this.form.buildId = obj.buildId;
+					if(obj.floorNo) {
+						this.form.floorNo = obj.floorNo > 3 ? obj.floorNo - 3 : obj.floorNo > 0 && obj.floorNo <= 3 ? obj.floorNo - 4 : obj.floorNo;
+					}
+					this.form.latidute = obj.y;
+					this.form.longidute = obj.x;
+					console.log(JSON.stringify(this.form))
+				})
+		},
 		onUnload() {
 			console.log('释放监听')
 			uni.$off('mapData');
 		},
 		onLoad() {
-			uni.$on('mapData',(data) => {
-				let obj = JSON.parse(data.data[0].detail);
-				console.log('监听到事件来自返回的参数：', JSON.stringify(obj));
-				this.form.xy = obj.x + ',' + obj.y;
-				this.form.buildId = obj.buildId;
-				this.form.floorNo = obj.floorNo && obj.floorNo > 3 ? obj.floorNo - 3 : obj.floorNo && obj.floorNo < 4 ? obj.floorNo - 4 : '';
-				this.form.latidute = obj.y;
-				this.form.longidute = obj.x;
-				console.log(JSON.stringify(this.form))
-			})
 			this.queryPlanTypeList();
 			let userInfo = uni.getStorageSync('mobileInfo');
 			let locationInfo = uni.getStorageSync('locationInfo');

pages/setting/user.vue

@@ -46,14 +46,16 @@
 				}
 			}
 		},
+		onShow() {
+				uni.$on('mapData',(data) => {
+					let obj = JSON.parse(data.data[0].detail);
+					console.log('监听到事件来自返回的参数：', obj);
+					this.form.xy = obj.x + ',' + obj.y;
+					this.form.latidute = obj.y;
+					this.form.longidute = obj.x;
+				})
+		},
 		onLoad() {
-			uni.$on('mapData',(data) => {
-				let obj = JSON.parse(data.data[0].detail);
-				console.log('监听到事件来自返回的参数：', obj);
-				this.form.xy = obj.x + ',' + obj.y;
-				this.form.latidute = obj.y;
-				this.form.longidute = obj.x;
-			})
 			let userInfo = uni.getStorageSync('mobileInfo');
 			if(userInfo){
 				this.userInfo = JSON.parse(userInfo);

pages/voiceRecord/report.vue

@@ -103,6 +103,17 @@
 			uni.$off('mapData');
 		},
 		onShow() {
+			uni.$on('mapData',(data) => {
+				let obj = JSON.parse(data.data[0].detail);
+				console.log('监听到事件来自返回的参数：', obj);
+				this.position = obj;
+				this.form.buildId = obj.buildId;
+				if(obj.floorNo) {
+					this.form.floorNo = obj.floorNo > 3 ? obj.floorNo - 3 : obj.floorNo > 0 && obj.floorNo <= 3 ? obj.floorNo - 4 : obj.floorNo;
+				}
+				this.form.latidute = obj.y;
+				this.form.longidute = obj.x;
+			})
 			//当前用户设置和常用报警点信息渲染
 			let userInfo = uni.getStorageSync('mobileInfo');
 			let locationInfo = uni.getStorageSync('locationInfo');
@@ -123,15 +134,6 @@
 			// this.getDeviceSn()
 		},
 		onLoad() {
-			uni.$on('mapData', (data) => {
-				let obj = JSON.parse(data.data[0].detail);
-				console.log('监听到事件来自返回的参数：', obj);
-				this.position = obj;
-				this.form.buildId = obj.buildId;
-				this.form.floorNo = obj.floorNo && obj.floorNo > 3 ? obj.floorNo - 3 : obj.floorNo && obj.floorNo < 4 ? obj.floorNo - 4 : '';
-				this.form.latidute = obj.y;
-				this.form.longidute = obj.x;
-			})
 			this.recorderManager = uni.getRecorderManager();
 			this.innerAudioContext = uni.createInnerAudioContext();
 			this.innerAudioContext.autoplay = true;
@@ -288,9 +290,14 @@
 					'';
 				let floorNo = '';
 				if(this.positionType == 1) {
-					floorNo = this.locationInfo.floorNo;
+					floorNo = this.locationInfo.floorNo ? this.locationInfo.floorNo : '';
 				}else{
-					floorNo = this.position.floorNo && this.position.floorNo > 3 ? this.position.floorNo - 3 : this.position.floorNo && this.position.floorNo < 4 ? this.position.floorNo - 4 : '';
+					if(this.position && this.position.floorNo) {
+						floorNo = this.position.floorNo > 3 ? this.position.floorNo - 3 :  this.position.floorNo > 0 && this.position.floorNo <= 3 ? this.position.floorNo - 4 : this.position.floorNo;
+					}
+					else{
+						floorNo = '';
+					}
 				}
 				this.form.floorNo = floorNo;
 				this.form.latidute = this.positionType == 1 ? this.locationInfo.latidute : this.position ? this.position.y : '';
@@ -359,6 +366,9 @@
 						})
 						return;
 					}
+					uni.showLoading({
+						title: '请求中'
+					});
 					uni.uploadFile({
 						url: getApp().globalData.apiUrl + '/appData/putFile',
 						files: this.voicePathList,
@@ -384,6 +394,11 @@
 						},
 						fail: (err) => {
 							console.log(err)
+						},
+						complete: () => {
+							setTimeout(() => {
+								uni.hideLoading();
+							}, 2000)
 						}
 					})
 				}).catch(err => {

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/0029f9b0-a3c9-11ee-ae3e-27214bbc5732
+https://ide.dcloud.net.cn/build/download/89126930-a48a-11ee-ac2d-89abc48f179b