From b79807ccf52c3d1b24ae498579e52f0df19c3a9b Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Sun, 26 Aug 2018 15:17:15 +0800
Subject: [PATCH] =?UTF-8?q?bgp=E3=80=81xmpp=20subscribe=5Fid=E5=9F=9F?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E5=8D=95=E7=8B=AC=E6=8F=90=E4=BA=A4=EF=BC=8C?=
 =?UTF-8?q?=E5=BF=85=E9=A1=BB=E6=90=AD=E9=85=8D=E5=85=B6=E4=BB=96=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/cfg/other/bgpForm.jsp       | 27 +++++-----
 .../WEB-INF/views/cfg/other/xmppForm.jsp      | 54 ++++++++++---------
 2 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
index 9636ad067..2135334a9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
@@ -19,6 +19,8 @@
 						$(".action").on("change", function() {
 							$("#serviceId").val($(this).attr("serviceId"));
 							$("#protocolId").val($(this).attr("protocolId"));
+							var action=$("input[name='action']:checked").val();
+							switchAction(action);
 						});
 						$("#serviceId").val($(".action:checked").attr("serviceId"));
 						$("#protocolId").val($(".action:checked").attr("protocolId"));
@@ -186,7 +188,7 @@
 								</div>
 								
 								<!-- dolog begin-->
-								<div class="row">
+								<div class="row doLog">
 									<div class="col-md-6">
 										<div class="form-group">
 											<label class="control-label col-md-3"><spring:message code="do_log" /></label>
@@ -213,7 +215,7 @@
 								<c:set var="ipCfgIndex" value="0"></c:set>
 								<c:set var="complexCfgIndex" value="0"></c:set>
 								<c:set var="strAsCfgIndex" value="0"></c:set>
-								<c:set var="strCfgIndex" value="0"></c:set>
+								<c:set var="subscribeIndex" value="0"></c:set>
 								<c:forEach items="${regionList}" var="region" varStatus="status">
 									<c:if test="${region.regionType eq 1 }">
 										<!--ip info-->
@@ -285,45 +287,44 @@
 											</c:otherwise>
 										</c:choose>
 									   </c:if>
-									  <c:if test="${region.configServiceType == 'subscribe_id'}">
-									     <c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
+									  <c:if test="${region.configServiceType eq 'subscribe_id' }">
+										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
 										<h4 class="form-section">
 											<spring:message code="${region.configRegionValue}" />
 											<small> <span
 												class="glyphicon glyphicon-plus ${tabName}Add"
 												onClick="addContent(this,'${tabName}')" title="add"></span></small>
 										</h4>
-										<c:set var="cfgName" value="ntcSubscribeIdCfgList[${strCfgIndex}]"></c:set>
-										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
+										<c:set var="cfgName" value="ntcSubscribeIdCfgList[${subscribeIndex}]"></c:set>
 										<c:choose>
 											<c:when test="${fn:length(_cfg.ntcSubscribeIdCfgList)>0}">
 												<c:set var="isBreak" value="false" ></c:set>
 												<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
 													<c:choose>
 														<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
-															<div class="row boxSolid ${tabName}${status.index}">
+															<div class="row ${tabName}${status.index}">
 																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 															</div>
 															<c:set var="isBreak" value="true" ></c:set>
-															<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+															<c:set var="subscribeIndex" value="${subscribeIndex+1 }"></c:set>
 														</c:when>
 													</c:choose>
 												</c:forEach>
 												<c:if test="${!isBreak}">
-													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+													<div class="row ${tabName}${status.index} hidden disabled">
 														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 													</div>
-													<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+													<c:set var="subscribeIndex" value="${subscribeIndex+1 }"></c:set>
 												</c:if>
 											</c:when>
 											<c:otherwise>
-												<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+												<div class="rows ${tabName}${status.index} hidden disabled">
 													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 												</div>
-												<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+												<c:set var="subscribeIndex" value="${subscribeIndex+1 }"></c:set>
 											</c:otherwise>
 										</c:choose>
-									  </c:if>
+									</c:if>
 									</c:if>
 									<c:if test="${region.regionType eq 3 }">
 										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
index 2574baca3..55e8643e0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
@@ -19,6 +19,8 @@
 						$(".action").on("change", function() {
 							$("#serviceId").val($(this).attr("serviceId"));
 							$("#protocolId").val($(this).attr("protocolId"));
+							var action=$("input[name='action']:checked").val();
+							switchAction(action);
 						});
 						$("#serviceId").val($(".action:checked").attr("serviceId"));
 						$("#protocolId").val($(".action:checked").attr("protocolId"));
