gfwleak/nms-nmsweb
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.补充前个问题其他页面的修改

Browse Source
This commit is contained in:
chenjinsong
2018-11-16 15:21:14 +08:00
parent df8215fedd
commit 65254b2758
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
WebRoot/page/detection/monitorData/monitorInfoListNewTopo.jsp
View File

@@ -563,6 +563,16 @@
<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:choose> <c:choose>
<c:when test="${ind.index eq 1}"> <c:when test="${ind.index eq 1}">
<td class="color_1_1" <td class="color_1_1"
@@ -571,7 +581,8 @@
<a <a
href="javascript:void(0);" href="javascript:void(0);"
onclick="remoteConn('${nodeSysType }','${cellData}','${nodeType }', this)"><c:out 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> </td>
</c:when> </c:when>
@@ -689,7 +700,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" />
@@ -709,7 +720,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>

8
WebRoot/page/detection/monitorData/monitorNEListChild.jsp
View File

@@ -128,6 +128,14 @@
<c:set var="sqId" value="${rowData[12] }" /> <c:set var="sqId" value="${rowData[12] }" />
<c:set var="charStateNum" value="${rowData[14] }" /> <c:set var="charStateNum" value="${rowData[14] }" />
<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}">
</c:when> </c:when>