diff --git a/src/views/map/dialog/index.vue b/src/views/map/dialog/index.vue index bdc983e..cc8d173 100644 --- a/src/views/map/dialog/index.vue +++ b/src/views/map/dialog/index.vue @@ -11,7 +11,7 @@ - + diff --git a/src/views/map/dialog/mkGateMachine.vue b/src/views/map/dialog/mkGateMachine.vue index 33d8cbd..aa3ba24 100644 --- a/src/views/map/dialog/mkGateMachine.vue +++ b/src/views/map/dialog/mkGateMachine.vue @@ -34,8 +34,8 @@ {{ item.USERNAME }} {{ item.TIME }} - 进入 - 出去 + 进入 + 出去 @@ -79,6 +79,12 @@ export default { gangkou: { type: String, default: '' + }, + corpId: { + type: String, + default() { + return '' + } } }, data() { @@ -107,7 +113,8 @@ export default { { GATE_AREA_ID: this.id, TYPE: this.type, - GANGKOU: this.gangkou + GANGKOU: this.gangkou, + CORPINFO_ID: this.corpId } ).then((data) => { Object.assign(this.info, data.pd) @@ -143,7 +150,8 @@ export default { { GATE_AREA_ID: this.id, TYPE: this.type, - GANGKOU: this.gangkou + GANGKOU: this.gangkou, + CORPINFO_ID: this.corpId } ).then((data) => { this.recordAllList = data.recordAllList diff --git a/src/views/map/index.vue b/src/views/map/index.vue index 8c138e9..6c4aa93 100644 --- a/src/views/map/index.vue +++ b/src/views/map/index.vue @@ -459,6 +459,16 @@ export default { containAuthorization: [], eliminateAuthorization: [], list: [ + { + label: '人员', + dialog_width: '800px', + check: false, + img: require('../../assets/map/gangkou_index/buttom/ico1.png'), + checkImg: require('../../assets/map/gangkou_index/buttom/ico1_on.png'), + type: 'PERSON', + containAuthorization: [], + eliminateAuthorization: [] + }, { label: '车辆', dialog_width: '600px',