master
zengwh 5 years ago
parent 87ce829a86
commit 33eef9688b

@ -127,17 +127,17 @@
<span class="hidden-xs" title="${CURRENT_USER.name}">${CURRENT_USER.name}</span> <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>
</c:when> </c:when>
<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>
</c:otherwise> </c:otherwise>

@ -30,7 +30,7 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: auto; overflow: auto;
background-color: #c1d7e3; background-color: #ecf0f5;
padding: 10px; padding: 10px;
} }
/** /**
@ -38,7 +38,7 @@
*/ */
.main{ .main{
background-color: white; background-color: white;
height: auto; min-height: calc(100vh - 20px);
border-radius: 5px; border-radius: 5px;
} }
/*表格外层div*/ /*表格外层div*/

@ -29,7 +29,7 @@
height: 120px; height: 120px;
text-align: center; text-align: center;
display: flex; display: flex;
justify-content: space-evenly; justify-content: space-around;
} }
.iconContext{ .iconContext{
width:118px; width:118px;

Loading…
Cancel
Save