Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git

into develop Conflicts: src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
2019-01-03 15:01:46 +08:00
parent 3fb9b5b159 2312b41035
commit 1e0fc76160
34 changed files with 1851 additions and 381 deletions
--- a/src/main/webapp/static/pages/scripts/echart.js
+++ b/src/main/webapp/static/pages/scripts/echart.js
@@ -292,7 +292,14 @@
    								fill: '#51586f'
    							}
    						}
-    					}
+    					},
+    					menuItems: [
+    	                    Highcharts.getOptions().exporting.buttons.contextButton.menuItems[0],// 打印
+    	                    Highcharts.getOptions().exporting.buttons.contextButton.menuItems[1],// jpeg
+    	                    'downloadPNG','downloadPDF',
+    	                    Highcharts.getOptions().exporting.buttons.contextButton.menuItems[4],// excel
+    	                    Highcharts.getOptions().exporting.buttons.contextButton.menuItems[3],// cvs
+    	                ]
    				}
    			}
    		},