From cc61430930d96ba5cde98ca9ce3df9bbb9e4a938 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Thu, 12 Jul 2018 13:50:39 +0800
Subject: [PATCH] =?UTF-8?q?=EF=BC=881=EF=BC=89=E5=88=A0=E9=99=A4=E4=B8=8D?=
 =?UTF-8?q?=E5=86=8D=E4=BD=BF=E7=94=A8=E7=9A=84=E6=97=A7=E7=89=88IP?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20=EF=BC=882=EF=BC=89=E5=85=AC=E5=85=B1IP?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4IP=E5=A4=8D=E7=94=A8?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E5=8E=BB=E9=99=A4=E7=9B=AE=E7=9A=84?=
 =?UTF-8?q?IP=E5=92=8C=E7=9B=AE=E7=9A=84=E7=AB=AF=E5=8F=A3=E7=9A=84?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8CIPSEC=E4=BF=AE=E5=A4=8D=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/cfg/common/ipForm.jsp       |   3 +
 .../WEB-INF/views/cfg/common/ipList.jsp       |  27 +-
 .../webapp/WEB-INF/views/cfg/iplist/form.jsp  | 170 --------
 .../webapp/WEB-INF/views/cfg/iplist/list.jsp  | 362 ------------------
 4 files changed, 26 insertions(+), 536 deletions(-)
 delete mode 100644 src/main/webapp/WEB-INF/views/cfg/iplist/form.jsp
 delete mode 100644 src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp

diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp
index eec6a4362..b3bd04589 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp
@@ -158,8 +158,11 @@ $(function(){
 								<c:set var="specialProtocol" value="${sfi.itemValue}"/>
 								</c:if>
                				</c:forEach>
+               				<c:if test="${specialProtocol ne 'ipmulitiplex'}">
            			   		<%@include file="/WEB-INF/include/form/ipInfo.jsp" %>
+           			   		</c:if>
            			   		<c:if test="${specialProtocol ne null and specialProtocol eq 'ipmulitiplex'}">
+           			   		<%@include file="/WEB-INF/include/form/complexIpInfo.jsp" %>
 	           			   		<div class="row">
 								    <div class="col-md-6">
 								        <div class="form-group">
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
index 33370a4fd..344c8bf39 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
@@ -217,10 +217,16 @@
 									<%-- <th><spring:message code="seq"/></th> --%>
 									<th><spring:message code="config_describe"/></th>
 									<th>ip<spring:message code="type"/></th>
+									<c:if test="${specialFunctionId ne 'ipmulitiplex'}">
 									<th><spring:message code="client_ip"/></th>
 									<th><spring:message code="client_port"/></th>
 									<th><spring:message code="server_ip"/></th>
 									<th><spring:message code="server_port"/></th>
+									</c:if>
+									<c:if test="${specialFunctionId eq 'ipmulitiplex'}">
+									<th><spring:message code="IP"/></th>
+									<th><spring:message code="port"/></th>
+									</c:if>
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="direction"/></th>
 									<th><spring:message code="protocol"/></th>
@@ -261,10 +267,16 @@
 									<td><c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType">
 										<c:if test="${ipType.itemCode==cfg.ipType}">${ipType.itemValue}</c:if>
 					                </c:forEach></td>
-									<td>${cfg.srcIpAddress }</td>
-									<td>${cfg.srcPort }</td>
-									<td>${cfg.destIpAddress }</td>
-									<td>${cfg.destPort }</td>
+					                <c:if test="${specialFunctionId ne 'ipmulitiplex'}">
+										<td>${cfg.srcIpAddress }</td>
+										<td>${cfg.srcPort }</td>
+										<td>${cfg.destIpAddress }</td>
+										<td>${cfg.destPort }</td>
+									</c:if>
+					                <c:if test="${specialFunctionId eq 'ipmulitiplex'}">
+										<td>${cfg.srcIpAddress }</td>
+										<td>${cfg.srcPort }</td>
+									</c:if>
 									<td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="serviceC">
 									       <c:if test="${cfg.action eq serviceC.itemCode}"><spring:message code="${serviceC.itemValue }"/></c:if>
@@ -276,9 +288,16 @@
 										</c:forEach>
 									</td>
 									<td>
+										<c:if test="${specialFunctionId ne 'ipsec'}">
 										<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
 											<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
 										</c:forEach>
+										</c:if>
+										<c:if test="${specialFunctionId eq 'ipsec'}">
+										<c:forEach items="${fns:getDictList('IPSEC_PROTOCOL')}" var="protocolC">
+											<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
+										</c:forEach>
+										</c:if>
 									</td>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
diff --git a/src/main/webapp/WEB-INF/views/cfg/iplist/form.jsp b/src/main/webapp/WEB-INF/views/cfg/iplist/form.jsp
deleted file mode 100644
index d26d5b444..000000000
--- a/src/main/webapp/WEB-INF/views/cfg/iplist/form.jsp
+++ /dev/null
@@ -1,170 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8"%>
-<%@ include file="/WEB-INF/include/taglib.jsp"%>
-<html>
-<head>
-<title><spring:message code="${cfgName}"></spring:message></title>
-<script type="text/javascript">
-$(function(){
-	if($("input[name='action']:checked").val()==0x20||$("input[name='action']:checked").val()==0x60){
-		$("#cfgRegionCode").val($("#cfgRegionCodeCallback").val());	
-		$("#cfgType").val($("#cfgTypeCallback").val());	
-	}else{
-		$("#cfgRegionCode").val($("#cfgRegionCodeMaat").val());	
-		$("#cfgType").val($("#cfgTypeMaat").val());	
-	}
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
-	$(".action").on("change", function() {
-		$("#serviceId").val($(this).attr("serviceId"));
-		$("#protocolId").val($(this).attr("protocolId"));
-		if($(this).val()==0x20||$(this).val()==0x60){
-			$("#cfgRegionCode").val($("#cfgRegionCodeCallback").val());	
-			$("#cfgType").val($("#cfgTypeCallback").val());	
-			$("input[name='isAreaEffective']").each(function(){
-				if($(this).val()==0){
-					$(this).click();
-				}
-			})
-		}else{
-			$("#cfgRegionCode").val($("#cfgRegionCodeMaat").val());	
-			$("#cfgType").val($("#cfgTypeMaat").val());	
-		}
-		
-	});
-	if('${fn:length(serviceList)}'>1){
-		$("#serviceId").val($(".action:checked").attr("serviceId"));
-		$("#protocolId").val($(".action:checked").attr("protocolId"));
-	}
-	$("#ipCfgFrom").validate({
-		errorPlacement: function(error,element){
-			$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
-		},
-		submitHandler: function(form){
-			
-			//loading('onloading...');
-			form.submit();
-		},
-		errorContainer: "#messageBox",
-	});
-});
-</script>
-</head>
-<body>
-<div class="page-content">
-	<h3 class="page-title">
-		<spring:message code="${cfgName}"></spring:message>
-	</h3>
-	<div class="row">
-		<div class="col-md-12">
-			<div class="portlet box blue">
-                  <div class="portlet-title">
-                     <div class="caption">
-                         <i class="fa fa-gift"></i>
-                        <c:if test="${empty _cfg.cfgId}"><spring:message code="add"></spring:message></c:if>
-						<c:if test="${not empty _cfg.cfgId}"><spring:message code="edit"></spring:message></c:if>
-					</div>
-                  </div>
-                  <div class="portlet-body form">
-                      <!-- BEGIN FORM-->
-                      <form id="ipCfgFrom" action="${ctx}/ntc/iplist/saveOrUpdate" method="post" class="form-horizontal">
-                          <div class="form-body row">
-                            <input name="cfgName" type="hidden" value="${cfgName}"/>
-                            <input type="hidden" name="cfgId" value="${_cfg.cfgId}">
-                            <input type="hidden" name="compileId" value="${_cfg.compileId}">
-                            <input type="hidden" name="functionId" value="${_cfg.functionId}">
-                            <input type="hidden" id="cfgType" name="cfgType" value="${_cfg.cfgType}">
-	                   		<input type="hidden" id="cfgRegionCode" name="cfgRegionCode" value="${_cfg.cfgRegionCode}">
-                            <c:if test="${fn:length(serviceList)==1}">
-			            	<c:forEach items="${serviceList}" var="service">
-                				<input type="hidden" name="action" value="${service.action }">
-			            	    <input type="hidden" id="serviceId" name="serviceId" value="${service.serviceId}">
-			            		<input type="hidden" id="protocolId" name="protocolId" value="${service.protocolId}">
-			            	</c:forEach>
-							</c:if>
-							<c:if test="${fn:length(serviceList)>1}">
-							 <input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
-							 <input type="hidden" id="protocolId" name="protocolId" value="${_cfg.protocolId}">
-							</c:if>
-                            <!-- 配置域类型 -->
-                   			<c:forEach items="${regionList}" var="region">
-	                   			<c:if test="${_cfg.functionId eq region.functionId}">
-	                   				<c:if test="${region.isMaat==1}"><!-- is maat -->
-	                   				<input type="hidden" id="cfgTypeMaat" value="${region.configRegionValue}">
-	                   				<input type="hidden" id="cfgRegionCodeMaat" value="${region.configRegionCode}">
-	                   				</c:if>
-	                   				<c:if test="${region.isMaat==0}">
-	                   				<input type="hidden" id="cfgTypeCallback" value="${region.configRegionValue}">
-	                   				<input type="hidden" id="cfgRegionCodeCallback" value="${region.configRegionCode}">
-	                   				</c:if>
-	                   			</c:if>
-                   			</c:forEach>
-                   			 <div class="form-body">
-                          <!-- desc and action -->
-                              <div class="row">
-								    <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
-								            <div class="col-md-6">
-								                <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
-								            </div>
-								        </div>
-								    </div>
-								    <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>>
-															<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>
-								            <div for="action"></div>
-								       </div>
-								   </div>
-								</div>
-							<!-- desc and action -->
-							<c:forEach items="${fns:getDictList('SPECIAL_FUNCTION_ID')}" var="sfi">
-								<c:if test="${sfi.itemCode==_cfg.functionId}">
-								<c:set var="specialProtocol" value="${sfi.itemValue}"/>
-								</c:if>
-               				</c:forEach>
-           			   		<%@include file="/WEB-INF/include/form/ipInfo.jsp" %>
-                           <%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
-                            <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
-                          </div>
-                          <div class="form-actions">
-                              <div class="row">
-                                  <div class="col-md-6">
-                                      <div class="row">
-                                          <div class="col-md-offset-3 col-md-8">
-                                              <button id="save" type="submit" class="btn green"><spring:message code="submit"/></button>
-                                              <button id="cancel" type="button" class="btn default"><spring:message code="cancel"/></button>
-                                          </div>
-                                      </div>
-                                  </div>
-                                  <div class="col-md-6"> </div>
-                              </div>
-                          </div>
-                      </form>
-                      <!-- END FORM-->
-                  </div>
-              </div>
-		</div>
-	</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp b/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp
deleted file mode 100644
index 05be41786..000000000
--- a/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp
+++ /dev/null
@@ -1,362 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8"%>
-<%@ include file="/WEB-INF/include/taglib.jsp"%>
-<html>
-<head>
-<title><spring:message code="${cfgName}"></spring:message></title>
-<script>
-	$(document).ready(function() {
-		//搜索框提示语初始化
-		if("${cfg.srcIpAddress}"){
-			$("#intype").val("${cfg.srcIpAddress}");
-		} else if("${cfg.destIpAddress}"){
-			$("#intype").val("${cfg.destIpAddress}");
-		} else if("${cfg.srcPort}"){
-			$("#intype").val("${cfg.srcPort}");
-		} else if("${cfg.destPort}"){
-			$("#intype").val("${cfg.destPort}");
-		} else if("${cfg.cfgDesc}"){
-			$("#intype").val("${cfg.cfgDesc}");
-		} else{
-			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
-		}
-		$("#seltype").change(function(){
-			$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
-		});
-		//筛选功能初始化
-		filterActionInit();
-		$("#isAudit").change(function(){
-			page();
-		});
-		//reset
-		$("#resetBtn").on("click",function(){
-			$("select.selectpicker").each(function(){
-				$(this).selectpicker('val',$(this).find('option:first').val());
-				$(this).find("option").attr("selected",false);
-				$(this).find("option:first").attr("selected",true);
-			});
-			$(".Wdate").attr("value",'');
-			$("#searchForm")[0].reset();
-		});
-	});
- 	var edit=function(url){
- 		var cked = $('tbody tr td input.i-checks:checkbox:checked');
- 		if(cked.val()==1){
- 			top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
- 			return;
- 		}
- 		if(cked.length==1){
- 			window.location = url+"&compileId="+cked.attr("id");
- 		}else{
- 			top.$.jBox.tip("<spring:message code='check_one'/>", "<spring:message code='info'/>");
- 			return;
- 		}
- 	}
-</script>
-</head>
-<body>
-
-<div class="page-content">
-	<div class="theme-panel hidden-xs hidden-sm">
-		<shiro:hasPermission name="iplist:config">
-			<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/ntc/iplist/form?functionId=${cfg.functionId}&cfgName=${cfgName}'">
-			<i class="fa fa-plus"></i>
-			<spring:message code="add"></spring:message></button>
-		</shiro:hasPermission>
-	</div>
-	<h3 class="page-title">
-		<spring:message code="${cfgName}"></spring:message>
-		<small><spring:message code="date_list"/></small>
-	</h3>
-	<h5 class="page-header"></h5>
-	<div class="row">
-		<div class="col-md-12">
-			<div class="portlet">
-				<div class="portlet-body">
-					<div class="row" >
-						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/ntc/iplist/list" method="post" class="form-search">
-							<input name="cfgName" type="hidden" value="${cfgName}"/>
-							<input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/>
-							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
-							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
-							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}"
-						callback="page();" />
-							<!-- 筛选按钮展开状态-->
-							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${cfg.isFilterAction }"/>
-							<!-- 搜索内容与操作按钮栏 -->
-							<div class="col-md-12">
-								<div class="pull-left">
-									<form:select path="isAudit" class="selectpicker select2 input-small">
-										<form:option value=""><spring:message code="all_states"/></form:option>
-										<c:forEach items="${fns:getDictList('SPEC_AUDIT')}" var="auditC">
-									       <form:option value="${auditC.itemCode}"><spring:message code="${auditC.itemValue}"></spring:message></form:option>
-							            </c:forEach>
-									</form:select>
-								</div>
-								<div class="pull-left">	
-								
-										<div class="input-group">
-                                            <div class="input-group-btn">
-                                            
-                                           		<form:select path="seltype" class="selectpicker select2 input-small" >
-													<form:option value="srcIpAddress"><spring:message code="client_ip"></spring:message></form:option>
-													<form:option value="destIpAddress"><spring:message code="server_ip"></spring:message></form:option>
-													<form:option value="srcPort"><spring:message code="client_port"></spring:message></form:option>
-													<form:option value="destPort"><spring:message code="server_port"></spring:message></form:option>
-													<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												</form:select>
-												
-                                            </div>
-                                            
-                                            <input id="intype" class="form-control input-medium" type="text" value="">
-                                     
-                                        </div> 
-	                               </div>
-								<div class="pull-left">
-									 <button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
-									 <button type="button" class="btn btn-default" id="resetBtn" > <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
-	                                 <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/><i class="fa fa-angle-double-down"></i></button>
-								</div>
-								 <div class="pull-right">
-								 		<shiro:hasPermission name="iplist:config">
-									 		<sys:delRow url="${ctx}/ntc/iplist/form?functionId=${cfg.functionId}&cfgName=${cfgName}" id="contentTable" label="update"></sys:delRow>
-	                                        <sys:delRow url="${ctx}/ntc/iplist/delete?functionId=${cfg.functionId}&cfgName=${cfgName}" id="contentTable" label="delete"></sys:delRow>
-                                        </shiro:hasPermission>
-                                   		<shiro:hasPermission name="iplist:config">
-	                                        <div class="btn-group">
-	                                            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-	                                                <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
-	                                                <i class="fa fa-angle-down"></i>
-	                                            </button>
-	                                            <ul class="dropdown-menu pull-right">
-	                                                <li><sys:delRow url="${ctx}/ntc/iplist/audit?isAudit=1&isValid=1&functionId=${cfg.functionId}&cfgName=${cfgName}" id="contentTable" label="approved"></sys:delRow></li>
-													<li><sys:delRow url="${ctx}/ntc/iplist/audit?isAudit=2&isValid=0&functionId=${cfg.functionId}&cfgName=${cfgName}" id="contentTable" label="unapproved"></sys:delRow></li>
-													<li><sys:delRow url="${ctx}/ntc/iplist/audit?isAudit=3&isValid=0&functionId=${cfg.functionId}&cfgName=${cfgName}" id="contentTable" label="cancelPass"></sys:delRow></li>            
-	                                            </ul>
-	                                        </div>
-                                        </shiro:hasPermission>
-                        			
-                                 	<a class="btn  btn-icon-only btn-default setfields tooltips" 
-                                      		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
-                                             <i class="icon-wrench"></i>
-                                     </a>
-                                 </div>
-							</div>
-							<!-- 搜索内容与操作按钮栏 -->
-							
-							<!-- 筛选搜索内容栏默认隐藏-->
-							<div class="col-md-12 filter-action-select-panle hide" >
-								<div class="row">
-									<div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="config_time"/>：</label>
-											<input name="search_create_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="<fmt:formatDate value='${cfg.search_create_time_start}' pattern='yyyy-MM-dd HH:mm:ss'/>" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										</div>
-									</div>
-									
-									<div class="col-md-2">
-										<div class="form-group">
-											<label>&nbsp;</label>
-											<input name="search_create_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="<fmt:formatDate value="${cfg.search_create_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										
-										</div>
-									</div>
-									<div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="edit_time"/>：</label>
-											<input name="search_edit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="<fmt:formatDate value="${cfg.search_edit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										
-										</div>
-									</div>
-									<div class="col-md-2">
-										<div class="form-group">
-											<label>&nbsp;</label>
-											<input name="search_edit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="<fmt:formatDate value="${cfg.search_edit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										
-										</div>
-									</div>
-									<div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="audit_time"/>：</label>
-											<input name="search_audit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="<fmt:formatDate value="${cfg.search_audit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										
-										</div>
-									</div>
-									<div class="col-md-2">
-										<div class="form-group">
-											<label>&nbsp;</label>
-											<input name="search_audit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="<fmt:formatDate value="${cfg.search_audit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										
-										</div>
-									</div>
-								</div>
-							</div>
-							<!-- /筛选搜索内容栏    结束-->
-						</form:form>
-					</div>
-					<div class="table-responsive">
-						<sys:message content="${message}"/>
-						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
-							<thead>
-								<tr>
-									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-									<%-- <th><spring:message code="seq"/></th> --%>
-									<th><spring:message code="config_describe"/></th>
-									<th>ip<spring:message code="type"/></th>
-									<th><spring:message code="client_ip"/></th>
-									<th><spring:message code="client_port"/></th>
-									<th><spring:message code="server_ip"/></th>
-									<th><spring:message code="server_port"/></th>
-									<th><spring:message code="block_type"/></th>
-									<th><spring:message code="direction"/></th>
-									<th><spring:message code="protocol"/></th>
-									<th><spring:message code="whether_area_block"/></th>
-									<th><spring:message code="letter"/></th>
-									<th><spring:message code="type"/></th>
-									<th><spring:message code="attribute"/></th>
-									<th><spring:message code="label"/></th>
-									<th><spring:message code="valid_identifier"/></th>
-									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
-									<th><spring:message code="creator"/></th>
-									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
-									<th><spring:message code="editor"/></th>
-									<th class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
-									<th><spring:message code="auditor"/></th>
-									<th class="sort-column r.audit_time"><spring:message code="audit_time"/></th>
-									<%-- <th><spring:message code="operation"></spring:message></th> --%>
-								</tr>
-							</thead>
-							<tbody>
-								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
-									<tr pId="${status.index}">
-									<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}" compileId="${cfg.compileId}" value="${cfg.isAudit}"></td>
-									<%-- <td>${status.index+1 }</td> --%>
-									<td>${cfg.cfgDesc }</td>
-									<td><c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType">
-										<c:if test="${ipType.itemCode==cfg.ipType}">${ipType.itemValue}</c:if>
-					                </c:forEach></td>
-									<td>${cfg.srcIpAddress }</td>
-									<td>${cfg.srcPort }</td>
-									<td>${cfg.destIpAddress }</td>
-									<td>${cfg.destPort }</td>
-									<td>
-										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="serviceC">
-									       <c:if test="${cfg.action eq serviceC.itemCode}"><spring:message code="${serviceC.itemValue }"/></c:if>
-							            </c:forEach>
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
-											<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemValue }"/></c:if>
-										</c:forEach>
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
-											<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
-										</c:forEach>
-									</td>
-									<td>
-										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isAreaEffective==1}">
-												<a href="javascript:viewAreaInfo('${ctx }','${cfg.areaEffectiveIds }','${cfg.compileId }')" >
-													<spring:message code="yes"/>
-												</a>
-										</c:if>
-									</td>
-									<td>${cfg.requestName }</td>
-									<td>
-									<c:set var="classify"></c:set>
-										<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId" varStatus="status">
-											<c:forEach items="${fls}" var="fl">
-												<c:if test="${classifyId eq fn:trim(fl.serviceDictId)}">
-												<c:if test="${status.index+1 eq 1}">
-													<c:set var="classify" value="${fl.itemValue}"></c:set>
-												</c:if>
-												<c:if test="${status.index+1 ne 1}">
-													<c:set var="classify" value="${classify},${fl.itemValue}"></c:set>
-												</c:if>
-												</c:if>
-											</c:forEach>
-										</c:forEach>
-										<a href="javascript:;" data-original-title="${classify}"
-										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
-											${fns:abbr(classify,20)}
-										</a>
-									</td>
-									<td>
-									<c:set var="attribute"></c:set>
-										<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId" varStatus="status">
-											<c:forEach items="${xzs}" var="xz">
-												<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">
-												<c:if test="${status.index+1 eq 1}">
-													<c:set var="attribute" value="${xz.itemValue}"></c:set>
-												</c:if>
-												<c:if test="${status.index+1 ne 1}">
-													<c:set var="attribute" value="${attribute},${xz.itemValue}"></c:set>
-												</c:if>
-												</c:if>
-											</c:forEach>
-										</c:forEach>
-										<a href="javascript:;" data-original-title="${attribute}"
-										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
-											${fns:abbr(attribute,20)}
-										</a>
-									</td>
-									<td>
-									<c:set var="lableInfo"></c:set>
-										<c:forEach items="${fn:split(cfg.lable,',')}" var="lableId" varStatus="status">
-											<c:forEach items="${lables}" var="lable">
-												<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">
-												<c:if test="${status.index+1 eq 1}">
-													<c:set var="lableInfo" value="${lable.itemValue}"></c:set>
-												</c:if>
-												<c:if test="${status.index+1 ne 1}">
-													<c:set var="lableInfo" value="${lableInfo},${lable.itemValue}"></c:set>
-												</c:if>
-												</c:if>
-											</c:forEach>
-										</c:forEach>
-										<a href="javascript:;" data-original-title="${lableInfo}"
-										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
-											${fns:abbr(lableInfo,20)}
-										</a>
-									</td>
-									<%-- <td>${cfg.areaEffectiveIds }</td> --%>
-									<td>
-										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
-										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('SPEC_AUDIT')}" var="auditC">
-									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'created'}"><span data-audit="created" class="label label-danger"><spring:message code="created"></spring:message></span></c:if>
-									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'approved'}"><span data-audit="approved" class="label label-success"><spring:message code="approved"></spring:message></span></c:if>
-									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'unapproved'}"><span data-audit="unapproved" class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:if>
-									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'cancel'}"><span  data-audit="cancel" class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:if>
-							            </c:forEach>
-									</td>
-									<td functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
-									<td>${cfg.creatorName }</td>
-									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
-									<td>${cfg.editorName }</td>
-									<td><fmt:formatDate value="${cfg.editTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
-									<td>${cfg.auditorName }</td>
-									<td><fmt:formatDate value="${cfg.auditTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
-								</tr>
-								</c:forEach>
-							</tbody>
-						</table>
-						<div class="page">${page}</div>
-					</div>
-					
-				</div>
-			</div>
-</div>
-</body>
-</html>
\ No newline at end of file