From e08ee121921e2e4e8162597516fb1a3ef203a924 Mon Sep 17 00:00:00 2001
From: shangguanyanfei <shangguan@zdjizhi.com>
Date: Mon, 17 Jun 2019 15:43:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=BB=9F=E8=AE=A1-=E5=9B=BD?=
 =?UTF-8?q?=E5=AE=B6=E4=BB=A3=E7=90=86=E7=9A=84=E8=8F=9C=E5=8D=95=EF=BC=8C?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=A1=B5=E9=9D=A2-=E9=98=BB=E6=96=AD?=
 =?UTF-8?q?=E5=92=8C=E7=9B=91=E6=B5=8B=E9=A1=B5=E9=9D=A2=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E7=9A=84=E7=99=BE=E5=88=86=E6=AF=94=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=92=8C=E9=A5=BC=E5=9B=BE=E7=9A=84=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sql/20190610/update_sys_menu.sql          | 12 +++++++
 .../WEB-INF/views/dashboard/commonNew.jsp     |  2 +-
 .../WEB-INF/views/dashboard/newActionList.jsp | 33 +------------------
 3 files changed, 14 insertions(+), 33 deletions(-)
 create mode 100644 src/main/resources/sql/20190610/update_sys_menu.sql

diff --git a/src/main/resources/sql/20190610/update_sys_menu.sql b/src/main/resources/sql/20190610/update_sys_menu.sql
new file mode 100644
index 000000000..6693f1c86
--- /dev/null
+++ b/src/main/resources/sql/20190610/update_sys_menu.sql
@@ -0,0 +1,12 @@
+
+#修改日志检索->国家代理->HTTP(S)阻断 url
+UPDATE `sys_menu` SET `href`='/log/pxy/httpBlockLists?searchAction=16' WHERE  code='http_block' and href='/log/pxy/httpBlockList?searchAction=16' and permission= '';
+#修改日志检索->国家代理->HTTP(S)监测 url
+UPDATE `sys_menu` SET `href`='/log/pxy/httpMonitLists?searchAction=1' WHERE code='http_monit' and href='/log/pxy/httpMonitogs' and permission= '';
+
+#实时报表->国家代理菜单和它下面的子菜单都置为失效
+UPDATE `sys_menu` SET `del_flag`='0' WHERE href ='/report/list?cfgName=http_block';
+UPDATE `sys_menu` SET `del_flag`='0' WHERE href ='/report/list?cfgName=http_redirect';
+UPDATE `sys_menu` SET `del_flag`='0' WHERE href ='/report/list?cfgName=http_replace';
+UPDATE `sys_menu` SET `del_flag`='0' WHERE href ='/report/list?cfgName=http_monit';
+UPDATE `sys_menu` SET `del_flag`='0' WHERE `code`='Proxy' and parent_id='780';
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/dashboard/commonNew.jsp b/src/main/webapp/WEB-INF/views/dashboard/commonNew.jsp
index 20f95e880..b9cb08a18 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/commonNew.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/commonNew.jsp
@@ -290,7 +290,7 @@
 		                <select id="chartType" name="chartType" class="selectpicker select2 input-small">
 							<option value ="line"><spring:message code="line_chart"/></option>
 							<option value ="column"><spring:message code="column_chart"/></option>
-							<c:if test="${concent ne '3'}">
+							<c:if test="${concent ne '2' and  concent ne '3' }">
 								<option value ="pie"><spring:message code="pie_chart"/></option>
 							</c:if>
 						</select>
diff --git a/src/main/webapp/WEB-INF/views/dashboard/newActionList.jsp b/src/main/webapp/WEB-INF/views/dashboard/newActionList.jsp
index 49067e278..712944821 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/newActionList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/newActionList.jsp
@@ -143,33 +143,7 @@ function showActionTransChart(chartType,xData,series){
 					}
 				},
 				showInLegend: true
-			},
-			column: {
-                dataLabels:{
-                    enabled:true,
-                    color: '#5B5B5B',
-                    formatter:function () {
-                    	 var total=JSON.parse($("#total").val())[0];
-                        a = this.y/total*100;
-                        return a.toFixed(2) + "%"
-                    }
-                }
-                // colorByPoint: true
-            },
-            line: {
-            	allowPointSelect: true,
-				cursor: 'pointer',
-                dataLabels:{
-                    enabled:true,
-                    color: '#5B5B5B',
-                    formatter:function () {
-                    	 var total=JSON.parse($("#total").val())[0];
-                        a = this.y/total*100;
-                        return a.toFixed(2) + "%"
-                    }
-                }
-                // colorByPoint: true
-            }
+			}
 		},
 	    series: series,
 	}
@@ -208,11 +182,6 @@ function showActionTransChart(chartType,xData,series){
 			chart.tooltip.pointFormat = "{point.y}| <b>{point.percentage:.1f}%</br>";
 		}else{
 			chart.tooltip.pointFormat = "<span style='color:{point.color}'>\u25CF</span> {series.name}: <b>{point.y}</b><br/>";
-			/* var a=JSON.parse($("#total").val())[0];
-			chart.tooltip.pointFormat =function(){
-				 var b=this.y/a*100;
-				return "<span style='color:{point.color}'>\u25CF</span> {series.name}: <b>"+b.toFixed(2)+"%</b><br/>";
-			} */ 
 		}
 		
 	}