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

去掉分组管理无用代码

Browse Source
This commit is contained in:
zhangwenqing
2019-06-05 10:40:36 +08:00
parent 2e2249ce15
commit c83472c508
20 changed files with 395 additions and 1065 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/webapp/WEB-INF/views/basics/commonGroupForm.jsp
View File

@@ -23,12 +23,6 @@ $(function(){
}
},
submitHandler: function(form){
if("${_cfg.groupType}" == 4){
$(".asnNo").removeClass("hidden");
}
if("${_cfg.groupType}" == 6){
$("#asnNo").val($(".groupType").find("#asnNo").val());
}
loading('onloading...');
form.submit();
},
@@ -81,10 +75,6 @@ $(function(){
<option value="${groupTypeC.itemCode}" <c:if test="${_cfg.groupType==groupTypeC.itemCode || (_cfg.groupType==null && groupTypeC.itemCode==1)}">selected</c:if>><spring:message code="${groupTypeC.itemValue}"/></option>
</c:if>
</c:forEach>
<%-- <option value="5" <c:if test="${_cfg.groupType eq 5 }">selected</c:if>><spring:message code="IP GROUP"/></option>
<option value="6" <c:if test="${_cfg.groupType eq 6 }">selected</c:if>><spring:message code="URL GROUP"/></option>
<option value="7" <c:if test="${_cfg.groupType eq 7 }">selected</c:if>><spring:message code="Domain GROUP"/></option>
<option value="8" <c:if test="${_cfg.groupType eq 8 }">selected</c:if>><spring:message code="SubscribeID GROUP"/></option> --%>
</select>
</div>
<div for="groupType"></div>

111
src/main/webapp/WEB-INF/views/basics/commonGroupList.jsp
View File

@@ -39,13 +39,6 @@
if(true == $(this).is(':checked')){
str += $(this).attr("id")+"_"+$(this).attr("groupType")+",";
ids += $(this).attr("id")+",";
/* if(typeof (map.get($(this).attr("groupType"))) != "undefined"){
map.set($(this).attr("groupType"), map.get($(this).attr("groupType")) +"_"+ $(this).attr("id"));
}else{
map.set($(this).attr("groupType"), $(this).attr("id"));
} */
//map.set($(this).attr("groupType"),$(this).attr("id"));
}
});
@@ -140,21 +133,13 @@
</div> --%>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<form:select path="seltype" class="selectpicker select2 input-small" >
<form:option value="groupName"><spring:message code="group_name"></spring:message></form:option>
<%-- <c:if test="${cfg.groupType==4}">
<form:option value="asnNo"><spring:message code="asn_no"></spring:message></form:option>
</c:if> --%>
</form:select>
</div>
<input id="intype" class="form-control input-medium" type="text" value="">
</div>
</div>
<div class="pull-left">
@@ -162,16 +147,13 @@
<button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
<button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/> <i class="fa fa-angle-double-down"></i></button>
</div>
<div class="pull-right">
<%-- <shiro:hasPermission name="avContUrl:config"> --%>
<sys:delRow url="${ctx}/basics/commonGroup/form?groupType=${cfg.groupType}" id="contentTable" label="update"></sys:delRow>
<a href="javascript:void(0);" class="btn btn-default" onclick="deletes('${ctx}/basics/commonGroup/delete?isValid=0&groupType=${cfg.groupType}')" data-toggle="tooltip" data-placement="top">
<i class="fa fa-trash"> <spring:message code="delete"/></i>
</a>
<%-- <sys:delRow url="${ctx}/basics/asn/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow> --%>
<%-- </shiro:hasPermission> --%>
<div class="btn-group">
<div class="pull-right">
<sys:delRow url="${ctx}/basics/commonGroup/form?groupType=${cfg.groupType}" id="contentTable" label="update"></sys:delRow>
<a href="javascript:void(0);" class="btn btn-default" onclick="deletes('${ctx}/basics/commonGroup/delete?isValid=0&groupType=${cfg.groupType}')" data-toggle="tooltip" data-placement="top">
<i class="fa fa-trash"> <spring:message code="delete"/></i>
</a>
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-wrench"></i> <spring:message code="export"></spring:message>
<i class="fa fa-angle-down"></i>
@@ -181,7 +163,6 @@
<li><sys:delRow url="${ctx}/basics/commonGroup/exportGroup?exType=csv" searchUrl="${ctx}/basics/commonGroup/list" id="contentTable" maxRow="5" label="cfg_csv"></sys:delRow></li>
</ul>
</div>
<a class="btn btn-icon-only btn-default setfields tooltips"
data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
<i class="icon-wrench"></i>
@@ -240,12 +221,6 @@
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th column="group_name" ><spring:message code="group_name"/></th>
<th column="group_type" ><spring:message code="group_type"/></th>
<%-- <c:if test="${cfg.groupType==4}">
<th column="asn_no" ><spring:message code="asn_no"/></th>
</c:if> --%>
<%-- <c:if test="${cfg.groupType==6}">
<th><spring:message code="group_type"/></th>
</c:if> --%>
<th column="desc" ><spring:message code="desc"/></th>
<th column="creator" ><spring:message code="creator"/></th>
<th column="config_time" class="sort-column r.create_time"><spring:message code="config_time"/></th>
@@ -256,60 +231,24 @@
<tbody>
<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
<tr>
<td><input type="checkbox" class="i-checks" id="${cfg.groupId}" groupType="${cfg.groupType}" serviceGroupId="${cfg.serviceGroupId}"></td>
<td>
<a href="javascript:;" data-original-title="${cfg.groupName}"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fns:abbr(cfg.groupName,20)}
</a>
</td>
<td>
<%-- <c:if test="${cfg.groupType==5}">
<spring:message code="IP GROUP"/>
</c:if>
<c:if test="${cfg.groupType==6}">
<spring:message code="URL GROUP"/>
</c:if>
<c:if test="${cfg.groupType==7}">
<spring:message code="Domain GROUP"/>
</c:if>
<c:if test="${cfg.groupType==8}">
<spring:message code="SubscribeID GROUP"/>
</c:if> --%>
<c:forEach items="${fns:getDictList('GROUP_TYPE')}" var="groupTypeC">
<c:if test="${cfg.groupType==groupTypeC.itemCode }"><spring:message code="${groupTypeC.itemValue}"/></c:if>
</c:forEach>
<%-- <c:choose>
<c:when test="${cfg.groupType==6 }">
<c:forEach items="${fns:getDictList('IR_TYPE')}" var="groupTypeC">
<c:if test="${cfg.asnNo==groupTypeC.itemCode }"><spring:message code="${groupTypeC.itemValue}"/></c:if>
</c:forEach>
</c:when>
<c:otherwise>
<c:forEach items="${fns:getDictList('GROUP_TYPE')}" var="groupTypeC">
<c:if test="${cfg.groupType==groupTypeC.itemCode }"><spring:message code="${groupTypeC.itemValue}"/></c:if>
</c:forEach>
</c:otherwise>
</c:choose> --%>
</td>
<%-- <c:if test="${cfg.groupType==4}">
<td>${cfg.asnNo}</td>
</c:if> --%>
<%-- <c:if test="${cfg.groupType==6}">
<td>
<c:forEach items="${fns:getDictList('IR_TYPE')}" var="ipTypeC">
<c:if test="${cfg.asnNo==ipTypeC.itemCode}">
${ipTypeC.itemValue }
</c:if>
</c:forEach>
</td>
</c:if> --%>
<td title="${cfg.description }">${fns:abbr(cfg.description,20)}</td>
<td>${cfg.creatorName }</td>
<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
<td>${cfg.editorName }</td>
<td><fmt:formatDate value="${cfg.editTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
</tr>
<td><input type="checkbox" class="i-checks" id="${cfg.groupId}" groupType="${cfg.groupType}" serviceGroupId="${cfg.serviceGroupId}"></td>
<td>
<a href="javascript:;" data-original-title="${cfg.groupName}"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fns:abbr(cfg.groupName,20)}
</a>
</td>
<td>
<c:forEach items="${fns:getDictList('GROUP_TYPE')}" var="groupTypeC">
<c:if test="${cfg.groupType==groupTypeC.itemCode }"><spring:message code="${groupTypeC.itemValue}"/></c:if>
</c:forEach>
</td>
<td title="${cfg.description }">${fns:abbr(cfg.description,20)}</td>
<td>${cfg.creatorName }</td>
<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
<td>${cfg.editorName }</td>
<td><fmt:formatDate value="${cfg.editTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
</tr>
</c:forEach>
</tbody>
</table>

