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 2f5d9efeb..4b271687d 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 dee80a927..e2cbc55e9 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(' ');
- actions.push(' ');
- actions.push('');
+ actions.push('编辑 ');
+ actions.push('新增 ');
+ actions.push('删除');
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 651d7c9db..98bff73ad 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 '目录';
@@ -45,7 +47,7 @@ function loading() {
{
field: 'visible',
title: '可见',
- align: 'center',
+ width : '10%',
formatter: function(row, index) {
if (row.visible == 0) {
return '显示';
@@ -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(' ');
- actions.push(' ');
- actions.push('');
+ actions.push('编辑 ');
+ actions.push('新增 ');
+ actions.push('删除');
return actions.join('');
}
}];
diff --git a/src/main/resources/templates/system/dept/dept.html b/src/main/resources/templates/system/dept/dept.html
index cb554b131..ddddef354 100644
--- a/src/main/resources/templates/system/dept/dept.html
+++ b/src/main/resources/templates/system/dept/dept.html
@@ -2,13 +2,13 @@
-
+
diff --git a/src/main/resources/templates/system/menu/menu.html b/src/main/resources/templates/system/menu/menu.html
index 3a8dcd328..0b5e1d17a 100644
--- a/src/main/resources/templates/system/menu/menu.html
+++ b/src/main/resources/templates/system/menu/menu.html
@@ -2,13 +2,13 @@
-
+