Merge remote-tracking branch 'origin/liuna'

src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp

@@ -41,7 +41,7 @@
 
 								<div class="slideMenu" id="cbp-spmenu-s2" style="">
 									<div class="form">
-										<tags:Public_ProvinceTag />
+
 										<tags:GJFX_datasource_channle_business/>
 										
 										<button id="submit" class="btn btn-primary" onclick="ruleResultSubmit()">提交</button>
@@ -113,15 +113,13 @@ $("#createRule").click(function(){
 		var dataSource=getStatsDataSourceCheckedValuesString();
         var chnnal=getStatsChannelCheckedValuesString();
         var bussines=getStatsBusinessCheckedValuesString();
-        var province=getProvinceCheckedValuesString();
+
         if(dataSource==""){
             $.alert("数据来源的选择不能为空");
        	}else if(chnnal===""){
             $.alert("渠道的选择不能为空");
        	}else if(bussines===""){
             $.alert("业务的选择不能为空");
-       	}else if(province===""){
-            $.alert("省份的选择不能为空");
        	}else{
            	toggleMenu('slidePushMenus');//隐藏筛选项
           	//数据来源标签
@@ -133,13 +131,11 @@ $("#createRule").click(function(){
 			//业务标签
 			$('#BusinessTag').text("业务").append($("<span class='badge'></span>").text(getStatsBusinessCheckedValues().length)).attr('data-original-title',getStatsBusinessCheckedTitlesString()).tooltip();
 
-			//省份标签
-			$('#ProvinceTag').text("省份").append($("<span class='badge'></span>").text(getProvinceCheckedValues().length)).attr('data-original-title',getProvinceCheckedTitles()).tooltip();
 			
 			$.ajax({
 			    type : 'GET',
 				contentType : 'application/json',
-				url: "${ctx}/AnalysisSupport/QualityRuleResult/ruleTableChange?province="+province+"&dataSource="+dataSource+"&chnnal="+chnnal+"&bussines="+bussines,
+				url: "${ctx}/AnalysisSupport/QualityRuleResult/ruleTableChange?dataSource="+dataSource+"&chnnal="+chnnal+"&bussines="+bussines,
 				dataType : 'text',
 				async: false,
 				beforeSend: function(data) { 
@@ -158,7 +154,7 @@ $("#createRule").click(function(){
 	}
 
 	function ruleResultReset(){
-		ProvinceReset();
+
 		statsDataSourceReset();//三级联动重置
 	}
 $("#updateRule").click(function(){
@@ -168,7 +164,23 @@ $("#updateRule").click(function(){
 
 $("#deleteRule").click(function(){
     var pageNum = $("#goPageNo").val();
-    location.href="${ctx}/AnalysisSupport/RuleDelete?qualityRuleId="+qualityRuleId;
+    $.dialog({
+        title: "提醒",
+        content:"确定删除质量规则？",
+        ok: function(){
+            $.ajax({
+                type: 'get',
+                url: "${ctx}/AnalysisSupport/QualityRuleResult/deleteOneRule?qualityRuleId="+qualityRuleId,
+				success:function(){
+                    window.location.href="${ctx}/AnalysisSupport/QualityRuleResult"
+                }
+            });
+		},
+        okValue:"确定",
+        cancel: function(){},
+        cancelValue:"取消",
+        lock:true
+    });
 });
 
 </script>