From 1cba6c000695d442904c6ff07c2af9c74e59fcde Mon Sep 17 00:00:00 2001 From: wangbing <1919101440@qq.com> Date: Sun, 5 Jan 2020 15:58:30 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=812323?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: ed6853d01c035424ec7d4b091f7e91decc51d5db --- .../SpringBoot/resources/static/css/base.css | 4 ++-- .../resources/templates/control/nav.ftl | 8 ++++---- .../resources/templates/screen/home.ftl | 18 +++++++++--------- .../resources/templates/screen/login.ftl | 4 ++-- .../resources/templates/screen/module/mgr.ftl | 2 +- .../templates/screen/module/system/dept.ftl | 2 +- .../templates/screen/module/system/dict.ftl | 2 +- .../screen/module/system/dictItem.ftl | 2 +- .../templates/screen/module/system/file.ftl | 2 +- .../screen/module/system/resource.ftl | 2 +- .../templates/screen/module/system/role.ftl | 2 +- .../templates/screen/module/system/tokens.ftl | 4 ++-- .../templates/screen/module/system/user.ftl | 16 ++++------------ .../SpringBoot/test/system/UserTest.java | 2 -- 14 files changed, 30 insertions(+), 40 deletions(-) diff --git a/src/main/resources/modules/SpringBoot/resources/static/css/base.css b/src/main/resources/modules/SpringBoot/resources/static/css/base.css index 56d6528e..95e31e5e 100644 --- a/src/main/resources/modules/SpringBoot/resources/static/css/base.css +++ b/src/main/resources/modules/SpringBoot/resources/static/css/base.css @@ -634,8 +634,8 @@ code { .loading-bar { width: 100%; - padding: 0px; - top: 0px; + padding: 0!important; + top: 0!important; box-shadow: 0px 0px 0px 0px; border: 0px; } diff --git a/src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl b/src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl index b03a36a4..d3582266 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl @@ -242,7 +242,7 @@ }, onReset: function (form) { this.$refs[form].resetFields(); - this.w('重置成功'); + nav.w('重置成功'); }, onPageChange: function (pageNumber) { this.vm.pageNumber = pageNumber; @@ -344,7 +344,7 @@ if (response.errors.length > 0) { nav.e(response.errors[0].message); } else { - this.s("删除成功"); + nav.s("删除成功"); this.onFind(); } }.bind(this)) @@ -354,7 +354,7 @@ }, onBitchDelete: function () { if (this.select.length == 0) { - this.w("至少选中一项"); + nav.w("至少选中一项"); } else { this.$confirm('将删除已选择的项, 是否继续?', '提示', { confirmButtonText: '确定', @@ -377,7 +377,7 @@ } } if (this.select.length === 0) { - this.s("删除成功") + nav.s("删除成功") this.onFind(); } } diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/home.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/home.ftl index 03aec9ea..a62c0e4e 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/home.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/home.ftl @@ -145,11 +145,11 @@

if (response.errors.length > 0) {

-

this.e(response.errors[0].message);

+

nav.e(response.errors[0].message);

} else {

-

this.i("Ajax调用成功!");

+

nav.i("Ajax调用成功!");

}

@@ -179,13 +179,13 @@

req.onError();

-

this.e(response.errors[0].message);

+

nav.e(response.errors[0].message);

} else {

req.onSuccess();

-

this.i("文件上传成功!");

+

nav.i("文件上传成功!");

}

