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

若某监测类别存在2个或以上且第一个的状态是异常，会导致搜索过滤改监测类别时第二个及以后的类别的状态、持续时间无法显示的问题

4 files changed, 40 insertions, 8 deletions

diff --git a/WebRoot/page/detection/monitorData/monitorInfoListNewChild.jsp b/WebRoot/page/detection/monitorData/monitorInfoListNewChild.jsp
index d7bd629..7b7f7b4 100644
--- a/WebRoot/page/detection/monitorData/monitorInfoListNewChild.jsp
+++ b/WebRoot/page/detection/monitorData/monitorInfoListNewChild.jsp
@@ -24,6 +24,14 @@
 							<c:set var="charStateNum" value="${rowData[14] }" />

 							<c:set var="nodeType" value="${rowData[15] }" />

 							<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:when test="${ind.index eq 1}">

 									<td class="color_1_1" rowspan="${fn:length(detecInfoList)}"

@@ -144,7 +152,7 @@
 								</c:when>

 								<c:when test="${ind.index eq 4}">

 									<td class="color_1_1">

-										<c:if test="${!handshakeEr}">

+										<c:if test="${isHandShake == 0 || !handshakeEr}">

 											<c:if test="${fn:trim(cellData)=='1'}">

 												<img src="<c:url value='/images/yes.gif'/>" border="0"

 													align="middle" />

@@ -164,7 +172,7 @@
 								</c:when>

 								<c:when test="${ind.index eq 6}">

 									<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:if>

 									</td>

diff --git a/WebRoot/page/detection/monitorData/monitorNEList.jsp b/WebRoot/page/detection/monitorData/monitorNEList.jsp
index 951ffb3..fd68ed2 100644
--- a/WebRoot/page/detection/monitorData/monitorNEList.jsp
+++ b/WebRoot/page/detection/monitorData/monitorNEList.jsp
@@ -572,6 +572,14 @@ $(function(){
 											<c:set var="charStateNum" value="${rowData[14] }" />

 											<c:set var="nodeType" value="${rowData[15] }" />

 											<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:when test="${ind.index eq 1}">

 													<td class="color_1_1" rowspan="${fn:length(detecInfoList)}"

@@ -692,7 +700,7 @@ $(function(){
 												</c:when>

 												<c:when test="${ind.index eq 4}">

 													<td class="color_1_1">

-														<c:if test="${!handshakeEr}">

+														<c:if test="${isHandShake == 0 || !handshakeEr}">

 															<c:if test="${fn:trim(cellData)=='1'}">

 																<img src="<c:url value='/images/yes.gif'/>" border="0"

 																	align="middle" />

@@ -712,7 +720,7 @@ $(function(){
 												</c:when>

 												<c:when test="${ind.index eq 6}">

 													<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:if>

 													</td>

diff --git a/WebRoot/page/detection/monitorData/monitorNEListChild.jsp b/WebRoot/page/detection/monitorData/monitorNEListChild.jsp
index d08d79c..fb0242a 100644
--- a/WebRoot/page/detection/monitorData/monitorNEListChild.jsp
+++ b/WebRoot/page/detection/monitorData/monitorNEListChild.jsp
@@ -24,6 +24,14 @@
 							<c:set var="charStateNum" value="${rowData[14] }" />

 							<c:set var="nodeType" value="${rowData[15] }" />

 							<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:when test="${ind.index eq 1}">

 									<td class="color_1_1" rowspan="${fn:length(detecInfoList)}"

@@ -144,7 +152,7 @@
 								</c:when>

 								<c:when test="${ind.index eq 4}">

 									<td class="color_1_1">

-										<c:if test="${!handshakeEr}">

+										<c:if test="${isHandShake == 0 || !handshakeEr}">

 											<c:if test="${fn:trim(cellData)=='1'}">

 												<img src="<c:url value='/images/yes.gif'/>" border="0"

 													align="middle" />

@@ -164,7 +172,7 @@
 								</c:when>

 								<c:when test="${ind.index eq 6}">

 									<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:if>

 									</td>

diff --git a/WebRoot/page/detection/monitorData/serverMonitorInfoListNew.jsp b/WebRoot/page/detection/monitorData/serverMonitorInfoListNew.jsp
index d227cb4..0f33332 100644
--- a/WebRoot/page/detection/monitorData/serverMonitorInfoListNew.jsp
+++ b/WebRoot/page/detection/monitorData/serverMonitorInfoListNew.jsp
@@ -596,6 +596,14 @@ $(function(){
 												<c:set var="charStateNum" value="${rowData[14] }" />

 												<c:set var="nodeType" value="${rowData[15] }" />

 												<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:choose>

@@ -726,7 +734,7 @@ $(function(){
 													</c:when>

 													<c:when test="${ind.index eq 4}">

 														<td class="color_1_1">

-															<c:if test="${!handshakeEr}">

+															<c:if test="${isHandShake == 0 || !handshakeEr}">

 																<c:if test="${fn:trim(cellData)=='1'}">

 																	<img src="<c:url value='/images/yes.gif'/>" border="0"

 																		align="middle" />

@@ -746,7 +754,7 @@ $(function(){
 													</c:when>

 													<c:when test="${ind.index eq 6}">

 														<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:if>

 														</td>