From e75e505ea3b5713404789048c728dcddbd64bab7 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Tue, 18 Aug 2020 14:01:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=80=89=E4=B8=AD=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/manage/controller/RoleController.java |  2 +-
 .../views/otherManage/backupDatabase.jsp      |  2 +-
 power-admin/src/main/webapp/static/js/menu.js | 43 ++++++++++++++++---
 3 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/power-admin/src/main/java/com/manage/controller/RoleController.java b/power-admin/src/main/java/com/manage/controller/RoleController.java
index feebcab..0e61004 100644
--- a/power-admin/src/main/java/com/manage/controller/RoleController.java
+++ b/power-admin/src/main/java/com/manage/controller/RoleController.java
@@ -77,7 +77,7 @@ public class RoleController {
      *  @Description 返回页面
      * */
     @OptionalLog(module = "查看",methods = "角色管理页面")
-    @RequiresPermissions(value="/role/pageUINotDown")
+    @RequiresPermissions(value="/role/pageUI")
     @RequestMapping("/pageUINotDown")
     public String pageUINotDown(){
         CacheManager.addExcCount("noExc");
diff --git a/power-admin/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp b/power-admin/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp
index 18ed862..8b6c611 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp
@@ -53,7 +53,7 @@
                         </div>
                         <div class="col-md-12" style="margin-top:5px">
                             <div class="form-group">
-                                <label>操作人：</label>
+                                <label>&emsp;操作人：</label>
                                 <input type="text" class="form-control input-sm" id="creater" maxlength="8">
                             </div>
                             <div class="form-group">
diff --git a/power-admin/src/main/webapp/static/js/menu.js b/power-admin/src/main/webapp/static/js/menu.js
index bd84146..07e3b19 100644
--- a/power-admin/src/main/webapp/static/js/menu.js
+++ b/power-admin/src/main/webapp/static/js/menu.js
@@ -2,7 +2,34 @@
 var defaultUrl = '/user/pageUI';
 //定义默认模块名
 var defaultModle = '基本管理';
-
+//系统标识
+var sysFlag = 'power';
+//用户id
+var userId = $("#userId").val();
+//选中菜单设置进浏览器存储
+function setBrowItem(_this){
+    var flag = sysFlag + '_' + userId;
+    //设置a标签id
+    localStorage.setItem(flag,$(_this).prop("id"));
+    localStorage.setItem(flag+"_url",$(_this).prop("href"));
+}
+//取出历史选中并选中
+function getBrowItem(){
+    //取出a标签id
+    var flag = sysFlag + '_' + userId;
+    var hisMenuId = localStorage.getItem(flag);
+    //选中历史菜单节点
+    if(hisMenuId != null && hisMenuId != ''){
+        var dom = $("#"+hisMenuId);
+        if(dom != undefined && dom != null && dom != '') {
+            indexSelected(dom);
+            //取出历史菜单地址跳转历史页面
+            var hisMenuUrl = localStorage.getItem(flag + "_url");
+            $("#iFrame1").prop("src", hisMenuUrl);
+        }
+    }
+}
+//菜单选中方法
 function indexSelected(_this) {
     $("#indexTreeMenu li").removeClass("active");
     $("ul.treeview-menu").find("a").removeClass("indexSelected");
@@ -10,6 +37,8 @@ function indexSelected(_this) {
     $(_this).addClass("indexSelected");
     $(_this).parent().parent().siblings().addClass('modleSelected');
     $(_this).parent().parent().parent().addClass("active");
+    //设置到缓存
+    setBrowItem(_this);
 }
 //获取菜单接口
 $(function () {
@@ -17,6 +46,7 @@ $(function () {
         $.ajax({
             url: path+"/menuPower/indexMenu",
             type: "POST",
+            async:false,
             success: function (result) {
                 if (result.code == 100) {
                     var listUser = result.extend.listUser;
@@ -45,6 +75,8 @@ $(function () {
         });
     };
     ajaxJsonFun();
+    //取出历史选中并选中
+    getBrowItem();
 });
 //系统管理员
 function menuRoleFun(menuArr) {
@@ -83,7 +115,7 @@ function menuRoleFun(menuArr) {
                 }
                 if (menuLiArr != null) {
                     if (menuLiArr.length > 0) {
-                        var liMenu = ulSysMenuFun(menuLiArr);
+                        var liMenu = ulSysMenuFun(menuLiArr,menuArr[i].menuId);
                         menuLiArr=[];
                         mulu.append(liMenu);
                     }
@@ -132,16 +164,17 @@ function aFun(aName, iconCss) {
     return subA;
 }
 
-function ulSysMenuFun(menuArr) {
+function ulSysMenuFun(menuArr,j) {
     var subUl = $(" <ul class=\"treeview-menu\" style=\"display: block;\"></ul>");
     for (var i = 0; i < menuArr.length; i++) {
+        var menuId = sysFlag + "Menu_" + j + "_" + i;
         var subLi = $("<li></li>");
         var subA = '';
         var menuUrl = menuArr[i].menuUrl;
         if(menuUrl == defaultUrl) {
-            subA = $("<a href=" + path + menuUrl + " target=\"iFrame1\" onclick = 'indexSelected(this)' class='indexSelected'></a>");
+            subA = $("<a href=" + path + menuUrl + " target=\"iFrame1\" onclick = 'indexSelected(this)' id='"+menuId+"' class='indexSelected'></a>");
         }else{
-            subA = $("<a href=" + path + menuUrl + " target=\"iFrame1\" onclick = 'indexSelected(this)'></a>");
+            subA = $("<a href=" + path + menuUrl + " target=\"iFrame1\" onclick = 'indexSelected(this)' id='"+menuId+"'></a>");
         }
         var subIcon = $("<i></i>");
         if (menuArr[i].menuIcon != undefined || menuArr[i].menuIcon != null || menuArr[i].menuIcon != '') {