Browse Source

1031,修改了删除NFC接口错误的问题,增加了连接蓝牙成功跳转到人脸管理页面

master
xiaoheiiskinder 1 year ago
parent
commit
da49ba4e84
6 changed files with 1506 additions and 11 deletions
  1. +6
    -3
      pages/addperson/addperson.js
  2. +1
    -0
      pages/personManger/personManger.js
  3. +29
    -4
      pages/roomDetail/roomDetail.js
  4. +1
    -1
      pages/roomDetail/roomDetail.wxml
  5. +1468
    -2
      pagesA/facepeople/facepeople.js
  6. +1
    -1
      pagesA/facepeople/facepeople.wxml

+ 6
- 3
pages/addperson/addperson.js View File

@ -910,7 +910,7 @@ Page({
if (data.length > 0) {
let passwordIndex = JSON.parse(data[0].content).index || ''
var dataPasswod = {
code: "lwj/passwordOperate",
code: "lwj/cardOperate",
data: {
lockerId: deviceinfo.deviceNum,
lockerUserId: personInfo.userId,
@ -1525,7 +1525,7 @@ Page({
wx.showLoading({
title: '删除房卡中',
})
var bytes = plugin.delRfCard(lockDevice.name, basecode, rfCardId, rfCardIndex)
var bytes = plugin.delRfCard(lockDevice.name, basecode, 0, rfCardIndex)
console.debug('bytes', bytes)
that.sendBytes(bytes)
},
@ -2933,6 +2933,7 @@ Page({
ids: [passwordLiAll.id]
}
WXAPI.deleteCertificates(data).then(res1 => {
console.log(res1, '2936');
if (res1.success) {
that.getNfc()
wx.showToast({
@ -3764,7 +3765,8 @@ Page({
})
var startTime = new Date(Number(moment(that.data.starttime).format('x')))
var endTime = new Date(Number(moment(that.data.endtime).format('x')))
var bytes = plugin.addRfCard(lockDevice.name, basecode, rfCardId, rfCardIndex, startTime, endTime)
console.log("锁", lockDevice.name, basecode, 0, rfCardIndex, startTime, endTime);
var bytes = plugin.addRfCard(lockDevice.name, basecode, 0, rfCardIndex, startTime, endTime)
console.debug('bytes', bytes)
that.sendBytes(bytes)
},
@ -3902,6 +3904,7 @@ Page({
cardName: cardName,
}
}
console.log("平台", dataPasswod);
WXAPI.sendCommand(dataPasswod).then(res => {
console.log(res, '获取索引')
if (res.success) {


+ 1
- 0
pages/personManger/personManger.js View File

@ -678,6 +678,7 @@ Page({
var cgInfo = wx.getStorageSync('cgInfo')
var current = e.currentTarget.dataset.current
var index = e.currentTarget.dataset.index
var personLi = that.data.personList[index]
wx.setStorageSync('personLi', that.data.personList[index])
this.setData({
current: current,


+ 29
- 4
pages/roomDetail/roomDetail.js View File

@ -334,10 +334,14 @@ Page({
})
},
// 前往图像管理
goImageManagement() {
wx.navigateTo({
url: '/pagesA/facepeople/facepeople',
})
goImageManagement(e) {
if(this.data.isSearch){
wx.navigateTo({
url: '/pagesA/facepeople/facepeople',
})
}else{
this.btntest1(e)
}
},
genOfflinePincodeShowMethods() {
// if(this.data.isSearch){
@ -837,6 +841,11 @@ Page({
url: '/pages/personManger/personManger',
})
},
gotofaceadd() {
wx.navigateTo({
url: '/pagesA/facepeople/facepeople',
})
},
openlockfun() {
var that = this
this.data.openlock = app.globalData.openlock
@ -1219,6 +1228,8 @@ Page({
this.configurewifj()
}else if(event == '8') {
this.personnelmanagement()
}else if(event == '11') {
this.facemanagement()
}
} else {
this.searchDevicesMethods()
@ -1304,6 +1315,8 @@ Page({
that.configurewifj()
}else if(that.data.event == '8') {
that.personnelmanagement()
}else if(that.data.event == '11') {
that.facemanagement()
}
wx.hideLoading({
success: (res) => {},
@ -1361,6 +1374,12 @@ Page({
taskId = 9010
that.initBluetooth()
},
// 图像管理
facemanagement() {
var that = this
taskId = 9011
that.initBluetooth()
},
LwjonOpenLock: function () {
var that = this
wx.showLoading({
@ -1503,6 +1522,10 @@ Page({
case 9010: {
this.gotoperson()
}
// 图像管理
case 9011: {
this.gotofaceadd()
}
default: {
}
@ -2245,6 +2268,8 @@ Page({
that.doWork()
}else if(taskId == 9010 && that.data.event == '8') {
that.doWork()
}else if(taskId == 9011 && that.data.event == '11') {
that.doWork()
}
}, 500)
},


+ 1
- 1
pages/roomDetail/roomDetail.wxml View File

@ -54,7 +54,7 @@
<view class="iconfont icon-renyuanguanli text-green"></view>
<view class="text-grey text-sm">人员管理</view>
</view>
<view class="actionli" bindtap="goImageManagement" wx:if="{{(deviceinfo.manufactureId ==1201 || deviceinfo.manufactureId == 1241) && authority}}">
<view class="actionli" bindtap="goImageManagement" data-i="11" wx:if="{{(deviceinfo.manufactureId ==1201 || deviceinfo.manufactureId == 1241) && authority}}">
<view class="iconfont icon-quanxianguanli text-green"></view>
<view class="text-grey text-sm">图像管理</view>
</view>


+ 1468
- 2
pagesA/facepeople/facepeople.js
File diff suppressed because it is too large
View File


+ 1
- 1
pagesA/facepeople/facepeople.wxml View File

@ -50,7 +50,7 @@
<image class="faceimg" src="{{avatarPath}}" wx:else></image>
</view>
</view>
<view class=""><button type="primary" bindtap="sendFp">添加</button></view>
<view class=""><button type="primary" bindtap="sendface">添加</button></view>
</view>
</van-popup>
</view>

Loading…
Cancel
Save