From b4aa7232a084df2155b1a7187b89f6a5f74eae3a Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 3 Sep 2020 15:41:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8F=9C=E5=8D=95=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E6=98=BE=E7=A4=BA=E9=A3=8E=E6=A0=BC=EF=BC=88default?=
 =?UTF-8?q?=E4=B8=BA=E5=B7=A6=E4=BE=A7=E5=AF=BC=E8=88=AA=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=EF=BC=8Ctopnav=E4=B8=BA=E9=A1=B6=E9=83=A8=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/index-topnav.html     | 24 +++++++++++++------
 .../src/main/resources/templates/index.html   |  4 ++--
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/index-topnav.html b/ruoyi-admin/src/main/resources/templates/index-topnav.html
index 45395f5b..65209b59 100644
--- a/ruoyi-admin/src/main/resources/templates/index-topnav.html
+++ b/ruoyi-admin/src/main/resources/templates/index-topnav.html
@@ -45,8 +45,8 @@
 			</div>
 			
             <!-- 左侧菜单 -->
-			<th:block th:each="menu,menuStat : ${menus}">
-			<div class="tab-pane fade height-full" th:id="|menu_${menu.menuId}|" th:classappend="${menuStat.first} ? |active in|">
+			<th:block th:each="menu : ${menus}">
+			<div class="tab-pane fade height-full" th:id="|menu_${menu.menuId}|">
 			  <ul class="nav">
                 <li th:each="cmenu : ${menu.children}">
 			      <a class="menu-content" th:if="${#lists.isEmpty(cmenu.children)}" th:href="@{${cmenu.url}}" th:classappend="${#strings.isEmpty(cmenu.target)} ? |menuItem| : ${cmenu.target}">
@@ -347,18 +347,26 @@ function switchSkin() {
 /* 切换菜单 */
 function toggleMenu() {
 	$.modal.confirm("确认要切换成左侧菜单吗？", function() {
-		$.get(ctx + 'system/menuStyle/left',function(result){
+		$.get(ctx + 'system/menuStyle/default', function(result) {
             window.location.reload();
-        });
+	    });
 	})
 }
 
 /** 刷新时访问路径页签 */
 function applyPath(url) {
-	$('a[href$="' + decodeURI(url) + '"]').click();
-	if (!$('a[href$="' + url + '"]').hasClass("noactive")) {
-	    $('a[href$="' + url + '"]').parent("li").addClass("selected").parents("li").addClass("active").end().parents("ul").addClass("in");
+	var $dataObj = $('a[href$="' + decodeURI(url) + '"]');
+	$dataObj.click();
+	if (!$dataObj.hasClass("noactive")) {
+	    $dataObj.parent("li").addClass("selected").parents("li").addClass("active").end().parents("ul").addClass("in");
 	}
+	// 顶部菜单同步处理
+    var tabStr = $dataObj.parents(".tab-pane").attr("id");
+    if ($.common.isNotEmpty(tabStr)) {
+        var sepIndex = tabStr.lastIndexOf('_');
+        var menuId = tabStr.substring(sepIndex + 1, tabStr.length);
+        $("#tab_" + menuId + " a").click();
+    }
 }
 
 $(function() {
@@ -372,6 +380,8 @@ $(function() {
 	    if ($.common.isNotEmpty(hash)) {
 	        var url = hash.substring(1, hash.length);
 	        applyPath(url);
+	    } else {
+	    	$(".navbar-toolbar li a").eq(0).click();
 	    }
 	}
 });
diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html
index 1ae40053..a1dc1d44 100644
--- a/ruoyi-admin/src/main/resources/templates/index.html
+++ b/ruoyi-admin/src/main/resources/templates/index.html
@@ -297,9 +297,9 @@ function switchSkin() {
 /* 切换菜单 */
 function toggleMenu() {
 	$.modal.confirm("确认要切换成横向菜单吗？", function() {
-		$.get(ctx + 'system/menuStyle/topnav',function(result){
+		$.get(ctx + 'system/menuStyle/topnav', function(result) {
             window.location.reload();
-        });
+	    });
 	})
 }