From ddfdabacd731bdd8510eb9a0af7bb5f60deef4d7 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 30 May 2019 09:40:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E7=9A=84=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=A0=8F=E5=AE=BD=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/static/css/style.css     | 4 ++--
 ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/css/style.css b/ruoyi-admin/src/main/resources/static/css/style.css
index bff2cd71..37ccc88c 100644
--- a/ruoyi-admin/src/main/resources/static/css/style.css
+++ b/ruoyi-admin/src/main/resources/static/css/style.css
@@ -444,7 +444,7 @@ body.canvas-menu.mini-navbar #page-wrapper, body.canvas-menu.mini-navbar .footer
 
 body.fixed-sidebar .navbar-static-side, body.canvas-menu .navbar-static-side {
     position: fixed;
-    width: 220px;
+    width: 200px;
     z-index: 2001;
     height: 100%;
 }
@@ -3166,7 +3166,7 @@ video {
 #page-wrapper {
     padding: 0 15px;
     position: inherit;
-    margin: 0 0 0 220px;
+    margin: 0 0 0 200px;
 }
 
 .title-action {
diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
index 16459e04..184c05e5 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
@@ -668,6 +668,10 @@
             openTab: function (title, url) {
             	createMenuItem(url, title);
             },
+            // 关闭选项卡
+            closeTab: function () {
+            	closeItem();
+            },
             // 禁用按钮
             disable: function() {
             	var doc = window.top == window.parent ? window.document : window.parent.document;
@@ -972,7 +976,7 @@
     	        	} else if ($contentWindow.$.table._option.type == table_type.bootstrapTreeTable) {
     	        		$contentWindow.$.treeTable.refresh();
                     }
-    	            closeItem();
+    	            $.modal.closeTab();
                 } else if (result.code == web_status.WARNING) {
                     $.modal.alertWarning(result.msg)
                 } else {