修复有时候蓝牙配对成功依然提示未连接的异常

pages/6075J/BJQ6075J.vue

@@ -260,7 +260,7 @@
 		baseURL
 	} from '@/utils/request.js';
 	import {
-		showLoading, 
+		showLoading,
 		hideLoading,
 		updateLoading
 	} from '@/utils/loading.js';
@@ -295,7 +295,7 @@
 		},
 		data() {
 			return {
-				Status: {       
+				Status: {
 
 
 					pageHide: false,
@@ -502,7 +502,7 @@
 			these = this;
 			this.initActionData();
 
-			
+
 
 
 
@@ -1110,13 +1110,13 @@
 
 							if (combinedData.length === curr - 1) {
 
-									Common.saveDeviceLog({
-										deviceId: this.device.id,
-										name: '发送紧急通知',
-										sendMsg: this.formData.sendMsg.trim()
-									}).catch(ex => {
+								Common.saveDeviceLog({
+									deviceId: this.device.id,
+									name: '发送紧急通知',
+									sendMsg: this.formData.sendMsg.trim()
+								}).catch(ex => {
 
-									});
+								});
 								holdHand('transmit complete', 200).then(res => {
 
 									MsgSuccess("消息发送成功", "确定", these);
@@ -1137,7 +1137,7 @@
 									console.log("发送成功", curr);
 									setTimeout(sendPacket, 1000);
 
-									
+
 								}).catch(err => {
 								if (err.code == '10007') {
 
@@ -1282,17 +1282,23 @@
 			},
 			getDevice: function() {
 
-				console.log("LinkedList=", ble.data.LinkedList);
-				console.log("this.device=", this.device);
 				let f = ble.data.LinkedList.find((v) => {
-					if (v.macAddress == these.device.deviceMac) {
-						if (!this.formData.deviceId) {
-							this.formData.deviceId = v.deviceId
-						};
-						return true;
+					let flag = v.macAddress == these.device.deviceMac;
+					if (!flag && v.device) {
+						flag = v.device.id == these.device.id;
 					}
+					if (flag) {
+						these.formData.deviceId = v.deviceId;
+					}
+					return flag;
 				});
 
+				// #ifdef WEB
+				f = {
+					deviceId: '123'
+				}
+				// #endif
+
 				return f;
 			},
 			showBleUnConnect() {
@@ -1430,7 +1436,7 @@
 					this.formData.bleStatu = true;
 
 					batchTool = new SendBatchData(this, res, ble);
-					
+
 				}
 
 			},
@@ -1524,7 +1530,8 @@
 			},
 			gotoMap() {
 				let promise = Promise.resolve([this.formData.sta_longitude, this.formData
-				.sta_latitude]); //lnglatConvert.wgs84_to_gcj02(this.formData.sta_longitude, this.formData.sta_latitude);
+					.sta_latitude
+				]); //lnglatConvert.wgs84_to_gcj02(this.formData.sta_longitude, this.formData.sta_latitude);
 				promise.then(lnglat => {
 
 					this.detailData.longitude = lnglat[0];