From f1e61902d02cb48fa4391f79d23ffc9fccd2992b Mon Sep 17 00:00:00 2001 From: RuoYi Date: Tue, 24 Apr 2018 23:51:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=8D=90=E8=B5=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/controller/IndexController.java | 7 ---- .../static/ruoyi/system/user/user.js | 6 ++++ src/main/resources/templates/index.html | 2 +- src/main/resources/templates/juanzhu.html | 33 ------------------- src/main/resources/templates/login.html | 2 +- .../resources/templates/system/user/user.html | 2 +- 6 files changed, 9 insertions(+), 43 deletions(-) delete mode 100644 src/main/resources/templates/juanzhu.html diff --git a/src/main/java/com/ruoyi/project/system/user/controller/IndexController.java b/src/main/java/com/ruoyi/project/system/user/controller/IndexController.java index df18db24..458c9110 100644 --- a/src/main/java/com/ruoyi/project/system/user/controller/IndexController.java +++ b/src/main/java/com/ruoyi/project/system/user/controller/IndexController.java @@ -47,11 +47,4 @@ public class IndexController extends BaseController return "main"; } - // 捐助列表 - @GetMapping("/system/juanzhu") - public String juanzhu(Model model) - { - return "juanzhu"; - } - } diff --git a/src/main/resources/static/ruoyi/system/user/user.js b/src/main/resources/static/ruoyi/system/user/user.js index f028e470..32f1598a 100644 --- a/src/main/resources/static/ruoyi/system/user/user.js +++ b/src/main/resources/static/ruoyi/system/user/user.js @@ -106,6 +106,12 @@ function queryDeptTreeDaTa() }); } +/*用户管理-部门*/ +function dept() { + var url = "/system/dept"; + createMenuItem(url, "部门管理"); +} + /*用户管理-删除*/ function remove(userId) { $.modalConfirm("确定要删除选中用户吗？", function(r) { diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index bf5530c5..794399d0 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -82,7 +82,7 @@
  • 欢迎来到若依管理后台.
    • - + diff --git a/src/main/resources/templates/juanzhu.html b/src/main/resources/templates/juanzhu.html deleted file mode 100644 index 8c6f2091..00000000 --- a/src/main/resources/templates/juanzhu.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - 若依捐赠 - - - - - - - - -
    -

    捐赠名单

    - - - - - - - - - - - - -
    序号昵称金额日期来源附言
    1庚子10¥2018-04-21支付宝加油！
    2yetao_study10¥2018-04-17码云感谢您的开源项目！
    34666yy 182******4110¥2018-04-17支付宝希望继续努力，分享更多
    4mua 150******0420¥2018-04-13支付宝无留言（感谢~~）
    5黄** 157***@qq.com5¥2018-04-12支付宝无留言（感谢~~）
    6wamich10¥2018-03-30码云感谢您的开源项目！
    7yimi10¥2018-03-13码云感谢您的开源项目！
    8David hai***163.com10¥2018-03-13支付宝无留言（感谢~~）
    -
    - - \ No newline at end of file diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index cb633374..dcb5faf6 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -43,7 +43,7 @@

    登录：

    -

    若依出品必属精品

    +

    你若不离不弃，我必生死相依

    忘记密码了？ diff --git a/src/main/resources/templates/system/user/user.html b/src/main/resources/templates/system/user/user.html index 5aa08c62..aac151e2 100644 --- a/src/main/resources/templates/system/user/user.html +++ b/src/main/resources/templates/system/user/user.html @@ -16,7 +16,7 @@ 组织机构
    - +