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

src/main/resources/messages/message_en.properties

@@ -2,13 +2,13 @@
 funMenu=Function Menu
 sysManage=System Management
 sysAuthor=System Authorization
-menuManage=Menu Management
-roleManage=Role Management
-dictManage=Dictionary Management
+menuManage=Menu
+roleManage=Role
+dictManage=Dictionary
 basicManage=Basic Management
-areaManage=Area Management
-officeManage=Office Management
-userManage=User Management
+areaManage=Area
+officeManage=Office
+userManage=User
 notify=My Notice
 help=Help
 home=Home
@@ -46,14 +46,14 @@ domain_control=Domain Control
 dns_control=DNS
 basic_configuration=Basic Configuration
 Request_from=Request Office
-classification_manage=Classification Management
-area_manage=Area Management
-feature_scope_manage=Feature Scope Management
+classification_manage=Classification
+area_manage=Area
+feature_scope_manage=Feature Scope
 special_tasks=Special Task
-label_manage=Tag Management
+label_manage=Tag
 protect_list=Protect List
 effect_range=Effective Range
-agreement_ip_configuration=Protocol IP Management
+agreement_ip_configuration=Protocol IP
 ip_spoofing_configuration=Spoofing IP
 website_control=Website
 host_control=HOST Control
@@ -98,8 +98,8 @@ sysService_manage=System Business
 service_manage=Service Type
 system_service_manage=System Service
 features_area=Feature Area
-attribute_manage=Attribute Management
-isp_manage=ISP Management
+attribute_manage=Attribute
+isp_manage=ISP
 ip_multiple_control=IP Multiple Control
 ip_port_control=IP+PORT Control
 website_multiple_control=Website Multiple Control
@@ -779,7 +779,7 @@ all_types=All Type
 group_type=Group Type
 group_name=Group Name
 default_group=Default Group
-policy_group_manage=Policy Group Management
+policy_group_manage=Policy Group
 #===========policy_group_manage end  =============
 #=============about manipulation=========
 ip_Reuse_policy=IP Reuse Policy
@@ -1018,8 +1018,8 @@ ctrl_http_whitelist=HTTP White List
 #=============function_service_dict==>service_name=================
 #=============about report===================
 report_list=Report
-hour_of_day_report=Daily Report
-day_of_month_report=Monthly Report
+hour_of_day_report=Hour Report
+day_of_month_report=Daily Report
 month_report=Month Report
 label_report=Tag Report
 attr_type_report=Attribute Report

src/main/webapp/WEB-INF/views/report/list.jsp

@@ -269,7 +269,7 @@ function customColumnClick(){
 								 <button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
 								 <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="export-btn"><i class="fa fa-download"> <spring:message code="export"/></i></button>
-                                 <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/><i class="fa fa-angle-double-down"></i></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">
                                 	<a class="btn  btn-icon-only btn-default setfields tooltips" 
@@ -281,8 +281,8 @@ function customColumnClick(){
 						<!-- 搜索内容与操作按钮栏 -->
 						
 						<!-- 筛选搜索内容栏默认隐藏-->
-						<div class="col-md-12 filter-action-select-panle hide" >
-						</div>
+						<!-- <div class="col-md-12 filter-action-select-panle hide" >
+						</div> -->
 						<!-- /筛选搜索内容栏    结束-->
 					</form:form>
 				</div>