修复服务器/网元监测页:

若某监测类别存在2个或以上且第一个的状态是异常,会导致搜索过滤改监测类别时第二个及以后的类别的状态、持续时间无法显示的问题
This commit is contained in:
chenjinsong
2018-11-15 19:20:11 +08:00
parent e101cf6e4a
commit 23b24b9ca8
4 changed files with 40 additions and 8 deletions

View File

@@ -24,6 +24,14 @@
<c:set var="charStateNum" value="${rowData[14] }" /> <c:set var="charStateNum" value="${rowData[14] }" />
<c:set var="nodeType" value="${rowData[15] }" /> <c:set var="nodeType" value="${rowData[15] }" />
<c:set var="status" value="${rowData[4] }" /> <c:set var="status" value="${rowData[4] }" />
<c:if test="${ctiId == 7}">
<c:set var="isHandShake" value="1"/>
</c:if>
<c:if test="${ctiId != 7}">
<c:set var="isHandShake" value="0"/>
</c:if>
<c:choose> <c:choose>
<c:when test="${ind.index eq 1}"> <c:when test="${ind.index eq 1}">
<td class="color_1_1" rowspan="${fn:length(detecInfoList)}" <td class="color_1_1" rowspan="${fn:length(detecInfoList)}"
@@ -144,7 +152,7 @@
</c:when> </c:when>
<c:when test="${ind.index eq 4}"> <c:when test="${ind.index eq 4}">
<td class="color_1_1"> <td class="color_1_1">
<c:if test="${!handshakeEr}"> <c:if test="${isHandShake == 0 || !handshakeEr}">
<c:if test="${fn:trim(cellData)=='1'}"> <c:if test="${fn:trim(cellData)=='1'}">
<img src="<c:url value='/images/yes.gif'/>" border="0" <img src="<c:url value='/images/yes.gif'/>" border="0"
align="middle" /> align="middle" />
@@ -164,7 +172,7 @@
</c:when> </c:when>
<c:when test="${ind.index eq 6}"> <c:when test="${ind.index eq 6}">
<td class="color_1_1" nowrap="nowrap"> <td class="color_1_1" nowrap="nowrap">
<c:if test="${!handshakeEr && status !='3'}"> <c:if test="${isHandShake == 0 || (!handshakeEr && status !='3')}">
<c:out value="${cellData}" default="" /> <c:out value="${cellData}" default="" />
</c:if> </c:if>
</td> </td>

View File

