From f27a1a316a95348638db0dea4d52a6a16bab8813 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 23 May 2018 22:33:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E5=BA=94?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/ry_20180522.sql | 45 +++++++++++-------- .../framework/web/service/DictService.java | 30 +++++++++++++ .../project/system/dict/domain/DictData.java | 29 +++++++++++- .../project/system/dict/domain/DictType.java | 2 +- .../system/dict/mapper/DictDataMapper.java | 8 ++++ .../dict/service/DictDataServiceImpl.java | 12 +++++ .../system/dict/service/IDictDataService.java | 10 ++++- .../mybatis/system/DictDataMapper.xml | 17 ++++++- src/main/resources/static/ruoyi/js/common.js | 2 - .../resources/static/ruoyi/monitor/job/add.js | 2 +- .../static/ruoyi/monitor/job/edit.js | 2 +- .../static/ruoyi/system/dict/data/data.js | 4 +- .../static/ruoyi/system/dict/type/type.js | 4 +- .../resources/templates/monitor/job/add.html | 12 ++--- .../resources/templates/monitor/job/edit.html | 12 ++--- .../templates/system/config/add.html | 12 ++--- .../templates/system/config/edit.html | 12 ++--- .../resources/templates/system/dept/add.html | 12 ++--- .../resources/templates/system/dept/edit.html | 12 ++--- .../templates/system/dict/data/add.html | 27 +++++++---- .../templates/system/dict/data/edit.html | 27 +++++++---- .../templates/system/dict/type/add.html | 12 ++--- .../templates/system/dict/type/edit.html | 12 ++--- .../resources/templates/system/menu/add.html | 12 ++--- .../resources/templates/system/menu/edit.html | 14 +++--- .../resources/templates/system/post/add.html | 12 ++--- .../resources/templates/system/post/edit.html | 12 ++--- .../resources/templates/system/user/add.html | 12 ++--- .../resources/templates/system/user/edit.html | 12 ++--- 29 files changed, 229 insertions(+), 162 deletions(-) create mode 100644 src/main/java/com/ruoyi/framework/web/service/DictService.java diff --git a/sql/ry_20180522.sql b/sql/ry_20180522.sql index 7bacd05c..2f5d9efe 100644 --- a/sql/ry_20180522.sql +++ b/sql/ry_20180522.sql @@ -390,7 +390,7 @@ create table sys_dict_type dict_id int(11) not null auto_increment comment '字典主键', dict_name varchar(100) default '' comment '字典名称', dict_type varchar(100) default '' comment '字典类型', - status int(1) default 0 comment '状态（0正常 1禁用）', + status int(1) default 0 comment '状态（0正常 1停用）', create_by varchar(64) default '' comment '创建者', create_time datetime comment '创建时间', update_by varchar(64) default '' comment '更新者', @@ -400,9 +400,13 @@ create table sys_dict_type unique (dict_type) ) engine=innodb auto_increment=100 default charset=utf8 comment = '字典类型表'; -insert into sys_dict_type values(1, '银行列表', 'sys_bank_code', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '银行数据列表'); -insert into sys_dict_type values(2, '支付通道', 'sys_pay_code', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '支付通道列表'); - +insert into sys_dict_type values(1, '用户性别', 'sys_user_sex', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '用户性别列表'); +insert into sys_dict_type values(2, '菜单状态', 'sys_menu_visible', 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(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', '系统是否列表'); -- ---------------------------- -- 11、字典数据表 @@ -415,7 +419,9 @@ create table sys_dict_data dict_label varchar(100) default '' comment '字典标签', dict_value varchar(100) default '' comment '字典键值', dict_type varchar(100) default '' comment '字典类型', - status int(1) default 0 comment '状态（0正常 1禁用）', + css_class varchar(500) default '' comment '样式属性', + is_default char(1) default 'N' comment '是否默认（Y是 N否）', + status int(1) default 0 comment '状态（0正常 1停用）', create_by varchar(64) default '' comment '创建者', create_time datetime comment '创建时间', update_by varchar(64) default '' comment '更新者', @@ -424,19 +430,20 @@ create table sys_dict_data primary key (dict_code) ) engine=innodb auto_increment=100 default charset=utf8 comment = '字典数据表'; -insert into sys_dict_data values(1, 1, '工商银行', '01', 'sys_bank_code', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); -insert into sys_dict_data values(2, 2, '建设银行', '02', 'sys_bank_code', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); -insert into sys_dict_data values(3, 3, '农业银行', '03', 'sys_bank_code', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); -insert into sys_dict_data values(4, 4, '光大银行', '04', 'sys_bank_code', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); -insert into sys_dict_data values(5, 5, '兴业银行', '05', 'sys_bank_code', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); -insert into sys_dict_data values(6, 6, '中国银行', '06', 'sys_bank_code', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); -insert into sys_dict_data values(7, 7, '平安银行', '07', 'sys_bank_code', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); -insert into sys_dict_data values(8, 8, '招商银行', '08', 'sys_bank_code', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); -insert into sys_dict_data values(9, 1, '微信支付', 'WX', 'sys_pay_code', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); -insert into sys_dict_data values(10, 2, '支付宝', 'ZFB', 'sys_pay_code', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); -insert into sys_dict_data values(11, 3, 'QQ支付', 'JD', 'sys_pay_code', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); -insert into sys_dict_data values(12, 4, '京东支付', 'QQ', 'sys_pay_code', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); - +insert into sys_dict_data values(1, 1, '男', '0', 'sys_user_sex', 'radio radio-info radio-inline', 'Y', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); +insert into sys_dict_data values(2, 2, '女', '1', 'sys_user_sex', 'radio radio-danger radio-inline', 'N', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); +insert into sys_dict_data values(3, 1, '显示', '0', 'sys_menu_visible', 'radio radio-info radio-inline', 'Y', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); +insert into sys_dict_data values(4, 2, '隐藏', '1', 'sys_menu_visible', 'radio radio-danger radio-inline', 'N', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); +insert into sys_dict_data values(5, 1, '正常', '0', 'sys_dept_status', 'radio radio-info radio-inline', 'Y', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); +insert into sys_dict_data values(6, 2, '停用', '1', 'sys_dept_status', 'radio radio-danger radio-inline', 'N', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); +insert into sys_dict_data values(7, 1, '正常', '0', 'sys_dict_status', 'radio radio-info radio-inline', 'Y', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); +insert into sys_dict_data values(8, 2, '停用', '1', 'sys_dict_status', 'radio radio-danger radio-inline', 'N', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); +insert into sys_dict_data values(9, 1, '正常', '0', 'sys_post_status', 'radio radio-info radio-inline', 'Y', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); +insert into sys_dict_data values(10, 2, '停用', '1', 'sys_post_status', 'radio radio-danger radio-inline', 'N', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); +insert into sys_dict_data values(11, 1, '正常', '0', 'sys_job_status', 'radio radio-info radio-inline', 'Y', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); +insert into sys_dict_data values(12, 2, '暂停', '1', 'sys_job_status', 'radio radio-danger radio-inline', 'N', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); +insert into sys_dict_data values(13, 1, '是', 'Y', 'sys_yes_no', 'radio radio-info radio-inline', 'Y', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); +insert into sys_dict_data values(14, 2, '否', 'N', 'sys_yes_no', 'radio radio-danger radio-inline', 'N', 0, 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', ''); -- ---------------------------- -- 12、参数配置表 @@ -452,7 +459,7 @@ create table sys_config ( create_time datetime comment '创建时间', update_by varchar(64) default '' comment '更新者', update_time datetime comment '更新时间', - remark varchar(500) default '' comment '备注', + remark varchar(500) default '' comment '备注', primary key (config_id) ) engine=innodb auto_increment=100 default charset=utf8 comment = '参数配置表'; diff --git a/src/main/java/com/ruoyi/framework/web/service/DictService.java b/src/main/java/com/ruoyi/framework/web/service/DictService.java new file mode 100644 index 00000000..cfc51607 --- /dev/null +++ b/src/main/java/com/ruoyi/framework/web/service/DictService.java @@ -0,0 +1,30 @@ +package com.ruoyi.framework.web.service; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import com.ruoyi.project.system.dict.domain.DictData; +import com.ruoyi.project.system.dict.service.IDictDataService; + +/** + * RuoYi首创 html调用 thymeleaf 实现字典读取 + * + * @author ruoyi + */ +@Component +public class DictService +{ + @Autowired + private IDictDataService dictDataService; + + /** + * 根据字典类型查询字典数据信息 + * + * @param dictType 字典类型 + * @return 参数键值 + */ + public List selectDictData(String dictType) + { + return dictDataService.selectDictDataByType(dictType); + } +} diff --git a/src/main/java/com/ruoyi/project/system/dict/domain/DictData.java b/src/main/java/com/ruoyi/project/system/dict/domain/DictData.java index a969a161..a5904c6e 100644 --- a/src/main/java/com/ruoyi/project/system/dict/domain/DictData.java +++ b/src/main/java/com/ruoyi/project/system/dict/domain/DictData.java @@ -20,7 +20,11 @@ public class DictData extends BaseEntity private String dictValue; /** 字典类型 */ private String dictType; - /** 状态（0正常 1禁用） */ + /** 字典样式 */ + private String cssClass; + /** 是否默认（Y是 N否） */ + private String isDefault; + /** 状态（0正常 1停用） */ private int status; public Long getDictCode() @@ -73,6 +77,26 @@ public class DictData extends BaseEntity this.dictType = dictType; } + public String getCssClass() + { + return cssClass; + } + + public void setCssClass(String cssClass) + { + this.cssClass = cssClass; + } + + public String getIsDefault() + { + return isDefault; + } + + public void setIsDefault(String isDefault) + { + this.isDefault = isDefault; + } + public int getStatus() { return status; @@ -87,7 +111,8 @@ public class DictData extends BaseEntity public String toString() { return "DictData [dictCode=" + dictCode + ", dictSort=" + dictSort + ", dictLabel=" + dictLabel + ", dictValue=" - + dictValue + ", dictType=" + dictType + ", status=" + status + "]"; + + dictValue + ", dictType=" + dictType + ", cssClass=" + cssClass + ", isDefault=" + isDefault + + ", status=" + status + "]"; } } diff --git a/src/main/java/com/ruoyi/project/system/dict/domain/DictType.java b/src/main/java/com/ruoyi/project/system/dict/domain/DictType.java index 04cf2d6e..bf10808c 100644 --- a/src/main/java/com/ruoyi/project/system/dict/domain/DictType.java +++ b/src/main/java/com/ruoyi/project/system/dict/domain/DictType.java @@ -16,7 +16,7 @@ public class DictType extends BaseEntity private String dictName; /** 字典类型 */ private String dictType; - /** 状态（0正常 1禁用） */ + /** 状态（0正常 1停用） */ private int status; public Long getDictId() diff --git a/src/main/java/com/ruoyi/project/system/dict/mapper/DictDataMapper.java b/src/main/java/com/ruoyi/project/system/dict/mapper/DictDataMapper.java index 59e220bc..c31e6a6d 100644 --- a/src/main/java/com/ruoyi/project/system/dict/mapper/DictDataMapper.java +++ b/src/main/java/com/ruoyi/project/system/dict/mapper/DictDataMapper.java @@ -18,6 +18,14 @@ public interface DictDataMapper * @return 字典数据集合信息 */ public List selectDictDataList(DictData dictData); + + /** + * 根据字典类型查询字典数据 + * + * @param dictType 字典类型 + * @return 字典数据集合信息 + */ + public List selectDictDataByType(String dictType); /** * 根据字典数据ID查询信息 diff --git a/src/main/java/com/ruoyi/project/system/dict/service/DictDataServiceImpl.java b/src/main/java/com/ruoyi/project/system/dict/service/DictDataServiceImpl.java index 604cbb00..33b49a52 100644 --- a/src/main/java/com/ruoyi/project/system/dict/service/DictDataServiceImpl.java +++ b/src/main/java/com/ruoyi/project/system/dict/service/DictDataServiceImpl.java @@ -31,6 +31,18 @@ public class DictDataServiceImpl implements IDictDataService return dictDataMapper.selectDictDataList(dictData); } + /** + * 根据字典类型查询字典数据 + * + * @param dictType 字典类型 + * @return 字典数据集合信息 + */ + @Override + public List selectDictDataByType(String dictType) + { + return dictDataMapper.selectDictDataByType(dictType); + } + /** * 根据字典数据ID查询信息 * diff --git a/src/main/java/com/ruoyi/project/system/dict/service/IDictDataService.java b/src/main/java/com/ruoyi/project/system/dict/service/IDictDataService.java index 064b7428..6057fb68 100644 --- a/src/main/java/com/ruoyi/project/system/dict/service/IDictDataService.java +++ b/src/main/java/com/ruoyi/project/system/dict/service/IDictDataService.java @@ -18,7 +18,15 @@ public interface IDictDataService * @return 字典数据集合信息 */ public List selectDictDataList(DictData dictData); - + + /** + * 根据字典类型查询字典数据 + * + * @param dictType 字典类型 + * @return 字典数据集合信息 + */ + public List selectDictDataByType(String dictType); + /** * 根据字典数据ID查询信息 * diff --git a/src/main/resources/mybatis/system/DictDataMapper.xml b/src/main/resources/mybatis/system/DictDataMapper.xml index 30730c76..d6a5bd4b 100644 --- a/src/main/resources/mybatis/system/DictDataMapper.xml +++ b/src/main/resources/mybatis/system/DictDataMapper.xml @@ -10,6 +10,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -18,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -53,6 +60,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dict_label = #{dictLabel}, dict_value = #{dictValue}, dict_type = #{dictType}, + css_class = #{cssClass}, + is_default = #{isDefault}, status = #{status}, remark = #{remark}, update_by = #{updateBy}, @@ -68,6 +77,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dict_label, dict_value, dict_type, + css_class, + is_default, status, remark, create_by, @@ -77,6 +88,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{dictLabel}, #{dictValue}, #{dictType}, + #{cssClass}, + #{isDefault}, #{status}, #{remark}, #{createBy}, diff --git a/src/main/resources/static/ruoyi/js/common.js b/src/main/resources/static/ruoyi/js/common.js index 62c4a79f..bb5fd9f4 100644 --- a/src/main/resources/static/ruoyi/js/common.js +++ b/src/main/resources/static/ruoyi/js/common.js @@ -178,8 +178,6 @@ $.ajaxSetup({ $.modalConfirm("登陆超时！请重新登陆！", function() { window.location.href = ctx + "login"; }) - } else if (textStatus == "error") { - $.modalAlert("请求超时！请稍后再试！", 'warning'); } } }); diff --git a/src/main/resources/static/ruoyi/monitor/job/add.js b/src/main/resources/static/ruoyi/monitor/job/add.js index 660c0a47..6db68b99 100644 --- a/src/main/resources/static/ruoyi/monitor/job/add.js +++ b/src/main/resources/static/ruoyi/monitor/job/add.js @@ -16,5 +16,5 @@ $("#form-job-add").validate({ }); function add() { - _ajax_save(ctx + "/monitor/job/save", $("#form-job-add").serialize()); + _ajax_save(ctx + "monitor/job/save", $("#form-job-add").serialize()); } \ No newline at end of file diff --git a/src/main/resources/static/ruoyi/monitor/job/edit.js b/src/main/resources/static/ruoyi/monitor/job/edit.js index fab7e860..74868d0b 100644 --- a/src/main/resources/static/ruoyi/monitor/job/edit.js +++ b/src/main/resources/static/ruoyi/monitor/job/edit.js @@ -16,5 +16,5 @@ $("#form-job-edit").validate({ }); function edit() { - _ajax_save(ctx + "/monitor/job/save", $("#form-job-edit").serialize()); + _ajax_save(ctx + "monitor/job/save", $("#form-job-edit").serialize()); } \ No newline at end of file diff --git a/src/main/resources/static/ruoyi/system/dict/data/data.js b/src/main/resources/static/ruoyi/system/dict/data/data.js index 107c7329..290521e6 100644 --- a/src/main/resources/static/ruoyi/system/dict/data/data.js +++ b/src/main/resources/static/ruoyi/system/dict/data/data.js @@ -22,13 +22,13 @@ $(function() { }, { field: 'status', - title: '操作状态', + title: '状态', align: 'center', formatter: function(value, row, index) { if (value == 0) { return '正常'; } else if (value == 1) { - return '禁用'; + return '停用'; } } }, diff --git a/src/main/resources/static/ruoyi/system/dict/type/type.js b/src/main/resources/static/ruoyi/system/dict/type/type.js index 4d32587a..076f4ed8 100644 --- a/src/main/resources/static/ruoyi/system/dict/type/type.js +++ b/src/main/resources/static/ruoyi/system/dict/type/type.js @@ -18,13 +18,13 @@ $(function() { }, { field: 'status', - title: '操作状态', + title: '状态', align: 'center', formatter: function(value, row, index) { if (value == 0) { return '正常'; } else if (value == 1) { - return '禁用'; + return '停用'; } } }, diff --git a/src/main/resources/templates/monitor/job/add.html b/src/main/resources/templates/monitor/job/add.html index 8adaed0f..51b7f682 100644 --- a/src/main/resources/templates/monitor/job/add.html +++ b/src/main/resources/templates/monitor/job/add.html @@ -37,14 +37,10 @@
-
-
- - -
-
- - +
+
+ +
diff --git a/src/main/resources/templates/monitor/job/edit.html b/src/main/resources/templates/monitor/job/edit.html index 9444326f..69e0a43c 100644 --- a/src/main/resources/templates/monitor/job/edit.html +++ b/src/main/resources/templates/monitor/job/edit.html @@ -38,14 +38,10 @@
-
-
- - -
-
- - +
+
+ +
diff --git a/src/main/resources/templates/system/config/add.html b/src/main/resources/templates/system/config/add.html index 5b3ce7e8..73f43861 100644 --- a/src/main/resources/templates/system/config/add.html +++ b/src/main/resources/templates/system/config/add.html @@ -25,14 +25,10 @@
-
-
- - -
-
- - +
+
+ +
diff --git a/src/main/resources/templates/system/config/edit.html b/src/main/resources/templates/system/config/edit.html index b7f86f0a..d957338c 100644 --- a/src/main/resources/templates/system/config/edit.html +++ b/src/main/resources/templates/system/config/edit.html @@ -26,14 +26,10 @@
-
-
- - -
-
- - +
+
+ +
diff --git a/src/main/resources/templates/system/dept/add.html b/src/main/resources/templates/system/dept/add.html index 206dc76c..bdb816ef 100644 --- a/src/main/resources/templates/system/dept/add.html +++ b/src/main/resources/templates/system/dept/add.html @@ -44,14 +44,10 @@
-
-
- - -
-
- - +
+
+ +
diff --git a/src/main/resources/templates/system/dept/edit.html b/src/main/resources/templates/system/dept/edit.html index 70334a25..4344c2c7 100644 --- a/src/main/resources/templates/system/dept/edit.html +++ b/src/main/resources/templates/system/dept/edit.html @@ -45,14 +45,10 @@
-
-
- - -
-
- - +
+
+ +
diff --git a/src/main/resources/templates/system/dict/data/add.html b/src/main/resources/templates/system/dict/data/add.html index 13319f87..3a702ea7 100644 --- a/src/main/resources/templates/system/dict/data/add.html +++ b/src/main/resources/templates/system/dict/data/add.html @@ -23,6 +23,21 @@
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
@@ -31,14 +46,10 @@
-
-
- - -
-
- - +
+
+ +
diff --git a/src/main/resources/templates/system/dict/data/edit.html b/src/main/resources/templates/system/dict/data/edit.html index 0eb31613..53ceb987 100644 --- a/src/main/resources/templates/system/dict/data/edit.html +++ b/src/main/resources/templates/system/dict/data/edit.html @@ -24,6 +24,21 @@
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
@@ -32,14 +47,10 @@
-
-
- - -
-
- - +
+
+ +
diff --git a/src/main/resources/templates/system/dict/type/add.html b/src/main/resources/templates/system/dict/type/add.html index f80dfefa..298d834b 100644 --- a/src/main/resources/templates/system/dict/type/add.html +++ b/src/main/resources/templates/system/dict/type/add.html @@ -19,14 +19,10 @@
-
-
- - -
-
- - +
+
+ +
diff --git a/src/main/resources/templates/system/dict/type/edit.html b/src/main/resources/templates/system/dict/type/edit.html index 42c9ec9e..be4b76af 100644 --- a/src/main/resources/templates/system/dict/type/edit.html +++ b/src/main/resources/templates/system/dict/type/edit.html @@ -20,14 +20,10 @@
-
-
- - -
-
- - +
+
+ +
diff --git a/src/main/resources/templates/system/menu/add.html b/src/main/resources/templates/system/menu/add.html index 4c284b1c..432f2c16 100644 --- a/src/main/resources/templates/system/menu/add.html +++ b/src/main/resources/templates/system/menu/add.html @@ -58,14 +58,10 @@
-
-
- - -
-
- - +
+
+ +
diff --git a/src/main/resources/templates/system/menu/edit.html b/src/main/resources/templates/system/menu/edit.html index b74be75c..4535a975 100644 --- a/src/main/resources/templates/system/menu/edit.html +++ b/src/main/resources/templates/system/menu/edit.html @@ -58,15 +58,11 @@
- -
-
- - -
-
- - + +
+
+ +
diff --git a/src/main/resources/templates/system/post/add.html b/src/main/resources/templates/system/post/add.html index c923e060..5e38f1b8 100644 --- a/src/main/resources/templates/system/post/add.html +++ b/src/main/resources/templates/system/post/add.html @@ -25,14 +25,10 @@
-
-
- - -
-
- - +
+
+ +
diff --git a/src/main/resources/templates/system/post/edit.html b/src/main/resources/templates/system/post/edit.html index 66a3c32b..3ac92e33 100644 --- a/src/main/resources/templates/system/post/edit.html +++ b/src/main/resources/templates/system/post/edit.html @@ -26,14 +26,10 @@
-
-
- - -
-
- - +
+
+ +
diff --git a/src/main/resources/templates/system/user/add.html b/src/main/resources/templates/system/user/add.html index f23b1f36..68bde9a2 100644 --- a/src/main/resources/templates/system/user/add.html +++ b/src/main/resources/templates/system/user/add.html @@ -47,14 +47,10 @@
-
-
- - -
-
- - +
+
+ +
diff --git a/src/main/resources/templates/system/user/edit.html b/src/main/resources/templates/system/user/edit.html index fc5283d3..4b0bd897 100644 --- a/src/main/resources/templates/system/user/edit.html +++ b/src/main/resources/templates/system/user/edit.html @@ -42,14 +42,10 @@
-
-
- - -
-
- - +
+
+ +