From 4e1272ec25700887ac56b9867b51356ffe60900d Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 17 Oct 2019 10:45:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81iframe=E5=B1=80=E9=83=A8?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/static/ruoyi/index.js  | 14 ++++++++++++++
 .../src/main/resources/templates/index.html   | 19 +++++++++++++++----
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/index.js b/ruoyi-admin/src/main/resources/static/ruoyi/index.js
index 04f67f3d..b4f8ba29 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/index.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/index.js
@@ -219,6 +219,7 @@ $(function() {
         flag = true;
         $(".nav ul li, .nav li").removeClass("selected");
         $(this).parent("li").addClass("selected");
+        setIframeUrl($(this).attr("href"));
         if (dataUrl == undefined || $.trim(dataUrl).length == 0) return false;
 
         // 选项卡菜单已存在
@@ -469,6 +470,13 @@ $(function() {
         $('#ax_close_max').show();
     }
     
+    // 设置锚点
+    function setIframeUrl(href) {
+        var nowUrl = window.location.href;
+        var newUrl = nowUrl.substring(0, nowUrl.indexOf("#"));
+        window.location.href = newUrl + "#" + href;
+    }
+    
     $(window).keydown(function(event) {
         if (event.keyCode == 27) {
             $('#content-main').removeClass('max');
@@ -476,6 +484,12 @@ $(function() {
         }
     });
     
+    window.onhashchange = function() {
+        var hash = location.hash;
+        var url = hash.substring(1, hash.length);
+        $('a[href$="' + url + '"]').click();
+    };
+    
     // 右键菜单实现
     $.contextMenu({
         selector: ".menuTab",
diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html
index ee75bd2a..d799bcff 100644
--- a/ruoyi-admin/src/main/resources/templates/index.html
+++ b/ruoyi-admin/src/main/resources/templates/index.html
@@ -27,9 +27,11 @@
         </div>
         <div class="sidebar-collapse">
             <ul class="nav" id="side-menu">
-                <li class="logo">
-				     <span class="logo-lg">RuoYi</span>
-            	</li>
+                <a th:href="@{/index}">
+                  <li class="logo">
+				    <span class="logo-lg" >RuoYi</span> 
+            	  </li>
+            	</a>
             	<li>
             		<div class="user-panel">
             			<a class="menuItem" title="个人中心" th:href="@{/system/user/profile}"> 
@@ -45,7 +47,7 @@
 				        </div>
 				    </div>
             	</li>
-                 <li class="active">
+                 <li>
                     <a href="index.html"><i class="fa fa-home"></i> <span class="nav-label">主页</span> <span class="fa arrow"></span></a>
                     <ul class="nav nav-second-level">
                         <li class="active"><a class="menuItem" th:href="@{/system/main}">了解若依</a></li>
@@ -272,6 +274,15 @@ function switchSkin() {
 		content : [ctx + "system/switchSkin", 'no']
 	})
 }
+
+$(function() {
+    var hash = location.hash;
+    if (hash !== '') {
+        var url = hash.substring(1, hash.length);
+        $('a[href$="' + url + '"]').parent("li").addClass("selected").parents("li").addClass("active").end().parents("ul").addClass("in");
+        $('a[href$="' + url + '"]').click();
+    }
+});
 </script>
 </body>
 </html>