@@ -55,7 +57,7 @@
 											}
 										});
 										//keywords非空校验完成校验二进制字符串
-										$(".boxSolid:visible").find("select[name$='isHexbin']").each(function(){
+				   						$(".boxSolid:visible").find("select[name$='isHexbin']").each(function(){
 											var isHexbin=$(this).val();
 											if(isHexbin == 1){ //十六进制 
 												var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
@@ -155,31 +157,35 @@
 											</div>
 										</div>
 									</div>
-									<div class="col-md-6">
+										<div class="col-md-6">
 										<div class="form-group">
 											<label class="control-label col-md-3"><spring:message
 													code="action" /></label>
 											<div class="col-md-6">
 												<c:forEach items="${serviceList}" var="service"
 													varStatus="satus">
-													<label class="radio-inline"> <c:if
-															test="${_cfg.functionId eq service.functionId}">
-															<input type="radio" name="action"
-																serviceId="${service.serviceId }"
-																protocolId="${service.protocolId }"
-																value="${service.action }" class="required action"
-																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
-															<spring:message code="${service.actionCode }" />
+													<label class="radio-inline"> 
+													<c:if test="${_cfg.functionId eq service.functionId}">
+																			<input type="radio" name="action"
+																				serviceId="${service.serviceId }"
+																				protocolId="${service.protocolId }"
+																			 value="${service.action }" class="required action"
+																			<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
+																		<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+																	<c:if test="${dict.itemCode eq service.action }">
+																  <spring:message code="${dict.itemValue }"/>
+																</c:if>
+															</c:forEach>
 														</c:if>
 													</label>
-												</c:forEach>
-											</div>
+												 </c:forEach>					
+											  </div>
 											<div for="action"></div>
 										</div>
 									</div>
 								</div>
 								<!-- dolog begin-->
-								<div class="row">
+								<div class="row doLog">
 									<div class="col-md-6">
 										<div class="form-group">
 											<label class="control-label col-md-3"><spring:message code="do_log" /></label>
@@ -204,7 +210,7 @@
 								<!-- dolog end-->
 								
 								<c:set var="ipCfgIndex" value="0"></c:set>
-								<c:set var="strCfgIndex" value="0"></c:set>
+								<c:set var="subscribeIndex" value="0"></c:set>
 								<c:set var="complexCfgIndex" value="0"></c:set>
 								<c:forEach items="${regionList}" var="region" varStatus="status">
 									<c:if test="${region.regionType eq 1 }">
@@ -239,44 +245,44 @@
 									<!--/ip info-->
 									</c:if>
 									<c:if test="${region.regionType eq 2 }">
-									  <c:if test="${region.configServiceType == 'subscribe_id'}">
-									     <c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
+								 <c:if test="${region.configServiceType eq 'subscribe_id' }">
+										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
 										<h4 class="form-section">
 											<spring:message code="${region.configRegionValue}" />
 											<small> <span
 												class="glyphicon glyphicon-plus ${tabName}Add"
 												onClick="addContent(this,'${tabName}')" title="add"></span></small>
 										</h4>
-										<c:set var="cfgName" value="ntcSubscribeIdCfgList[${strCfgIndex}]"></c:set>
+										<c:set var="cfgName" value="ntcSubscribeIdCfgList[${subscribeIndex}]"></c:set>
 										<c:choose>
 											<c:when test="${fn:length(_cfg.ntcSubscribeIdCfgList)>0}">
 												<c:set var="isBreak" value="false" ></c:set>
 												<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
 													<c:choose>
 														<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
-															<div class="row boxSolid ${tabName}${status.index}">
+															<div class="row ${tabName}${status.index}">
 																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 															</div>
 															<c:set var="isBreak" value="true" ></c:set>
-															<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+															<c:set var="subscribeIndex" value="${subscribeIndex+1 }"></c:set>
 														</c:when>
 													</c:choose>
 												</c:forEach>
 												<c:if test="${!isBreak}">
-													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+													<div class="row ${tabName}${status.index} hidden disabled">
 														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 													</div>
-													<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+													<c:set var="subscribeIndex" value="${subscribeIndex+1 }"></c:set>
 												</c:if>
 											</c:when>
 											<c:otherwise>
-												<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+												<div class="rows ${tabName}${status.index} hidden disabled">
 													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 												</div>
-												<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+												<c:set var="subscribeIndex" value="${subscribeIndex+1 }"></c:set>
 											</c:otherwise>
 										</c:choose>
-									  </c:if>
+									</c:if>
 									</c:if>