Merge branch 'demostration_08' into 'develop'

行为日志去掉action

See merge request !13

src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp

@@ -50,13 +50,13 @@ $(document).ready(function(){
 							
 							<!-- 搜索内容与操作按钮栏 -->
 							<div class="col-md-12">
-								<div class="pull-left">
+								<%-- <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>
 									</form:select>
-								</div>
+								</div> --%>
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
@@ -158,7 +158,7 @@ $(document).ready(function(){
 							<thead>
 								<tr>
 									<th><spring:message code='cfg_id'/></th>
-									<th><spring:message code="action"/></th>
+									<%-- <th><spring:message code="action"/></th> --%>
 									<th><spring:message code='found_time'/></th>
 									<th><spring:message code='entrance'/></th>
 									
@@ -191,13 +191,13 @@ $(document).ready(function(){
 							<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
 								<tr>
 									<td>${log.cfgId } <a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a></td> 
-									<td>
+									<%-- <td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
 											<c:if test="${dict.itemCode eq log.action}">
 												<spring:message code="${dict.itemValue}"/>
 											</c:if>
 										</c:forEach>
-									</td>
+									</td> --%>
 									<td>${log.foundTime}</td>
 									<td>
 										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">