@@ -1030,9 +1030,9 @@ doAjax: function () { this.$ajax.login({}).then(function (response) { if (response.errors.length > 0) { - this.e(response.errors[0].message); + nav.e(response.errors[0].message); } else { - this.i("Ajax调用成功!"); + nav.i("Ajax调用成功!"); } }.bind(this)) }, @@ -1056,10 +1056,10 @@ this.$ajax.upload(req.file).then(function (response) { if (response.errors.length > 0) { req.onError(); - this.e(response.errors[0].message); + nav.e(response.errors[0].message); } else { req.onSuccess(); - this.i("文件上传成功!"); + nav.i("文件上传成功!"); } }.bind(this)) }, @@ -1077,7 +1077,7 @@ this.$refs[formName].resetFields(); }, handleEdit: function (index, row) { - this.i("编辑"); + nav.i("编辑"); }, showMessage: function () { diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/login.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/login.ftl index bce33493..26bbc049 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/login.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/login.ftl @@ -124,9 +124,9 @@ .post(function (response) { this.isSubmit = false; if (response.errors.length > 0) { - this.e(response.errors[0].message); + nav.e(response.errors[0].message); } else { - this.i("登录成功!", function () { + nav.i("登录成功!", function () { location.href = "/" }); } diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl index 7076bbcf..5c359799 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl @@ -312,7 +312,7 @@ this.onDelete(item); break; default: - this.w("未找到对应的命令"); + nav.w("未找到对应的命令"); break; } }, diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl index 9c975ddc..408a4d09 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl @@ -342,7 +342,7 @@ this.onDelete(item); break; default: - this.w("未找到对应的命令"); + nav.w("未找到对应的命令"); break; } }, diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dict.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dict.ftl index 49c879f7..7df2d40e 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dict.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dict.ftl @@ -247,7 +247,7 @@ } break; default: - this.w("未找到对应的命令"); + nav.w("未找到对应的命令"); break; } } diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dictItem.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dictItem.ftl index a50baf67..cda470c1 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dictItem.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dictItem.ftl @@ -231,7 +231,7 @@ this.onDelete(item); break; default: - this.w("未找到对应的命令"); + nav.w("未找到对应的命令"); break; } } diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/file.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/file.ftl index 1164f815..7e00abb9 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/file.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/file.ftl @@ -239,7 +239,7 @@ this.onDelete(item); break; default: - this.w("未找到对应的命令"); + nav.w("未找到对应的命令"); break; } }, diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/resource.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/resource.ftl index 2ed5c81a..8f8272be 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/resource.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/resource.ftl @@ -350,7 +350,7 @@ this.onDelete(item); break; default: - this.w("未找到对应的命令"); + nav.w("未找到对应的命令"); break; } }, diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/role.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/role.ftl index 728f50bf..afa1c512 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/role.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/role.ftl @@ -247,7 +247,7 @@ this.onDelete(item); break; default: - this.w("未找到对应的命令"); + nav.w("未找到对应的命令"); break; } }, diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/tokens.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/tokens.ftl index e7204e87..90f081c0 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/tokens.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/tokens.ftl @@ -270,7 +270,7 @@ if (response.errors.length > 0) { nav.e(response.errors[0].message); } else { - this.s("注销成功"); + nav.s("注销成功"); this.onFind(); } }.bind(this)) @@ -279,7 +279,7 @@ }); break; default: - this.w("未找到对应的命令"); + nav.w("未找到对应的命令"); break; } }, diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/user.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/user.ftl index 185b0212..aba70449 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/user.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/user.ftl @@ -15,7 +15,7 @@ - + 搜索 @@ -153,7 +153,7 @@ - + @@ -177,9 +177,7 @@ userCode: "", userAlias: "", userStatus: "", - deptId: "", deptCode: "", - deptName: "", pageNumber: 1, pageSize: 10, totalCount: 0, @@ -195,9 +193,7 @@ userAlias: "", userPwd: "", userStatus: "1", - deptId: "", deptCode: "", - deptName: "", rowVersion: "" }, formRules: { @@ -219,13 +215,9 @@ userStatus: [ {required: true, message: '用户状态不能为空', trigger: 'blur'}, ], - deptId: [], deptCode: [ {min: 1, max: 50, message: '部门代码长度在 1 到 50 个字符', trigger: 'blur'} - ], - deptName: [ - {min: 1, max: 100, message: '部门名称长度在 1 到 100 个字符', trigger: 'blur'} - ], + ] }, roleList: [] }, @@ -265,7 +257,7 @@ this.onDelete(item); break; default: - this.w("未找到对应的命令"); + nav.w("未找到对应的命令"); break; } }, diff --git a/src/main/resources/modules/SpringBoot/test/system/UserTest.java b/src/main/resources/modules/SpringBoot/test/system/UserTest.java index 4eb812cd..09e82a60 100644 --- a/src/main/resources/modules/SpringBoot/test/system/UserTest.java +++ b/src/main/resources/modules/SpringBoot/test/system/UserTest.java @@ -116,9 +116,7 @@ public class UserTest { request.setUserCode(""); request.setUserAlias("test"); request.setUserStatus("code"); - request.setDeptId(1L); request.setDeptCode("A01"); - request.setDeptName("部门名称"); UserFindResponse response = userManager.find(request, token);