Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

This commit is contained in:
zhanghongqing
2018-08-02 14:48:53 +08:00
6 changed files with 54 additions and 7 deletions

View File

@@ -180,7 +180,9 @@
<tbody>
<c:forEach var="_log" items="${page.list }" varStatus="status">
<tr>
<td>${_log.cfgId }</td>
<td>${_log.cfgId }
<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
</td>
<td>
<c:if test="${_log.action eq 16 }"><spring:message code="action_reject"/></c:if>
<c:if test="${_log.action eq 1 }"><spring:message code="action_monit"/></c:if>

View File

@@ -62,8 +62,11 @@ $(document).ready(function(){
<div class="pull-left">
<form:select path="action" class="selectpicker select2 input-small">
<form:option value=""><spring:message code="action"/></form:option>
<form:option value="16"><spring:message code="action_reject"/></form:option>
<form:option value="1"><spring:message code="action_monit"/></form:option>
<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action">
<c:if test="${action.itemValue eq 'action_reject' or action.itemValue eq 'action_monit' }">
<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
</c:if>
</c:forEach>
</form:select>
</div>
<div class="pull-left">

View File

@@ -62,8 +62,11 @@ $(document).ready(function(){
<div class="pull-left">
<form:select path="action" class="selectpicker select2 input-small">
<form:option value=""><spring:message code="action"/></form:option>
<form:option value="16"><spring:message code="action_reject"/></form:option>
<form:option value="1"><spring:message code="action_monit"/></form:option>
<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action">
<c:if test="${action.itemValue eq 'action_reject' or action.itemValue eq 'action_monit' }">
<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
</c:if>
</c:forEach>
</form:select>
</div>
<div class="pull-left">

View File

@@ -62,8 +62,11 @@ $(document).ready(function(){
<div class="pull-left">
<form:select path="action" class="selectpicker select2 input-small">
<form:option value=""><spring:message code="action"/></form:option>
<form:option value="16"><spring:message code="action_reject"/></form:option>
<form:option value="1"><spring:message code="action_monit"/></form:option>
<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action">
<c:if test="${action.itemValue eq 'action_reject' or action.itemValue eq 'action_monit' }">
<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
</c:if>
</c:forEach>
</form:select>
</div>
<div class="pull-left">