From 3d38a202ba10159c2f21bbcf4c7d568eda7f5719 Mon Sep 17 00:00:00 2001
From: zengwh <zengwh>
Date: Mon, 14 Sep 2020 15:12:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8E=86=E5=8F=B2=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/gatewayDir/gatewayIndex.jsp   |  2 +-
 .../webapp/WEB-INF/views/loginDir/index.jsp     |  2 +-
 power-admin/src/main/webapp/static/js/menu.js   | 17 +++++++++++++----
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp b/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
index 67dc409..7db877d 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
@@ -319,7 +319,7 @@
     <!-- 底部版权-->
     <footer class="main-footer">
         <div class="pull-right hidden-xs">
-            <b>Version</b> 20200821
+            <b>Version</b> 20200911_1
         </div>
         <strong>Copyright &copy; 2019-2090 厦门嘉时软件.</strong> All rights
         reserved.
diff --git a/power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp b/power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp
index c13b3c6..57dca4c 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp
@@ -281,7 +281,7 @@
     </footer>
 </div>
 <%@ include file="/WEB-INF/jspf/webSocket.jspf" %>
-<script type="text/javascript" src="${path}/static/js/menu.js?t=2020-08-21"></script>
+<script type="text/javascript" src="${path}/static/js/menu.js?t=2020-09-14_1"></script>
 <script type="text/javascript">
     $(document).ready(function () {
         var headerHeight = $(".main-header").height() || 0;
diff --git a/power-admin/src/main/webapp/static/js/menu.js b/power-admin/src/main/webapp/static/js/menu.js
index 120004e..901220e 100644
--- a/power-admin/src/main/webapp/static/js/menu.js
+++ b/power-admin/src/main/webapp/static/js/menu.js
@@ -1,5 +1,5 @@
 //定义默认加载url
-var defaultUrl = '/user/pageUI';
+var defaultUrl = '';
 //定义默认模块名
 var defaultModle = '基本管理';
 //系统标识
@@ -18,6 +18,10 @@ function getBrowItem(){
     //取出a标签id
     var flag = sysFlag + '_' + userId;
     var hisMenuId = localStorage.getItem(flag);
+    if(hisMenuId == 'undefined'){
+        //报错时
+        $("#iFrame1").prop("src", path+defaultUrl);
+    }
     //选中历史菜单节点
     if(hisMenuId != null && hisMenuId != ''){
         var dom = $("#"+hisMenuId);
@@ -25,6 +29,10 @@ function getBrowItem(){
             indexSelected(dom);
             //取出历史菜单地址跳转历史页面
             var hisMenuUrl = localStorage.getItem(flag + "_url");
+            if(hisMenuUrl == 'undefined'){
+                //报错时
+                hisMenuUrl = $("#"+hisMenuId).prop("href");
+            }
             $("#iFrame1").prop("src", hisMenuUrl);
         }
     }
@@ -112,7 +120,7 @@ function menuRoleFun(menuArr) {
                 }
                 if (menuLiArr != null) {
                     if (menuLiArr.length > 0) {
-                        var liMenu = ulSysMenuFun(menuLiArr,menuArr[i].menuId);
+                        var liMenu = ulSysMenuFun(menuLiArr);
                         menuLiArr=[];
                         mulu.append(liMenu);
                     }
@@ -130,6 +138,7 @@ function menuRoleFun(menuArr) {
             url = firstLink;
         }
         if(url != ''){
+            defaultUrl = url;
             $("#iFrame1").prop("src",path+url);
         }
     }
@@ -161,10 +170,10 @@ function aFun(aName, iconCss) {
     return subA;
 }
 
-function ulSysMenuFun(menuArr,j) {
+function ulSysMenuFun(menuArr) {
     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 menuId = sysFlag + "Menu_" + "_" + menuArr[i].menuId;
         var subLi = $("<li></li>");
         var subA = '';
         var menuUrl = menuArr[i].menuUrl;