From 23b24b9ca899175f3d659009c55f17a70a8add56 Mon Sep 17 00:00:00 2001
From: chenjinsong <chenjinsong@nismail.iie.ac.cn>
Date: Thu, 15 Nov 2018 19:20:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=8D=E5=8A=A1=E5=99=A8/?=
 =?UTF-8?q?=E7=BD=91=E5=85=83=E7=9B=91=E6=B5=8B=E9=A1=B5=EF=BC=9A=20?=
 =?UTF-8?q?=E8=8B=A5=E6=9F=90=E7=9B=91=E6=B5=8B=E7=B1=BB=E5=88=AB=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A82=E4=B8=AA=E6=88=96=E4=BB=A5=E4=B8=8A=E4=B8=94?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=80=E4=B8=AA=E7=9A=84=E7=8A=B6=E6=80=81=E6=98=AF?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=EF=BC=8C=E4=BC=9A=E5=AF=BC=E8=87=B4=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E8=BF=87=E6=BB=A4=E6=94=B9=E7=9B=91=E6=B5=8B=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB=E6=97=B6=E7=AC=AC=E4=BA=8C=E4=B8=AA=E5=8F=8A=E4=BB=A5?=
 =?UTF-8?q?=E5=90=8E=E7=9A=84=E7=B1=BB=E5=88=AB=E7=9A=84=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E3=80=81=E6=8C=81=E7=BB=AD=E6=97=B6=E9=97=B4=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../monitorData/monitorInfoListNewChild.jsp          | 12 ++++++++++--
 WebRoot/page/detection/monitorData/monitorNEList.jsp | 12 ++++++++++--
 .../detection/monitorData/monitorNEListChild.jsp     | 12 ++++++++++--
 .../monitorData/serverMonitorInfoListNew.jsp         | 12 ++++++++++--
 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>