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

Merge branch 'develop_no_common_group' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop_no_common_group

Browse Source
This commit is contained in:
duandongmei
2019-04-25 15:18:43 +08:00
parent b50d324303 26097409d6
commit 65d3f5013f
124 changed files with 1174 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/webapp/WEB-INF/tags/sys/delRow.tag
View File

@@ -448,7 +448,7 @@ function doAll(checkboxes,url){
// 无来函选项的取消审核操作
top.$.jBox.confirm("<spring:message code='confirm_message'/>","<spring:message code='info'/>",function(v,h,f){
if(v=="ok"){
if(v=="ok"){
if(url.indexOf("?")>0){
window.location = url+"&ids="+ids+"&compileIds="+compileIds;
}else{
@@ -464,7 +464,6 @@ function doAll(checkboxes,url){
},{buttonsFocus:1});
top.$('.jbox-body .jbox-icon').css('top','55px');
}
alert("333");
//除取消审核之外的业务
}else{
@@ -472,11 +471,14 @@ function doAll(checkboxes,url){
if(v=="ok"){
if(url.indexOf("?")>0){
//window.location = url+"&ids="+ids+"&compileIds="+compileIds;
url = url+"&ids="+ids+"&compileIds="+compileIds;
exportXmlRequest(url);
if(url.indexOf("exType") > 0){
url = url+"&ids="+ids+"&compileIds="+compileIds;
exportXmlRequest(url);
}else{
window.location = url+"&ids="+ids+"&compileIds="+compileIds;
}
}else{
window.location = url+"?ids="+ids+"&compileIds="+compileIds;
window.location = url+"?ids="+ids+"&compileIds="+compileIds;
}
if(url.indexOf("?isAudit") > 1){
loading('<spring:message code="onloading"/>');
@@ -564,14 +566,12 @@ function exportData(url,maxRow,searchUrl,exType){
}
if(column.toString()!="" && column.toString() =="<spring:message code='log'/>"){
top.$.jBox.tip("<spring:message code='all_columns_hidden'/>", "<spring:message code='info'/>");
alert("第一个return");
return;
}
if(column.toString()!=""){
url+="&columns="+column.toString();
}else{
top.$.jBox.tip("<spring:message code='all_columns_hidden'/>", "<spring:message code='info'/>");
alert("第二个return");
return;
}
if(hColumn.toString()!=""){
@@ -590,7 +590,7 @@ function exportData(url,maxRow,searchUrl,exType){
if(v=="ok"){
if($("#intype").val() != null && $("#intype").val() != ""){
$("#intype").attr("name",$("#seltype").val());
}
}
exportXmlRequest(url);
}
},{buttonsFocus:1});
@@ -598,7 +598,7 @@ function exportData(url,maxRow,searchUrl,exType){
}else{
if($("#intype").val() != null && $("#intype").val() != ""){
$("#intype").attr("name",$("#seltype").val());
}
}
exportXmlRequest(url);
}
}else{
@@ -608,16 +608,15 @@ function exportData(url,maxRow,searchUrl,exType){
}
function exportXmlRequest(url){
loading('onloading');
url+="&"+$('#searchForm').serialize();
var xmlResquest = new XMLHttpRequest();
xmlResquest.open("POST", url, true);
xmlResquest.setRequestHeader("Content-type", "application/json");
xmlResquest.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
xmlResquest.responseType = "blob";
xmlResquest.onload = function (oEvent) {
var contDisp = xmlResquest.getResponseHeader("content-disposition");
var fileName = contDisp.substring(contDisp.indexOf("=")+1,contDisp.length).replace(/\"/g,"");
var content = xmlResquest.response;
var elink = document.createElement('a');
var fileName = contDisp.substring(contDisp.indexOf("=")+1,contDisp.length).replace(/\"/g,"");
var content = xmlResquest.response;
var elink = document.createElement('a');
elink.download = fileName;
elink.style.display = 'none';
var blob = new Blob([content]);
@@ -630,7 +629,7 @@ function exportXmlRequest(url){
if (xmlResquest.readyState==4) {
top.$.jBox.closeTip();
}
}
xmlResquest.send();
}
xmlResquest.send($('#searchForm').serialize());
}
</script>
</script>

37
src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
View File

@@ -483,20 +483,35 @@ function sampleFileValidate(fileType,fileName){
</div> --%>
<div class="col-md-6 level" >
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="harm_level"/></label>
<div class="col-md-6">
<select name="level" data-live-search="true" class="selectpicker form-control required">
<option value="0" ><spring:message code="selected"/></option>
<c:forEach items="${fns:getDictList('CONFIDENCE_INTERVAL')}" var="configdenceC">
<option value="${configdenceC.itemCode}" <c:if test="${_cfg.level==configdenceC.itemCode || (_cfg.level==null && configdenceC.itemCode eq 90)}">selected</c:if>><spring:message code="${configdenceC.itemValue}"/></option>
</c:forEach>
</select>
</div>
<c:choose>
<c:when test="${_cfg.functionId eq 29}">
<div class="level hidden">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="harm_level"/></label>
<div class="col-md-6">
<select name="level" data-live-search="true" class="selectpicker form-control required">
<option value="0" ><spring:message code="selected"/></option>
<c:forEach items="${fns:getDictList('CONFIDENCE_INTERVAL')}" var="configdenceC">
<option value="${configdenceC.itemCode}" <c:if test="${_cfg.level==configdenceC.itemCode || (_cfg.level==null && configdenceC.itemCode eq 90)}">selected</c:if>><spring:message code="${configdenceC.itemValue}"/></option>
</c:forEach>
</select>
</div>
</div>
</c:when>
<c:otherwise>
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="harm_level"/></label>
<div class="col-md-6">
<select name="level" data-live-search="true" class="selectpicker form-control required">
<option value="0" ><spring:message code="selected"/></option>
<c:forEach items="${fns:getDictList('CONFIDENCE_INTERVAL')}" var="configdenceC">
<option value="${configdenceC.itemCode}" <c:if test="${_cfg.level==configdenceC.itemCode || (_cfg.level==null && configdenceC.itemCode eq 90)}">selected</c:if>><spring:message code="${configdenceC.itemValue}"/></option>
</c:forEach>
</select>
</div>
</c:otherwise>
</c:choose> 
<div for="level"></div>
</div>
</div>
</div>
<div class="row doLog">

2
src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
View File

@@ -461,7 +461,7 @@
</td>
<td class="schedulerFlag">
<c:choose>
<c:when test="${not empty indexCfg.schedule }">
<c:when test="${not empty cfg.schedule }">
<span isScheduler="yes">
<i class="icon-clock icon-state-danger"></i>
</span>

14
src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp
View File

@@ -274,9 +274,9 @@ function privateFileValidate(){
</c:forEach>
</select>
</div>
</div>
<div for="keyringType"></div>
</div>
<div for="keyringType"></div>
</div>
</div>
</div>
<div class="row">
@@ -302,9 +302,9 @@ function privateFileValidate(){
<input id="publicKeyFile" name="publicKeyFile" type="hidden" value="${_cfg.publicKeyFile }"/>
</div>
</div>
<div id="publicInfo"></div>
<div id="publicInfo"></div>
<div for="publicKeyFileInfo"></div>
</div>
<div for="publicKeyFileInfo"></div>
</div>
<div class="col-md-6">
<div class="form-group">
@@ -329,9 +329,9 @@ function privateFileValidate(){
</div>
</div>
&nbsp;&nbsp;<label ><i class='fa fa-info-circle'></i>&nbsp;<spring:message code='private_certificate'/></label>
<div for="privateInfo"></div>
<div for="privateInfo"></div>
<div for="privateKeyFileInfo"></div>
</div>
<div for="privateKeyFileInfo"></div>
</div>
</div>
<div class="row ">

4
src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
View File

@@ -181,6 +181,10 @@
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return;
} */
if($(".boxSolid:visible").length==0){
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return;
}
//代表所有区域都隐藏了，提示必须增加个区域信息
if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){
if($("#areaIsp").hasClass("hidden")) $("#areaIp").find(".glyphicon-plus").click();

20
src/main/webapp/static/pages/scripts/pageLogs.js
View File

@@ -117,27 +117,24 @@ Date.prototype.Format = function (fmt) {
function aJaxImportPost(url, params) {
top.$.jBox.tip("onloading",'loading',{opacity:0.5,persistent:true});
// 创建form元素
var temp_form = document.createElement("form");
temp_form.id = "temp_form";
var temp_form = document.createElement("form");
// 设置form属性
temp_form .id = 'temp_form';
temp_form .action = url;
temp_form .target = "_self";
temp_form .method = "post";
temp_form .style.display = "none";
temp_form .style.display = "none";
// 处理需要传递的参数
for (var x in params) {
var opt = document.createElement("textarea");
opt.name = x;
opt.value = params[x];
temp_form .appendChild(opt);
}
document.body.appendChild(temp_form);
url=url+"?";
url+="&"+$('#temp_form').serialize();
}
document.body.appendChild(temp_form);
var xmlResquest = new XMLHttpRequest();
xmlResquest.open("POST", url, true);
xmlResquest.setRequestHeader("Content-type", "application/json");
xmlResquest.setRequestHeader("Content-Disposition","attachment");
xmlResquest.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
xmlResquest.responseType = "blob";
xmlResquest.onload = function (oEvent) {
var contDisp = xmlResquest.getResponseHeader("content-disposition")
@@ -150,13 +147,12 @@ function aJaxImportPost(url, params) {
elink.href = URL.createObjectURL(blob);
document.body.appendChild(elink);
elink.click();
document.body.removeChild(elink);
document.body.removeChild(elink);
};
xmlResquest.onreadystatechange = function() {
if (xmlResquest.readyState==4) {
top.$.jBox.closeTip();
}
};
xmlResquest.send();
xmlResquest.send($("#temp_form").serialize());
}