diff --git a/src/main/resources/sql/20190613/obj_group_list.sql b/src/main/resources/sql/20190613/obj_group_list.sql index 61c2770a0..f2205bba8 100644 --- a/src/main/resources/sql/20190613/obj_group_list.sql +++ b/src/main/resources/sql/20190613/obj_group_list.sql @@ -21,10 +21,10 @@ INSERT INTO `sys_menu`(`parent_id`, `parent_ids`, `code`, `name`, `sort`, `href` # Object List INSERT INTO `sys_menu` (`parent_id`, `parent_ids`, `code`, `name`, `sort`, `href`, `target`, `icon`, `is_show`, `permission`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `del_flag`, `menu_bg`, `quick_action`, `is_top`, `function_id`)SELECT s1.id, CONCAT_WS(',', s1.parent_ids, s1.id), 'object_list', 'Object List', '60', '', '', '', '1', '', '1', '2019-06-12 10:12:05', '1', '2019-06-12 10:12:05', '', '1', NULL, '0', '0', NULL FROM sys_menu s1, sys_menu s2 WHERE s2.CODE = 'configuration_manage' AND s2.del_flag = 1 AND s1.parent_id = s2.id AND s1.CODE = 'object_list_group'; # IP、URL、Domain、SubscribeId -INSERT INTO `sys_menu` (`parent_id`, `parent_ids`, `code`, `name`, `sort`, `href`, `target`, `icon`, `is_show`, `permission`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `del_flag`, `menu_bg`, `quick_action`, `is_top`, `function_id`)SELECT s.id, CONCAT_WS(',', s.parent_ids, s.id), 'ip_group_configuration', 'IP公共组管理', '340', '/basics/ip/list', '', '', '1', 'ip:common:config', '1', '2019-05-27 14:06:23', '1', '2019-06-12 10:13:38', '', '1', NULL, '0', '0', '605' FROM sys_menu s WHERE s.CODE = 'Object List' AND s.del_flag = 1; -INSERT INTO `sys_menu` (`parent_id`, `parent_ids`, `code`, `name`, `sort`, `href`, `target`, `icon`, `is_show`, `permission`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `del_flag`, `menu_bg`, `quick_action`, `is_top`, `function_id`)SELECT s.id, CONCAT_WS(',', s.parent_ids, s.id), 'url_group_configuration', 'URL公共组管理', '350', '/basics/url/list', '', '', '1', 'url:common:config', '1', '2019-05-27 15:54:43', '1', '2019-06-12 10:12:56', '', '1', NULL, '0', '0', '606' FROM sys_menu s WHERE s.CODE = 'Object List' AND s.del_flag = 1; -INSERT INTO `sys_menu` (`parent_id`, `parent_ids`, `code`, `name`, `sort`, `href`, `target`, `icon`, `is_show`, `permission`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `del_flag`, `menu_bg`, `quick_action`, `is_top`, `function_id`)SELECT s.id, CONCAT_WS(',', s.parent_ids, s.id), 'domain_group_configuration', '域名公共组管理', '360', '/basics/domain/list', '', '', '1', 'domain:common:config', '1', '2019-06-06 15:18:43', '1', '2019-06-12 10:14:32', '', '1', NULL, '0', '0', '607' FROM sys_menu s WHERE s.CODE = 'Object List' AND s.del_flag = 1; -INSERT INTO `sys_menu` (`parent_id`, `parent_ids`, `code`, `name`, `sort`, `href`, `target`, `icon`, `is_show`, `permission`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `del_flag`, `menu_bg`, `quick_action`, `is_top`, `function_id`)SELECT s.id, CONCAT_WS(',', s.parent_ids, s.id), 'scriberid_group_configuration', '账号公共组管理', '370', '/basics/scriberId/list', '', '', '1', 'scriberid:common:config', '1', '2019-06-06 15:20:51', '1', '2019-06-12 10:14:05', '', '1', NULL, '0', '0', '608' FROM sys_menu s WHERE s.CODE = 'Object List' AND s.del_flag = 1; +INSERT INTO `sys_menu` (`parent_id`, `parent_ids`, `code`, `name`, `sort`, `href`, `target`, `icon`, `is_show`, `permission`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `del_flag`, `menu_bg`, `quick_action`, `is_top`, `function_id`)SELECT s.id, CONCAT_WS(',', s.parent_ids, s.id), 'ip_group_configuration', 'IP公共组管理', '340', '/basics/ip/list', '', '', '1', 'ip:common:config', '1', '2019-05-27 14:06:23', '1', '2019-06-12 10:13:38', '', '1', NULL, '0', '0', '605' FROM sys_menu s WHERE s.CODE = 'object_list' AND s.del_flag = 1; +INSERT INTO `sys_menu` (`parent_id`, `parent_ids`, `code`, `name`, `sort`, `href`, `target`, `icon`, `is_show`, `permission`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `del_flag`, `menu_bg`, `quick_action`, `is_top`, `function_id`)SELECT s.id, CONCAT_WS(',', s.parent_ids, s.id), 'url_group_configuration', 'URL公共组管理', '350', '/basics/url/list', '', '', '1', 'url:common:config', '1', '2019-05-27 15:54:43', '1', '2019-06-12 10:12:56', '', '1', NULL, '0', '0', '606' FROM sys_menu s WHERE s.CODE = 'object_list' AND s.del_flag = 1; +INSERT INTO `sys_menu` (`parent_id`, `parent_ids`, `code`, `name`, `sort`, `href`, `target`, `icon`, `is_show`, `permission`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `del_flag`, `menu_bg`, `quick_action`, `is_top`, `function_id`)SELECT s.id, CONCAT_WS(',', s.parent_ids, s.id), 'domain_group_configuration', '域名公共组管理', '360', '/basics/domain/list', '', '', '1', 'domain:common:config', '1', '2019-06-06 15:18:43', '1', '2019-06-12 10:14:32', '', '1', NULL, '0', '0', '607' FROM sys_menu s WHERE s.CODE = 'object_list' AND s.del_flag = 1; +INSERT INTO `sys_menu` (`parent_id`, `parent_ids`, `code`, `name`, `sort`, `href`, `target`, `icon`, `is_show`, `permission`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `del_flag`, `menu_bg`, `quick_action`, `is_top`, `function_id`)SELECT s.id, CONCAT_WS(',', s.parent_ids, s.id), 'scriberid_group_configuration', '账号公共组管理', '370', '/basics/scriberId/list', '', '', '1', 'scriberid:common:config', '1', '2019-06-06 15:20:51', '1', '2019-06-12 10:14:05', '', '1', NULL, '0', '0', '608' FROM sys_menu s WHERE s.CODE = 'object_list' AND s.del_flag = 1; #为admin用户分配角色 insert into sys_privilege (PRIVILEGE_MASTER,PRIVILEGE_MASTER_VALUE,PRIVILEGE_ACCESS,PRIVILEGE_ACCESS_VALUE,PRIVILEGE_OPERATION ) select 'ROLE',r.id,1000,m.id,1 from sys_role r,sys_menu m where r.name='admin' and m.code in ('object_list_group','policy_group','object_list','ip_group_configuration','url_group_configuration','domain_group_configuration','scriberid_group_configuration'); \ No newline at end of file diff --git a/src/main/webapp/static/global/css/page.css b/src/main/webapp/static/global/css/page.css index 640530c2f..9111ff3c6 100644 --- a/src/main/webapp/static/global/css/page.css +++ b/src/main/webapp/static/global/css/page.css @@ -91,19 +91,11 @@ margin-top: 20px; white-space: normal; } -/* ����ʵʱ����ģ��,��ӡ��ť����ʾ �������� */ +/* 控制实时报表模块,打印按钮的显示 或者隐藏 */ .css-print{ display: none; } -/* ��������Ӵ� */ +/* 控制字体加粗 */ .print-title{ font-weight:bold; } - -/* 分组配置管理模块 */ -.ui-autocomplete { - max-height: 180px; - overflow-y: auto; - /* 防止水平滚动条 */ - overflow-x: hidden; -} \ No newline at end of file diff --git a/src/main/webapp/static/global/plugins/jquery-ui/jquery-ui.min.css b/src/main/webapp/static/global/plugins/jquery-ui/jquery-ui.min.css index 192616942..e60fb041a 100644 --- a/src/main/webapp/static/global/plugins/jquery-ui/jquery-ui.min.css +++ b/src/main/webapp/static/global/plugins/jquery-ui/jquery-ui.min.css @@ -111,7 +111,10 @@ position: absolute; top: 0; left: 0; - cursor: default + cursor: default; + max-height: 180px; + overflow-y: auto; + overflow-x: hidden; /* 防止水平滚动条 */ } .ui-button { @@ -1814,4 +1817,4 @@ body .ui-tooltip { opacity: .2; filter: Alpha(Opacity = 20); border-radius: 5px -} \ No newline at end of file +}