14
src/main/webapp/WEB-INF/views/basics/ipCommGroupFormAdd.jsp
View File

@@ -138,23 +138,19 @@
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_group"/></label>
<div class="col-md-6">
<select name="userRegion3" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
<option value="${_cfg.userRegion3}"><spring:message code="select"/></option>
<select name="groupId" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
<option value=""><spring:message code="select"/></option>
<c:forEach items="${policyGroupInfos}" var="ipGroupInfo">
<option value="${ipGroupInfo.groupId}"
<c:if test="${_cfg.userRegion3 eq ipGroupInfo.groupId }">
selected
</c:if>
>${ipGroupInfo.groupName}</option>
<option value="${ipGroupInfo.serviceGroupId}">${ipGroupInfo.groupName}</option>
</c:forEach>
</select>
</div>
<div for="userRegion3"></div>
<div for="groupId"></div>
</div>
</div>
</div>
<h4 class="form-section">
<spring:message code="ip_group_configuration" />
<spring:message code="http_ip_title" />
<small> <span
class="glyphicon glyphicon-plus ipAdd"
onClick="addContent(this,'ipInfo')" title="add"></span></small>

13
src/main/webapp/WEB-INF/views/basics/ipCommGroupFormUpdate.jsp
View File

@@ -5,8 +5,6 @@
<title><spring:message code="ip_group_configuration"></spring:message></title>
<script type="text/javascript">
$(function(){
$("select[name='protocol']").parents(".form-group").addClass("hidden");
$("select[name='direction']").parents(".form-group").addClass("hidden");
$("#cfgFrom").validate({
errorPlacement: function(error,element){
$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
@@ -96,8 +94,8 @@
<select name="groupId" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
<option value="${_cfg.groupId}"><spring:message code="select"/></option>
<c:forEach items="${policyGroupInfos}" var="ipGroupInfo">
<option value="${ipGroupInfo.groupId}"
<c:if test="${_cfg.groupId eq ipGroupInfo.groupId }">
<option value="${ipGroupInfo.serviceGroupId}"
<c:if test="${_cfg.groupId eq ipGroupInfo.serviceGroupId }">
selected
</c:if>
>${ipGroupInfo.groupName}</option>
@@ -129,7 +127,12 @@
</div>
</div>
</div>
<div class="row ipInfo">
<h4 class="form-section">
<spring:message code="http_ip_title" />
</h4>
<div class="row ipInfo boxSolid">
<div class="row" style="height: 15px;"></div>
<div class="row">
<div class="col-md-6">
<div class="form-group ">

129
src/main/webapp/WEB-INF/views/basics/ipCommonGroupCfgList.jsp
View File

@@ -41,7 +41,7 @@
//修改导入Form表单action
var importPath="/basics/ip/list?functionId=${cfg.functionId}"
$("#importForm1").attr("action","${ctx}/basics/ip/import?importPath="+importPath);
ajaxGroupName();
});
var edit=function(url){
var cked = $('tbody tr td input.i-checks:checkbox:checked');
@@ -56,34 +56,7 @@
return;
}
}
var ajaxGroupName=function(){
var groupIds=[];
$(".group").each(function(){
if(groupIds.join(",").indexOf($(this).text().trim())==-1){
groupIds.push($(this).text().trim());
}
});
$.ajax({
type:'post',
timeout:10000,//超时时间设置，查询接口时间过长超时
url:'${ctx}/basics/ip/ajaxGetGroups',
data:{"groupIds":groupIds.join(',')},
dataType:'json',
async:true,
success:function(data,textStatus){//处理返回结果
if(textStatus=="success"){
$(".group").each(function(){
var text=$(this);
$.each(data,function(key,values){
if(key==$(text).text()){
$(text).html(values);
}
});
})
}
}
});
}
</script>
</head>
<body>
@@ -167,7 +140,7 @@
<form:select path="groupId" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
<form:option value=""><spring:message code='ip_group'/></form:option>
<c:forEach items="${policyGroupInfos}" var="policyGroup">
<form:option value="${policyGroup.groupId}"><spring:message code='${policyGroup.groupName}'/></form:option>
<form:option value="${policyGroup.serviceGroupId}"><spring:message code='${policyGroup.groupName}'/></form:option>
</c:forEach>
</form:select>
</div>
@@ -251,29 +224,8 @@
</div>
</div>
<%-- <div class="col-md-2">
<div class="form-group">
<label><spring:message code="audit_time"/>：</label>
<input name="search_audit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="<fmt:formatDate value="${cfg.search_audit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
</div>
</div>
<div class="col-md-2">
<div class="form-group">
<label>&nbsp;</label>
<input name="search_audit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="<fmt:formatDate value="${cfg.search_audit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
</div>
</div> --%>
</div>
</div>
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
@@ -281,69 +233,62 @@
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<%-- <th class="sort-column r.compile_id" style="display: none;" column="cfg_id" ><spring:message code="cfg_id"/></th> --%>
<%-- <th><spring:message code="seq"/></th> --%>
<th column="config_describe" ><spring:message code="config_describe"/></th>
<%-- <th><spring:message code="group"/></th> --%>
<th class="sort-column r.user_region3" column="userregion3" ><spring:message code="ip_group"/></th>
<th column="ip_type" ><spring:message code="ip_type"/></th>
<th column="IP" ><spring:message code="IP"/></th>
<th column="ip_pattern" ><spring:message code="ip_pattern"/></th>
<%-- <th><spring:message code="is_audit"/></th> --%>
<%-- <th><spring:message code="log_total"/></th> --%>
<th column="valid_identifier" ><spring:message code="valid_identifier"/></th>
<th column="creator" ><spring:message code="creator"/></th>
<th column="config_time" class="sort-column r.create_time"><spring:message code="config_time"/></th>
<th column="editor" ><spring:message code="editor"/></th>
<th column="edit_time" class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
<%-- <th><spring:message code="auditor"/></th>
<th class="sort-column r.audit_time"><spring:message code="audit_time"/></th> --%>
<%-- <th><spring:message code="operation"></spring:message></th> --%>
</tr>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th column="config_describe" ><spring:message code="config_describe"/></th>
<th class="sort-column r.group_id" column="groupId" ><spring:message code="group_name"/></th>
<th column="ip_type" ><spring:message code="ip_type"/></th>
<th column="ip_pattern" ><spring:message code="ip_pattern"/></th>
<th column="IP" ><spring:message code="IP"/></th>
<th column="protocol" ><spring:message code="protocol"/></th>
<th column="direction" ><spring:message code="direction"/></th>
<th column="creator" ><spring:message code="creator"/></th>
<th column="config_time" class="sort-column r.create_time"><spring:message code="config_time"/></th>
<th column="editor" ><spring:message code="editor"/></th>
<th column="edit_time" class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
</tr>
</thead>
<tbody>
<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
<tr>
<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}" isValid="${cfg.isValid}" value="${cfg.isAudit}"></td>
<%-- <td>${cfg.compileId }</td> --%>
<td>${cfg.cfgDesc }</td>
<td class="group">${cfg.groupId}</td>
<td>
<c:forEach items="${policyGroupInfos}" var="policyGroup">
<c:if test="${policyGroup.serviceGroupId eq cfg.groupId }">
${policyGroup.groupName}
</c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemValue }"/></c:if>
</c:forEach>
</td>
<td title="${cfg.destIpAddress }">${fns:abbr(cfg.destIpAddress, 42)}</td>
<%-- <td>${cfg.destPort }</td> --%>
<td>
<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
<c:if test="${cfg.destIpPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemValue }"/></c:if>
</c:forEach>
</td>
<%-- <td>
<c:choose>
<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
</c:choose>
</td> --%>
<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td> --%>
<td title="${cfg.destIpAddress }">${fns:abbr(cfg.destIpAddress, 42)}</td>
<td>
<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
<c:if test="${cfg.protocol==protocolC.itemCode }">
<spring:message code="${protocolC.itemValue }"/>
</c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
<c:if test="${cfg.direction==directionC.itemCode}">
<spring:message code="${directionC.itemValue}"/>
</c:if>
</c:forEach>
</td>
<td>${cfg.creatorName }</td>
<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
<td>${cfg.editorName }</td>
<td><fmt:formatDate value="${cfg.editTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
<%-- <td>${cfg.auditorName }</td>
<td><fmt:formatDate value="${cfg.auditTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td> --%>
</tr>
</c:forEach>
</tbody>

