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

1、修改多域配置表单逻辑，删除修改不必要的功能配置域字典多层循环判断；

Browse Source 
2、修改配置列表的区域管控信息查询

Signed-off-by: zhangwei <zhangwei@intranet.com>
This commit is contained in:
zhangwei
2018-06-06 09:57:26 +08:00
parent 827325ef75
commit 59202b6d29
17 changed files with 191 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
View File

@@ -5,16 +5,16 @@
<title></title>
</head>
<c:forEach items="${regionList}" var="regionDistrict">
<%-- <c:forEach items="${regionList}" var="regionDistrict">
<c:if
test="${_cfg.functionId eq regionDistrict.functionId
and regionDistrict.regionType eq 3
and regionValue eq regionDistrict.configRegionValue}">
and regionValue eq regionDistrict.configRegionValue}"> --%>
<!-- regionDistrict.regionType==3表示增强字符串类配置 -->
<input type="hidden" name="${cfgName}.cfgType" value="${regionDistrict.configRegionValue }">
<input type="hidden" name="${cfgName}.cfgRegionCode" value="${regionDistrict.configRegionCode }">
</c:if>
</c:forEach>
<input type="hidden" name="${cfgName}.cfgType" value="${region.configRegionValue }">
<input type="hidden" name="${cfgName}.cfgRegionCode" value="${region.configRegionCode }">
<%-- </c:if>
</c:forEach> --%>
<div class="row">
<div class="pull-right">
@@ -30,16 +30,11 @@
<div class="col-md-6">
<select name="${cfgName}.district"
class="selectpicker show-tick form-control required district" onchange="changeDistrict($(this))">
<c:forEach items="${regionList}" var="regionDistrict">
<c:if
test="${_cfg.functionId eq regionDistrict.functionId and regionValue eq regionDistrict.configRegionValue}">
<c:forEach items="${fn:split(regionDistrict.configDistrict,',')}"
var="_district">
<option value="${_district }"
<c:if test="${complexCfg.district==_district}">selected</c:if>>${_district }</option>
</c:forEach>
</c:if>
</c:forEach>
<c:forEach items="${fn:split(region.configDistrict,',')}"
var="_district">
<option value="${_district }"
<c:if test="${complexCfg.district==_district}">selected</c:if>>${_district }</option>
</c:forEach>
</select>
<input type="hidden" name="${cfgName}.districtShowName" placeholder="<spring:message code='please_input'/> <spring:message code='custom_region'/>" class="otherValue form-control" value="${complexCfg.district}"/>
</div>