解决冲突
This commit is contained in:
wangxin
@@ -5,6 +5,20 @@
|
||||
<title><spring:message code="${cfgName}"></spring:message></title>
|
||||
<link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet"/>
|
||||
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/bootstrap-select.min.js"></script>
|
||||
<c:choose>
|
||||
<c:when test="${cookie.Language.value eq 'zh_CN'}">
|
||||
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-zh_CN.min.js"></script>
|
||||
</c:when>
|
||||
<c:when test="${cookie.Language.value eq 'en'}">
|
||||
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
|
||||
</c:when>
|
||||
<c:when test="${cookie.Language.value eq 'ru_RU'}">
|
||||
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-ru_RU.min.js"></script>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
|
||||
@@ -25,7 +39,7 @@
|
||||
<div class="theme-panel hidden-xs hidden-sm">
|
||||
<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/complex/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button>
|
||||
<button type="button" class="btn btn-primary"
|
||||
onClick="javascript:window.location='${ctx}/cfg/complex/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="新增"></spring:message></button>
|
||||
onClick="javascript:window.location='${ctx}/cfg/complex/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="add"></spring:message></button>
|
||||
</div>
|
||||
|
||||
<h3 class="page-title">
|
||||
@@ -37,7 +51,7 @@
|
||||
<div class="portlet box blue">
|
||||
<div class="portlet-title">
|
||||
<div class="caption">
|
||||
<i class="fa fa-cogs"></i><spring:message code="列表"></spring:message>
|
||||
<i class="fa fa-cogs"></i><spring:message code="date_list"></spring:message>
|
||||
</div>
|
||||
<div class="tools">
|
||||
<!-- <a href="javascript:;" class="collapse" data-original-title=""
|
||||
@@ -54,16 +68,16 @@
|
||||
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
|
||||
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
|
||||
<div class="col-md-12">
|
||||
<spring:message code="state"/> : <form:select path="isAudit" class="selectpicker select2" title="--请选择--" >
|
||||
<form:option value=""></form:option>
|
||||
<spring:message code="state"/> : <form:select path="isAudit" class="selectpicker select2">
|
||||
<form:option value=""><spring:message code="select"/></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="取消审核通过"></spring:message></form:option>
|
||||
<form:option value="3"><spring:message code="cancel"></spring:message></form:option>
|
||||
</form:select>
|
||||
<spring:message code="函号"/> :
|
||||
<form:select path="requestId" class="selectpicker select2" title="--请选择--" data-live-search="true" data-live-search-placeholder="搜索">
|
||||
<form:option value=""></form:option>
|
||||
<spring:message code="request_number"/> :
|
||||
<form:select path="requestId" class="selectpicker select2" data-live-search="true" data-live-search-placeholder="search">
|
||||
<form:option value=""><spring:message code="select"/></form:option>
|
||||
<c:forEach items="${requestInfos}" var="requestInfo" >
|
||||
<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
|
||||
</c:forEach>
|
||||
@@ -71,15 +85,15 @@
|
||||
<button type="button" class="btn btn-default btn-sm" onclick="return page()">
|
||||
<i class="fa fa-edit"></i><spring:message code="search"></spring:message>
|
||||
</button>
|
||||
<spring:message code="排序"/> :
|
||||
<form:select path="page.orderBy" class="selectpicker select2" title="--请选择--">
|
||||
<form:option value=""></form:option>
|
||||
<form:option value="createTime asc">按创建时间顺序</form:option>
|
||||
<form:option value="createTime desc">按创建时间倒序</form:option>
|
||||
<form:option value="editTime asc">按修改时间顺序</form:option>
|
||||
<form:option value="editTime desc">按修改时间倒序</form:option>
|
||||
<form:option value="auditTime asc">按审核时间顺序</form:option>
|
||||
<form:option value="auditTime desc">按审核时间倒序</form:option>
|
||||
<spring:message code="sort"/> :
|
||||
<form:select path="page.orderBy" class="selectpicker select2">
|
||||
<form:option value=""><spring:message code="select"/></form:option>
|
||||
<form:option value="createTime asc"><spring:message code="createTime_asc"/></form:option>
|
||||
<form:option value="createTime desc"><spring:message code="createTime_desc"/></form:option>
|
||||
<form:option value="editTime asc"><spring:message code="editTime_asc"/></form:option>
|
||||
<form:option value="editTime desc"><spring:message code="editTime_desc"/></form:option>
|
||||
<form:option value="auditTime asc"><spring:message code="auditTime_asc"/></form:option>
|
||||
<form:option value="auditTime desc"><spring:message code="auditTime_desc"/></form:option>
|
||||
</form:select>
|
||||
</div>
|
||||
</form:form>
|
||||
@@ -88,27 +102,27 @@
|
||||
<table class="table table-striped table-bordered table-condensed text-nowrap">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>配置ID</th>
|
||||
<th>配置描述</th>
|
||||
<th>匹配区域</th>
|
||||
<th>关键字</th>
|
||||
<th>管控类型</th>
|
||||
<th><spring:message code="seq"/></th>
|
||||
<th><spring:message code="config_describe"/></th>
|
||||
<th><spring:message code="match_area"/></th>
|
||||
<th><spring:message code="key_word"/></th>
|
||||
<th><spring:message code="block_type"/></th>
|
||||
<!-- <th>业务id</th> -->
|
||||
<th>来函</th>
|
||||
<th><spring:message code="letter"/></th>
|
||||
<!-- <th>编译id</th> -->
|
||||
<th>是否区域管控</th>
|
||||
<th>分类</th>
|
||||
<th>性质</th>
|
||||
<th>标签</th>
|
||||
<th><spring:message code="whether_area_block"/></th>
|
||||
<th><spring:message code="type"/></th>
|
||||
<th><spring:message code="type"/></th>
|
||||
<th><spring:message code="property"/></th>
|
||||
<!-- <th>区域生效id</th> -->
|
||||
<th>有效标识</th>
|
||||
<th>是否审核</th>
|
||||
<th>创建人员</th>
|
||||
<th>配置时间</th>
|
||||
<th>修改人员</th>
|
||||
<th>修改时间</th>
|
||||
<th>审核人员</th>
|
||||
<th>审核时间</th>
|
||||
<th><spring:message code="valid_indentifier"/></th>
|
||||
<th><spring:message code="is_audit"/></th>
|
||||
<th><spring:message code="creator"/></th>
|
||||
<th><spring:message code="config_time"/></th>
|
||||
<th><spring:message code="editor"/></th>
|
||||
<th><spring:message code="edit_time"/></th>
|
||||
<th><spring:message code="auditor"/></th>
|
||||
<th><spring:message code="audit_time"/></th>
|
||||
<th><spring:message code="operation"></spring:message></th>
|
||||
</tr>
|
||||
</thead>
|
||||
@@ -120,19 +134,19 @@
|
||||
<td>${cfg.district }</td>
|
||||
<td>${cfg.keywords }</td>
|
||||
<td>
|
||||
<c:if test="${1 eq cfg.action }">阻断</c:if>
|
||||
<c:if test="${2 eq cfg.action }">监测</c:if>
|
||||
<c:if test="${5 eq cfg.action }">封堵白名单</c:if>
|
||||
<c:if test="${6 eq cfg.action }">监测白名单</c:if>
|
||||
<c:if test="${7 eq cfg.action }">封堵监测白名单</c:if>
|
||||
<c:if test="${8 eq cfg.action }">灰名单</c:if>
|
||||
<c:if test="${1 eq cfg.action }"><spring:message code="block"/></c:if>
|
||||
<c:if test="${2 eq cfg.action }"><spring:message code="monitor"/></c:if>
|
||||
<c:if test="${5 eq cfg.action }"><spring:message code="block_white_list"/></c:if>
|
||||
<c:if test="${6 eq cfg.action }"><spring:message code="monitor_white_list"/></c:if>
|
||||
<c:if test="${7 eq cfg.action }"><spring:message code="block_monitor_white_list"/></c:if>
|
||||
<c:if test="${8 eq cfg.action }"><spring:message code="grey_list"/></c:if>
|
||||
</td>
|
||||
<%-- <td>${cfg.serviceId }</td> --%>
|
||||
<td>${cfg.requestName }</td>
|
||||
<%-- <td>${cfg.compileId }</td> --%>
|
||||
<td>
|
||||
<c:if test="${cfg.isAreaEffective==0}">否</c:if>
|
||||
<c:if test="${cfg.isAreaEffective==1}">是</c:if>
|
||||
<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
|
||||
<c:if test="${cfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
|
||||
</td>
|
||||
<td>
|
||||
<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId">
|
||||
@@ -160,16 +174,16 @@
|
||||
</td>
|
||||
<%-- <td>${cfg.areaEffectiveIds }</td> --%>
|
||||
<td>
|
||||
<c:if test="${cfg.isValid==0}">否</c:if>
|
||||
<c:if test="${cfg.isValid==1}">是</c:if>
|
||||
<c:if test="${cfg.isValid==-1}">已删除</c:if>
|
||||
<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>
|
||||
</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="取消审核通过"></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.creatorName }</td>
|
||||
|
||||
Reference in New Issue
Block a user