修改service字典,monit时Block的action doLog disable值0去掉，页面doLog在非拦截时交由service字典控制

2 files changed, 2 insertions, 16 deletions

diff --git a/src/main/resources/sql/20190613/obj_group_list.sql b/src/main/resources/sql/20190613/obj_group_list.sql
index f2205bba8..040bc9fd1 100644
--- a/src/main/resources/sql/20190613/obj_group_list.sql
+++ b/src/main/resources/sql/20190613/obj_group_list.sql
@@ -1,5 +1,5 @@
 #function_service_dict
-INSERT INTO `function_service_dict`(`function_id`, `protocol_id`, `action`, `action_code`, `service_id`, `service_name`, `service_desc`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `region_code`, `is_import`, `sort`, `config_do_log`) VALUES (888, 0, 1, 'monit', 0, 'obj_group_monit', NULL, 1, NULL, NULL, NULL, NULL, NULL, 0, 0, '1;0,1,2;2');
+INSERT INTO `function_service_dict`(`function_id`, `protocol_id`, `action`, `action_code`, `service_id`, `service_name`, `service_desc`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `region_code`, `is_import`, `sort`, `config_do_log`) VALUES (888, 0, 1, 'monit', 0, 'obj_group_monit', NULL, 1, NULL, NULL, NULL, NULL, NULL, 0, 0, '1;1,2;2');
 INSERT INTO `function_service_dict`(`function_id`, `protocol_id`, `action`, `action_code`, `service_id`, `service_name`, `service_desc`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `region_code`, `is_import`, `sort`, `config_do_log`) VALUES (888, 0, 16, 'reject', -1, 'obj_group_reject', NULL, 1, NULL, NULL, NULL, NULL, NULL, 0, 0, '1;0,1,2;2');
 #functiuon_region_dict;
 INSERT INTO `function_region_dict`( `function_id`, `config_district`, `config_region_code`, `config_region_value`, `config_desc`, `is_valid`, `is_maat`, `region_type`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `config_service_type`, `config_expr_type`, `config_match_method`, `config_ip_type`, `config_hex`, `config_multi_keywords`, `config_ip_pattern`, `config_port_pattern`, `config_direction`, `config_protocol`, `config_ip_port_show`, `config_region_sort`, `is_import`) VALUES (888, '', 0, '0', '0', 1, 1, 0, NULL, NULL, NULL, NULL, '', '', '', '', '', '', NULL, NULL, NULL, NULL, NULL, 1, 1);
diff --git a/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp b/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp
index e98e939cb..ead0ff5d8 100644
--- a/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp
@@ -48,6 +48,7 @@ $(function(){
 
 		var action=$("input[name='action']:checked").val();
 		switchAction(action);
+        processDoLog($(this).attr("configDoLog"));
 		//处理页面协议
 		if($(this).val()!="1"){
 			if($("[name='userRegion1']").val()=="intercept"){
@@ -56,13 +57,6 @@ $(function(){
 			}
 			$("[name='userRegion1'] option[value=intercept]").addClass("hidden").addClass("disabled");
 			$(".domainGroup").addClass("hidden").addClass("disabled");
-			//处理do_log
-			$(".doLog").removeClass("hidden");
-			$("[name='doLog']").each(function () {
-				if($(this).val()==0){
-					$(this).parent(".radio-inline").removeClass("hidden");
-				}
-			})
 		}else{
 			$("[name='userRegion1'] option[value=intercept]").removeClass("hidden").removeClass("disabled");
 			if($("[name='userRegion1']").val()=="intercept"){
@@ -81,14 +75,6 @@ $(function(){
 				//处理do_log
 				$(".doLog").removeClass("hidden");
 			}
-			$("[name='doLog']").each(function () {
-				if($(this).val()==0){
-					if(typeof($(this).attr("checked"))!="undefined"){
-						$(this).removeAttr("checked");
-					}
-					$(this).parent(".radio-inline").addClass("hidden");
-				}
-			})
 		}
 		$("[name='userRegion1']").selectpicker("refresh");
 	});