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

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();