删除统计-国家代理的菜单，统计页面-阻断和监测页面去掉图表的百分比显示和饼图的展示

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';

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>

src/main/webapp/WEB-INF/views/dashboard/newActionList.jsp

@@ -143,32 +143,6 @@ 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/>";
-			} */ 
 		}
 		
 	}