gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

（1）IP类通用导入配置功能增加，针对同一个菜单不同action发往不同maattable进行了处理。格式验证在后面会加上。

Browse Source 
（2）IP通用页面，域名通用页面表单提交遮罩层增加。
This commit is contained in:
wangxin
2018-07-01 15:32:27 +08:00
parent 1d7896872e
commit fff7aec3f2
14 changed files with 382 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
src/main/webapp/WEB-INF/include/excel/importIp.jsp Normal file
View File

@@ -0,0 +1,115 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<script type="text/javascript">
$(function(){
conslole.log("调用须知：调用本页面函数在common.js里，并且需要配置字典MAAT_SERVICE中的项")
});
</script>
<div class="modal fade" id="import_modal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<form id="importForm1" action="${ctx}${urlPrefix}/importIp"
method="post" enctype="multipart/form-data" class="form-horizontal"
onsubmit="loading('<spring:message code='loading'/>');">
<input type="hidden" id="cfgRegionCode" name="cfgRegionCode" value="" />
<input type="hidden" id="cfgType" name="cfgType" value=""/>
<input type="hidden" id="serviceId" name="serviceId" value="">
<input type="hidden" id="protocolId" name="protocolId" value="">
<input type="hidden" id="functionId" name="functionId" value="${cfg.functionId}">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">
<spring:message code="import" />
</h5>
<button type="button" class="close" data-dismiss="modal"
aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<div class="alert alert-error hide">
<button class="close" data-dismiss="alert"></button>
<span></span>
</div>
<div class="row">
<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}">
<c:forEach items="${fns:getDictList('MAAT_SERVICE')}" var="serviceC">
<c:if test="${service.serviceId==serviceC.itemCode}">
<span class="${serviceC.itemValue}">
<input type="radio" name="action" serviceId="${service.serviceId }" protocolId="${service.protocolId }"
value="${service.action }" disabled class="required action">
<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>
</span>
</c:if>
</c:forEach>
</c:if>
</label>
</c:forEach>
</div>
<div for="action"></div>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="form-group">
<label class="col-md-2 control-label" style="margin-top:5px;"><spring:message
code="chooseFile" />：</label>
<div class="controls">
<div class="fileupload fileupload-new"
data-provides="fileupload">
<div class="input-append">
<div class="uneditable-input">
<i class="fa fa-fa fa-file"></i> <span
class="fileupload-preview"></span>
</div>
<span class="btn btn-file ">
<button type="button" class="btn fileupload-new">
<spring:message code="add" />
</button>
<button type="button" class="btn fileupload-exists">
<spring:message code="edit" />
</button> <input type="file" class="default" id="uploadFile"
name="file" /> <input type="hidden" name="flag"
value="${flag }" />
</span>
<button type="button" class="btn red fileupload-exists"
data-dismiss="fileupload" style="margin-left:-1px;">
<spring:message code="remove" />
</a>
<button type="button" onclick="downLoadXLS()"
class="btn black" style="margin-left:-1px">
<spring:message code="download" />
</button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn red" onclick="importCfg()">
<spring:message code="ok" />
</button>
<button type="button" class="btn" data-dismiss="modal">
<spring:message code="close" />
</button>
</div>
</div>
</div>
</form>
</div>

29
src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
View File

@@ -38,19 +38,6 @@
$("#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>
@@ -60,12 +47,28 @@
</c:if>
</c:forEach>
<div class="page-content">
<!-- 模板导入，start -->
<%@include file="/WEB-INF/include/excel/importIp.jsp" %>
<!-- 模板导入，end -->
<div class="theme-panel hidden-xs hidden-sm">
<shiro:hasPermission name="${requiresPermissionPrefix.concat(':config')}">
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}${urlPrefix}/form?functionId=${cfg.functionId}&cfgName=${cfgName}'">
<i class="fa fa-plus"></i>
<spring:message code="add"></spring:message></button>
<!-- 导入功能按钮 -->
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle green" data-toggle="dropdown">
<i class="fa fa-wrench"></i> <spring:message code="import"></spring:message>
<i class="fa fa-angle-down"></i>
</button>
<ul class="dropdown-menu pull-right">
<c:forEach items="${regionList}" var="region" varStatus="status">
<li><a href="javascript:;" onClick="toImport('${region.configRegionCode}','${region.configRegionValue}');">
<i class="fa fa-upload"></i><spring:message code="${region.configRegionValue}"/></a></li>
</c:forEach>
</ul>
</div>
</shiro:hasPermission>
</div>
<h3 class="page-title">