解决版本冲突 更新代码

src/main/resources/messages/message_en.properties

@@ -28,67 +28,67 @@ text_monitor=text monitor
 text_enhance_manage=text enhance manage
 text_enhance_monitor=text enhance monitor
 plaintext_manage=plaintext manage
-monitor_white=monitor white
-ip_monitor_white=ip monitor white
-monitor_grey=monitor grey
+control_white=control white
+ip_control_white=ip control white
+control_grey=control grey
 social_app_grey=social app grey
-encryption_monitor=encryption monitor
-specific_agreement_monitor=specific agreement monitor
-social_app_monitor=social app monitor
-online_media_monitor=online media monitor
-sip_ip_monitor=sip ip monitor
-domain_monitor_white=domain monitor white
-ip_address_monitor=ip address monitor
-ip_monitor=ip monitor
-ip_port_monitor=ip port monitor
-domain_monitor=domain monitor
-dns_monitor=dns monitor
+encryption_control=encryption control
+specific_agreement_control=specific agreement control
+social_app_control=social app control
+online_media_control=online media control
+sip_ip_control=sip ip control
+domain_control_white=domain control white
+ip_address_control=ip address control
+ip_control=ip control
+ip_port_control=ip port control
+domain_control=domain control
+dns_control=dns control
 basic_configuration=basic configuration
 letter_from=letter from
 classification=classification
-classification_manage=classification_manage
-attribute_manage=attribute_manage
-area_manage=area_manage
-isp_manage=isp_manage
-feature_scope_manage=feature_scope_manage
+classification_manage=classification manage
+attribute_manage=attribute manage
+area_manage=area manage
+isp_manage=isp manage
+feature_scope_manage=feature scope manage
 special_tasks=special tasks
 label_manage=label manage
 protect_list=protect list
 effect_range=effect range
 agreement_ip_configuration=agreement ip configuration
 ip_spoofing_configuration=ip spoofing configuration
-website_monitor=website monitor
-host_monitor=host monitor
-url_monitor=url monitor
-website_keyword_monitor=website keyword monitor
-mail_monitor=mail monitor
-recipient_monitor=recipient monitor
-sender_monitor=sender monitor
-theme_monitor=theme monitor
-mail_keyword_monitor=mail keyword monitor
-mail_attachment_name_monitor=mail attachment name monitor
-mail_attachment_content_monitor=mail attachment content monitor
-file_transfer_monitor=file transfer monitor
-ftp_address_monitor=ftp address monitor
-ftp_name_monitor=ftp name monitor
-ftp_content_monitor=ftp content monitor
+website_control=website control
+host_control=host control
+url_control=url control
+website_keyword_control=website keyword control
+mail_control=mail control
+recipient_control=recipient control
+sender_control=sender control
+theme_control=theme control
+mail_keyword_control=mail keyword control
+mail_attachment_name_control=mail attachment name control
+mail_attachment_content_control=mail attachment content control
+file_transfer_control=file transfer control
+ftp_address_control=ftp address control
+ftp_name_control=ftp name control
+ftp_content_control=ftp content control
 http_app_feature=http app feature
 ssl_app_feature=ssl app feature
-tunnel_protocol_monitor=tunnel protocol monitor
-l2tp_ip_monitor=l2tp ip monitor
-pptp_ip_monitor=pptp ip monitor
-openvpn_monitor=openvpn monitor
-ssh_monitor=ssh monitor
-ssl_monitor=ssl monitor
-ssl_feature_monitor=ssl feature monitor
-ssl_sni_monitor=ssl sni monitor
-ssl_address_monitor=ssl address monitor
+tunnel_protocol_control=tunnel protocol control
+l2tp_ip_control=l2tp ip control
+pptp_ip_control=pptp ip control
+openvpn_control=openvpn control
+ssh_control=ssh control
+ssl_control=ssl control
+ssl_feature_control=ssl feature control
+ssl_sni_control=ssl sni control
+ssl_address_control=ssl address control
 https_website_content_replace=https website content replace
