From d1335db3a37dec4ee98ed2d14fd6b20b216a9e99 Mon Sep 17 00:00:00 2001
From: shangguanyanfei <shangguan@zdjizhi.com>
Date: Wed, 26 Jun 2019 15:19:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E9=87=8F=E7=BB=9F=E8=AE=A1-=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E9=A1=B5=E9=9D=A2=20=E9=98=BB=E6=96=AD=E7=9B=91?=
 =?UTF-8?q?=E6=B5=8B=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/dashboard/commonNew.jsp     | 8 ++++----
 src/main/webapp/WEB-INF/views/dashboard/newActionList.jsp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/dashboard/commonNew.jsp b/src/main/webapp/WEB-INF/views/dashboard/commonNew.jsp
index e227979c2..a39a2ac1c 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/commonNew.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/commonNew.jsp
@@ -396,7 +396,7 @@ var detailNation4 = new Array('domainList');
 var detailNation5 = new Array('TOP100');
 //统计维度下拉框内容数组
 var dimensionNation1 = new Array('Rule');
-var dimensionNation2 = new Array('block','monitor');
+var dimensionNation2 = new Array('Block','Monitor');
 var dimensionNation3 = new Array('Gbps','pps');
 var dimensionNation4 = new Array('bps','pps','link count','uniq client ip count','uniq server ip count');
 var dimensionNation5 = new Array('link count','uniq client ip count','uniq server ip count');
@@ -946,7 +946,7 @@ function  concentOnChange(){
 			$("#statis_detail_1").hide();
 			$("#statis_detail_2").hide();
 			$("#statis_detail_3").hide();
-			createSelect('dimension_select','block', dimensionNation2);
+			createSelect('dimension_select','Block', dimensionNation2);
 			$("#search").removeAttr("onclick");
 			$("#search").attr("onclick","return searchListRuleType()");
 		}else if(concent == 3){ // 
@@ -1045,10 +1045,10 @@ function searchListRuleType(){
 	var beginDate=$("#beginDate").val();
 	var endDate=$("#endDate").val();
 	var searchAction="action_reject";
-	if(dimension_select=="block"){
+	if(dimension_select=="Block"){
 		searchAction="action_reject";
 	}
-	if(dimension_select=="monitor"){	
+	if(dimension_select=="Monitor"){	
 		searchAction="action_monit";
 	}
 	window.location.href="${ctx}/dashboard/traffic/newtrafficBlockMonitorList?concent="+concent+"&searchAction="+searchAction
diff --git a/src/main/webapp/WEB-INF/views/dashboard/newActionList.jsp b/src/main/webapp/WEB-INF/views/dashboard/newActionList.jsp
index 712944821..591e188da 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/newActionList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/newActionList.jsp
@@ -27,10 +27,10 @@ function searchList(){
 		window.location.reload();
 	}else{
 		var search_action="";
-		if($("#dimension_select").val() =="block"){
+		if($("#dimension_select").val() =="Block"){
 			search_action="action_reject";
 		}
-		if($("#dimension_select").val() =="monitor"){
+		if($("#dimension_select").val() =="Monitor"){
 			search_action="action_monit";
 		}
 		actionTransAjax(search_action,start,end);