Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
This commit is contained in:
wangxin
@@ -76,20 +76,177 @@
|
||||
$("#"+openId).show();
|
||||
$("#"+closeId).parent().parent().next("tr").hide();
|
||||
});
|
||||
$(".action").on("change", function() {
|
||||
$("#serviceId").val($(this).attr("serviceId"));
|
||||
$("#protocolId").val($(this).attr("protocolId"));
|
||||
});
|
||||
});
|
||||
|
||||
//导入文件提示框
|
||||
/* function toImport(cfgRegionCode,cfgType){
|
||||
$("#cfgRegionCode").val(cfgRegionCode);
|
||||
$("#cfgType").val(cfgType);
|
||||
$("#import_modal").modal({
|
||||
backdrop:"static",
|
||||
keyboard:false,
|
||||
show:true
|
||||
});
|
||||
}
|
||||
//下载模板
|
||||
function downLoadXLS(){
|
||||
window.location ="${ctx}/ntc/website/import/template?functionId="+$("#functionId").val()+"&cfgRegionCode="+$("#cfgRegionCode").val();
|
||||
}
|
||||
//导入配置
|
||||
function importCfg(){
|
||||
if($("#serviceId").val()==""){
|
||||
alert("请选择action");
|
||||
return ;
|
||||
}
|
||||
var fileName = $(".fileupload-preview", $("#importForm1")).text();
|
||||
var $error = $('.alert-error', $("#importForm1"));
|
||||
if(fileName==""){
|
||||
|
||||
$("span",$error).html("请选择xls或者xlsx格式文件进行导入...");
|
||||
$error.removeClass("hide");
|
||||
$error.addClass("show");
|
||||
return false;
|
||||
|
||||
}else if(fileName.lastIndexOf("\.")==-1||fileName.substring(fileName.lastIndexOf("\.")+1).toLowerCase()!='xls' &&fileName.substring(fileName.lastIndexOf("\.")+1).toLowerCase()!='xlsx'){
|
||||
$("span",$error).html("导入的文件后缀，必须为xls或者xlsx...");
|
||||
$error.removeClass("hide");
|
||||
$error.addClass("show");
|
||||
return false;
|
||||
}
|
||||
$("#import_modal").modal('hide');//导入文件隐藏
|
||||
$("#importForm1").submit();
|
||||
} */
|
||||
</script>
|
||||
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<div class="page-content">
|
||||
<div class="theme-panel hidden-xs hidden-sm">
|
||||
<%-- <div class="modal fade" id="import_modal" tabindex="-1" role="dialog"
|
||||
aria-labelledby="exampleModalLabel" aria-hidden="true">
|
||||
<form id="importForm1" action="${ctx}/ntc/website/importHttp/"
|
||||
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">×</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}">
|
||||
<input type="radio" name="action"
|
||||
serviceId="${service.serviceId }"
|
||||
protocolId="${service.protocolId }"
|
||||
value="${service.action }" class="required action">
|
||||
<spring:message code="${service.actionCode }" />
|
||||
</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> --%>
|
||||
|
||||
<div class="theme-panel hidden-xs hidden-sm">
|
||||
<shiro:hasPermission name="website:http:config">
|
||||
<button type="button" class="btn btn-primary"
|
||||
onClick="javascript:window.location='${ctx}/ntc/website/httpForm?functionId=${cfg.functionId}'">
|
||||
<i class="fa fa-plus"></i>
|
||||
<spring:message code="add"></spring:message></button>
|
||||
<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>
|
||||
|
||||
|
||||
@@ -31,8 +31,6 @@
|
||||
|
||||
$("button[data-dismiss='modal']").click(function (){
|
||||
|
||||
alert("close");
|
||||
|
||||
window.location ="${ctx}/specific/specificServiceHostCfg/list";
|
||||
})
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user