6
src/main/webapp/WEB-INF/views/basics/urlCommGroupFormAdd.jsp
View File

@@ -271,14 +271,14 @@
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="url_group"/></label>
<div class="col-md-6">
<select name="userRegion3" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
<select name="groupId" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
<option value=""><spring:message code="select"/></option>
<c:forEach items="${policyGroupInfos}" var="urlGroupInfo">
<option value="${urlGroupInfo.groupId}">${urlGroupInfo.groupName}</option>
<option value="${urlGroupInfo.serviceGroupId}">${urlGroupInfo.groupName}</option>
</c:forEach>
</select>
</div>
<div for="userRegion3"></div>
<div for="groupId"></div>
</div>
</div>
</div>

22
src/main/webapp/WEB-INF/views/basics/urlCommGroupFormUpdate.jsp
View File

@@ -121,18 +121,18 @@
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="urlGroup"/></label>
<div class="col-md-6">
<%-- <input class="form-control required digits asnMustExists" type="text" name="${cfgName}.cfgKeywords" value="${cfg.cfgKeywords}" ctx="${ctx}"> --%>
<select name="userRegion3" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
<option value="${_cfg.userRegion3}"><spring:message code="select"/></option>
<c:forEach items="${policyGroupInfos}" var="urlGroupInfo">
<option value="${urlGroupInfo.groupId}"
<c:if test="${_cfg.userRegion3 eq urlGroupInfo.groupId }">
<select name="groupId" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
<option value=""><spring:message code="select"/></option>
<c:forEach items="${policyGroupInfos}" var="groupInfo">
<option value="${groupInfo.serviceGroupId}"
<c:if test="${_cfg.groupId eq groupInfo.serviceGroupId }">
selected
</c:if>
>${urlGroupInfo.groupName}</option>
>${groupInfo.groupName}</option>
</c:forEach>
</select>
</div>
<div for="userRegion3"></div>
<div for="groupId"></div>
</div>
</div>
</div>
@@ -152,7 +152,7 @@
onClick="delContent(this,'strInfo');" />
</div>
</div> -->
<div class=" boxSolid ">
<div class="boxSolid">
<div class="row" style="height: 15px;"></div>
<c:forEach items="${regionList}" var="region" varStatus="status">
<%-- <c:set var="cfgName" value="urlCommGroupList[-1]"></c:set> --%>
@@ -243,7 +243,11 @@
<c:forEach var="matchMethod" items="${fn:split(region.configMatchMethod,',')}">
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<c:if test="${matchMethodC.itemCode eq matchMethod}">
<option value="${matchMethodC.itemCode}">
<option value="${matchMethodC.itemCode}"
<c:if test="${_cfg.matchMethod eq matchMethod}">
selected
</c:if>
>
<spring:message code="${matchMethodC.itemValue}"/>
</option>
</c:if>

