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

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

@@ -82,7 +82,7 @@
 	</div>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting.js"></script>
-<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/series-label.js"></script>
+<%-- <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/series-label.js"></script> --%>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting-data.js"></script>
 <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/standalone.js"></script>
@@ -162,6 +162,8 @@ function changeBandwidth(unitType,beginDate,endDate){
 			//	type:'area',
 				name: "IPv4",
 				data: ipv4data,
+				lineColor:'#aecdff',
+				lineWidth:1,
 				marker: {
 		            enabled: false
 		        }
@@ -169,6 +171,8 @@ function changeBandwidth(unitType,beginDate,endDate){
 			//	type:'area',
 				name: "IPv6",
 				data: ipv6data,
+				lineColor:'#9ac0fe',
+				lineWidth:1,
 				marker: {
 		            enabled: false
 		        }
@@ -176,6 +180,8 @@ function changeBandwidth(unitType,beginDate,endDate){
 			//	type:'area',
 				name: "TCP",
 				data: tcpdata,
+				lineColor:'#85b4fe',
+				lineWidth:1,
 				marker: {
 		            enabled: false
 		        }
@@ -183,6 +189,8 @@ function changeBandwidth(unitType,beginDate,endDate){
 			//	type:'area',
 				name: "UDP",
 				data: udpdata,
+				lineColor:'#71a7fe',
+				lineWidth:1,
 				marker: {
 		            enabled: false
 		        }
@@ -203,6 +211,8 @@ function changeBandwidth(unitType,beginDate,endDate){
 			//	type:'area',
 				name: "IPv4",
 				data: ipv4data2,
+				lineColor:'#aecdff',
+				lineWidth:1,
 				marker: {
 		            enabled: false
 		        }
@@ -210,6 +220,8 @@ function changeBandwidth(unitType,beginDate,endDate){
 			//	type:'area',
 				name: "IPv6",
 				data: ipv6data2,
+				lineColor:'#9ac0fe',
+				lineWidth:1,
 				marker: {
 		            enabled: false
 		        }
@@ -217,6 +229,8 @@ function changeBandwidth(unitType,beginDate,endDate){
 			//	type:'area',
 				name: "TCP",
 				data: tcpdata2,
+				lineColor:'#85b4fe',
+				lineWidth:1,
 				marker: {
 		            enabled: false
 		        }
@@ -224,6 +238,8 @@ function changeBandwidth(unitType,beginDate,endDate){
 			//	type:'area',
 				name: "UDP",
 				data: udpdata2,
+				lineColor:'#71a7fe',
+				lineWidth:1,
 				marker: {
 		            enabled: false
 		        }
@@ -258,7 +274,7 @@ function showBandwidthChart(id,unitType,xdata,ydata,title){
 				x: 5
 			}
 		},
-		colors: ['#25a2ff','#0594ff','#0086e9','#026fc0'],
+		colors: ['#d6e6ff','#c2d9ff','#aecdff','#9ac0fe'],
 		noData:{
 			style: {//设置字体颜色
 				color: '#413333',
@@ -328,7 +344,7 @@ function showBandwidthChart(id,unitType,xdata,ydata,title){
 	        enabled:false
 	    },plotOptions: {
 			/* area: {
-				marker: {
+				/* marker: {
 					radius: 2
 				},
 				lineWidth: 1,
@@ -337,7 +353,8 @@ function showBandwidthChart(id,unitType,xdata,ydata,title){
 						lineWidth: 1
 					}
 				},
-				threshold: null
+				threshold: null 
+				lineColor:'#8216db'
 			}, */
 			series: {
 				label: {