diff --git a/dvadmin-backend/apps/vadmin/scripts/permission/permission_menu.sql b/dvadmin-backend/apps/vadmin/scripts/permission/permission_menu.sql index 1a4e064..4b8919f 100644 --- a/dvadmin-backend/apps/vadmin/scripts/permission/permission_menu.sql +++ b/dvadmin-backend/apps/vadmin/scripts/permission/permission_menu.sql @@ -97,10 +97,10 @@ INSERT INTO `permission_menu` (id, description, modifier, update_datetime, creat INSERT INTO `permission_menu` (id, description, modifier, update_datetime, create_datetime, menuType, icon, name, orderNum, isFrame, web_path, component_path, interface_path, interface_method, perms, status, visible, isCache, creator_id, parentId_id, dept_belong_id) VALUES (64, '', 'admin', '2021-03-16 14:31:27.618230', '2021-03-16 14:31:01.026470', '2', NULL, '登录日志查询', 1, '1', NULL, NULL, '/admin/system/logininfor/', 'GET', 'admin:system:logininfor:get', '1', '1', '1', 1, 62, 1); INSERT INTO `permission_menu` (id, description, modifier, update_datetime, create_datetime, menuType, icon, name, orderNum, isFrame, web_path, component_path, interface_path, interface_method, perms, status, visible, isCache, creator_id, parentId_id, dept_belong_id) VALUES (65, '', 'admin', '2021-03-16 14:31:44.112525', '2021-03-16 14:31:44.112572', '2', NULL, '操作日志查询', 1, '1', NULL, NULL, '/admin/system/operlog/', 'GET', 'admin:system:operlog:get', '1', '1', '1', 1, 63, 1); INSERT INTO `permission_menu` (id, description, modifier, update_datetime, create_datetime, menuType, icon, name, orderNum, isFrame, web_path, component_path, interface_path, interface_method, perms, status, visible, isCache, creator_id, parentId_id, dept_belong_id) VALUES (66, '', 'admin', '2021-03-16 14:33:05.482942', '2021-03-16 14:33:05.483003', '0', 'monitor', '系统监控', 3, '1', 'monitor', NULL, NULL, 'GET', NULL, '1', '1', '1', 1, NULL, 1); -INSERT INTO `permission_menu` (id, description, modifier, update_datetime, create_datetime, menuType, icon, name, orderNum, isFrame, web_path, component_path, interface_path, interface_method, perms, status, visible, isCache, creator_id, parentId_id, dept_belong_id) VALUES (67, '', 'admin', '2021-03-16 14:49:59.260322', '2021-03-16 14:34:59.165065', '1', 'online', '在线用户', 1, '1', 'online', 'vadmin/monitor/online/index', '', 'GET', '', '1', '1', '1', 1, 66, 1); +INSERT INTO `permission_menu` (id, description, modifier, update_datetime, create_datetime, menuType, icon, name, orderNum, isFrame, web_path, component_path, interface_path, interface_method, perms, status, visible, isCache, creator_id, parentId_id, dept_belong_id) VALUES (67, '', 'admin', '2021-03-16 14:49:59.260322', '2021-03-16 14:34:59.165065', '1', 'online', '在线用户', 1, '1', '/monitor/online', 'vadmin/monitor/online/index', '', 'GET', '', '1', '1', '1', 1, 66, 1); INSERT INTO `permission_menu` (id, description, modifier, update_datetime, create_datetime, menuType, icon, name, orderNum, isFrame, web_path, component_path, interface_path, interface_method, perms, status, visible, isCache, creator_id, parentId_id, dept_belong_id) VALUES (68, '', 'admin', '2021-03-16 14:36:00.989981', '2021-03-16 14:35:50.894454', '2', NULL, '在线用户查询', 1, '1', NULL, NULL, '/admin/monitor/online/', 'GET', 'admin:monitor:online:get', '1', '1', '1', 1, 67, 1); INSERT INTO `permission_menu` (id, description, modifier, update_datetime, create_datetime, menuType, icon, name, orderNum, isFrame, web_path, component_path, interface_path, interface_method, perms, status, visible, isCache, creator_id, parentId_id, dept_belong_id) VALUES (69, '', 'admin', '2021-03-16 14:37:10.577186', '2021-03-16 14:37:10.577231', '2', NULL, '用户强退', 2, '1', NULL, NULL, '/admin/monitor/online/{id}/', 'PUT', 'admin:monitor:online:{id}:put', '1', '1', '1', 1, 67, 1); -INSERT INTO `permission_menu` (id, description, modifier, update_datetime, create_datetime, menuType, icon, name, orderNum, isFrame, web_path, component_path, interface_path, interface_method, perms, status, visible, isCache, creator_id, parentId_id, dept_belong_id) VALUES (70, '', 'admin', '2021-03-16 15:04:21.404578', '2021-03-16 14:45:51.507961', '1', 'job', '定时任务', 2, '1', 'celery', 'vadmin/monitor/celery/index', '', 'GET', NULL, '1', '1', '1', 1, 66, 1); +INSERT INTO `permission_menu` (id, description, modifier, update_datetime, create_datetime, menuType, icon, name, orderNum, isFrame, web_path, component_path, interface_path, interface_method, perms, status, visible, isCache, creator_id, parentId_id, dept_belong_id) VALUES (70, '', 'admin', '2021-03-16 15:04:21.404578', '2021-03-16 14:45:51.507961', '1', 'job', '定时任务', 2, '1', '/monitor/celery', 'vadmin/monitor/celery/index', '', 'GET', NULL, '1', '1', '1', 1, 66, 1); INSERT INTO `permission_menu` (id, description, modifier, update_datetime, create_datetime, menuType, icon, name, orderNum, isFrame, web_path, component_path, interface_path, interface_method, perms, status, visible, isCache, creator_id, parentId_id, dept_belong_id) VALUES (71, '', 'admin', '2021-03-16 15:04:11.799260', '2021-03-16 14:59:53.619219', '2', NULL, '任务查询', 1, '1', NULL, NULL, '/admin/monitor/celery/', 'GET', 'admin:monitor:celery:get', '1', '1', '1', 1, 70, 1); INSERT INTO `permission_menu` (id, description, modifier, update_datetime, create_datetime, menuType, icon, name, orderNum, isFrame, web_path, component_path, interface_path, interface_method, perms, status, visible, isCache, creator_id, parentId_id, dept_belong_id) VALUES (72, '', 'admin', '2021-03-16 15:04:06.645135', '2021-03-16 15:00:21.809600', '2', NULL, '任务新增', 2, '1', NULL, NULL, '/admin/monitor/celery/', 'POST', 'admin:monitor:celery:post', '1', '1', '1', 1, 70, 1); INSERT INTO `permission_menu` (id, description, modifier, update_datetime, create_datetime, menuType, icon, name, orderNum, isFrame, web_path, component_path, interface_path, interface_method, perms, status, visible, isCache, creator_id, parentId_id, dept_belong_id) VALUES (73, '', 'admin', '2021-03-16 15:04:00.041701', '2021-03-16 15:00:45.994228', '2', NULL, '任务修改', 3, '1', NULL, NULL, '/admin/monitor/celery/{id}/', 'PUT', 'admin:monitor:celery:{id}:put', '1', '1', '1', 1, 70, 1); diff --git a/dvadmin-backend/apps/vadmin/scripts/permission/permission_role.sql b/dvadmin-backend/apps/vadmin/scripts/permission/permission_role.sql index 06a1fa4..95f765b 100644 --- a/dvadmin-backend/apps/vadmin/scripts/permission/permission_role.sql +++ b/dvadmin-backend/apps/vadmin/scripts/permission/permission_role.sql @@ -157,6 +157,15 @@ INSERT INTO `permission_role_menu` (id, role_id, menu_id) VALUES (75, 1, 62); INSERT INTO `permission_role_menu` (id, role_id, menu_id) VALUES (76, 1, 63); INSERT INTO `permission_role_menu` (id, role_id, menu_id) VALUES (70, 1, 64); INSERT INTO `permission_role_menu` (id, role_id, menu_id) VALUES (71, 1, 65); +INSERT INTO `permission_role_menu` (id, role_id, menu_id) VALUES (79, 1, 66); +INSERT INTO `permission_role_menu` (id, role_id, menu_id) VALUES (87, 1, 67); +INSERT INTO `permission_role_menu` (id, role_id, menu_id) VALUES (80, 1, 70); +INSERT INTO `permission_role_menu` (id, role_id, menu_id) VALUES (81, 1, 71); +INSERT INTO `permission_role_menu` (id, role_id, menu_id) VALUES (82, 1, 72); +INSERT INTO `permission_role_menu` (id, role_id, menu_id) VALUES (83, 1, 73); +INSERT INTO `permission_role_menu` (id, role_id, menu_id) VALUES (84, 1, 74); +INSERT INTO `permission_role_menu` (id, role_id, menu_id) VALUES (85, 1, 75); +INSERT INTO `permission_role_menu` (id, role_id, menu_id) VALUES (86, 1, 76); INSERT INTO `permission_role_menu` (id, role_id, menu_id) VALUES (72, 1, 77); INSERT INTO `permission_role_menu` (id, role_id, menu_id) VALUES (73, 1, 78); INSERT INTO `permission_role_menu` (id, role_id, menu_id) VALUES (77, 1, 85); diff --git a/dvadmin-ui/src/components/CommonStaticTable/index.vue b/dvadmin-ui/src/components/CommonStaticTable/index.vue deleted file mode 100644 index fe92660..0000000 --- a/dvadmin-ui/src/components/CommonStaticTable/index.vue +++ /dev/null @@ -1,465 +0,0 @@ - - - - - diff --git a/dvadmin-ui/src/router/index.js b/dvadmin-ui/src/router/index.js index 9b9ad26..e13fbab 100755 --- a/dvadmin-ui/src/router/index.js +++ b/dvadmin-ui/src/router/index.js @@ -98,18 +98,6 @@ export const constantRoutes = [ meta: { title: '字典数据', icon: '' } } ] - },{ - path: '/celerymanage', - component: Layout, - hidden: false, - children: [ - { - path: 'celerymanage', - component: (resolve) => require(['@/views/vadmin/monitor/celery/index'], resolve), - name: 'Data', - meta: { title: 'celery管理', icon: '' } - } - ] } ]