diff --git a/components/department/department.vue b/components/department/department.vue index 2624d50..6b6479e 100644 --- a/components/department/department.vue +++ b/components/department/department.vue @@ -9,11 +9,11 @@ :is-show-clear="isShowClear" theme-color="#3377ff" page-height="92vh" - label-key="name" - value-key="id" - children-key="children" + label-key="DEPARTMENT_NAME" + value-key="DEPARTMENT_ID" + children-key="nodes" @confirm="fnTreeConfirm" - @cancel="visible = false" + @cancel="$emit('update:visible', false)" /> @@ -57,9 +57,11 @@ export default { async fnGetData() { const resData = await getDepartmentTree({ loading: false, - postMethod: 'application/json', + // postMethod: 'application/json', + TYPE:'2', + CORP_ID:this.$store.getters.getUserInfo.CORPINFO_ID, }); - this.treeData = JSON.parse(resData.zTreeNodes); + this.treeData = resData.tree.tree; } }, } diff --git a/components/department/index.vue b/components/department/index.vue index 1e8277f..5cb8834 100644 --- a/components/department/index.vue +++ b/components/department/index.vue @@ -83,8 +83,8 @@ export default { methods: { fnConfirm(event) { if (event.length > 0) { - this.$emit('update:name', event[0].name) - this.$emit('update:id', event[0].id) + this.$emit('update:name', event[0].DEPARTMENT_NAME) + this.$emit('update:id', event[0].DEPARTMENT_ID) } else { this.$emit('update:name', '') this.$emit('update:id', '') diff --git a/components/personnel/index.vue b/components/personnel/index.vue index 8026684..1c52b28 100644 --- a/components/personnel/index.vue +++ b/components/personnel/index.vue @@ -29,8 +29,7 @@ + + diff --git a/pages/door_access_control/vehicle_info/add.vue b/pages/door_access_control/vehicle_info/add.vue new file mode 100644 index 0000000..8375958 --- /dev/null +++ b/pages/door_access_control/vehicle_info/add.vue @@ -0,0 +1,147 @@ + + + + + diff --git a/pages/door_access_control/vehicle_info/index.vue b/pages/door_access_control/vehicle_info/index.vue new file mode 100644 index 0000000..ba3f98e --- /dev/null +++ b/pages/door_access_control/vehicle_info/index.vue @@ -0,0 +1,165 @@ + + + + + diff --git a/pages/door_access_control/vehicle_info/view.vue b/pages/door_access_control/vehicle_info/view.vue new file mode 100644 index 0000000..8715e28 --- /dev/null +++ b/pages/door_access_control/vehicle_info/view.vue @@ -0,0 +1,45 @@ + + + + + diff --git a/pages/index/index.vue b/pages/index/index.vue index 559a1dd..87249b8 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -94,7 +94,12 @@ img: require('../../static/icon-apps/app_icons9.png'), title: '隐患整改', url: '/pages/hidden_rectification/index' - } + }, + { + img: require('../../static/icon-apps/home-door.png'), + title: '口门门禁管理', + url: '/pages/door_access_control/index' + }, ], classInfo: null, } diff --git a/static/icon-apps/home-door.png b/static/icon-apps/home-door.png new file mode 100644 index 0000000..0a4a023 Binary files /dev/null and b/static/icon-apps/home-door.png differ