From a41d33740dc783b361a3ea37b762b3318820f21d Mon Sep 17 00:00:00 2001
From: luoxj <1227731421@qq.com>
Date: Thu, 2 Jul 2020 08:40:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=BA=90404?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/manager/index.ftl         | 15 ---------------
 src/main/webapp/static/ms-admin/5.0.0/css/app.css |  1 -
 .../webapp/static/ms-admin/5.0.0/css/index.css    |  2 +-
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/main/webapp/WEB-INF/manager/index.ftl b/src/main/webapp/WEB-INF/manager/index.ftl
index e9517fb7..9af6daf6 100644
--- a/src/main/webapp/WEB-INF/manager/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/index.ftl
@@ -192,8 +192,6 @@
             collapseMenu: false, //菜单折叠，false不折叠
             currentTab: '工作台', //当前激活tab的name
             tabIndex: 1,
-            // markList:
-            // ['项目管理', '组织管理', '客户管理', '合同管理', '印章管理', '绩效管理', '权限管理', '系统设置'],
             markList: [
                 {title: "权限管理", icon: "icon-wode", hide: true},
                 {title: "系统设置", icon: "icon-xitongguanli", hide: true},
@@ -310,18 +308,6 @@
                 })
 
             },
-            <#--connect: function () {-->
-            <#--    var that = this-->
-            <#--    var sockjs = new SockJS("/websocket");-->
-            <#--    var stompClient = Stomp.over(sockjs);-->
-            <#--    stompClient.connect({}, function (frame) {-->
-            <#--        stompClient.subscribe('/topic/message/' +${Session.manager_session.managerId}, function (greeting) {-->
-            <#--            if (greeting.body == "list") {-->
-            <#--                that.getMessage()-->
-            <#--            }-->
-            <#--        });-->
-            <#--    });-->
-            <#--},-->
             markMenu: function (title, icon) {
                 var menu = {
                     title: title,
@@ -571,7 +557,6 @@
             //setInterval(this.getMessage,3000)
             // 菜单列表
             this.list();
-            // this.connect();
             //获取登录用户信息
             this.managerGet();
             var that = this;
diff --git a/src/main/webapp/static/ms-admin/5.0.0/css/app.css b/src/main/webapp/static/ms-admin/5.0.0/css/app.css
index 9c2b4ebc..ba1179b6 100644
--- a/src/main/webapp/static/ms-admin/5.0.0/css/app.css
+++ b/src/main/webapp/static/ms-admin/5.0.0/css/app.css
@@ -134,7 +134,6 @@ a:link,a:visited,a:active{text-decoration: none; color:#409EFF;}
 .ms-index .el-menu {
     border-right: none;
     background-color: unset;
-    height: calc(100vh - 141px);
 }
 .ms-index .el-menu-item {
     white-space: nowrap;
diff --git a/src/main/webapp/static/ms-admin/5.0.0/css/index.css b/src/main/webapp/static/ms-admin/5.0.0/css/index.css
index cdf16b1a..34d8204c 100644
--- a/src/main/webapp/static/ms-admin/5.0.0/css/index.css
+++ b/src/main/webapp/static/ms-admin/5.0.0/css/index.css
@@ -86,7 +86,7 @@ textarea::-webkit-input-placeholder {
   height: 50px;
 }
 .ms-header button {
-  height: 30px;
+  /*height: 30px;*/
 }
 .ms-pagination {
   padding: 20px 0;