github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

菜单、部门样式调整

pull/4/head
RuoYi 2018-05-24 09:56:57 +08:00
parent ce80396188
commit 970fbb23f8
5 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/ry_20180522.sql → sql/ry_20180524.sql
View File

@ -405,8 +405,8 @@ insert into sys_dict_type values(2, '菜单状态', 'sys_menu_visible', 0, 'admi
insert into sys_dict_type values(3, '部门状态', 'sys_dept_status', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '部门状态列表'); insert into sys_dict_type values(3, '部门状态', 'sys_dept_status', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '部门状态列表');
insert into sys_dict_type values(4, '岗位状态', 'sys_post_status', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '岗位状态列表'); insert into sys_dict_type values(4, '岗位状态', 'sys_post_status', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '岗位状态列表');
insert into sys_dict_type values(5, '字典状态', 'sys_dict_status', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '字典状态列表'); insert into sys_dict_type values(5, '字典状态', 'sys_dict_status', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '字典状态列表');
insert into sys_dict_type values(5, '任务状态', 'sys_job_status', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '任务状态列表'); insert into sys_dict_type values(6, '任务状态', 'sys_job_status', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '任务状态列表');
insert into sys_dict_type values(6, '系统是否', 'sys_yes_no', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '系统是否列表'); insert into sys_dict_type values(7, '系统是否', 'sys_yes_no', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '系统是否列表');
-- ---------------------------- -- ----------------------------
-- 11、字典数据表 -- 11、字典数据表

6
src/main/resources/static/ruoyi/system/dept/dept.js
View File

@ -34,9 +34,9 @@ function loading() {
formatter : function(row, index) { formatter : function(row, index) {
if(row.parentId != 0) { if(row.parentId != 0) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-primary btn-sm ' + editFlag + '" href="#" title="编辑" mce_href="#" onclick="edit(\'' + row.deptId + '\')"><i class="fa fa-edit"></i></a> '); actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="edit(\'' + row.deptId + '\')"><i class="fa fa-edit">编辑</i></a> ');
actions.push('<a class="btn btn-primary btn-sm ' + addFlag + '" href="#" title="新增" mce_href="#" onclick="add(\'' + row.deptId + '\')"><i class="fa fa-plus"></i></a> '); actions.push('<a class="btn btn-info btn-xs ' + addFlag + '" href="#" onclick="add(\'' + row.deptId + '\')"><i class="fa fa-plus">新增</i></a> ');
actions.push('<a class="btn btn-warning btn-sm ' + removeFlag + '" href="#" title="删除" mce_href="#" onclick="remove(\'' + row.deptId + '\')"><i class="fa fa-remove"></i></a>'); actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="remove(\'' + row.deptId + '\')"><i class="fa fa-remove">删除</i></a>');
return actions.join(''); return actions.join('');
} else { } else {
return ""; return "";

23
src/main/resources/static/ruoyi/system/menu/menu.js
View File

@ -9,6 +9,7 @@ function loading() {
{ {
title : '菜单名称', title : '菜单名称',
field : 'menuName', field : 'menuName',
width : '20%',
formatter : function(row, index) { formatter : function(row, index) {
if(row.icon == null || row == "") { if(row.icon == null || row == "") {
return row.menuName; return row.menuName;
@ -19,17 +20,18 @@ function loading() {
}, },
{ {
field : 'orderNum', field : 'orderNum',
title : '排序' title : '排序',
width : '10%',
}, },
{ {
field : 'url', field : 'url',
title : '请求地址' title : '请求地址',
width : '15%',
}, },
{ {
title : '类型', title : '类型',
field : 'menuType', field : 'menuType',
align : 'center', width : '10%',
valign : 'middle',
formatter : function(item, index) { formatter : function(item, index) {
if (item.menuType == 'M') { if (item.menuType == 'M') {
return '<span class="label label-primary">目录</span>'; return '<span class="label label-primary">目录</span>';
@ -45,7 +47,7 @@ function loading() {
{ {
field: 'visible', field: 'visible',
title: '可见', title: '可见',
align: 'center', width : '10%',
formatter: function(row, index) { formatter: function(row, index) {
if (row.visible == 0) { if (row.visible == 0) {
return '<span class="label label-success">显示</span>'; return '<span class="label label-success">显示</span>';
@ -56,16 +58,17 @@ function loading() {
}, },
{ {
field : 'perms', field : 'perms',
title : '权限标识' title : '权限标识',
width : '15%',
}, },
{ {
title : '操作', title : '操作',
align : 'center', width : '20%',
formatter : function(row, index) { formatter : function(row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-primary btn-sm ' + editFlag + '" href="#" title="编辑" mce_href="#" onclick="edit(\'' + row.menuId + '\')"><i class="fa fa-edit"></i></a> '); actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" mce_href="#" onclick="edit(\'' + row.menuId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-primary btn-sm ' + addFlag + '" href="#" title="新增" mce_href="#" onclick="add(\'' + row.menuId + '\')"><i class="fa fa-plus"></i></a> '); actions.push('<a class="btn btn-info btn-xs ' + addFlag + '" href="#" onclick="add(\'' + row.menuId + '\')"><i class="fa fa-plus"></i>新增</a> ');
actions.push('<a class="btn btn-warning btn-sm ' + removeFlag + '" href="#" title="删除" mce_href="#" onclick="remove(\'' + row.menuId + '\')"><i class="fa fa-remove"></i></a>'); actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="remove(\'' + row.menuId + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join(''); return actions.join('');
} }
}]; }];

6
src/main/resources/templates/system/dept/dept.html
View File

@ -2,12 +2,12 @@
<html xmlns:th="http://www.w3.org/1999/xhtml"> <html xmlns:th="http://www.w3.org/1999/xhtml">
<meta charset="utf-8"> <meta charset="utf-8">
<head th:include="include :: header"></head> <head th:include="include :: header"></head>
<body class="gray-bg"> <body>
<div class="wrapper wrapper-content"> <div class="wrapper wrapper-content">
<div class="btn-group hidden-xs" id="tableToolbar" role="group"> <div class="btn-group hidden-xs" id="tableToolbar" role="group">
<div class="form-group"> <div class="form-group">
<button type="button" class="btn btn-outline btn-default" th:onclick="'javascript:add(100)'" shiro:hasPermission="system:dept:add"> <button type="button" class="btn btn-outline btn-default" onclick="javascript:add(100)" shiro:hasPermission="system:dept:add">
<i class="glyphicon glyphicon-plus"></i> <i class="fa fa-plus"></i> 新增部门
</button> </button>
</div> </div>
</div> </div>

6
src/main/resources/templates/system/menu/menu.html
View File

@ -2,12 +2,12 @@
<html xmlns:th="http://www.w3.org/1999/xhtml"> <html xmlns:th="http://www.w3.org/1999/xhtml">
<meta charset="utf-8"> <meta charset="utf-8">
<head th:include="include :: header"></head> <head th:include="include :: header"></head>
<body class="gray-bg"> <body>
<div class="wrapper wrapper-content"> <div class="wrapper wrapper-content">
<div class="btn-group hidden-xs" id="tableToolbar" role="group"> <div class="btn-group hidden-xs" id="tableToolbar" role="group">
<div class="form-group"> <div class="form-group">
<button type="button" class="btn btn-outline btn-default" th:onclick="'javascript:add(0)'" shiro:hasPermission="system:menu:add"> <button type="button" class="btn btn-outline btn-default" onclick="javascript:add(0)" shiro:hasPermission="system:menu:add">
<i class="glyphicon glyphicon-plus"></i> <i class="fa fa-plus"></i> 新增菜单
</button> </button>
</div> </div>
</div> </div>