dyf/APP
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827

Browse Source 
# Conflicts:
#	pages/common/index/index.vue
This commit is contained in:
liub
2026-03-30 14:01:07 +08:00
parent 37f5047a46 6839e9fd40
commit d134c67a16
12 changed files with 1066 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pages/common/addBLE/addEquip.vue
View File

@ -185,7 +185,7 @@
},
onHide: function() {
this.Status.isPageHidden = true;
ble.StopSearch();
if (ble) ble.StopSearch();
},
onUnload() {
@ -205,7 +205,6 @@
}
},
onLoad(option) {
debugger;
eventChannel = this.getOpenerEventChannel();
eventChannel.on('detailData', function(rec) {
@ -351,11 +350,10 @@
// console.log("+++ 发现新设备，准备添加到列表:", JSON.stringify(device));
if (these.device && these.device.bluetoothName && device.name) {
if (these.device.bluetoothName === device.name || (device.name && device.name
.indexOf(these
.device.bluetoothName) > -1) || (device.name && this.device
.bluetoothName.indexOf(
device.name) > -1)) {
const bn = these.device.bluetoothName;
if (these.device.bluetoothName === device.name ||
(device.name.indexOf(bn) > -1) ||
(bn.indexOf(device.name) > -1)) {
device.isTarget = true;
}
}
@ -635,7 +633,7 @@
if (f && f.macAddress) {
if (!this.device.deviceMac) { //走服务端验证
if (!these.device || !these.device.deviceMac) { //走服务端验证
console.error("走服务端验证")
request({
url: '/app/device/getDeviceInfoByDeviceMac',

8
pages/common/index/index.vue
View File

@ -252,12 +252,8 @@
activeTabInfo: '',
dic: {
showMsgTypes: ['BJQ6170', 'HBY210', 'HBY670', 'BJQ6075', 'BJQ6075J'], //需要发送消息的类型
showMapTypes: ['BJQ6170', 'HBY210', 'HBY670', 'BJQ6075', 'HBY018A', 'HBY100-J', 'BJQ6075J', 'HBY008A',
'HBY100-Y'
], //需要显示地图的类型
showCallPolice: ['BJQ6170', 'HBY210', 'HBY670', 'BJQ6075', 'HBY018A', 'HBY100-J', 'BJQ6075J',
'HBY008A', 'HBY100-Y'
] //需要发送报警的类型
showMapTypes: ['BJQ6170', 'HBY210', 'HBY670', 'BJQ6075', 'HBY018A', 'HBY100-J', 'BJQ6075J', 'HBY008A','HBY100-Y'], //需要显示地图的类型
showCallPolice: ['BJQ6170', 'HBY210', 'HBY670', 'BJQ6075', 'HBY018A', 'HBY100-J', 'BJQ6075J','HBY008A', 'HBY100-Y'] //需要发送报警的类型
},
isPageShow: true
}