diff --git a/dist/static/config.js b/dist/static/config.js index ed73ae4..f84bb04 100644 --- a/dist/static/config.js +++ b/dist/static/config.js @@ -21,13 +21,21 @@ export default { code:4, desc:"Z电信" }, + // { + // code:5, + // desc:"移动透传" + // }, + // { + // code:6, + // desc:"wifi" + // }, { - code:5, - desc:"移动透传" + code:6, + desc:"Z移动透传" }, { - code:6, - desc:"wifi" + code:5, + desc:"Zwifi" }, { code:7, diff --git a/src/views/userManagement.vue b/src/views/userManagement.vue index be08b5f..f9361e8 100644 --- a/src/views/userManagement.vue +++ b/src/views/userManagement.vue @@ -445,7 +445,8 @@
- +
@@ -750,6 +751,7 @@ import zw from "./zw.vue" import getFinger from "./getFinger.vue" import md5 from 'js-md5' import ICINLocker from "../utils/equipment.js" +import Cropper from "../components/cropperJs/index.vue"; import { timestampToTime, dec2hex, @@ -1107,7 +1109,8 @@ export default { freeUserTitle: '冻结用户', userTypeList: [], maxDateTime: '', - minDateTime: '' + minDateTime: '', + faceData: '' }; }, computed: { @@ -1140,7 +1143,8 @@ export default { personLi, zw, getFinger, contrast, - NumberGrow + NumberGrow, + Cropper }, mounted() { // 获取全部合同 @@ -1173,6 +1177,9 @@ export default { this.$store.commit("increment", 1); }, methods: { + getFaceData(val){ + this.faceData = val.split(',')[1] + }, // 获取全部合同 getLeasesList() { let data = { @@ -4449,8 +4456,28 @@ export default { return false } if (documentType == 10) { - this.$message.error("人脸暂未开放"); - return + if (pzname == '') { + pzname = '人脸' + sort + } + let str = { + username: this.voucher.username, + pzname: pzname, + userTelephone: this.drawerRow.info.userTelephone, + userPassword: this.drawerRow.info.userPassword, + faceData: this.faceData, + password: "", + passwordStartTime: moment(this.value2[0]).format('YYYYMMDDHHmmss'), + passwordEndTime: moment(this.value2[1]).format('YYYYMMDDHHmmss'), + order: 6220 + } + let data = { + cardId: this.drawerRow.id, + content: JSON.stringify(str), + type: documentType, + startTime: parseInt( moment(this.value2[0]).valueOf() / 1000), + endTime: parseInt(moment(this.value2[1]).valueOf() / 1000), + }; + return false } else if (documentType == 11) { var fingerprint = localStorage.getItem("fingerprint"); var indexofstr = fingerprint.indexOf(',') @@ -4578,7 +4605,6 @@ export default { is: false, }; } - var data = { cardId: this.drawerRow.id, content: JSON.stringify(str), @@ -4587,9 +4613,13 @@ export default { endTime: moment(this.value2[1]).valueOf() / 1000 }; httpPost(data, this.$api.addCertificates).then((res) => { - this.$message.success('添加成功') - this.roomstatus1 = true; - this.getcertificate(); + if(res.success){ + this.$message.success('添加成功') + this.roomstatus1 = true; + this.getcertificate(); + }else{ + this.$message.error('添加失败') + } }); }, // 重新下发凭证