diff --git a/src/api/setting/devices.js b/src/api/setting/devices.js new file mode 100644 index 0000000..101a6a8 --- /dev/null +++ b/src/api/setting/devices.js @@ -0,0 +1,46 @@ +import request from '@/utils/request' +import { parseStrEmpty } from "@/utils/bonus"; + +// 查询列表 +export function listMachine(query) { + return request({ + url: '/system/attendanceMachine/list', + method: 'get', + params: query + }) +} + +// 查询详细 +export function getMachine(machineId) { + return request({ + url: '/system/attendanceMachine/' + machineId, + method: 'delete' + }) + } + +// 新增 +export function addMachine(data) { + return request({ + url: '/system/attendanceMachine', + method: 'post', + data: data + }) +} + +// 修改 +export function updateMachine(data) { + return request({ + url: '/system/attendanceMachine', + method: 'put', + data: data + }) +} + +// 删除 +export function delMachine(machineId) { + return request({ + url: '/system/attendanceMachine/' + machineId, + method: 'delete' + }) +} + \ No newline at end of file diff --git a/src/api/setting/rules.js b/src/api/setting/rules.js new file mode 100644 index 0000000..ea56ff4 --- /dev/null +++ b/src/api/setting/rules.js @@ -0,0 +1,56 @@ +import request from '@/utils/request' +import { parseStrEmpty } from "@/utils/bonus"; + +// 查询列表 +export function listAttGroup(query) { + return request({ + url: '/system/attGroup/list', + method: 'get', + params: query + }) +} + +// 查询详细 +export function getAttGroup(groupId) { + return request({ + url: '/system/attGroup/' + groupId, + method: 'delete' + }) + } + +// 查询组织选择列表 +export function selectOrgList(data) { + return request({ + url: '/system/attGroup/selectOrgList', + method: 'post', + data: data + }) + } + + +// 新增 +export function addAttGroup(data) { + return request({ + url: '/system/attGroup', + method: 'post', + data: data + }) +} + +// 修改 +export function updateAttGroup(data) { + return request({ + url: '/system/attGroup', + method: 'put', + data: data + }) +} + +// 删除 +export function delAttGroup(groupId) { + return request({ + url: '/system/attGroup/' + groupId, + method: 'delete' + }) +} + \ No newline at end of file diff --git a/src/api/system/dept.js b/src/api/system/dept.js index 7c2d3d3..68f0dcf 100644 --- a/src/api/system/dept.js +++ b/src/api/system/dept.js @@ -34,6 +34,14 @@ export function addDept(data) { }) } +export function orgPersonSelect(query) { + return request({ + url: '/system/org/orgPersonSelect', + method: 'get', + params: query + }) +} + // 修改部门 export function updateDept(data) { return request({ diff --git a/src/api/system/userInfo.js b/src/api/system/userInfo.js new file mode 100644 index 0000000..d5aecb9 --- /dev/null +++ b/src/api/system/userInfo.js @@ -0,0 +1,47 @@ +import request from '@/utils/request' +import { parseStrEmpty } from "@/utils/bonus"; + +// 查询用户列表 +export function listUser(query) { + return request({ + url: '/system/user/getUserList', + method: 'get', + params: query + }) +} + +// 查询用户详细 +export function getUserById(query) { + return request({ + url: '/system/user/getUserById', + method: 'get', + params: query + }) + } + +// 新增用户 +export function addUser(data) { + return request({ + url: '/system/user/addUser', + method: 'post', + data: data + }) +} + +// 修改用户 +export function updateUser(data) { + return request({ + url: '/system/user/updateUser', + method: 'put', + data: data + }) +} + +// 删除用户 +export function delUser(userId) { + return request({ + url: '/system/user/delUser/' + userId, + method: 'delete' + }) +} + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 935cb32..72f1e3e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -92,34 +92,34 @@ export const constantRoutes = [ // 动态路由，基于用户权限动态去加载 export const dynamicRoutes = [ - { - path: '/system/user-auth', - component: Layout, - hidden: true, - permissions: ['system:user:edit'], - children: [ - { - path: 'role/:userId(\\d+)', - component: () => import('@/views/system/user/authRole'), - name: 'AuthRole', - meta: { title: '分配角色', activeMenu: '/system/user' } - } - ] - }, - { - path: '/system/role-auth', - component: Layout, - hidden: true, - permissions: ['system:role:edit'], - children: [ - { - path: 'user/:roleId(\\d+)', - component: () => import('@/views/system/role/authUser'), - name: 'AuthUser', - meta: { title: '分配用户', activeMenu: '/system/role' } - } - ] - }, + // { + // path: '/system/user-auth', + // component: Layout, + // hidden: true, + // permissions: ['system:user:edit'], + // children: [ + // { + // path: 'role/:userId(\\d+)', + // component: () => import('@/views/system/user/authRole'), + // name: 'AuthRole', + // meta: { title: '分配角色', activeMenu: '/system/user' } + // } + // ] + // }, + // { + // path: '/system/role-auth', + // component: Layout, + // hidden: true, + // permissions: ['system:role:edit'], + // children: [ + // { + // path: 'user/:roleId(\\d+)', + // component: () => import('@/views/system/role/authUser'), + // name: 'AuthUser', + // meta: { title: '分配用户', activeMenu: '/system/role' } + // } + // ] + // }, { path: '/system/dict-data', component: Layout, @@ -133,21 +133,6 @@ export const dynamicRoutes = [ meta: { title: '字典数据', activeMenu: '/system/dict' } } ] - }, - - { - path: '/tool/gen-edit', - component: Layout, - hidden: true, - permissions: ['tool:gen:edit'], - children: [ - { - path: 'index/:tableId(\\d+)', - component: () => import('@/views/tool/gen/editTable'), - name: 'GenEdit', - meta: { title: '修改生成配置', activeMenu: '/tool/gen' } - } - ] } ] diff --git a/src/views/setting/devices/index.vue b/src/views/setting/devices/index.vue new file mode 100644 index 0000000..90e63f1 --- /dev/null +++ b/src/views/setting/devices/index.vue @@ -0,0 +1,314 @@ + + + \ No newline at end of file diff --git a/src/views/setting/rules/index.vue b/src/views/setting/rules/index.vue new file mode 100644 index 0000000..dd2d4f9 --- /dev/null +++ b/src/views/setting/rules/index.vue @@ -0,0 +1,415 @@ + + + \ No newline at end of file diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 970884a..4fda025 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -1,23 +1,21 @@