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

src/main/webapp/static/global/plugins/highcharts/js/offline-exporting.js

@@ -278,6 +278,7 @@ License: www.highcharts.com/license
 					textKey: "downloadPNG",
 					onclick: function () {
 						console.log(this)
+						console.log(chart_main)
 						this.legend.itemStyle.color='#000000'
 						this.exportChartLocal()
 						this.legend.itemStyle.color='#ffffff'

src/main/webapp/static/global/scripts/pzLog.js

@@ -6,13 +6,26 @@ $(function(){
 	 getTotalLog();
 });
 
-function setTime(){
+/*function setTime(){
 	var chooseDate=new Date($('#beginDate').val());
 	chooseDate=chooseDate.setDate(chooseDate.getDate()+7);
 	var modifyTime=new Date(chooseDate);
 	$('#endDate').val(modifyTime.getFullYear()+"-"+((modifyTime.getMonth()+1)>=10?(modifyTime.getMonth()+1):"0"+(modifyTime.getMonth()+1))+"-"+(modifyTime.getDate()>=10?modifyTime.getDate():'0'+modifyTime.getDate())+' '+(modifyTime.getHours()>=10?modifyTime.getHours():'0'+modifyTime.getHours())+':'+(modifyTime.getMinutes()>=10?modifyTime.getMinutes():'0'+modifyTime.getMinutes())+':'+(modifyTime.getSeconds()>=10?modifyTime.getSeconds():'0'+modifyTime.getSeconds()));
+}*/
+function setTime(dayData){
+	var useTime=$('#beginDate').val();
+	if(useTime==''){
+		return;
+	}
+	var chooseDate=new Date(useTime);
+	chooseDate=chooseDate.setDate(chooseDate.getDate()+dayData);
+	var now =new Date();
+	if(now.getTime()<new Date(chooseDate).getTime()){
+		chooseDate=now;
+	}
+	var modifyTime=new Date(chooseDate);
+	$('#endDate').val(modifyTime.getFullYear()+"-"+((modifyTime.getMonth()+1)>=10?(modifyTime.getMonth()+1):"0"+(modifyTime.getMonth()+1))+"-"+(modifyTime.getDate()>=10?modifyTime.getDate():'0'+modifyTime.getDate())+' '+(modifyTime.getHours()>=10?modifyTime.getHours():'0'+modifyTime.getHours())+':'+(modifyTime.getMinutes()>=10?modifyTime.getMinutes():'0'+modifyTime.getMinutes())+':'+(modifyTime.getSeconds()>=10?modifyTime.getSeconds():'0'+modifyTime.getSeconds()));
 }
-
 function setTimee(){
 	var chooseDate=new Date($('#searchFoundStartTime').val());
 	chooseDate=chooseDate.setDate(chooseDate.getDate()+1);
@@ -21,6 +34,68 @@ function setTimee(){
 }
 
 
+function currentTime() {
+    var now = new Date();
+        
+    var year = now.getFullYear();       
+    var month = now.getMonth() + 1;     
+    var day = now.getDate();           
+
+    var hh = now.getHours();            
+    var mm = now.getMinutes();          
+
+    var clock = year + "-";
+
+    if (month < 10)  clock += "0";
+    clock += month + "-";
+
+    if (day < 10) clock += "0";
+    clock += day + " ";
+
+    if (hh < 10)  clock += "0";
+    clock += hh + ":";
+
+    if (mm < 10) clock += '0';
+    clock += mm;
+    return (clock);
+}
+function getMaxDate(day){
+	var clock=currentTime();
+	var dt;
+	var times=0;
+	dt=$("#beginDate").val();
+	if(dt!=''){
+		times =Date.parse(dt.replace(/-/g,'/'))+day*24*60*60*1000;//时间间隔为10天
+	
+		if(times-Date.parse(clock.replace(/-/g,'/'))<0){
+			var d1 = new Date(times);
+			var year = d1.getFullYear();       
+			var month = d1.getMonth() + 1;    //月份以0开头 
+			var day = d1.getDate();           
+	
+			var hh = d1.getHours();            
+			var mm = d1.getMinutes();          
+	
+			var clock = year + "-";
+	
+			if (month < 10) clock += "0";
+			clock += month + "-";
+	
+			if (day < 10) clock += "0";
+			clock += day + " ";
+	
+			if (hh < 10) clock += "0";
+			clock += hh + ":";
+	
+			if (mm < 10) clock += '0';
+			clock += mm;
+						
+		}
+	}
+	return clock;
+}
+
+
 var getTotalLog=function(){
 	/*
 		td需要配置属性有，audit,functionId，compileId，action

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
+    	                ]
     				}
     			}
     		},

src/main/webapp/static/pages/scripts/importExcel.js

@@ -133,9 +133,10 @@ var importCfg=function(){
 	}
 	var appFlag=true;
 	if(($("#functionId").val() == 63)||($("#functionId").val() == 408)||($("#functionId").val() == 407)||
-			($("#functionId").val() == 402)||($("#functionId").val() == 403)||($("#functionId").val() == 405)){
+			($("#functionId").val() == 402)||($("#functionId").val() == 403)||($("#functionId").val() == 405)
+			||($("#functionId").val() == 563)||($("#functionId").val() == 565)||($("#functionId").val() == 564)||($("#functionId").val() == 566)){
 		var appIdValue=$("#appIdName").val();
-		if(appIdValue == null || appIdValue ==''){
+		if(appIdValue == null || appIdValue =='' || typeof(appIdValue) == "undefined"){
 			appFlag=false;
 		}
 	}