gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
into develop

Conflicts:
	src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
This commit is contained in:
tanghao
2019-01-03 15:01:46 +08:00
parent 3fb9b5b159 2312b41035
commit 1e0fc76160
34 changed files with 1851 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/webapp/static/pages/scripts/echart.js
View File

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

5
src/main/webapp/static/pages/scripts/importExcel.js
View File

@@ -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;
}
}