120
src/main/webapp/WEB-INF/views/basics/urlCommGroupList.jsp
View File

@@ -8,8 +8,6 @@
//搜索框提示语初始化
if("${cfg.cfgDesc}"){
$("#intype").val("${cfg.cfgDesc}");
}else if("${cfg.compileId}"){
$("#intype").val("${cfg.compileId}");
}else if("${cfg.cfgKeywords}"){
$("#intype").val("${cfg.cfgKeywords}");
}else{
@@ -82,7 +80,6 @@
<h3 class="page-title">
<spring:message code="url_group_configuration"></spring:message>
</h3>
<h5 class="page-header"></h5>
<div class="col-md-12">
@@ -96,50 +93,27 @@
<input id="exportValue" type="hidden" value=""/>
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}"
callback="page();" />
<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();" />
<!-- 筛选按钮展开状态-->
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${cfg.isFilterAction }"/>
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12">
<%-- <div class="pull-left">
<c:set var="state"><spring:message code='group'/></c:set>
<form:select path="isAudit" class="selectpicker select2 input-small">
<form:option value=""><spring:message code="all_states"/></form:option>
<form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option>
<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
</form:select>
</div> --%>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<form:select path="seltype" class="selectpicker select2 input-small" >
<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
<form:option value="cfgKeywords"><spring:message code="URL"></spring:message></form:option>
<%-- <form:option value="action"><spring:message code="block_type"></spring:message></form:option> --%>
<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
<form:option value="cfgKeywords"><spring:message code="URL"/> <spring:message code="key_word"/></form:option>
</form:select>
</div>
<input id="intype" class="form-control input-medium" type="text" value="">
<div class="input-group-btn">
<form:select path="isValid" class="selectpicker select2 input-small" >
<form:option value=""><spring:message code="select"/></form:option>
<form:option value="1"><spring:message code="yes"/></form:option>
<form:option value="0"><spring:message code="no"/></form:option>
</form:select>
</div>
</div>
</div>
<div class="pull-left">
<form:select path="groupId" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
<form:option value=""><spring:message code='url_group'/></form:option>
<c:forEach items="${policyGroups}" var="policyGroup">
<form:option value="${policyGroup.groupId}"><spring:message code='${policyGroup.groupName}'/></form:option>
<c:forEach items="${policyGroupInfos}" var="policyGroup">
<form:option value="${policyGroup.serviceGroupId}"><spring:message code='${policyGroup.groupName}'/></form:option>
</c:forEach>
</form:select>
</div>
@@ -166,19 +140,6 @@
</ul>
</div>
<%-- <shiro:hasPermission name="url:common:confirm">
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
<i class="fa fa-angle-down"></i>
</button>
<ul class="dropdown-menu pull-right">
<li><sys:delRow url="${ctx}/basics/url/audit?isAudit=1&isValid=1&functionId=${cfg.functionId }" id="contentTable" label="approved"></sys:delRow></li>
<li><sys:delRow url="${ctx}/basics/url/audit?isAudit=2&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="unapproved"></sys:delRow></li>
<li><sys:delRow url="${ctx}/basics/url/audit?isAudit=3&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="cancelPass"></sys:delRow></li>
</ul>
</div>
</shiro:hasPermission> --%>
<a class="btn btn-icon-only btn-default setfields tooltips"
data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
<i class="icon-wrench"></i>
@@ -224,29 +185,8 @@
</div>
</div>
<div class="col-md-2">
<div class="form-group">
<label><spring:message code="audit_time"/>：</label>
<input name="search_audit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="<fmt:formatDate value="${cfg.search_audit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
</div>
</div>
<div class="col-md-2">
<div class="form-group">
<label>&nbsp;</label>
<input name="search_audit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="<fmt:formatDate value="${cfg.search_audit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
</div>
</div>
</div>
</div>
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
@@ -254,58 +194,42 @@
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th class="sort-column r.compile_id" style="display: none;" column="cfg_id" ><spring:message code="cfg_id"/></th>
<th column="config_describe" ><spring:message code="config_describe"/></th>
<th class="sort-column cfg_keywords">URL<spring:message code="key_word"/></th>
<th><spring:message code="is_audit"/></th>
<th column="sort-column group_name" ><spring:message code="group_name"/></th>
<th column="valid_identifier" ><spring:message code="valid_identifier"/></th>
<th column="creator" ><spring:message code="creator"/></th>
<th column="config_time" class="sort-column create_time"><spring:message code="config_time"/></th>
<th column="editor" ><spring:message code="editor"/></th>
<th column="edit_time" class="sort-column edit_time"><spring:message code="edit_time"/></th>
<th column="auditor"><spring:message code="auditor"/></th>
<th class="sort-column audit_time"><spring:message code="audit_time"/></th>
</tr>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th column="config_describe" ><spring:message code="config_describe"/></th>
<th class="sort-column r.group_id" column="groupId"><spring:message code="group_name"/></th>
<th class="sort-column cfg_keywords"><spring:message code="URL"/> <spring:message code="key_word"/></th>
<th column="match_method" ><spring:message code="match_method"/></th>
<th column="creator" ><spring:message code="creator"/></th>
<th column="config_time" class="sort-column create_time"><spring:message code="config_time"/></th>
<th column="editor" ><spring:message code="editor"/></th>
<th column="edit_time" class="sort-column edit_time"><spring:message code="edit_time"/></th>
</tr>
</thead>
<tbody>
<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
<tr>
<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}" isValid="${cfg.isValid}" value="${cfg.isAudit}"></td>
<td>${cfg.compileId }</td>
<td>${cfg.cfgDesc }</td>
<td>${cfg.cfgKeywords }</td>
<td>
<c:choose>
<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
</c:choose>
</td>
<td>${cfg.groupName }
<c:forEach items="${policyGroupInfos}" var="info">
<c:if test="${cfg.userRegion3 eq info.groupId }">
<c:if test="${cfg.groupId eq info.serviceGroupId }">
<spring:message code="${info.groupName }"/>
</c:if>
</c:forEach>
</td>
<td>${cfg.cfgKeywords }</td>
<td>
<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<c:if test="${matchMethodC.itemCode eq cfg.matchMethod}">
<spring:message code="${matchMethodC.itemValue}"/>
</c:if>
</c:forEach>
</td>
<td>${cfg.creatorName }</td>
<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
<td>${cfg.editorName }</td>
<td><fmt:formatDate value="${cfg.editTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
<td>${cfg.auditorName }</td>
<td><fmt:formatDate value="${cfg.auditTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
</tr>
</c:forEach>
</tbody>