diff options
| author | chenjinsong <[email protected]> | 2018-11-16 15:21:14 +0800 |
|---|---|---|
| committer | chenjinsong <[email protected]> | 2018-11-16 15:21:14 +0800 |
| commit | 65254b2758ed3241993489a0b6183e8ef1704bc0 (patch) | |
| tree | f64f92b35c9ff3c20af9e64b6fdf393cb6ba25ab /WebRoot | |
| parent | df8215fedd2b59ac194c99017934755ee1b313d4 (diff) | |
1.补充前个问题其他页面的修改
Diffstat (limited to 'WebRoot')
| -rw-r--r-- | WebRoot/page/detection/monitorData/monitorInfoListNewTopo.jsp | 17 | ||||
| -rw-r--r-- | WebRoot/page/detection/monitorData/monitorNEListChild.jsp | 8 |
2 files changed, 22 insertions, 3 deletions
diff --git a/WebRoot/page/detection/monitorData/monitorInfoListNewTopo.jsp b/WebRoot/page/detection/monitorData/monitorInfoListNewTopo.jsp index c5e3284..326f23a 100644 --- a/WebRoot/page/detection/monitorData/monitorInfoListNewTopo.jsp +++ b/WebRoot/page/detection/monitorData/monitorInfoListNewTopo.jsp @@ -563,6 +563,16 @@ <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>
<c:when test="${ind.index eq 1}">
<td class="color_1_1"
@@ -571,7 +581,8 @@ <a
href="javascript:void(0);"
onclick="remoteConn('${nodeSysType }','${cellData}','${nodeType }', this)"><c:out
- value="${cellData}" default="" /> </a>
+ value="${cellData}" default="" />
+ <c:if test="${not empty specialServer}"><span style="color:red">*</span></c:if></a>
</td>
</c:when>
@@ -689,7 +700,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" />
@@ -709,7 +720,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/monitorNEListChild.jsp b/WebRoot/page/detection/monitorData/monitorNEListChild.jsp index fb0242a..833bfc2 100644 --- a/WebRoot/page/detection/monitorData/monitorNEListChild.jsp +++ b/WebRoot/page/detection/monitorData/monitorNEListChild.jsp @@ -128,6 +128,14 @@ <c:set var="sqId" value="${rowData[12] }" />
<c:set var="charStateNum" value="${rowData[14] }" />
<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}">
</c:when>
|