-https_website_monitor=https website monitor
-rtp_ip_monitor=rtp ip monitor
-mms_ip_monitor=mms ip monitor
-rtsp_ip_monitor=rtsp ip monitor
-rtmp_ip_monitor=rtmp ip monitor
+https_website_control=https website control
+rtp_ip_control=rtp ip control
+mms_ip_control=mms ip control
+rtsp_ip_control=rtsp ip control
+rtmp_ip_control=rtmp ip control
 examine_manage=examine manage
 audit_manage=audit manage
 log_search=log search
@@ -137,6 +137,10 @@ begin_date=begin date
 end_date=end date
 delete=delete
 special_task=special task
+cancel_approved=cancel approved
+task_name=task name
+task_org=task organization
+task_time=task time
 #============laihan end======================
 
 
@@ -157,6 +161,17 @@ turning_page=It is turning to the page
 login_timeout=No login or login timeout,please login again,Thank you!
 captcha_error=captcha error
 enter_captcha=Please enter the captcha
+input=please input
+input_title=please input title
+all_states=all states
+filter=filter
+to=to
+reset=reset
+info=info
+has_approved=It has been approved and can not be operated on !
+hasnot_approved=It has not been approved and can not be operated on !
+check_one=choose one please !
+one_more=please choose at least one !
 #==========message end=====================
 
 #==========yewuliexingguanli begin=====================

src/main/resources/messages/message_ru.properties

@@ -28,62 +28,67 @@ text_monitor=text monitor
 text_enhance_manage=text enhance manage
 text_enhance_monitor=text enhance monitor
 plaintext_manage=plaintext manage
-monitor_white=monitor white
-ip_monitor_white=ip monitor white
-monitor_grey=monitor grey
+control_white=control white
+ip_control_white=ip control white
+control_grey=control grey
 social_app_grey=social app grey
-encryption_monitor=encryption monitor
-specific_agreement_monitor=specific agreement monitor
-social_app_monitor=social app monitor
-online_media_monitor=online media monitor
-sip_ip_monitor=sip ip monitor
-domain_monitor_white=domain monitor white
-ip_address_monitor=ip address monitor
-ip_monitor=ip monitor
-ip_port_monitor=ip port monitor
-domain_monitor=domain monitor
-dns_monitor=dns monitor
+encryption_control=encryption control
+specific_agreement_control=specific agreement control
+social_app_control=social app control
+online_media_control=online media control
+sip_ip_control=sip ip control
+domain_control_white=domain control white
+ip_address_control=ip address control
+ip_control=ip control
+ip_port_control=ip port control
+domain_control=domain control
+dns_control=dns control
 basic_configuration=basic configuration
 letter_from=letter from
 classification=classification
+classification_manage=classification manage
+attribute_manage=attribute manage
+area_manage=area manage
+isp_manage=isp manage
+feature_scope_manage=feature scope manage
 special_tasks=special tasks
 label_manage=label manage
 protect_list=protect list
 effect_range=effect range
 agreement_ip_configuration=agreement ip configuration
 ip_spoofing_configuration=ip spoofing configuration
-website_monitor=website monitor
-host_monitor=host monitor
-url_monitor=url monitor
-website_keyword_monitor=website keyword monitor
-mail_monitor=mail monitor
-recipient_monitor=recipient monitor
-sender_monitor=sender monitor
-theme_monitor=theme monitor
-mail_keyword_monitor=mail keyword monitor
-mail_attachment_name_monitor=mail attachment name monitor
-mail_attachment_content_monitor=mail attachment content monitor
-file_transfer_monitor=file transfer monitor
-ftp_address_monitor=ftp address monitor
-ftp_name_monitor=ftp name monitor
-ftp_content_monitor=ftp content monitor
+website_control=website control
+host_control=host control
+url_control=url control
+website_keyword_control=website keyword control
+mail_control=mail control
+recipient_control=recipient control
+sender_control=sender control
+theme_control=theme control
+mail_keyword_control=mail keyword control
+mail_attachment_name_control=mail attachment name control
+mail_attachment_content_control=mail attachment content control
+file_transfer_control=file transfer control
+ftp_address_control=ftp address control
+ftp_name_control=ftp name control
+ftp_content_control=ftp content control
 http_app_feature=http app feature
 ssl_app_feature=ssl app feature
