From da3d5a4c45ae35aac3a33bd261edccd8f6cabf51 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 24 May 2018 09:56:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E3=80=81=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/{ry_20180522.sql => ry_20180524.sql}      |  4 ++--
 .../static/ruoyi/system/dept/dept.js          |  6 ++---
 .../static/ruoyi/system/menu/menu.js          | 23 +++++++++++--------
 .../resources/templates/system/dept/dept.html |  8 +++----
 .../resources/templates/system/menu/menu.html |  8 +++----
 5 files changed, 26 insertions(+), 23 deletions(-)
 rename sql/{ry_20180522.sql => ry_20180524.sql} (99%)

diff --git a/sql/ry_20180522.sql b/sql/ry_20180524.sql
similarity index 99%
rename from sql/ry_20180522.sql
rename to sql/ry_20180524.sql
index 2f5d9efe..4b271687 100644
--- a/sql/ry_20180522.sql
+++ b/sql/ry_20180524.sql
@@ -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(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_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(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(7, '系统是否', 'sys_yes_no',       0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '系统是否列表');
 
 -- ----------------------------
 -- 11、字典数据表
diff --git a/src/main/resources/static/ruoyi/system/dept/dept.js b/src/main/resources/static/ruoyi/system/dept/dept.js
index dee80a92..e2cbc55e 100644
--- a/src/main/resources/static/ruoyi/system/dept/dept.js
+++ b/src/main/resources/static/ruoyi/system/dept/dept.js
@@ -34,9 +34,9 @@ function loading() {
 			formatter : function(row, index) {
 				if(row.parentId != 0) {
 					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-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-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-success btn-xs ' + editFlag + '" href="#" onclick="edit(\'' + row.deptId + '\')"><i class="fa fa-edit">编辑</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-danger btn-xs ' + removeFlag + '" href="#" onclick="remove(\'' + row.deptId + '\')"><i class="fa fa-remove">删除</i></a>');
 					return actions.join('');
 				} else {
 					return "";
diff --git a/src/main/resources/static/ruoyi/system/menu/menu.js b/src/main/resources/static/ruoyi/system/menu/menu.js
index 651d7c9d..98bff73a 100644
--- a/src/main/resources/static/ruoyi/system/menu/menu.js
+++ b/src/main/resources/static/ruoyi/system/menu/menu.js
@@ -9,6 +9,7 @@ function loading() {
         {
 			title : '菜单名称',
 			field : 'menuName',
+			width : '20%',
 			formatter : function(row, index) {
 				if(row.icon == null || row == "") {
 					return row.menuName;
@@ -19,17 +20,18 @@ function loading() {
 		},
         {
         	field : 'orderNum',
-			title : '排序'
+			title : '排序',
+			width : '10%',
         },
         {
         	field : 'url',
-			title : '请求地址'
+			title : '请求地址',
+			width : '15%',
         },
         {
 			title : '类型',
 			field : 'menuType',
-			align : 'center',
-			valign : 'middle',
+			width : '10%',
 			formatter : function(item, index) {
 				if (item.menuType == 'M') {
 					return '<span class="label label-primary">目录</span>';
@@ -45,7 +47,7 @@ function loading() {
 		{
             field: 'visible',
             title: '可见',
-            align: 'center',
+            width : '10%',
             formatter: function(row, index) {
                 if (row.visible == 0) {
                     return '<span class="label label-success">显示</span>';
@@ -56,16 +58,17 @@ function loading() {
         },
         {
         	field : 'perms',
-			title : '权限标识'
+			title : '权限标识',
+			width : '15%',
         },
         {
         	title : '操作',
-			align : 'center',
+			width : '20%',
 			formatter : function(row, index) {
 				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-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-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-success btn-xs ' + editFlag + '" href="#" mce_href="#" onclick="edit(\'' + row.menuId + '\')"><i class="fa fa-edit"></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-danger btn-xs ' + removeFlag + '" href="#" onclick="remove(\'' + row.menuId + '\')"><i class="fa fa-remove"></i>删除</a>');
 				return actions.join('');
 			}
         }];
diff --git a/src/main/resources/templates/system/dept/dept.html b/src/main/resources/templates/system/dept/dept.html
index cb554b13..ddddef35 100644
--- a/src/main/resources/templates/system/dept/dept.html
+++ b/src/main/resources/templates/system/dept/dept.html
@@ -2,13 +2,13 @@
 <html xmlns:th="http://www.w3.org/1999/xhtml">
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
-<body class="gray-bg">
+<body>
 	<div class="wrapper wrapper-content">
 	    <div class="btn-group hidden-xs" id="tableToolbar" role="group">
 	    	<div class="form-group">
-	            <button type="button" class="btn btn-outline btn-default" th:onclick="'javascript:add(100)'" shiro:hasPermission="system:dept:add">
-	                <i class="glyphicon glyphicon-plus"></i>
-	            </button>
+	            <button type="button" class="btn btn-outline btn-default" onclick="javascript:add(100)" shiro:hasPermission="system:dept:add">
+                    <i class="fa fa-plus"></i> 新增部门
+                </button>
 			</div>
         </div>
 		<table class="bootstrap-table" data-mobile-responsive="true">
diff --git a/src/main/resources/templates/system/menu/menu.html b/src/main/resources/templates/system/menu/menu.html
index 3a8dcd32..0b5e1d17 100644
--- a/src/main/resources/templates/system/menu/menu.html
+++ b/src/main/resources/templates/system/menu/menu.html
@@ -2,13 +2,13 @@
 <html xmlns:th="http://www.w3.org/1999/xhtml">
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
-<body class="gray-bg">
+<body>
 	<div class="wrapper wrapper-content">
 	    <div class="btn-group hidden-xs" id="tableToolbar" role="group">
 	    	<div class="form-group">
-	            <button type="button" class="btn btn-outline btn-default" th:onclick="'javascript:add(0)'" shiro:hasPermission="system:menu:add">
-	                <i class="glyphicon glyphicon-plus"></i>
-	            </button>
+	            <button type="button" class="btn btn-outline btn-default" onclick="javascript:add(0)" shiro:hasPermission="system:menu:add">
+                    <i class="fa fa-plus"></i> 新增菜单
+                </button>
 			</div>
         </div>
 		<table class="bootstrap-table" data-mobile-responsive="true">