Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
3d934928b9
|
@ -192,8 +192,6 @@
|
||||||
collapseMenu: false, //菜单折叠,false不折叠
|
collapseMenu: false, //菜单折叠,false不折叠
|
||||||
currentTab: '工作台', //当前激活tab的name
|
currentTab: '工作台', //当前激活tab的name
|
||||||
tabIndex: 1,
|
tabIndex: 1,
|
||||||
// markList:
|
|
||||||
// ['项目管理', '组织管理', '客户管理', '合同管理', '印章管理', '绩效管理', '权限管理', '系统设置'],
|
|
||||||
markList: [
|
markList: [
|
||||||
{title: "权限管理", icon: "icon-wode", hide: true},
|
{title: "权限管理", icon: "icon-wode", hide: true},
|
||||||
{title: "系统设置", icon: "icon-xitongguanli", 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) {
|
markMenu: function (title, icon) {
|
||||||
var menu = {
|
var menu = {
|
||||||
title: title,
|
title: title,
|
||||||
|
@ -571,7 +557,6 @@
|
||||||
//setInterval(this.getMessage,3000)
|
//setInterval(this.getMessage,3000)
|
||||||
// 菜单列表
|
// 菜单列表
|
||||||
this.list();
|
this.list();
|
||||||
// this.connect();
|
|
||||||
//获取登录用户信息
|
//获取登录用户信息
|
||||||
this.managerGet();
|
this.managerGet();
|
||||||
var that = this;
|
var that = this;
|
||||||
|
|
|
@ -134,7 +134,6 @@ a:link,a:visited,a:active{text-decoration: none; color:#409EFF;}
|
||||||
.ms-index .el-menu {
|
.ms-index .el-menu {
|
||||||
border-right: none;
|
border-right: none;
|
||||||
background-color: unset;
|
background-color: unset;
|
||||||
height: calc(100vh - 141px);
|
|
||||||
}
|
}
|
||||||
.ms-index .el-menu-item {
|
.ms-index .el-menu-item {
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
|
|
|
@ -86,7 +86,7 @@ textarea::-webkit-input-placeholder {
|
||||||
height: 50px;
|
height: 50px;
|
||||||
}
|
}
|
||||||
.ms-header button {
|
.ms-header button {
|
||||||
height: 30px;
|
/*height: 30px;*/
|
||||||
}
|
}
|
||||||
.ms-pagination {
|
.ms-pagination {
|
||||||
padding: 20px 0;
|
padding: 20px 0;
|
||||||
|
|
Loading…
Reference in New Issue