1、修改HTTP/DNS/SSL/MAIL/FTP配置、列表界面字典参数项,以及增加区域管控的查看连接;

2、音视频样例状态修改提交服务接口参数修改,以及界面必填项标识增加;

3、所有数据角色非admin用户过滤配置审核取消的配置;

4、修改功能配置域字典排序。

Signed-off-by: zhangwei <zhangwei@intranet.com>
This commit is contained in:
zhangwei
2018-06-05 18:25:40 +08:00
parent 02177e655c
commit f18dc424ac
21 changed files with 192 additions and 329 deletions

View File

@@ -11,7 +11,7 @@ $(function(){
</head>
<c:forEach items="${regionList}" var="regionDistrict">
<c:if
test="${_cfg.functionId eq regionDistrict.functionId and regionDistrict.regionType eq 1}">
test="${ipPort.functionId eq regionDistrict.functionId and regionDistrict.regionType eq 1}">
<!-- regionDistrict.regionType==1表示IP类配置 -->
<input type="hidden" name="${cfgName}.cfgType" value="${regionDistrict.configRegionValue }">
<input type="hidden" name="${cfgName}.cfgRegionCode" value="${regionDistrict.configRegionCode }">
@@ -32,11 +32,9 @@ $(function(){
<div class="col-md-6">
<select name="${cfgName}.ipType"
class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType">
<option value="${ipType.itemCode}" <c:if test="${ipPort.ipType==ipType.itemCode}">selected</c:if> >
${ipType.itemValue}
</option>
</c:forEach>
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
<option value="${ipTypeC.itemCode}" <c:if test="${ipPort.ipType==ipTypeC.itemCode || (ipPort.ipType==null && ipTypeC.itemCode==4)}">selected</c:if>><spring:message code="${ipTypeC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="${cfgName}.ipType"></div>
@@ -51,14 +49,9 @@ $(function(){
<div class="col-md-6">
<select name="${cfgName}.ipPattern"
class="selectpicker show-tick form-control required">
<option value="1"
<c:if test="${ipPort.ipPattern==1 || ipPort.ipPattern==null}">selected</c:if>><spring:message
code="subnet" /></option>
<option value="2"
<c:if test="${ipPort.ipPattern==2}">selected</c:if>><spring:message
code="ip_range" /></option>
<option value="3"
<c:if test="${ipPort.ipPattern==3}">selected</c:if>>IP</option>
<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
<option value="${ipPatternC.itemCode}" <c:if test="${ipPort.ipPattern==ipPatternC.itemCode || (ipPort.ipPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="${cfgName}.ipPattern"></div>
@@ -85,11 +78,9 @@ $(function(){
<div class="col-md-6">
<select name="${cfgName}.portPattern"
class="selectpicker show-tick form-control required">
<option value="1"
<c:if test="${ipPort.portPattern==1 || ipPort.portPattern== null}">selected</c:if>>port</option>
<option value="2"
<c:if test="${ipPort.portPattern==2}">selected</c:if>><spring:message
code="subnet" /></option>
<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
<option value="${portPatternC.itemCode}" <c:if test="${ipPort.portPattern==portPatternC.itemCode || (ipPort.portPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="${cfgName}.portPattern"></div>
@@ -142,14 +133,9 @@ $(function(){
<div class="col-md-6">
<select name="${cfgName}.protocol"
class="selectpicker show-tick form-control required">
<option value=""><spring:message code="select" /></option>
<option value="6"
<c:if test="${ipPort.protocol==6}">selected</c:if>>TCP</option>
<option value="17"
<c:if test="${ipPort.protocol==17}">selected</c:if>>UDP</option>
<option value="0"
<c:if test="${ipPort.protocol==0 || ipPort.protocol==null}">selected</c:if>><spring:message
code="arbitrary" /></option>
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
<option value="${protocolC.itemCode}" <c:if test="${ipPort.protocol==protocolC.itemCode || (ipPort.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="${cfgName}.protocol"></div>
@@ -162,16 +148,9 @@ $(function(){
<div class="col-md-6">
<select name="${cfgName}.direction"
class="selectpicker show-tick form-control required">
<option value=""><spring:message code="select" /></option>
<option value="0"
<c:if test="${ipPort.direction==0 || ipPort.direction==null}">selected</c:if>><spring:message
code="twoway" /></option>
<option value="1"
<c:if test="${ipPort.direction==1 }">selected</c:if>>
<spring:message code="ingress" /></option>
<option value="2"
<c:if test="${ipPort.direction==2 }">selected</c:if>>
<spring:message code="degress" /></option>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
<option value="${directionC.itemCode}" <c:if test="${ipPort.direction==directionC.itemCode || (ipPort.direction==null && directionC.itemCode==0)}">selected</c:if>><spring:message code="${directionC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="${cfgName}.direction"></div>