diff --git a/src/api/device.js b/src/api/device.js index aa899f9..752e641 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -15,8 +15,8 @@ export function adminEnter(id) { return http.post('/device/admin/enter/' + id) } -export function adminOut(id) { - return http.post('/device/admin/out/' + id) +export function adminOut(id, pwd) { + return http.post('/device/admin/out/' + id, { 'password': pwd }) } export function uploadLog(id) { return http.post('/device/upload/log/' + id) diff --git a/src/views/device/index.vue b/src/views/device/index.vue index c869576..0fc04ca 100644 --- a/src/views/device/index.vue +++ b/src/views/device/index.vue @@ -48,12 +48,20 @@ + + 请输入开门密码: + + + @@ -71,9 +79,14 @@ export default { }, data() { return { + dialogFormByDay: false, + deviceId: undefined, params: { search_eq_d$venueId: undefined }, + form: { + password: '' + }, venues: [], intervalid1: undefined } @@ -105,14 +118,19 @@ export default { }) }, - handleEnter(id) { - adminEnter(id).then(response => { + handleOutPassword(id) { + this.deviceId = id + this.dialogFormByDay = true + }, + + handleEnter() { + adminEnter(this.deviceId).then(response => { this.handleSearch() }) }, handleOut(id) { - adminOut(id).then(response => { + adminOut(this.deviceId, this.form.password).then(response => { this.handleSearch() }) }, diff --git a/src/views/member/enter/veneu/log/edit.vue b/src/views/member/enter/veneu/log/edit.vue index 90530e2..438885a 100644 --- a/src/views/member/enter/veneu/log/edit.vue +++ b/src/views/member/enter/veneu/log/edit.vue @@ -78,10 +78,10 @@ export default { return { activeName: '1', form: { - id: undefined + id: 0 }, params: { - id: undefined + id: 0 } } },