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
test="${strCfg.functionId eq regionDistrict.functionId
and regionDistrict.regionType eq 2
and regionValue eq regionDistrict.configRegionValue}">
<!-- regionDistrict.regionType==2表示字符串类配置 -->
@@ -67,19 +67,9 @@ $(function(){
<div class="col-md-6">
<select name="${cfgName}.matchMethod"
class="selectpicker select2 form-control required">
<option value=""><spring:message code="select" /></option>
<option value="0"
<c:if test="${strCfg.matchMethod==0 || strCfg.matchMethod==null }">selected</c:if>><spring:message
code="substring_match"></spring:message></option>
<option value="1"
<c:if test="${strCfg.matchMethod==1 }">selected</c:if>><spring:message
code="right_match"></spring:message></option>
<option value="2"
<c:if test="${strCfg.matchMethod==2 }">selected</c:if>><spring:message
code="left_match"></spring:message></option>
<option value="3"
<c:if test="${strCfg.matchMethod==3 || strCfg.matchMethod==null}">selected</c:if>><spring:message
code="exactly_match"></spring:message></option>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<option value="${matchMethodC.itemCode}" <c:if test="${strCfg.matchMethod==matchMethodC.itemCode || (strCfg.matchMethod==null && matchMethodC.itemCode==3)}">selected</c:if>><spring:message code="${matchMethodC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="${cfgName}.matchMethod"></div>
@@ -94,16 +84,9 @@ $(function(){
<div class="col-md-6">
<select name="${cfgName}.isHexbin"
class="selectpicker select2 form-control required">
<option value=""><spring:message code="select" /></option>
<option value="0"
<c:if test="${strCfg.isHexbin==0 || strCfg.isHexbin==null}">selected</c:if>><spring:message
code="case_insensitive_nohex"></spring:message></option>
<option value="1"
<c:if test="${strCfg.isHexbin==1 }">selected</c:if>><spring:message
code="hex_binary"></spring:message></option>
<option value="2"
<c:if test="${strCfg.isHexbin==2 }">selected</c:if>><spring:message
code="case_sensitive_nohex"></spring:message></option>
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
<option value="${isHexbinC.itemCode}" <c:if test="${strCfg.isHexbin==isHexbinC.itemCode || (strCfg.matchMethod==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="${cfgName}.isHexbin"></div>