修改门户管理页面和右上角操作

master
zengwh 5 years ago
parent b5908c0cb5
commit 6e18cd2433

@ -154,7 +154,12 @@ public class LoginController {
public String getSessionRemainingTime(HttpServletRequest request)throws Exception{ public String getSessionRemainingTime(HttpServletRequest request)throws Exception{
long lastAccessTime = 0L; long lastAccessTime = 0L;
String sessionId = request.getSession().getId(); String sessionId = request.getSession().getId();
lastAccessTime = (long)request.getSession().getAttribute(sessionId); Object attribute = request.getSession().getAttribute(sessionId);
return JSON.toJSONString(TOKEN_EXPIRE_TIME-(System.currentTimeMillis()-lastAccessTime)); if(null != attribute){
lastAccessTime = (long)attribute;
return JSON.toJSONString(TOKEN_EXPIRE_TIME-(System.currentTimeMillis()-lastAccessTime));
}else{
return null;
}
} }
} }

@ -13,143 +13,47 @@
var path = "${path}"; var path = "${path}";
</script> </script>
<style type="text/css"> <style type="text/css">
.logo{
height: 59px!important;
}
.navbar-custom-menu{ .navbar-custom-menu{
padding-right:17px; padding-right:17px;
} }
/** /**
* 内容背景颜色 *右侧
*/ */
.content-wrapper{ .rightDiv{
background-color: #fff!important;
}
/**
* 上图标div
*/
.header{
width: 100%; width: 100%;
height: 120px; height: 83%;
margin-top: 0!important;
}
.headerLeft{
width:70px;
height:100%;
}
.iconContext{
width:104px;
height:100%;
margin-left: 35px;
} }
/** /**
* 字内容div背景颜色 *右侧上部分
*/ */
.content-header{ .rightTopDiv{
background-color: #ecf0f5!important; width: 100%;
padding: 0!important; height: 40%;
} min-height: 190px;
/**
* echartDiv
*/
.echartsSection{
background-color: #ecf0f5!important;
margin-top: 10px;
width:100%;
height: 566px;
}
/**
* 上组图div
*/
.topEchartsDiv{
padding:0!important;
width:100%;
height:50%;
}
/**
* 下组图div
*/
.bottomEchartsDiv{
padding:0!important;
width:100%;
height:50%;
}
/**
* 系统操作div
*/
.systemOperDiv{
width:33%;
height: 100%;
}
/**
* 在线用户统计div
*/
.alineDiv{
margin-left: 1%;
width:66%;
height: 100%;
}
/**
* 在线用户里内容div
*/
.topEchartsRightDiv{
width:48%;
height: 88%;
}
/**
* 在线用户里内容右div
*/
.topEchartsRightDiv2{
margin-left:15px;
}
/**
* 下组图内容div
*/
.bottomEchartsContentDiv{
width:31%;
height: 88%;
}
/**
* 下组图内容div非左div
*/
.bottomEchartsContentNotLeftDiv{
margin-left: 25px;
} }
/** .rightTopSpanDiv{
* echart头标题div padding-top: 10%;
*/
.echartsHeader{
background-color: #3C8DBC;
width: 100%; width: 100%;
height:12%; height:50px;
text-align: center; text-align: center;
font-size: 18px;
color: #fff;
padding-top:3px;
}
hr{
margin: 0!important;
}
#alineLineDivMain canvas{
heigth:120%;
} }
#alineBarDivMain canvas{ .rightTopSpanDiv span{
heigth:120%; font-size: 36px;
font-weight: bold;
} }
/*#serverListenGaugeDiv1 canvas{*/
/*width:120%!important;*/
/*height:120%!important;*/
/*}*/
.hidden-xs{ .hidden-xs{
max-width: 200px; max-width: 200px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.main-sidebar{
padding-top: 40px!important;
}
</style> </style>
</head> </head>
<body class="hold-transition skin-blue"> <body class="hold-transition skin-blue">
<%--<a href="http://192.168.1.3:8080/emr_record/login?token=IxEQVDobAlREQlRFQk5HTE5BRFQ3JyBURkRFTQ==&userName=1137">hhhhhhhhhhhhhhhh</a>--%>
<input type="hidden" id="userId" value="${CURRENT_USER.userId}"> <input type="hidden" id="userId" value="${CURRENT_USER.userId}">
<input type="hidden" id="webSocketUrl" value="${WEBSOCKET_URLHEAD}"> <input type="hidden" id="webSocketUrl" value="${WEBSOCKET_URLHEAD}">
<input type="hidden" id="strSplit" value="${STR_SPLIT}"> <input type="hidden" id="strSplit" value="${STR_SPLIT}">
@ -157,17 +61,11 @@
<div class="wrapper"> <div class="wrapper">
<header class="main-header"> <header class="main-header">
<!--logo--> <!--logo-->
<div class=" logo"> <div class="logo">
<%--<div class="pull-left image" style="align-content: baseline;">
<img src="${path}/static/bootstrap-3.3.7/dist/img/credit/paypal.png"
style=":height:70%;width: 70%;margin-top:0.25rem;"
class="user-image" alt="User Image">
</div>--%>
<div class="pull-left info" style="width: 100%"> <div class="pull-left info" style="width: 100%">
<p>嘉时软件</p> <p>嘉时软件</p>
</div> </div>
</div> </div>
<nav class="navbar navbar-static-top"> <nav class="navbar navbar-static-top">
<a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button"> <a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">
<span class="sr-only">Toggle navigation</span> <span class="sr-only">Toggle navigation</span>
@ -177,7 +75,7 @@
<li class="user user-menu"> <li class="user user-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" onclick="noticeManage()"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" onclick="noticeManage()">
<span class="label label-warning" id="noticeCount">0</span> <span class="label label-warning" id="noticeCount">0</span>
<i class="fa fa-envelope-o" style="font-size: 25px;"></i> <i class="fa fa-envelope-o" style="font-size: 21px;"></i>
</a> </a>
</li> </li>
<li class="user user-menu"> <li class="user user-menu">
@ -187,7 +85,7 @@
<c:when test="${CURRENT_USER.powerDepts == '' || CURRENT_USER.powerDepts == null || CURRENT_USER.powerDepts == 'null'}"> <c:when test="${CURRENT_USER.powerDepts == '' || CURRENT_USER.powerDepts == null || CURRENT_USER.powerDepts == 'null'}">
<c:choose> <c:choose>
<c:when test="${CURRENT_USER.name != null && CURRENT_USER.name != '' && CURRENT_USER.name != 'null'}"> <c:when test="${CURRENT_USER.name != null && CURRENT_USER.name != '' && CURRENT_USER.name != 'null'}">
<p class="hidden-xs" title="${CURRENT_USER.name}">${CURRENT_USER.name}</p> <span class="hidden-xs" title="${CURRENT_USER.name}">${CURRENT_USER.name}</span>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<p class="hidden-xs" title="${CURRENT_USER.userName}">${CURRENT_USER.userName}</p> <p class="hidden-xs" title="${CURRENT_USER.userName}">${CURRENT_USER.userName}</p>
@ -207,118 +105,68 @@
</c:choose> </c:choose>
</a> </a>
</li> </li>
<li> <li class="dropdown">
<div class="margin"> <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-home" style="font-size: 21px"></i></a>
<div class="btn-group"> <ul class="dropdown-menu" role="menu">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" <li><a href="${path}/logout?token=${token}">退出登录</a></li>
aria-expanded="false" style="height:34px"> </ul>
操作
<span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span>
</button>
<ul class="dropdown-menu" role="menu">
<%--<li><a href="#">帮助</a></li>
<li><a href="#">联系我们</a></li>
<li><a href="${path}/gatewayPage">返回首页</a></li>
<li class="divider"></li>--%>
<li><a href="${path}/logout?token=${token}">退出登录</a></li>
</ul>
</div>
</div>
</li> </li>
</ul> </ul>
</div> </div>
</nav> </nav>
</header> </header>
<aside class="main-sidebar"> <aside class="main-sidebar">
<div onclick="mainManage()" style="cursor:pointer"> <!--主页-->
<!-- Unnamed (形状) --> <div onclick="mainManage()" class="menuDiv">
<div id="u86" class="ax_default icon"> <div class="ax_default icon imgDiv">
<img id="u86_img" class="img " src="${path}/static/images/门户页面/u86.png"/> <img class="img" src="${path}/static/images/门户页面/u86.png"/>
</div> </div>
<!-- Unnamed (矩形) --> <div class="titleDiv">
<div id="u158" class="ax_default _三级标题"> <div class="textDiv">
<div id="u158_div" class=""></div>
<!-- Unnamed () -->
<div id="u159" class="text" style="visibility: visible;">
<p><span>主页</span></p> <p><span>主页</span></p>
</div> </div>
</div> </div>
</div> </div>
<!--通知信息-->
<!-- Unnamed (组合) --> <div onclick="noticeManage()" class="menuDiv">
<div onclick="noticeManage()" style="cursor:pointer"> <div class="ax_default icon imgDiv">
<!-- Unnamed (形状) --> <img class="img" src="${path}/static/images/门户页面/u161.png"/>
<div id="u161" class="ax_default icon">
<img id="u161_img" class="img " src="${path}/static/images/门户页面/u161.png"/>
<!-- Unnamed () -->
<div id="u162" class="text" style="display: none; visibility: hidden">
<p><span></span></p>
</div>
</div> </div>
<!-- Unnamed (矩形) --> <div class="titleDiv">
<div id="u163" class="ax_default _三级标题"> <div class="textDiv">
<div id="u163_div" class=""></div>
<!-- Unnamed () -->
<div id="u164" class="text" style="visibility: visible;">
<p><span>通知信息</span></p> <p><span>通知信息</span></p>
</div> </div>
</div> </div>
</div> </div>
<!--修改密码-->
<div onclick="helpDocumentManage()" style="cursor:pointer"> <div onclick="helpDocumentManage()" class="menuDiv">
<!-- Unnamed (形状) --> <div class="ax_default icon imgDiv">
<div id="u152" class="ax_default icon"> <img class="img" src="${path}/static/images/门户页面/u152.png"/>
<img id="u152_img" class="img " src="${path}/static/images/门户页面/u152.png"/>
<!-- Unnamed () -->
<div id="u153" class="text" style="display: none; visibility: hidden">
<p><span></span></p>
</div>
</div> </div>
<!-- Unnamed (矩形) --> <div class="titleDiv">
<div id="u165" class="ax_default _三级标题"> <div class="textDiv">
<div id="u165_div" class=""></div>
<!-- Unnamed () -->
<div id="u166" class="text" style="visibility: visible;">
<p><span>帮助文档</span></p> <p><span>帮助文档</span></p>
</div> </div>
</div> </div>
</div> </div>
<!--帮助文档-->
<div onclick="updatePassword()" style="cursor:pointer"> <div onclick="updatePassword()" class="menuDiv">
<!-- Unnamed (形状)/user/toUpdatePassword --> <div class="ax_default icon imgDiv">
<div id="u154" class="ax_default icon"> <img class="img" src="${path}/static/images/门户页面/u154.png"/>
<img id="u154_img" class="img " src="${path}/static/images/门户页面/u154.png"/>
<!-- Unnamed () -->
<div id="u155" class="text" style="display: none; visibility: hidden">
<p><span></span></p>
</div>
</div> </div>
<!-- Unnamed (矩形) --> <div class="titleDiv">
<div id="u167" class="ax_default _三级标题"> <div class="textDiv">
<div id="u167_div" class=""></div>
<!-- Unnamed () -->
<div id="u168" class="text" style="visibility: visible;">
<p><span>修改密码</span></p> <p><span>修改密码</span></p>
</div> </div>
</div> </div>
</div> </div>
<!--联系我们-->
<div onclick="callMeManage()" style="cursor:pointer"> <div onclick="callMeManage()" class="menuDiv">
<!-- Unnamed (形状) --> <div class="ax_default icon imgDiv">
<div id="u156" class="ax_default icon"> <img class="img" src="${path}/static/images/门户页面/u156.png"/>
<img id="u156_img" class="img " src="${path}/static/images/门户页面/u156.png"/>
<!-- Unnamed () -->
<div id="u157" class="text" style="display: none; visibility: hidden">
<p><span></span></p>
</div>
</div> </div>
<!-- Unnamed (矩形) --> <div class="titleDiv">
<div id="u169" class=" _三级标题"> <div class="textDiv">
<div id="u169_div" class=""></div>
<!-- Unnamed () -->
<div id="u170" class="text" style="visibility: visible;">
<p><span>联系我们</span></p> <p><span>联系我们</span></p>
</div> </div>
</div> </div>
@ -329,218 +177,126 @@
id="iframe" name="iframe" scrolling="no" frameborder="0"></iframe> id="iframe" name="iframe" scrolling="no" frameborder="0"></iframe>
</div> </div>
<div class="content-wrapper" id="sectionDiv"> <div class="content-wrapper" id="sectionDiv">
<section class="content-header"> <div class="rightDiv">
<div class="header"> <div class="rightTopDiv">
<div class="headerLeft left"> <div class="rightTopSpanDiv">
<a href="#"> <span>嘉时软件 病案无纸化归档管理系统</span>
<div id="u191" class="ax_default box_1">
<div id="u191_div" class=""></div>
<!-- Unnamed () -->
<div id="u192" class="text" style="display: none; visibility: hidden">
<p><span></span></p>
</div>
</div>
<div id="u187" class="ax_default icon">
<img id="u187_img" class="img " src="${path}/static/images/门户页面/u187.png"/>
<!-- Unnamed () -->
<div id="u188" class="text" style="display: none; visibility: hidden">
<p><span></span></p>
</div>
</div>
</a>
</div> </div>
<c:if test="${power == 1}"> </div>
<div class="iconContext left"> <section class="content-header">
<a href="${path}/index"> <div class="header">
<!-- Unnamed (矩形) --> <c:if test="${power == 1}">
<div id="u128" class="ax_default sticky_2"> <div class="iconContext left">
<div id="u128_div" class=""></div> <a href="${path}/index">
<!-- Unnamed () --> <div class="backgroupImgDiv blue rightDefaultImg">
<div id="u129" class="text" style="display: none; visibility: hidden"> <div class="rightImgDiv">
<p><span></span></p> <img class="rightImg" src="${path}/static/images/门户页面/u130.png"/>
</div> </div>
</div> <div class="rightTitleDiv">
<!-- Unnamed (形状) --> <div class="rightTitle">
<div id="u130" class="ax_default icon"> <span>权限系统</span>
<img id="u130_img" class="img " src="${path}/static/images/门户页面/u130.png"/> </div>
<!-- Unnamed () --> </div>
<div id="u131" class="text" style="display: none; visibility: hidden">
<p><span></span></p>
</div>
</div>
<!-- Unnamed (矩形) -->
<div id="u132" class="ax_default _二级标题">
<div id="u132_div" class=""></div>
<!-- Unnamed () -->
<div id="u133" class="text" style="visibility: visible;">
<p><span>权限系统</span></p>
</div>
</div>
</a>
</div>
</c:if>
<c:if test="${emr_medical_record == 1}">
<div class="iconContext left">
<a href="${EMRMEDICALRECORD_URLHEAD}/login?token=${token}&userName=${CURRENT_USER.userName}">
<!-- Unnamed (矩形) -->
<div id="u134" class="ax_default sticky_2">
<div id="u134_div" class=""></div>
<!-- Unnamed () -->
<div id="u135" class="text" style="display: none; visibility: hidden">
<p><span></span></p>
</div>
</div>
<!-- Unnamed (形状) -->
<div id="u136" class="ax_default icon">
<img id="u136_img" class="img " src="${path}/static/images/门户页面/u136.png"/>
<!-- Unnamed () -->
<div id="u137" class="text" style="display: none; visibility: hidden">
<p><span></span></p>
</div>
</div>
<!-- Unnamed (矩形) -->
<div id="u138" class="ax_default _二级标题">
<div id="u138_div" class=""></div>
<!-- Unnamed () -->
<div id="u139" class="text" style="visibility: visible;text-align: center">
<p><span>病案归档系统</span></p>
</div>
</div>
</a>
</div>
</c:if>
<c:if test="${emr_record == 1}">
<div class="iconContext left">
<a href="${EMRRECORD_URLHEAD}/login?token=${token}&userName=${CURRENT_USER.userName}">
<!-- Unnamed (矩形) -->
<div id="u140" class="ax_default sticky_3">
<div id="u140_div" class=""></div>
<!-- Unnamed () -->
<div id="u141" class="text" style="display: none; visibility: hidden">
<p><span></span></p>
</div> </div>
</div> </a>
<!-- Unnamed (形状) --> </div>
<div id="u142" class="ax_default icon"> </c:if>
<img id="u142_img" class="img " src="${path}/static/images/门户页面/u138.png"/> <c:if test="${emr_medical_record == 1}">
<!-- Unnamed () --> <div class="iconContext left">
<div id="u143" class="text" style="display: none; visibility: hidden"> <a href="${EMRMEDICALRECORD_URLHEAD}/login?token=${token}&userName=${CURRENT_USER.userName}">
<p><span></span></p> <div class="backgroupImgDiv green rightDefaultImg_bg">
<div class="rightImgDiv">
<img class="rightImg" src="${path}/static/images/门户页面/u136.png"/>
</div>
<div class="rightTitleDiv">
<div class="rightTitle">
<span>病案归档系统</span>
</div>
</div>
</div> </div>
</div> </a>
<!-- Unnamed (矩形) --> </div>
<div id="u144" class="ax_default _二级标题"> </c:if>
<div id="u144_div" class=""></div> <c:if test="${emr_record == 1}">
<!-- Unnamed () --> <div class="iconContext left">
<div id="u145" class="text" style="visibility: visible;text-align: center"> <a href="${EMRRECORD_URLHEAD}/login?token=${token}&userName=${CURRENT_USER.userName}">
<p><span>档案管理系统</span></p> <div class="backgroupImgDiv orange rightDefaultImg">
<div class="rightImgDiv">
<img class="rightImg" src="${path}/static/images/门户页面/u138.png"/>
</div>
<div class="rightTitleDiv">
<div class="rightTitle">
<span>档案管理系统</span>
</div>
</div>
</div> </div>
</div>
</a> </a>
</div> </div>
</c:if> </c:if>
<%--<c:if test="${emr_apply_copy == 1}"> <%--<c:if test="${emr_apply_copy == 1}">
<div class="iconContext left"> <div class="iconContext left">
<a href="${EMRAPPLYCOPY_URLHEAD}/auth/login?token=${token}&userName=${CURRENT_USER.userName}"> <a href="${EMRAPPLYCOPY_URLHEAD}/auth/login?token=${token}&userName=${CURRENT_USER.userName}">
<!-- Unnamed (矩形) --> <!-- Unnamed (矩形) -->
<div id="u146" class="ax_default sticky_3"> <div id="u146" class="ax_default sticky_3">
<div id="u146_div" class=""></div> <div id="u146_div" class=""></div>
<!-- Unnamed () --> <!-- Unnamed () -->
<div id="u147" class="text" style="display: none; visibility: hidden"> <div id="u147" class="text" style="display: none; visibility: hidden">
<p><span></span></p> <p><span></span></p>
</div>
</div> </div>
</div> <!-- Unnamed (形状) -->
<!-- Unnamed (形状) --> <div id="u148" class="ax_default icon">
<div id="u148" class="ax_default icon"> <img id="u148_img" class="img " src="${path}/static/images/门户页面/u149.png"/>
<img id="u148_img" class="img " src="${path}/static/images/门户页面/u149.png"/> <!-- Unnamed () -->
<!-- Unnamed () --> <div id="u149" class="text" style="display: none; visibility: hidden">
<div id="u149" class="text" style="display: none; visibility: hidden"> <p><span></span></p>
<p><span></span></p> </div>
</div> </div>
</div> <!-- Unnamed (矩形) -->
<!-- Unnamed (矩形) --> <div id="u150" class="ax_default _二级标题">
<div id="u150" class="ax_default _二级标题"> <div id="u150_div" class=""></div>
<div id="u150_div" class=""></div> <!-- Unnamed () -->
<!-- Unnamed () --> <div id="u151" class="text" style="visibility: visible;text-align: center">
<div id="u151" class="text" style="visibility: visible;text-align: center"> <p><span>病案复印预约</span></p>
<p><span>病案复印预约</span></p> </div>
</div> </div>
</div> </a>
</a> </div>
</div> </c:if>
</c:if> <c:if test="${emr_files == 1}">
<c:if test="${emr_files == 1}"> <div class="iconContext left">
<div class="iconContext left"> <a href="${EMRFILES_URLHEAD}/login?token=${token}&userName=${CURRENT_USER.userName}">
<a href="${EMRFILES_URLHEAD}/login?token=${token}&userName=${CURRENT_USER.userName}"> <!-- Unnamed (矩形) -->
<!-- Unnamed (矩形) --> <div id="u1461" class="ax_default sticky_3">
<div id="u1461" class="ax_default sticky_3"> <div id="u1461_div" class=""></div>
<div id="u1461_div" class=""></div> <!-- Unnamed () -->
<!-- Unnamed () --> <div id="u1471" class="text" style="display: none; visibility: hidden">
<div id="u1471" class="text" style="display: none; visibility: hidden"> <p><span></span></p>
<p><span></span></p> </div>
</div> </div>
</div> <!-- Unnamed (形状) -->
<!-- Unnamed (形状) --> <div id="u1481" class="ax_default icon">
<div id="u1481" class="ax_default icon"> <img id="u1481_img" class="img " src="${path}/static/images/门户页面/u148.png"/>
<img id="u1481_img" class="img " src="${path}/static/images/门户页面/u148.png"/> <!-- Unnamed () -->
<!-- Unnamed () --> <div id="u1491" class="text" style="display: none; visibility: hidden">
<div id="u1491" class="text" style="display: none; visibility: hidden"> <p><span></span></p>
<p><span></span></p> </div>
</div> </div>
</div> <!-- Unnamed (矩形) -->
<!-- Unnamed (矩形) --> <div id="u1501" class="ax_default _二级标题">
<div id="u1501" class="ax_default _二级标题"> <div id="u1501_div" class=""></div>
<div id="u1501_div" class=""></div> <!-- Unnamed () -->
<!-- Unnamed () --> <div id="u1511" class="text" style="visibility: visible;text-align: center">
<div id="u1511" class="text" style="visibility: visible;text-align: center"> <p><span>病案签收</span></p>
<p><span>病案签收</span></p> </div>
</div> </div>
</div> </a>
</a> </div>
</div> </c:if>--%>
</c:if>--%>
</div>
</section>
<%--<section class="content-bottom echartsSection">
<!--上echarts-->
<div class="topEchartsDiv" style="background-color: #fff">
<!--系统操作div-->
<div class="systemOperDiv left">
<div class="echartsHeader">
<span>权限系统操作</span>
</div>
<div id="systemOperDivMain" style="width:100%;height:100%;"></div>
</div>
<!--统计用户在线div-->
<div class="alineDiv left" style="background-color: #fff">
<div class="echartsHeader">
<span>在线人数统计</span>
</div>
<div class="topEchartsRightDiv left">
<div style="width:100%;height: 11%;"><span style="font-size: 16px">本月客户阶段统计(客户总量:<span id="maxCountList"></span>)</span><hr style="color: grey"></div>
<div id="alineLineDivMain" style="width:100%;height:89%;"></div>
</div>
<div class="topEchartsRightDiv topEchartsRightDiv2 left">
<div style="width:100%;height: 11%;text-align: right"><span style="font-size: 16px;padding-right: 35px">总拜访量:<span id="loginCount"></span></span></div>
<div id="alineBarDivMain" style="width:100%;height:89%;"></div>
</div>
</div>
</div>
<div class="bottomEchartsDiv">
<div class="echartsHeader">
<span>服务器监控</span>
</div>
<div class="bottomEchartsContentDiv left">
<div id="serverListenGaugeDiv1" style="width:100%;height:100%;"></div>
</div>
<div class="bottomEchartsContentDiv left bottomEchartsContentNotLeftDiv">
<div id="serverListenGaugeDiv2" style="width:100%;height:100%;"></div>
</div>
<div class="bottomEchartsContentDiv left bottomEchartsContentNotLeftDiv">
<div id="serverListenGaugeDiv3" style="width:100%;height:100%;"></div>
</div> </div>
</div> </section>
</section>--%> </div>
</div> </div>
<!-- 底部版权--> <!-- 底部版权-->
<footer class="main-footer"> <footer class="main-footer">

@ -28,12 +28,12 @@
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.logo{
height: 59px!important;
}
.row-fluid{ .row-fluid{
overflow-y: hidden; overflow-y: hidden;
} }
.main-sidebar{
padding-top: 40px!important;
}
</style> </style>
<body class="hold-transition skin-blue" scroll="no"> <body class="hold-transition skin-blue" scroll="no">
<input type="hidden" id="userId" value="${CURRENT_USER.userId}"> <input type="hidden" id="userId" value="${CURRENT_USER.userId}">
@ -45,7 +45,7 @@
<!--logo--> <!--logo-->
<div class="logo"> <div class="logo">
<div class="pull-left info" style="width: 100%"> <div class="pull-left info" style="width: 100%">
<p>嘉时软件</p> <span>嘉时软件</span>
</div> </div>
</div> </div>
@ -56,23 +56,23 @@
<div class="navbar-custom-menu"> <div class="navbar-custom-menu">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li class="user user-menu"> <li class="messages-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" onclick="noticeManage1(-1)"> <a href="#" onclick="noticeManage1(-1)">
<span class="label label-warning" id="noticeCount">0</span> <span class="label label-warning" id="noticeCount">0</span>
<i class="fa fa-envelope-o" style="font-size: 25px;"></i> <i class="fa fa-envelope-o" style="font-size: 21px;"></i>
</a> </a>
</li> </li>
<li class="user user-menu"> <li class="user user-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"> <a href="#">
<img src="${path}/static/bootstrap-3.3.7/dist/img/user2-160x160.jpg" class="user-image" alt="User Image"> <img src="${path}/static/bootstrap-3.3.7/dist/img/user2-160x160.jpg" class="user-image" alt="User Image">
<c:choose> <c:choose>
<c:when test="${CURRENT_USER.powerDepts == '' || CURRENT_USER.powerDepts == null || CURRENT_USER.powerDepts == 'null'}"> <c:when test="${CURRENT_USER.powerDepts == '' || CURRENT_USER.powerDepts == null || CURRENT_USER.powerDepts == 'null'}">
<c:choose> <c:choose>
<c:when test="${CURRENT_USER.name != null && CURRENT_USER.name != '' && CURRENT_USER.name != 'null'}"> <c:when test="${CURRENT_USER.name != null && CURRENT_USER.name != '' && CURRENT_USER.name != 'null'}">
<p class="hidden-xs" title="${CURRENT_USER.name}">${CURRENT_USER.name}</p> <span class="hidden-xs" title="${CURRENT_USER.name}">${CURRENT_USER.name}</span>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<p class="hidden-xs" title="${CURRENT_USER.userName}">${CURRENT_USER.userName}</p> <span class="hidden-xs" title="${CURRENT_USER.userName}">${CURRENT_USER.userName}</span>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
@ -80,10 +80,10 @@
<c:otherwise> <c:otherwise>
<c:choose> <c:choose>
<c:when test="${CURRENT_USER.name != null && CURRENT_USER.name != '' && CURRENT_USER.name != 'null'}"> <c:when test="${CURRENT_USER.name != null && CURRENT_USER.name != '' && CURRENT_USER.name != 'null'}">
<p class="hidden-xs" title="${CURRENT_USER.name}(${CURRENT_USER.powerDepts})">${CURRENT_USER.name}(${CURRENT_USER.powerDepts})</p> <span class="hidden-xs" title="${CURRENT_USER.name}(${CURRENT_USER.powerDepts})">${CURRENT_USER.name}(${CURRENT_USER.powerDepts})</span>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<p class="hidden-xs" title="${CURRENT_USER.userName}(${CURRENT_USER.powerDepts})">${CURRENT_USER.userName}(${CURRENT_USER.powerDepts})</p> <span class="hidden-xs" title="${CURRENT_USER.userName}(${CURRENT_USER.powerDepts})">${CURRENT_USER.userName}(${CURRENT_USER.powerDepts})</span>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
@ -91,24 +91,15 @@
</c:choose> </c:choose>
</a> </a>
</li> </li>
<li> <li class="dropdown">
<div class="margin"> <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-home" style="font-size: 21px"></i></a>
<div class="btn-group"> <ul class="dropdown-menu" role="menu">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" <%--<li><a href="#">帮助</a></li>
aria-expanded="false" style="height:34px"> <li><a href="#">联系我们</a></li>--%>
操作 <li><a href="${path}/gatewayPage">返回主页</a></li>
<span class="caret"></span> <li class="divider"></li>
<span class="sr-only">Toggle Dropdown</span> <li><a href="${path}/logout?token=${token}">退出登录</a></li>
</button> </ul>
<ul class="dropdown-menu" role="menu">
<%--<li><a href="#">帮助</a></li>
<li><a href="#">联系我们</a></li>--%>
<li><a href="${path}/gatewayPage">返回主页</a></li>
<li class="divider"></li>
<li><a href="${path}/logout?token=${token}">退出登录</a></li>
</ul>
</div>
</div>
</li> </li>
</ul> </ul>
</div> </div>

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save