@@ -572,6 +572,14 @@ $(function(){
<c:set var="charStateNum" value="${rowData[14] }" /> <c:set var="charStateNum" value="${rowData[14] }" />
<c:set var="nodeType" value="${rowData[15] }" /> <c:set var="nodeType" value="${rowData[15] }" />
<c:set var="status" value="${rowData[4] }" /> <c:set var="status" value="${rowData[4] }" />
<c:if test="${ctiId == 7}">
<c:set var="isHandShake" value="1"/>
</c:if>
<c:if test="${ctiId != 7}">
<c:set var="isHandShake" value="0"/>
</c:if>
<c:choose> <c:choose>
<c:when test="${ind.index eq 1}"> <c:when test="${ind.index eq 1}">
<td class="color_1_1" rowspan="${fn:length(detecInfoList)}" <td class="color_1_1" rowspan="${fn:length(detecInfoList)}"
@@ -692,7 +700,7 @@ $(function(){
</c:when> </c:when>
<c:when test="${ind.index eq 4}"> <c:when test="${ind.index eq 4}">
<td class="color_1_1"> <td class="color_1_1">
<c:if test="${!handshakeEr}"> <c:if test="${isHandShake == 0 || !handshakeEr}">
<c:if test="${fn:trim(cellData)=='1'}"> <c:if test="${fn:trim(cellData)=='1'}">
<img src="<c:url value='/images/yes.gif'/>" border="0" <img src="<c:url value='/images/yes.gif'/>" border="0"
align="middle" /> align="middle" />
@@ -712,7 +720,7 @@ $(function(){
</c:when> </c:when>
<c:when test="${ind.index eq 6}"> <c:when test="${ind.index eq 6}">
<td class="color_1_1" nowrap="nowrap"> <td class="color_1_1" nowrap="nowrap">
<c:if test="${!handshakeEr && status !='3'}"> <c:if test="${isHandShake == 0 || (!handshakeEr && status !='3')}">
<c:out value="${cellData}" default="" /> <c:out value="${cellData}" default="" />
</c:if> </c:if>
</td> </td>

View File

@@ -24,6 +24,14 @@
<c:set var="charStateNum" value="${rowData[14] }" /> <c:set var="charStateNum" value="${rowData[14] }" />
<c:set var="nodeType" value="${rowData[15] }" /> <c:set var="nodeType" value="${rowData[15] }" />
<c:set var="status" value="${rowData[4] }" /> <c:set var="status" value="${rowData[4] }" />
<c:if test="${ctiId == 7}">
<c:set var="isHandShake" value="1"/>
</c:if>
<c:if test="${ctiId != 7}">
<c:set var="isHandShake" value="0"/>
</c:if>
<c:choose> <c:choose>
<c:when test="${ind.index eq 1}"> <c:when test="${ind.index eq 1}">
<td class="color_1_1" rowspan="${fn:length(detecInfoList)}" <td class="color_1_1" rowspan="${fn:length(detecInfoList)}"
@@ -144,7 +152,7 @@
</c:when> </c:when>
<c:when test="${ind.index eq 4}"> <c:when test="${ind.index eq 4}">
<td class="color_1_1"> <td class="color_1_1">
<c:if test="${!handshakeEr}"> <c:if test="${isHandShake == 0 || !handshakeEr}">
<c:if test="${fn:trim(cellData)=='1'}"> <c:if test="${fn:trim(cellData)=='1'}">
<img src="<c:url value='/images/yes.gif'/>" border="0" <img src="<c:url value='/images/yes.gif'/>" border="0"
align="middle" /> align="middle" />
@@ -164,7 +172,7 @@
</c:when> </c:when>
<c:when test="${ind.index eq 6}"> <c:when test="${ind.index eq 6}">
<td class="color_1_1" nowrap="nowrap"> <td class="color_1_1" nowrap="nowrap">
<c:if test="${!handshakeEr && status !='3'}"> <c:if test="${isHandShake == 0 || (!handshakeEr && status !='3')}">
<c:out value="${cellData}" default="" /> <c:out value="${cellData}" default="" />
</c:if> </c:if>
</td> </td>

View File

@@ -596,6 +596,14 @@ $(function(){
<c:set var="charStateNum" value="${rowData[14] }" /> <c:set var="charStateNum" value="${rowData[14] }" />
<c:set var="nodeType" value="${rowData[15] }" /> <c:set var="nodeType" value="${rowData[15] }" />
<c:set var="status" value="${rowData[4] }" /> <c:set var="status" value="${rowData[4] }" />
<c:if test="${ctiId == 7}">
<c:set var="isHandShake" value="1"/>
</c:if>
<c:if test="${ctiId != 7}">
<c:set var="isHandShake" value="0"/>
</c:if>
<!-- 特种设备特殊标记 --> <!-- 特种设备特殊标记 -->
<c:set var="specialServer" value="${rowData[18] }" /> <c:set var="specialServer" value="${rowData[18] }" />
<c:choose> <c:choose>
@@ -726,7 +734,7 @@ $(function(){
</c:when> </c:when>
<c:when test="${ind.index eq 4}"> <c:when test="${ind.index eq 4}">
<td class="color_1_1"> <td class="color_1_1">
<c:if test="${!handshakeEr}"> <c:if test="${isHandShake == 0 || !handshakeEr}">
<c:if test="${fn:trim(cellData)=='1'}"> <c:if test="${fn:trim(cellData)=='1'}">
<img src="<c:url value='/images/yes.gif'/>" border="0" <img src="<c:url value='/images/yes.gif'/>" border="0"
align="middle" /> align="middle" />
@@ -746,7 +754,7 @@ $(function(){
</c:when> </c:when>
<c:when test="${ind.index eq 6}"> <c:when test="${ind.index eq 6}">
<td class="color_1_1" nowrap="nowrap"> <td class="color_1_1" nowrap="nowrap">
<c:if test="${!handshakeEr && status !='3'}"> <c:if test="${isHandShake == 0 || (!handshakeEr && status !='3')}">
<c:out value="${cellData}" default="" /> <c:out value="${cellData}" default="" />
</c:if> </c:if>
</td> </td>