-tunnel_protocol_monitor=tunnel protocol monitor
-l2tp_ip_monitor=l2tp ip monitor
-pptp_ip_monitor=pptp ip monitor
-openvpn_monitor=openvpn monitor
-ssh_monitor=ssh monitor
-ssl_monitor=ssl monitor
-ssl_feature_monitor=ssl feature monitor
-ssl_sni_monitor=ssl sni monitor
-ssl_address_monitor=ssl address monitor
+tunnel_protocol_control=tunnel protocol control
+l2tp_ip_control=l2tp ip control
+pptp_ip_control=pptp ip control
+openvpn_control=openvpn control
+ssh_control=ssh control
+ssl_control=ssl control
+ssl_feature_control=ssl feature control
+ssl_sni_control=ssl sni control
+ssl_address_control=ssl address control
 https_website_content_replace=https website content replace
-https_website_monitor=https website monitor
-rtp_ip_monitor=rtp ip monitor
-mms_ip_monitor=mms ip monitor
-rtsp_ip_monitor=rtsp ip monitor
-rtmp_ip_monitor=rtmp ip monitor
+https_website_control=https website control
+rtp_ip_control=rtp ip control
+mms_ip_control=mms ip control
+rtsp_ip_control=rtsp ip control
+rtmp_ip_control=rtmp ip control
 examine_manage=examine manage
 audit_manage=audit manage
 log_search=log search
@@ -132,11 +137,15 @@ begin_date=begin date
 end_date=end date
 delete=delete
 special_task=special task
+cancel_approved=cancel approved
+task_name=task name
+task_org=task organization
+task_time=task time
 #============laihan end======================
 
 
 #==========message begin=====================
-required=This field is required！
+required=This field is required\uff01
 select=Please select
 date_list=Date List
 confirm_message=Are you sure?
@@ -152,6 +161,17 @@ turning_page=It is turning to the page
 login_timeout=No login or login timeout,please login again,Thank you!
 captcha_error=captcha error
 enter_captcha=Please enter the captcha
+input=please input
+input_title=please input title
+all_states=all states
+filter=filter
+to=to
+reset=reset
+info=info
+has_approved=It has been approved and can not be operated on !
+hasnot_approved=It has not been approved and can not be operated on !
+check_one=choose one please !
+one_more=please choose at least one !
 #==========message end=====================
 
 #==========yewuliexingguanli begin=====================

src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp

@@ -11,6 +11,7 @@
 	function reset(){
  		$("#searchForm").reset();
  	}
+	
 	/** 
 	 处理全选、全取消
 	**/
@@ -68,6 +69,12 @@
 		return false;
 	}
 		$(document).ready(function() {
+			
+			//reset
+			$("#resetBtn").on("click",function(){
+				$(".Wdate").attr("value",'');
+				$("#searchForm")[0].reset();
+			});
 
 			//设定显示总条数
 			$("#showTotalCount").text('${showTotalCount}');
@@ -229,8 +236,8 @@
 								<div class="row">
 									
 									<div class="pull-left">
-										<button type="button" class="btn blue" onclick="page2()"> <i class="fa fa-search"></i> 搜索  </button>
-										<button type="button" class="btn btn-default" onclick="reset()"> <i class="fa fa-refresh"></i> 重置  </button>
+										<button type="button"  class="btn blue" onclick="page2()"> <i class="fa fa-search"></i> 搜索  </button>
+										<button type="button" id="resetBtn" class="btn btn-default" onclick="reset()"> <i class="fa fa-refresh"></i> 重置  </button>
 									</div>
 							
 								</div>

src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp

@@ -77,7 +77,12 @@
 				$("#intype").attr("name",$("#seltype").find("option:selected").val());
 				$("#intype").val('${searchContent}');
 			
-			
+				//reset
+				$("#resetBtn").on("click",function(){
+					$(".Wdate").attr("value",'');
+					$("#searchForm")[0].reset();
+				});
+				
 			//筛选功能初始化
 	 		filterActionInit();
 	 		
@@ -228,7 +233,7 @@
 									
 									<div class="pull-left">
 										<button type="button" class="btn blue" onclick="page2()"> <i class="fa fa-search"></i> 搜索  </button>
-										<button type="button" class="btn btn-default" onclick="reset()"> <i class="fa fa-refresh"></i> 重置  </button>
+										<button type="button" id="resetBtn" class="btn btn-default" onclick="reset()"> <i class="fa fa-refresh"></i> 重置  </button>
 									</div>
 							
 								</div>