diff --git a/src/api/access.js b/src/api/access.js index 54dda50..156c1c4 100644 --- a/src/api/access.js +++ b/src/api/access.js @@ -30,14 +30,15 @@ }) } // 新增授权 -export function addPermission(params) { +export function addPermission(form) { return request({ url: 'acsPermission/add', method: 'post', - params, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } + params: { + doorCode: form.doorCode, + strategyId: form.strategyId + }, + data: form.personList }) } diff --git a/src/api/access.js b/src/api/access.js index 54dda50..156c1c4 100644 --- a/src/api/access.js +++ b/src/api/access.js @@ -30,14 +30,15 @@ }) } // 新增授权 -export function addPermission(params) { +export function addPermission(form) { return request({ url: 'acsPermission/add', method: 'post', - params, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } + params: { + doorCode: form.doorCode, + strategyId: form.strategyId + }, + data: form.personList }) } diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue index dc19d8e..a931668 100644 --- a/src/views/doorManage/controlDoor.vue +++ b/src/views/doorManage/controlDoor.vue @@ -107,6 +107,10 @@ }, // 保存数据 saveData: function() { + if(this.doorForm.beginDateTime >= this.doorForm.endDateTime){ + this.$message.warning("生效时间必须小于失效时间") + return + } this.updateData() }, // 修改数据 diff --git a/src/api/access.js b/src/api/access.js index 54dda50..156c1c4 100644 --- a/src/api/access.js +++ b/src/api/access.js @@ -30,14 +30,15 @@ }) } // 新增授权 -export function addPermission(params) { +export function addPermission(form) { return request({ url: 'acsPermission/add', method: 'post', - params, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } + params: { + doorCode: form.doorCode, + strategyId: form.strategyId + }, + data: form.personList }) } diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue index dc19d8e..a931668 100644 --- a/src/views/doorManage/controlDoor.vue +++ b/src/views/doorManage/controlDoor.vue @@ -107,6 +107,10 @@ }, // 保存数据 saveData: function() { + if(this.doorForm.beginDateTime >= this.doorForm.endDateTime){ + this.$message.warning("生效时间必须小于失效时间") + return + } this.updateData() }, // 修改数据 diff --git a/src/views/memberManage/addIris.vue b/src/views/memberManage/addIris.vue index e65e74c..d450107 100644 --- a/src/views/memberManage/addIris.vue +++ b/src/views/memberManage/addIris.vue @@ -21,7 +21,8 @@ image_zy1: '', image_yy1: '' }, - iframeMsg: '' + iframeMsg: '', + type: '' // 跳转类型 } }, mounted() { @@ -33,9 +34,6 @@ if (this.$route.query.personId) { this.irisForm.personId = this.$route.query.personId } - if (this.$route.query.idCardNo) { - this.irisForm.idCardNo = this.$route.query.idCardNo - } // console.log(this.irisForm) }, activated() { @@ -89,7 +87,13 @@ if (response.code === 200) { this.$message.success('保存虹膜成功') this.resetForm() - this.$router.push({ path: '/staff' }) + if(this.type === 'staff') { + this.$router.push({ path: '/staff' }) + } + if(this.type === 'visitor') { + this.$router.push({ path: '/visitor' }) + } + } }) } diff --git a/src/api/access.js b/src/api/access.js index 54dda50..156c1c4 100644 --- a/src/api/access.js +++ b/src/api/access.js @@ -30,14 +30,15 @@ }) } // 新增授权 -export function addPermission(params) { +export function addPermission(form) { return request({ url: 'acsPermission/add', method: 'post', - params, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } + params: { + doorCode: form.doorCode, + strategyId: form.strategyId + }, + data: form.personList }) } diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue index dc19d8e..a931668 100644 --- a/src/views/doorManage/controlDoor.vue +++ b/src/views/doorManage/controlDoor.vue @@ -107,6 +107,10 @@ }, // 保存数据 saveData: function() { + if(this.doorForm.beginDateTime >= this.doorForm.endDateTime){ + this.$message.warning("生效时间必须小于失效时间") + return + } this.updateData() }, // 修改数据 diff --git a/src/views/memberManage/addIris.vue b/src/views/memberManage/addIris.vue index e65e74c..d450107 100644 --- a/src/views/memberManage/addIris.vue +++ b/src/views/memberManage/addIris.vue @@ -21,7 +21,8 @@ image_zy1: '', image_yy1: '' }, - iframeMsg: '' + iframeMsg: '', + type: '' // 跳转类型 } }, mounted() { @@ -33,9 +34,6 @@ if (this.$route.query.personId) { this.irisForm.personId = this.$route.query.personId } - if (this.$route.query.idCardNo) { - this.irisForm.idCardNo = this.$route.query.idCardNo - } // console.log(this.irisForm) }, activated() { @@ -89,7 +87,13 @@ if (response.code === 200) { this.$message.success('保存虹膜成功') this.resetForm() - this.$router.push({ path: '/staff' }) + if(this.type === 'staff') { + this.$router.push({ path: '/staff' }) + } + if(this.type === 'visitor') { + this.$router.push({ path: '/visitor' }) + } + } }) } diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue index 5004830..62809ed 100644 --- a/src/views/memberManage/listStaff.vue +++ b/src/views/memberManage/listStaff.vue @@ -250,7 +250,8 @@ path: '/addIris', query: { personId: row.id, - idCardNo: row.idCardNo + idCardNo: row.idCardNo, + type: 'staff' } }) }, diff --git a/src/api/access.js b/src/api/access.js index 54dda50..156c1c4 100644 --- a/src/api/access.js +++ b/src/api/access.js @@ -30,14 +30,15 @@ }) } // 新增授权 -export function addPermission(params) { +export function addPermission(form) { return request({ url: 'acsPermission/add', method: 'post', - params, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } + params: { + doorCode: form.doorCode, + strategyId: form.strategyId + }, + data: form.personList }) } diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue index dc19d8e..a931668 100644 --- a/src/views/doorManage/controlDoor.vue +++ b/src/views/doorManage/controlDoor.vue @@ -107,6 +107,10 @@ }, // 保存数据 saveData: function() { + if(this.doorForm.beginDateTime >= this.doorForm.endDateTime){ + this.$message.warning("生效时间必须小于失效时间") + return + } this.updateData() }, // 修改数据 diff --git a/src/views/memberManage/addIris.vue b/src/views/memberManage/addIris.vue index e65e74c..d450107 100644 --- a/src/views/memberManage/addIris.vue +++ b/src/views/memberManage/addIris.vue @@ -21,7 +21,8 @@ image_zy1: '', image_yy1: '' }, - iframeMsg: '' + iframeMsg: '', + type: '' // 跳转类型 } }, mounted() { @@ -33,9 +34,6 @@ if (this.$route.query.personId) { this.irisForm.personId = this.$route.query.personId } - if (this.$route.query.idCardNo) { - this.irisForm.idCardNo = this.$route.query.idCardNo - } // console.log(this.irisForm) }, activated() { @@ -89,7 +87,13 @@ if (response.code === 200) { this.$message.success('保存虹膜成功') this.resetForm() - this.$router.push({ path: '/staff' }) + if(this.type === 'staff') { + this.$router.push({ path: '/staff' }) + } + if(this.type === 'visitor') { + this.$router.push({ path: '/visitor' }) + } + } }) } diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue index 5004830..62809ed 100644 --- a/src/views/memberManage/listStaff.vue +++ b/src/views/memberManage/listStaff.vue @@ -250,7 +250,8 @@ path: '/addIris', query: { personId: row.id, - idCardNo: row.idCardNo + idCardNo: row.idCardNo, + type: 'staff' } }) }, diff --git a/src/views/memberManage/listVisitor.vue b/src/views/memberManage/listVisitor.vue index b6e0a3d..e3ffc97 100644 --- a/src/views/memberManage/listVisitor.vue +++ b/src/views/memberManage/listVisitor.vue @@ -234,17 +234,25 @@ }) }, registerIris(row) { - const token = getToken() - const id = row.id - const idCardNo = row.idCardNo - const baseUrl = getProject().register_url - if (isIE()) { - const url = baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo - window.open(url, '_blank') - } else { - const url = 'openIE:' + baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo - window.location.href = url - } + // const token = getToken() + // const id = row.id + // const idCardNo = row.idCardNo + // const baseUrl = getProject().register_url + // if (isIE()) { + // const url = baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo + // window.open(url, '_blank') + // } else { + // const url = 'openIE:' + baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo + // window.location.href = url + // } + this.$router.push({ + path: '/addIris', + query: { + personId: row.id, + idCardNo: row.idCardNo, + type: 'visitor' + } + }) }, // 查询数据 search() { diff --git a/src/api/access.js b/src/api/access.js index 54dda50..156c1c4 100644 --- a/src/api/access.js +++ b/src/api/access.js @@ -30,14 +30,15 @@ }) } // 新增授权 -export function addPermission(params) { +export function addPermission(form) { return request({ url: 'acsPermission/add', method: 'post', - params, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) - } + params: { + doorCode: form.doorCode, + strategyId: form.strategyId + }, + data: form.personList }) } diff --git a/src/views/doorManage/controlDoor.vue b/src/views/doorManage/controlDoor.vue index dc19d8e..a931668 100644 --- a/src/views/doorManage/controlDoor.vue +++ b/src/views/doorManage/controlDoor.vue @@ -107,6 +107,10 @@ }, // 保存数据 saveData: function() { + if(this.doorForm.beginDateTime >= this.doorForm.endDateTime){ + this.$message.warning("生效时间必须小于失效时间") + return + } this.updateData() }, // 修改数据 diff --git a/src/views/memberManage/addIris.vue b/src/views/memberManage/addIris.vue index e65e74c..d450107 100644 --- a/src/views/memberManage/addIris.vue +++ b/src/views/memberManage/addIris.vue @@ -21,7 +21,8 @@ image_zy1: '', image_yy1: '' }, - iframeMsg: '' + iframeMsg: '', + type: '' // 跳转类型 } }, mounted() { @@ -33,9 +34,6 @@ if (this.$route.query.personId) { this.irisForm.personId = this.$route.query.personId } - if (this.$route.query.idCardNo) { - this.irisForm.idCardNo = this.$route.query.idCardNo - } // console.log(this.irisForm) }, activated() { @@ -89,7 +87,13 @@ if (response.code === 200) { this.$message.success('保存虹膜成功') this.resetForm() - this.$router.push({ path: '/staff' }) + if(this.type === 'staff') { + this.$router.push({ path: '/staff' }) + } + if(this.type === 'visitor') { + this.$router.push({ path: '/visitor' }) + } + } }) } diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue index 5004830..62809ed 100644 --- a/src/views/memberManage/listStaff.vue +++ b/src/views/memberManage/listStaff.vue @@ -250,7 +250,8 @@ path: '/addIris', query: { personId: row.id, - idCardNo: row.idCardNo + idCardNo: row.idCardNo, + type: 'staff' } }) }, diff --git a/src/views/memberManage/listVisitor.vue b/src/views/memberManage/listVisitor.vue index b6e0a3d..e3ffc97 100644 --- a/src/views/memberManage/listVisitor.vue +++ b/src/views/memberManage/listVisitor.vue @@ -234,17 +234,25 @@ }) }, registerIris(row) { - const token = getToken() - const id = row.id - const idCardNo = row.idCardNo - const baseUrl = getProject().register_url - if (isIE()) { - const url = baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo - window.open(url, '_blank') - } else { - const url = 'openIE:' + baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo - window.location.href = url - } + // const token = getToken() + // const id = row.id + // const idCardNo = row.idCardNo + // const baseUrl = getProject().register_url + // if (isIE()) { + // const url = baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo + // window.open(url, '_blank') + // } else { + // const url = 'openIE:' + baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo + // window.location.href = url + // } + this.$router.push({ + path: '/addIris', + query: { + personId: row.id, + idCardNo: row.idCardNo, + type: 'visitor' + } + }) }, // 查询数据 search() { diff --git a/src/views/query/queryStaff.vue b/src/views/query/queryStaff.vue index c5534f7..279818b 100644 --- a/src/views/query/queryStaff.vue +++ b/src/views/query/queryStaff.vue @@ -9,25 +9,25 @@ - - - - - - - - - - + + v-for="item in doorList" + :key="item.id" + :label="item.doorName" + :value="item.doorCode"/> + + + + + + + + + +