diff --git a/src/api/query.js b/src/api/query.js index 5117a9c..71ddede 100644 --- a/src/api/query.js +++ b/src/api/query.js @@ -59,6 +59,15 @@ }) } +// 设备列表 +export function getDeviceLabelList(params) { + return request({ + url: 'device/listAllLabel', + method: 'get', + params + }) +} + // 批量导出员工记录 export function exportStaffRecords(params) { return request({ diff --git a/src/api/query.js b/src/api/query.js index 5117a9c..71ddede 100644 --- a/src/api/query.js +++ b/src/api/query.js @@ -59,6 +59,15 @@ }) } +// 设备列表 +export function getDeviceLabelList(params) { + return request({ + url: 'device/listAllLabel', + method: 'get', + params + }) +} + // 批量导出员工记录 export function exportStaffRecords(params) { return request({ diff --git a/src/router/modules/access.js b/src/router/modules/access.js index 1914a15..8f97299 100644 --- a/src/router/modules/access.js +++ b/src/router/modules/access.js @@ -93,7 +93,7 @@ children: [ { path: '/querystaff', - component: () => import('@/views/query/queryStaff'), // Parent router-view + component: () => import('@/views/query/listRecord'), name: 'StaffQuery', meta: { title: '员工数据查询', permission: ['/query/staff'] } diff --git a/src/api/query.js b/src/api/query.js index 5117a9c..71ddede 100644 --- a/src/api/query.js +++ b/src/api/query.js @@ -59,6 +59,15 @@ }) } +// 设备列表 +export function getDeviceLabelList(params) { + return request({ + url: 'device/listAllLabel', + method: 'get', + params + }) +} + // 批量导出员工记录 export function exportStaffRecords(params) { return request({ diff --git a/src/router/modules/access.js b/src/router/modules/access.js index 1914a15..8f97299 100644 --- a/src/router/modules/access.js +++ b/src/router/modules/access.js @@ -93,7 +93,7 @@ children: [ { path: '/querystaff', - component: () => import('@/views/query/queryStaff'), // Parent router-view + component: () => import('@/views/query/listRecord'), name: 'StaffQuery', meta: { title: '员工数据查询', permission: ['/query/staff'] } diff --git a/src/router/modules/base.js b/src/router/modules/base.js index 7268361..056024b 100644 --- a/src/router/modules/base.js +++ b/src/router/modules/base.js @@ -67,7 +67,7 @@ path: '/addVisitor', name: 'AddVisiotr', hidden: true, - component: () => import('@/views/memberManage/addPerson'), + component: () => import('@/views/memberManage/addPersonIris'), meta: { title: '新增访客', icon: '', permission: ['/visitor/add'] } }, { diff --git a/src/api/query.js b/src/api/query.js index 5117a9c..71ddede 100644 --- a/src/api/query.js +++ b/src/api/query.js @@ -59,6 +59,15 @@ }) } +// 设备列表 +export function getDeviceLabelList(params) { + return request({ + url: 'device/listAllLabel', + method: 'get', + params + }) +} + // 批量导出员工记录 export function exportStaffRecords(params) { return request({ diff --git a/src/router/modules/access.js b/src/router/modules/access.js index 1914a15..8f97299 100644 --- a/src/router/modules/access.js +++ b/src/router/modules/access.js @@ -93,7 +93,7 @@ children: [ { path: '/querystaff', - component: () => import('@/views/query/queryStaff'), // Parent router-view + component: () => import('@/views/query/listRecord'), name: 'StaffQuery', meta: { title: '员工数据查询', permission: ['/query/staff'] } diff --git a/src/router/modules/base.js b/src/router/modules/base.js index 7268361..056024b 100644 --- a/src/router/modules/base.js +++ b/src/router/modules/base.js @@ -67,7 +67,7 @@ path: '/addVisitor', name: 'AddVisiotr', hidden: true, - component: () => import('@/views/memberManage/addPerson'), + component: () => import('@/views/memberManage/addPersonIris'), meta: { title: '新增访客', icon: '', permission: ['/visitor/add'] } }, { diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue index dfcc5c2..2ea176f 100644 --- a/src/views/memberManage/listStaff.vue +++ b/src/views/memberManage/listStaff.vue @@ -34,6 +34,7 @@ 初始化剩余年假 批量导入 - + 导出记录 删除 新增 diff --git a/src/api/query.js b/src/api/query.js index 5117a9c..71ddede 100644 --- a/src/api/query.js +++ b/src/api/query.js @@ -59,6 +59,15 @@ }) } +// 设备列表 +export function getDeviceLabelList(params) { + return request({ + url: 'device/listAllLabel', + method: 'get', + params + }) +} + // 批量导出员工记录 export function exportStaffRecords(params) { return request({ diff --git a/src/router/modules/access.js b/src/router/modules/access.js index 1914a15..8f97299 100644 --- a/src/router/modules/access.js +++ b/src/router/modules/access.js @@ -93,7 +93,7 @@ children: [ { path: '/querystaff', - component: () => import('@/views/query/queryStaff'), // Parent router-view + component: () => import('@/views/query/listRecord'), name: 'StaffQuery', meta: { title: '员工数据查询', permission: ['/query/staff'] } diff --git a/src/router/modules/base.js b/src/router/modules/base.js index 7268361..056024b 100644 --- a/src/router/modules/base.js +++ b/src/router/modules/base.js @@ -67,7 +67,7 @@ path: '/addVisitor', name: 'AddVisiotr', hidden: true, - component: () => import('@/views/memberManage/addPerson'), + component: () => import('@/views/memberManage/addPersonIris'), meta: { title: '新增访客', icon: '', permission: ['/visitor/add'] } }, { diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue index dfcc5c2..2ea176f 100644 --- a/src/views/memberManage/listStaff.vue +++ b/src/views/memberManage/listStaff.vue @@ -34,6 +34,7 @@ 初始化剩余年假 批量导入 - + 导出记录 删除 新增 diff --git a/src/views/query/listRecord.vue b/src/views/query/listRecord.vue index c496e6a..6f9220e 100644 --- a/src/views/query/listRecord.vue +++ b/src/views/query/listRecord.vue @@ -3,11 +3,11 @@
- - + + - - + + @@ -18,18 +18,20 @@ - - + + + :value="item.devCode"> + {{ item.devCode }} + {{ item.label }} + - - + + + + import selectTree from '@/components/SelectTree/singleSelect' -import { getRecordList, getDoorSourceList, getDeviceSourceList, exportRecords } from '@/api/query' +import { getRecordList, getDoorSourceList, getDeviceSourceList, getDeviceLabelList ,exportRecords } from '@/api/query' import DownloadTemplate from '@/components/DownloadTemplate' import DeptSelect from '@/components/DeptSelect/index' import { downloadFile } from '@/utils/downloadUtils' @@ -207,7 +211,7 @@ }, // 获取设备列表 getDeviceSource() { - getDeviceSourceList(this.devQuery).then(response => { + getDeviceLabelList().then(response => { this.deviceList = response.data }) }, @@ -298,4 +302,9 @@ margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2 } } + .form-container { + .selectForm-container-item { + width: 220px; + } + }