优化ip导入,增加app选项

This commit is contained in:
duandongmei
2018-10-19 16:37:37 +08:00
parent 5655f16c32
commit 3b6a3b8721
2 changed files with 87 additions and 36 deletions

View File

@@ -1,12 +1,8 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<script type="text/javascript">
$(function(){
//console.log("调用须知调用本页面函数在common.js里并且需要配置字典MAAT_SERVICE中的项")
});
</script>
<script src="${pageContext.request.contextPath}/static/pages/scripts/importExcel.js" type="text/javascript"></script>
<div class="modal fade" id="import_modal" tabindex="-1" role="dialog" aria-labelledby="mo" aria-hidden="true">
<form id="importForm1" action="${ctx}/ntc/iplist/import" method="post" enctype="multipart/form-data" class="form-horizontal"
<form id="importForm1" action="${ctx}/ntc/iplist/import?importPath=${importPath}" method="post" enctype="multipart/form-data" class="form-horizontal"
onsubmit="loading('<spring:message code='loading'/>');">
<div class="modal-dialog" role="document" style="width:700px;">
@@ -25,32 +21,34 @@ $(function(){
<button class="close" data-dismiss="alert"></button>
<span></span>
</div>
<input type="hidden" name="fucntionId" id="fucntionId" value="${cfg.functionId }">
<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">
<c:if test="${(service.serviceId ne 37) && (service.serviceId ne 149)}">
<label class="radio-inline"> <c:if
test="${cfg.functionId eq service.functionId}">
<input type="radio" name="serviceDictId"
serviceId="${service.serviceId }"
functionId="${service.functionId }"
cfgRegionCodeS="${service.regionCode }"
protocolId="${service.protocolId }"
action="${service.action }"
value="${service.dictId }"
class="required action"
<c:if test="${satus.index eq 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:set var="serviceIndex" value="0"></c:set>
<c:forEach items="${serviceList}" var="service" >
<c:if test="${(service.serviceId ne 37) && (service.serviceId ne 149) && (service.isImport eq 1)}">
<c:if test="${cfg.functionId eq service.functionId}">
<label class="radio-inline">
<input type="radio" name="serviceDictId"
serviceId="${service.serviceId }"
functionId="${service.functionId }"
cfgRegionCodeS="${service.regionCode }"
protocolId="${service.protocolId }"
action="${service.action }"
value="${service.dictId }"
class="required action"
<c:if test="${serviceIndex eq 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>
</label>
<c:set var="serviceIndex" value="${serviceIndex+1 }"></c:set>
</c:if>
</label>
</c:if>
</c:forEach>
</div>
@@ -61,10 +59,10 @@ $(function(){
code="cfg_type" />
</label>
<div class="col-md-6">
<c:forEach items="${regionList}" var="region"
varStatus="satus">
<label class="radio-inline">
<c:if test="${cfg.functionId eq region.functionId}">
<c:set var="regionIndex" value="0"></c:set>
<c:forEach items="${regionList}" var="region" >
<c:if test="${(cfg.functionId eq region.functionId) && (region.isImport eq 1)}">
<label class="radio-inline">
<span>
<input type="radio" name="regionDictIds" class="required"
value="${region.dictId }"
@@ -81,12 +79,12 @@ $(function(){
configPortPattern="${region.configPortPattern}"
configDirection="${region.configDirection}"
configProtocol="${region.configProtocol}"
<c:if test="${regionList.size() eq 1}">checked</c:if>
>
<c:if test="${regionIndex eq 0}">checked</c:if>>
<spring:message code="${region.configRegionValue }"/>
</span>
</label>
<c:set var="regionIndex" value="${regionIndex+1 }"></c:set>
</c:if>
</label>
</c:forEach>
</div>
<div for="action"></div>
@@ -107,6 +105,59 @@ $(function(){
<div for="requestId"></div>
</div>
</br>
<!-- 63 app -->
<c:if test="${cfg.functionId eq 63 }">
<c:set var="cfgType" value="1"></c:set>
<c:set var="spec_service_id"><spring:message code="social_app"/></c:set>
</c:if>
<!-- 408 tunnel behavior -->
<c:if test="${cfg.functionId eq 408 }">
<c:set var="cfgType" value="2"></c:set>
<c:set var="spec_service_id"><spring:message code="encrypted_tunnel_behavior"/></c:set>
</c:if>
<!-- 407 basic -->
<c:if test="${cfg.functionId eq 407 }">
<c:set var="cfgType" value="3"></c:set>
<c:set var="spec_service_id"><spring:message code="basic_protocol"/></c:set>
</c:if>
<c:if test="${!empty cfgType }">
<div class="row">
<c:forEach items="${fns:getDictList('IS_SHOW_BUSINESS_TYPE') }" var="showBusinessType">
<c:if test="${showBusinessType.itemCode==1 }">
<c:set var="isShowBusinessType" value="true"/>
</c:if>
<c:if test="${showBusinessType.itemCode!=1 }">
<c:set var="isShowBusinessType" value="false"/>
</c:if>
</c:forEach>
<c:set var="spec_service_id"><spring:message code="social_app"/></c:set>
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="social_app"/></label>
<div class="col-md-6">
<sys:treeselect id="appId" name="appId" value=""
labelName="parent.specServiceName" notAllowSelectParent="true" enableSearch="true"
labelValue=""
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${cfgType }&specific=${!isShowBusinessType}" extId="0"
notAllowSelectRoot="true" cssClass="form-control required"/>
</div>
<div for="parent.specServiceName"></div>
</div>
</br>
<c:if test="${cfgType eq 3}">
<div class="row hidden">
</c:if>
<c:if test="${cfgType ne 3}">
<div class="row">
</c:if>
<label class="control-label col-md-3"><spring:message code="behaviour_type"/></label>
<div class="col-md-6" id="behaviorId">
<select name="behaviorId" data-live-search="true" class="selectpicker form-control">
<option value=""><spring:message code="select"/></option>
</select>
</div>
</div>
</c:if>
</br>
<div class="col-md-12">
<div class="form-group">
<label class="col-md-2 control-label" style="margin-top:5px;"><spring:message

View File

@@ -85,8 +85,6 @@
<body>
<div class="page-content">
<!-- 模板导入start -->
<%@include file="/WEB-INF/include/excel/importModal.jsp" %>
<div class="theme-panel hidden-xs hidden-sm">
<shiro:hasPermission name="iplist:config">
<button type="button" class="btn btn-primary"
@@ -473,6 +471,8 @@
</div>
</div>
</div>
<c:set var="importPath" value="${ctx}/ntc/iplist/list?functionId=${cfg.functionId}"/>
<!-- 模板导入start -->
<%@include file="/WEB-INF/include/excel/importModal.jsp" %>
</body>
</html>