From 91fdce0d1fa3ac0c70f77ed5ccc6573fca444836 Mon Sep 17 00:00:00 2001 From: xiaohei <11674173+xiaohei102908@user.noreply.gitee.com> Date: Thu, 30 Nov 2023 18:07:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC3.8.0=20=202023-11-30=20=20lj?= =?UTF-8?q?d=201=E3=80=81=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/userManagement.vue | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/src/views/userManagement.vue b/src/views/userManagement.vue index 8ba67e4..a0a084d 100644 --- a/src/views/userManagement.vue +++ b/src/views/userManagement.vue @@ -1698,7 +1698,7 @@ export default { faceIndex: lt.contentJSON.index, action: 3, endTime: endTime1, - faceData: lt.contentJSON.faceData, + // faceData: lt.contentJSON.faceData, lockerId: deviceinfo.deviceNum, lockerUserId: lt.contentJSON.userPassword, startTime: startTime1, @@ -1708,7 +1708,6 @@ export default { } httpPost(dataface, this.$api.sendCommand).then(res => { console.log(res); - lt.contentJSON.index = res.data.index lt.contentJSON.operateMode = 21 lt.contentJSON.order = 6221 lt.contentJSON.passwordStartTime = startTime1 @@ -1770,12 +1769,14 @@ export default { } httpPost(data, this.$api.sendCommand).then(res => { console.log(res); + lt.contentJSON.operateMode = 17 + lt.contentJSON.order = 6217 + lt.contentJSON.passwordStartTime = startTime1 + lt.contentJSON.passwordEndTime = endTime1 if (res.success) { - str.index = res.data.index - let data1 = { id: lt.id, - content: JSON.stringify(str), //operateMode:NFC-10、把人员添加到凭证-1 + content: JSON.stringify(lt.contentJSON), //operateMode:NFC-10、把人员添加到凭证-1 startTime: startTime1, endTime: endTime1, } @@ -1826,10 +1827,14 @@ export default { } httpPost(data, this.$api.sendCommand).then(res => { console.log(res); + lt.contentJSON.operateMode = 11 + lt.contentJSON.order = 6211 + lt.contentJSON.passwordStartTime = startTime1 + lt.contentJSON.passwordEndTime = endTime1 if (res.success) { let data1 = { id: lt.id, - content: JSON.stringify(str), //operateMode:NFC-10、把人员添加到凭证-1 + content: JSON.stringify(lt.contentJSON), //operateMode:NFC-10、把人员添加到凭证-1 startTime: startTime1, endTime: endTime1, } @@ -1879,10 +1884,14 @@ export default { } httpPost(data, this.$api.sendCommand).then(res => { console.log(res); + lt.contentJSON.operateMode = 8 + lt.contentJSON.order = 6208 + lt.contentJSON.passwordStartTime = startTime1 + lt.contentJSON.passwordEndTime = endTime1 if (res.success) { let data1 = { id: lt.id, - content: JSON.stringify(str), //operateMode:NFC-10、把人员添加到凭证-1 + content: JSON.stringify(lt.contentJSON), //operateMode:NFC-10、把人员添加到凭证-1 startTime: startTime1, endTime: endTime1, } @@ -3837,7 +3846,7 @@ export default { var password = "" if (JSON.parse(row.content).password.length == 8) { password = utils.cardFormatConversion(JSON.parse(row.content).password) - password = password + '00000000' + password = password // + '00000000' } else if (JSON.parse(row.content).password.length == 16) { password = JSON.parse(row.content).password } else { @@ -4037,7 +4046,7 @@ export default { var password = "" if (JSON.parse(row.content).password.length == 8) { password = utils.cardFormatConversion(JSON.parse(row.content).password) - password = password + '00000000' + password = password // + '00000000' } else if (JSON.parse(row.content).password.length == 16) { password = JSON.parse(row.content).password } else { @@ -5115,7 +5124,7 @@ export default { this.$message.error("卡格式错误,请重新录入") return } - pwd = pwd + '00000000' + pwd = pwd // + '00000000' var startTime = JSON.stringify(row.startTime) var endTime = JSON.stringify(row.endTime) if (startTime.length == 13) { @@ -5552,6 +5561,7 @@ export default { cardId: this.drawerRow.id, },]; httpPost(data, this.$api.unbindCard).then((res) => { + console.log(res) if (res.success) { var array = this.roomtable, SelectedList = [], @@ -5634,7 +5644,7 @@ export default { inStatus: "0,1,702" } } - httpGet(data, _this.$api.getCertificates).then(res => { + httpGet(data, this.$api.getCertificates).then(res => { if (res.success) { let dataOne = utils.zlib_unzip(res.data) dataOne.map(lt => { @@ -7190,7 +7200,7 @@ export default { var userid = info.userPassword var cardNo = utils.cardFormatConversion(drawerRow.modeContent.toUpperCase()) if (cardNo.length == 8) { - cardNo = cardNo + '00000000' + cardNo = cardNo // + '00000000' } else if (cardNo.length != 16) { cardNo = cardNo.padEnd(16, '0') }