diff --git a/src/main/java/com/nis/util/excel/ExcelCsv.java b/src/main/java/com/nis/util/excel/ExcelCsv.java index 6d6e04cd6..6ddc09f38 100644 --- a/src/main/java/com/nis/util/excel/ExcelCsv.java +++ b/src/main/java/com/nis/util/excel/ExcelCsv.java @@ -264,15 +264,15 @@ public class ExcelCsv { * @param * @return list 数据列表 */ - public static Map> setDataList(Properties msgProp, Map dataMap, Map map){ - Map> dataList=new HashMap>(); + public static Map>> setDataList(Properties msgProp, Map dataMap, Map map){ + Map>> dataList=new HashMap>>(); Set keyList=dataMap.keySet(); for (String key : keyList) { List list=dataMap.get(key); - List listT=new ArrayList(); + List> listT=new ArrayList>(); for (E e : list){ int colunm = 0; - StringBuilder sb = new StringBuilder(); + List lisb=new ArrayList(); for (Object[] os : annotationMap.get(key)){ ExcelField ef = (ExcelField)os[0]; Object val = null; @@ -332,16 +332,17 @@ public class ExcelCsv { log.error("Get entity value failed",ex); val = ""; } - sb.append(val + "┆~"); + lisb.add(String.valueOf(val)); } - listT.add(String.valueOf(sb)); + listT.add(lisb); + //listT.add(String.valueOf(sb)); } dataList.put(key, listT); } return dataList; } - public static void writeCSVFile(HttpServletResponse response,List titleList,Map> headMap, Map> dataMap,String fileName, + public static void writeCSVFile(HttpServletResponse response,List titleList,Map> headMap, Map>> dataMap,String fileName, String titleTime,Properties msgProp) { try { // 写入临时文件 @@ -369,9 +370,9 @@ public class ExcelCsv { // 写入文件头部 writeHead(heads, cs); //获取文件内容 - List datas=dataMap.get(titleList.get(i)); + List> datas=dataMap.get(titleList.get(i)); // 写入文件内容 - for (String row : datas) { + for (List row: datas) { writeRow(row, cs); } } @@ -421,12 +422,11 @@ public class ExcelCsv { csvWriter.newLine(); } - private static void writeRow(String data, BufferedWriter csvWriter) throws Exception { + private static void writeRow(List data, BufferedWriter csvWriter) throws Exception { // 写入文件内容 //Html 解码 - data = Encodes.unescapeHtml(data.toString()); - String [] datas=data.split("┆~"); - for (String tag : datas) { + for (String tag : data) { + tag = Encodes.unescapeHtml(tag.toString()); StringBuffer sb = new StringBuffer(); if("null".equals(tag.trim())){ tag=null; diff --git a/src/main/webapp/WEB-INF/include/form/pageGroup.jsp b/src/main/webapp/WEB-INF/include/form/pageGroup.jsp index da4255d80..cb6d3f916 100644 --- a/src/main/webapp/WEB-INF/include/form/pageGroup.jsp +++ b/src/main/webapp/WEB-INF/include/form/pageGroup.jsp @@ -71,7 +71,7 @@ function toPage(pageNo, pageSize, funcParam) { $('tbody').children().css('display', 'none'); //显示元素 $('tbody').children().slice((pageNo-1)*pageSize, pageNo*pageSize).css('display', ''); - totaltb(pageNo,pageSize); + showTotal(); } //底部跳页按钮 diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp index 7e03dfc07..a645200b4 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp @@ -67,7 +67,9 @@ diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp index 579ea84ec..d5cc42edf 100644 --- a/src/main/webapp/WEB-INF/views/index.jsp +++ b/src/main/webapp/WEB-INF/views/index.jsp @@ -249,6 +249,73 @@ append: null }); } + + + function getTitl(tableMark){ + var tb=document.getElementsByName(tableMark)[0]; + var rows = tb.rows; + var cells = tb.cells; + var colums = tb.rows[0].cells.length; + $("."+tableMark+" .count").empty(); + $("."+tableMark+" .count").append(""); + for(var j = 1; j < colums; j++){ + var sum = 0; + for(var i = 1;i"+sum+""); + } + } + + function getExport(tableId,url,titleName){ + loading(''); + getTitl(tableId); + var tb=document.getElementsByName(tableId); + var rows=tb[0].rows; + var list=new Array(); + list.splice(0,list.length); + var column=[]; //获取标题 + var index=[];//获取数据列下标 + var num=0; + $("table[name='"+tableId+"']").find("tr th").each(function(){ + if($(this).is(":visible")){ + column.push($(this).text().trim()); + index.push(num); + } + num++; + }); + for(var i=1 ; i 20){ + rowMap.push(rows[i].cells[n].title); + }else{ + rowMap.push(rows[i].cells[n].innerText); + } + }else{ + rowMap.push(rows[i].cells[n].innerText); + } + } + } + list[i-1]=rowMap; + } + var menuName = $("#menuName").val(); + var fileName = menuName + "_" + getNowFormatDate(); + var pztitle =$("#"+titleName).text(); + var map={}; + map.heard=column; + map.book=list; + map.titleTime=pztitle; + map.titleCode="config_service_statistics"; + var exports=JSON.stringify(map); + aJaxImportPost(url,{"exports":exports}); + $("."+tableId+" .count").empty(); + closeTip(); + } index @@ -260,9 +327,7 @@
- - [：${requestStatisticTime }] - + [：${requestStatisticTime }]
@@ -272,7 +337,7 @@
@@ -329,8 +394,7 @@
- - [：${configStatisticTime }] + [：${configStatisticTime }]
@@ -340,7 +404,7 @@
diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp index ca8f70e5a..a5bc10067 100644 --- a/src/main/webapp/WEB-INF/views/report/list.jsp +++ b/src/main/webapp/WEB-INF/views/report/list.jsp @@ -101,7 +101,7 @@ $(document).ready(function() { var lipx=Number(li/6); lipx=lipx-3; $(".lireport").css({'width':lipx+'px','text-overflow':'ellipsis','overflow':'hidden'}); - + totaltb(1,-1); }); function getExportHead(){ // 报表导出 文件增加表头 @@ -372,6 +372,13 @@ function customColumnClick(){ $('#total').html(trtotal); } } + function showTotal(){ + if($("#total")!=null){ + $("#total").show(); + } + } + + window.onload=function (){ setTimeout(function (){ var height=document.documentElement.clientHeight; @@ -477,7 +484,7 @@ function customColumnClick(){ var column=[]; //获取标题 var index=[];//获取数据列下标 var num=0; - $("#"+tableId+" thead tr th").each(function(){ + $("#"+tableId).find("tr th").each(function(){ if($(this).is(":visible")){ column.push($(this).text().trim()); index.push(num); diff --git a/src/main/webapp/static/global/plugins/highcharts/js/data.js b/src/main/webapp/static/global/plugins/highcharts/js/data.js index d66c819dd..37a620485 100644 --- a/src/main/webapp/static/global/plugins/highcharts/js/data.js +++ b/src/main/webapp/static/global/plugins/highcharts/js/data.js @@ -1,10 +1,5 @@ /* - Highcharts JS v6.1.0 (2018-04-13) - Data module - - (c) 2012-2017 Torstein Honsi - - License: www.highcharts.com/license +charts JS v6.1.0 (2018-04-13) */ (function(y){"object"===typeof module&&module.exports?module.exports=y:y(Highcharts)})(function(y){(function(h){h.ajax=function(A){var m=h.merge(!0,{url:!1,type:"GET",dataType:"json",success:!1,error:!1,data:!1,headers:{}},A);A={json:"application/json",xml:"application/xml",text:"text/plain",octet:"application/octet-stream"};var r=new XMLHttpRequest;if(!m.url)return!1;r.open(m.type.toUpperCase(),m.url,!0);r.setRequestHeader("Content-Type",A[m.dataType]||A.text);h.objectEach(m.headers,function(h,m){r.setRequestHeader(m, h)});r.onreadystatechange=function(){var h;if(4===r.readyState){if(200===r.status){h=r.responseText;if("json"===m.dataType)try{h=JSON.parse(h)}catch(F){m.error&&m.error(r,F);return}return m.success&&m.success(h)}m.error&&m.error(r,r.responseText)}};try{m.data=JSON.stringify(m.data)}catch(v){}r.send(m.data||!0)}})(y);(function(h){var A=h.addEvent,m=h.Chart,r=h.win.document,v=h.each,y=h.objectEach,G=h.pick,D=h.inArray,E=h.isNumber,B=h.merge,H=h.splat,I=h.fireEvent,J=h.some,x,C=function(a,b,c){this.init(a, @@ -19,7 +14,7 @@ var e=this,d=a||this.options,k=d.csv,p;a="undefined"!==typeof d.startRow&&d.star m=c(k));for(var r=0,t=a;t<=g;t++)"#"===k[t][0]?r++:b(k[t],t-a-r);d.columnTypes&&0!==d.columnTypes.length||!w.length||!w[0].length||"date"!==w[0][1]||d.dateFormat||(d.dateFormat=f(p[0]));this.dataFound()}return p},parseTable:function(){var a=this.options,b=a.table,c=this.columns,f=a.startRow||0,e=a.endRow||Number.MAX_VALUE,d=a.startColumn||0,k=a.endColumn||Number.MAX_VALUE;b&&("string"===typeof b&&(b=r.getElementById(b)),v(b.getElementsByTagName("tr"),function(a,b){b>=f&&b<=e&&v(a.children,function(a, e){("TD"===a.tagName||"TH"===a.tagName)&&e>=d&&e<=k&&(c[e-d]||(c[e-d]=[]),c[e-d][b-f]=a.innerHTML)})}),this.dataFound());return c},fetchLiveData:function(){function a(p){function g(g,k,m){function t(){e&&b.liveDataURL===g&&(b.liveDataTimeout=setTimeout(a,d))}if(!g||0!==g.indexOf("http"))return g&&c.error&&c.error("Invalid URL"),!1;p&&(clearTimeout(b.liveDataTimeout),b.liveDataURL=g);h.ajax({url:g,dataType:m||"json",success:function(a){b&&b.series&&k(a);t()},error:function(a,b){3>++f&&t();return c.error&& c.error(b,a)}});return!0}g(k.csvURL,function(a){b.update({data:{csv:a}})},"text")||g(k.rowsURL,function(a){b.update({data:{rows:a}})})||g(k.columnsURL,function(a){b.update({data:{columns:a}})})}var b=this.chart,c=this.options,f=0,e=c.enablePolling,d=1E3*(c.dataRefreshRate||2),k=B(c);if(!c||!c.csvURL&&!c.rowsURL&&!c.columnsURL)return!1;1E3>d&&(d=1E3);delete c.csvURL;delete c.rowsURL;delete c.columnsURL;a(!0);return c&&(c.csvURL||c.rowsURL||c.columnsURL)},parseGoogleSpreadsheet:function(){function a(d){var f= -["https://spreadsheets.google.com/feeds/cells",c,e,"public/values?alt\x3djson"].join("/");h.ajax({url:f,dataType:"json",success:function(c){d(c);b.enablePolling&&setTimeout(function(){a(d)},b.dataRefreshRate)},error:function(a,c){return b.error&&b.error(c,a)}})}var b=this.options,c=b.googleSpreadsheetKey,f=this.chart,e=b.googleSpreadsheetWorksheet||1,d=b.startRow||0,k=b.endRow||Number.MAX_VALUE,p=b.startColumn||0,g=b.endColumn||Number.MAX_VALUE,n=1E3*(b.dataRefreshRate||2);4E3>n&&(n=4E3);c&&(delete b.googleSpreadsheetKey, +["#",c,e,"public/values?alt\x3djson"].join("/");h.ajax({url:f,dataType:"json",success:function(c){d(c);b.enablePolling&&setTimeout(function(){a(d)},b.dataRefreshRate)},error:function(a,c){return b.error&&b.error(c,a)}})}var b=this.options,c=b.googleSpreadsheetKey,f=this.chart,e=b.googleSpreadsheetWorksheet||1,d=b.startRow||0,k=b.endRow||Number.MAX_VALUE,p=b.startColumn||0,g=b.endColumn||Number.MAX_VALUE,n=1E3*(b.dataRefreshRate||2);4E3>n&&(n=4E3);c&&(delete b.googleSpreadsheetKey, a(function(a){var b=[];a=a.feed.entry;var c,e=(a||[]).length,h=0,n,m,q;if(!a||0===a.length)return!1;for(q=0;q=p&&q<=g&&(b[q-p]=[]);for(q=0;q=p&&n<=g&&h>=d&&h<=k&&(m=c.gs$cell||c.content,c=null,m.numericValue?c=0<=m.$t.indexOf("/")||0<=m.$t.indexOf("-")?m.$t:0a[e+1])):(h&&h.length&&(v=this.parseDate(d)),r&&E(v)&&"float"!==x?(t[e]=d,a[e]=v,a.isDatetime=!0,void 0!==a[e+1]&&(d=v>a[e+1],d!==u&&void 0!== diff --git a/src/main/webapp/static/global/plugins/highcharts/js/drilldown.js b/src/main/webapp/static/global/plugins/highcharts/js/drilldown.js index 6597bf721..070affda7 100644 --- a/src/main/webapp/static/global/plugins/highcharts/js/drilldown.js +++ b/src/main/webapp/static/global/plugins/highcharts/js/drilldown.js @@ -1,10 +1,5 @@ /* - Highcharts JS v6.1.0 (2018-04-13) - Highcharts Drilldown module - - Author: Torstein Honsi - License: www.highcharts.com/license - +charts JS v6.1.0 (2018-04-13) */ (function(p){"object"===typeof module&&module.exports?module.exports=p:p(Highcharts)})(function(p){(function(d){var p=d.animObject,x=d.noop,y=d.color,z=d.defaultOptions,k=d.each,q=d.extend,F=d.format,A=d.objectEach,t=d.pick,m=d.Chart,n=d.seriesTypes,B=n.pie,n=n.column,C=d.Tick,u=d.fireEvent,D=d.inArray,E=1;q(z.lang,{drillUpText:"\u25c1 Back to {series.name}"});z.drilldown={activeAxisLabelStyle:{cursor:"pointer",color:"#003399",fontWeight:"bold",textDecoration:"underline"},activeDataLabelStyle:{cursor:"pointer", color:"#003399",fontWeight:"bold",textDecoration:"underline"},animation:{duration:500},drillUpButton:{position:{align:"right",x:-10,y:10}}};d.SVGRenderer.prototype.Element.prototype.fadeIn=function(a){this.attr({opacity:.1,visibility:"inherit"}).animate({opacity:t(this.newOpacity,1)},a||{duration:250})};m.prototype.addSeriesAsDrilldown=function(a,b){this.addSingleSeriesAsDrilldown(a,b);this.applyDrilldown()};m.prototype.addSingleSeriesAsDrilldown=function(a,b){var c=a.series,e=c.xAxis,f=c.yAxis,g, diff --git a/src/main/webapp/static/global/plugins/highcharts/js/exporting-data.js b/src/main/webapp/static/global/plugins/highcharts/js/exporting-data.js index 02e0889fc..9506bd954 100644 --- a/src/main/webapp/static/global/plugins/highcharts/js/exporting-data.js +++ b/src/main/webapp/static/global/plugins/highcharts/js/exporting-data.js @@ -1,10 +1,8 @@ /* - Highcharts JS v7.0.0 (2018-12-11) +charts JS v7.0.0 (2018-12-11) Exporting module + (c) 2010-2018 - (c) 2010-2018 Torstein Honsi - - License: www.highcharts.com/license */ (function(m){"object"===typeof module&&module.exports?module.exports=m:"function"===typeof define&&define.amd?define(function(){return m}):m("undefined"!==typeof Highcharts?Highcharts:void 0)})(function(m){(function(a){a.ajax=function(f){var b=a.merge(!0,{url:!1,type:"GET",dataType:"json",success:!1,error:!1,data:!1,headers:{}},f);f={json:"application/json",xml:"application/xml",text:"text/plain",octet:"application/octet-stream"};var c=new XMLHttpRequest;if(!b.url)return!1;c.open(b.type.toUpperCase(), b.url,!0);c.setRequestHeader("Content-Type",f[b.dataType]||f.text);a.objectEach(b.headers,function(a,f){c.setRequestHeader(f,a)});c.onreadystatechange=function(){var a;if(4===c.readyState){if(200===c.status){a=c.responseText;if("json"===b.dataType)try{a=JSON.parse(a)}catch(v){b.error&&b.error(c,v);return}return b.success&&b.success(a)}b.error&&b.error(c,c.responseText)}};try{b.data=JSON.stringify(b.data)}catch(k){}c.send(b.data||!0)}})(m);(function(a){var f=a.win,b=f.navigator,c=f.document,k=f.URL|| @@ -21,7 +19,7 @@ c(g.exporting.tableCaption,g.title.text?g.title.text.replace(/&/g,"\x26amp;").re e;++c)d=a[c],k=a[c+1],d===k?++l:l?(h+=m("th","highcharts-table-topheading",'scope\x3d"col" colspan\x3d"'+(l+1)+'"',d),l=0):(d===b[c]?g.exporting.useRowspanHeaders?(k=2,delete b[c]):(k=1,b[c]=""):k=1,h+=m("th","highcharts-table-topheading",'scope\x3d"col"'+(1(.*?$)/);d&&d[1]&&(d='\x3cforeignObject x\x3d"0" y\x3d"0" width\x3d"'+a.chart.width+'" height\x3d"'+ a.chart.height+'"\x3e\x3cbody xmlns\x3d"http://www.w3.org/1999/xhtml"\x3e'+d[1]+"\x3c/body\x3e\x3c/foreignObject\x3e",b=b.replace("\x3c/svg\x3e",d+"\x3c/svg\x3e"))}b=b.replace(/zIndex="[^"]+"/g,"").replace(/symbolName="[^"]+"/g,"").replace(/jQuery[0-9]+="[^"]+"/g,"").replace(/url\(("|")(\S+)("|")\)/g,"url($2)").replace(/url\([^#]+#/g,"url(#").replace(/.*?$/, diff --git a/src/main/webapp/static/global/plugins/highcharts/js/exporting.js.old b/src/main/webapp/static/global/plugins/highcharts/js/exporting.js.old index 1cef1138e..898390955 100644 --- a/src/main/webapp/static/global/plugins/highcharts/js/exporting.js.old +++ b/src/main/webapp/static/global/plugins/highcharts/js/exporting.js.old @@ -1,10 +1,9 @@ /* - Highcharts JS v6.1.0 (2018-04-13) - Exporting module +charts JS v6.1.0 (2018-04-13) - (c) 2010-2017 Torstein Honsi - License: www.highcharts.com/license + (c) 2010-2017 + */ (function(h){"object"===typeof module&&module.exports?module.exports=h:h(Highcharts)})(function(h){(function(f){var h=f.defaultOptions,z=f.doc,A=f.Chart,w=f.addEvent,H=f.removeEvent,D=f.fireEvent,q=f.createElement,B=f.discardElement,u=f.css,p=f.merge,r=f.pick,k=f.each,E=f.objectEach,t=f.extend,I=f.isTouchDevice,C=f.win,F=C.navigator.userAgent,J=f.Renderer.prototype.symbols;/Edge\/|Trident\/|MSIE /.test(F);/firefox/i.test(F);t(h.lang,{/*printChart:"Print chart",*//*downloadPNG:"Download PNG image",*/downloadJPEG:"Download JPEG image", /*downloadPDF:"Download PDF document",*//*downloadSVG:"Download SVG vector image",*/contextButtonTitle:"download"});h.navigation={buttonOptions:{theme:{},symbolSize:14,symbolX:12.5,symbolY:10.5,align:"right",buttonSpacing:3,height:22,verticalAlign:"top",width:24}};p(!0,h.navigation,{menuStyle:{border:"1px solid #999999",background:"#ffffff",padding:"5px 0"},menuItemStyle:{padding:"0.5em 1em",background:"none",color:"#333333",fontSize:I?"14px":"11px",transition:"background 250ms, color 250ms"},menuItemHoverStyle:{background:"#335cad", diff --git a/src/main/webapp/static/global/plugins/highcharts/js/highcharts.js b/src/main/webapp/static/global/plugins/highcharts/js/highcharts.js index 9a8479a7c..bcd1f05e7 100644 --- a/src/main/webapp/static/global/plugins/highcharts/js/highcharts.js +++ b/src/main/webapp/static/global/plugins/highcharts/js/highcharts.js @@ -1,13 +1,11 @@ /* - Highcharts JS v6.1.0 (2018-04-13) +charts JS v6.1.0 (2018-04-13) + (c) 2009-2016 - (c) 2009-2016 Torstein Honsi - - License: www.highcharts.com/license */ (function(T,K){"object"===typeof module&&module.exports?module.exports=T.document?K(T):K:T.Highcharts=K(T)})("undefined"!==typeof window?window:this,function(T){var K=function(){var a="undefined"===typeof T?window:T,C=a.document,F=a.navigator&&a.navigator.userAgent||"",D=C&&C.createElementNS&&!!C.createElementNS("http://www.w3.org/2000/svg","svg").createSVGRect,r=/(edge|msie|trident)/i.test(F)&&!a.opera,g=-1!==F.indexOf("Firefox"),e=-1!==F.indexOf("Chrome"),t=g&&4>parseInt(F.split("Firefox/")[1], -10);return a.Highcharts?a.Highcharts.error(16,!0):{product:"Highcharts",version:"6.1.0",deg2rad:2*Math.PI/360,doc:C,hasBidiBug:t,hasTouch:C&&void 0!==C.documentElement.ontouchstart,isMS:r,isWebKit:-1!==F.indexOf("AppleWebKit"),isFirefox:g,isChrome:e,isSafari:!e&&-1!==F.indexOf("Safari"),isTouchDevice:/(Mobile|Android|Windows Phone)/.test(F),SVG_NS:"http://www.w3.org/2000/svg",chartCount:0,seriesTypes:{},symbolSizes:{},svg:D,win:a,marginNames:["plotTop","marginRight","marginBottom","plotLeft"],noop:function(){}, -charts:[]}}();(function(a){a.timers=[];var C=a.charts,F=a.doc,D=a.win;a.error=function(r,g){r=a.isNumber(r)?"Highcharts error #"+r+": www.highcharts.com/errors/"+r:r;if(g)throw Error(r);D.console&&console.log(r)};a.Fx=function(a,g,e){this.options=g;this.elem=a;this.prop=e};a.Fx.prototype={dSetter:function(){var a=this.paths[0],g=this.paths[1],e=[],t=this.now,w=a.length,l;if(1===t)e=this.toD;else if(w===g.length&&1>t)for(;w--;)l=parseFloat(a[w]),e[w]=isNaN(l)?g[w]:t*parseFloat(g[w]-l)+l;else e=g;this.elem.attr("d", +10);return a.Highcharts?a.Highcharts.error(16,!0):{product:"charts",version:"6.1.0",deg2rad:2*Math.PI/360,doc:C,hasBidiBug:t,hasTouch:C&&void 0!==C.documentElement.ontouchstart,isMS:r,isWebKit:-1!==F.indexOf("AppleWebKit"),isFirefox:g,isChrome:e,isSafari:!e&&-1!==F.indexOf("Safari"),isTouchDevice:/(Mobile|Android|Windows Phone)/.test(F),SVG_NS:"http://www.w3.org/2000/svg",chartCount:0,seriesTypes:{},symbolSizes:{},svg:D,win:a,marginNames:["plotTop","marginRight","marginBottom","plotLeft"],noop:function(){}, +charts:[]}}();(function(a){a.timers=[];var C=a.charts,F=a.doc,D=a.win;a.error=function(r,g){r=a.isNumber(r)?"error #"+r+"#"+r:r;if(g)throw Error(r);D.console&&console.log(r)};a.Fx=function(a,g,e){this.options=g;this.elem=a;this.prop=e};a.Fx.prototype={dSetter:function(){var a=this.paths[0],g=this.paths[1],e=[],t=this.now,w=a.length,l;if(1===t)e=this.toD;else if(w===g.length&&1>t)for(;w--;)l=parseFloat(a[w]),e[w]=isNaN(l)?g[w]:t*parseFloat(g[w]-l)+l;else e=g;this.elem.attr("d", e,null,!0)},update:function(){var a=this.elem,g=this.prop,e=this.now,t=this.options.step;if(this[g+"Setter"])this[g+"Setter"]();else a.attr?a.element&&a.attr(g,e,null,!0):a.style[g]=e+this.unit;t&&t.call(a,e,this)},run:function(r,g,e){var t=this,w=t.options,l=function(a){return l.stopped?!1:t.step(a)},u=D.requestAnimationFrame||function(a){setTimeout(a,13)},c=function(){for(var d=0;d=u+this.startTime?(this.now=this.end,this.pos=1,this.update(),e=c[this.prop]=!0,a.objectEach(c,function(a){!0!== a&&(e=!1)}),e&&l&&l.call(w),r=!1):(this.pos=t.easing((g-this.startTime)/u),this.now=this.start+(this.end-this.start)*this.pos,this.update(),r=!0);return r},initPath:function(r,g,e){function t(a){var f,c;for(b=a.length;b--;)f="M"===a[b]||"L"===a[b],c=/[a-zA-Z]/.test(a[b+3]),f&&c&&a.splice(b+1,0,a[b+1],a[b+2],a[b+1],a[b+2])}function w(a,f){for(;a.length=e.second?0:n*Math.floor(d.get("Milliseconds",f)/n));b>=e.second&&d.set("Seconds",f,b>=e.minute?0:n*Math.floor(d.get("Seconds",f)/n));b>=e.minute&&d.set("Minutes",f,b>=e.hour?0:n*Math.floor(d.get("Minutes",f)/n));b>=e.hour&&d.set("Hours",f,b>=e.day?0:n*Math.floor(d.get("Hours",f)/n));b>=e.day&&d.set("Date",f,b>=e.month?1:n*Math.floor(d.get("Date",f)/n));b>=e.month&&(d.set("Month",f,b>=e.year?0:n*Math.floor(d.get("Month",f)/n)),p=d.get("FullYear",f));b>=e.year&&d.set("FullYear",f,p-p%n);b===e.week&& d.set("Date",f,d.get("Date",f)-d.get("Day",f)+g(c,1));p=d.get("FullYear",f);c=d.get("Month",f);var J=d.get("Date",f),q=d.get("Hours",f);l=f.getTime();d.variableTimezone&&(z=u-l>4*e.month||d.getTimezoneOffset(l)!==d.getTimezoneOffset(u));f=f.getTime();for(l=1;fk.length&&F(k,function(a){0=== a%18E5&&"000000000"===d.dateFormat("%H%M%S%L",a)&&(x[a]="day")})}k.info=D(a,{higherRanks:x,totalRange:b*n});return k}}})(K);(function(a){var C=a.color,F=a.merge;a.defaultOptions={colors:"#7cb5ec #434348 #90ed7d #f7a35c #8085e9 #f15c80 #e4d354 #2b908f #f45b5b #91e8e1".split(" "),symbols:["circle","diamond","square","triangle","triangle-down"],lang:{loading:"Loading...",months:"January February March April May June July August September October November December".split(" "),shortMonths:"Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" "), -weekdays:"Sunday Monday Tuesday Wednesday Thursday Friday Saturday".split(" "),decimalPoint:".",numericSymbols:"kMGTPE".split(""),resetZoom:"Reset zoom",resetZoomTitle:"Reset zoom level 1:1",thousandsSep:" "},global:{},time:a.Time.prototype.defaultOptions,chart:{borderRadius:0,defaultSeriesType:"line",ignoreHiddenSeries:!0,spacing:[10,10,15,10],resetZoomButton:{theme:{zIndex:6},position:{align:"right",x:-10,y:10}},width:null,height:null,borderColor:"#335cad",backgroundColor:"#ffffff",plotBorderColor:"#cccccc"}, +weekdays:"Sunday Monday Tuesday Wednesday Thursday Friday Saturday".split(" "),decimalPoint:".",numericSymbols:"kMGTPE".split(""),resetZoom:"Reset",resetZoomTitle:"Reset zoom level 1:1",thousandsSep:" "},global:{},time:a.Time.prototype.defaultOptions,chart:{borderRadius:0,defaultSeriesType:"line",ignoreHiddenSeries:!0,spacing:[10,10,15,10],resetZoomButton:{theme:{zIndex:6},position:{align:"right",x:-10,y:10}},width:null,height:null,borderColor:"#335cad",backgroundColor:"#ffffff",plotBorderColor:"#cccccc"}, title:{text:"Chart title",align:"center",margin:15,widthAdjust:-44},subtitle:{text:"",align:"center",widthAdjust:-44},plotOptions:{},labels:{style:{position:"absolute",color:"#333333"}},legend:{enabled:!0,align:"center",alignColumns:!0,layout:"horizontal",labelFormatter:function(){return this.name},borderColor:"#999999",borderRadius:0,navigation:{activeColor:"#003399",inactiveColor:"#cccccc"},itemStyle:{color:"#333333",fontSize:"12px",fontWeight:"bold",textOverflow:"ellipsis"},itemHoverStyle:{color:"#000000"}, itemHiddenStyle:{color:"#cccccc"},shadow:!1,itemCheckboxStyle:{position:"absolute",width:"13px",height:"13px"},squareSymbol:!0,symbolPadding:5,verticalAlign:"bottom",x:0,y:0,title:{style:{fontWeight:"bold"}}},loading:{labelStyle:{fontWeight:"bold",position:"relative",top:"45%"},style:{position:"absolute",backgroundColor:"#ffffff",opacity:.5,textAlign:"center"}},tooltip:{enabled:!0,animation:a.svg,borderRadius:3,dateTimeLabelFormats:{millisecond:"%A, %b %e, %H:%M:%S.%L",second:"%A, %b %e, %H:%M:%S", minute:"%A, %b %e, %H:%M",hour:"%A, %b %e, %H:%M",day:"%A, %b %e, %Y",week:"Week from %A, %b %e, %Y",month:"%B %Y",year:"%Y"},footerFormat:"",padding:8,snap:a.isTouchDevice?25:10,backgroundColor:C("#f7f7f7").setOpacity(.85).get(),borderWidth:1,headerFormat:'\x3cspan style\x3d"font-size: 10px"\x3e{point.key}\x3c/span\x3e\x3cbr/\x3e',pointFormat:'\x3cspan style\x3d"color:{point.color}"\x3e\u25cf\x3c/span\x3e {series.name}: \x3cb\x3e{point.y}\x3c/b\x3e\x3cbr/\x3e',shadow:!0,style:{color:"#333333",cursor:"default", diff --git a/src/main/webapp/static/global/plugins/highcharts/js/no-data-to-display.js b/src/main/webapp/static/global/plugins/highcharts/js/no-data-to-display.js index b00d4776d..1ab9c87c1 100644 --- a/src/main/webapp/static/global/plugins/highcharts/js/no-data-to-display.js +++ b/src/main/webapp/static/global/plugins/highcharts/js/no-data-to-display.js @@ -1,11 +1,8 @@ /* - Highcharts JS v6.1.0 (2018-04-13) +charts JS v6.1.0 (2018-04-13) Plugin for displaying a message when there is no data visible in chart. - (c) 2010-2017 Highsoft AS - Author: Oystein Moseng - License: www.highcharts.com/license */ (function(d){"object"===typeof module&&module.exports?module.exports=d:d(Highcharts)})(function(d){(function(c){var d=c.seriesTypes,e=c.Chart.prototype,f=c.getOptions(),g=c.extend,h=c.each;g(f.lang,{noData:"No data to display"});f.noData={position:{x:0,y:0,align:"center",verticalAlign:"middle"}};f.noData.style={fontWeight:"bold",fontSize:"12px",color:"#666666"};h("bubble gauge heatmap pie sankey treemap waterfall".split(" "),function(b){d[b]&&(d[b].prototype.hasData=function(){return!!this.points.length})}); c.Series.prototype.hasData=function(){return this.visible&&void 0!==this.dataMax&&void 0!==this.dataMin};e.showNoData=function(b){var a=this.options;b=b||a&&a.lang.noData;a=a&&a.noData;!this.noDataLabel&&this.renderer&&(this.noDataLabel=this.renderer.label(b,0,0,null,null,null,a.useHTML,null,"no-data"),this.noDataLabel.attr(a.attr).css(a.style),this.noDataLabel.add(),this.noDataLabel.align(g(this.noDataLabel.getBBox(),a.position),!1,"plotBox"))};e.hideNoData=function(){this.noDataLabel&&(this.noDataLabel= diff --git a/src/main/webapp/static/global/plugins/highcharts/js/offline-exporting.js b/src/main/webapp/static/global/plugins/highcharts/js/offline-exporting.js index 38062c420..3e5f3f282 100644 --- a/src/main/webapp/static/global/plugins/highcharts/js/offline-exporting.js +++ b/src/main/webapp/static/global/plugins/highcharts/js/offline-exporting.js @@ -1,10 +1,7 @@ /* - Highcharts JS v6.1.0 (2018-04-13) +charts JS v6.1.0 (2018-04-13) Client side exporting module - (c) 2015 Torstein Honsi / Oystein Moseng - - License: www.highcharts.com/license */ (function(n){"object"===typeof module&&module.exports?module.exports=n:n(Highcharts)})(function(n){(function(c){function n(a,f){var d=t.getElementsByTagName("head")[0],b=t.createElement("script");b.type="text/javascript";b.src=a;b.onload=f;b.onerror=function(){c.error("Error loading script "+a)};d.appendChild(b)}var C=c.merge,e=c.win,r=e.navigator,t=e.document,w=c.each,x=e.URL||e.webkitURL||e,B=/Edge\/|Trident\/|MSIE /.test(r.userAgent),D=/Edge\/\d+/.test(r.userAgent),E=B?150:0;c.CanVGRenderer={}; c.dataURLtoBlob=function(a){if(e.atob&&e.ArrayBuffer&&e.Uint8Array&&e.Blob&&x.createObjectURL){a=a.match(/data:([^;]*)(;base64)?,([0-9A-Za-z+/]+)/);for(var c=e.atob(a[3]),d=new e.ArrayBuffer(c.length),d=new e.Uint8Array(d),b=0;b]*height\s*=\s*\"?(\d+)\"?[^>]*>/)[1]*A,m=function(){u.drawSvg(a,0,0,l,k);try{c.downloadURL(r.msSaveOrOpenBlob?f.msToBlob():f.toDataURL(q),v),b&&b()}catch(H){d()}finally{g()}};f.width=l;f.height=k;e.canvg?m():(p=!0,n(h+"rgbcolor.js",function(){n(h+"canvg.js",function(){m()})}))},d,d,function(){p&&g()}))};c.Chart.prototype.getSVGForLocalExport=function(a,e,d,b){var f=this,l,k=0,m,p,g,h,n,q=function(a,c,d){++k;d.imageElement.setAttributeNS("http://www.w3.org/1999/xlink","href", a);k===l.length&&b(f.sanitizeSVG(m.innerHTML,p))};c.wrap(c.Chart.prototype,"getChartHTML",function(b){var a=b.apply(this,Array.prototype.slice.call(arguments,1));p=this.options;m=this.container.cloneNode(!0);return a});f.getSVGForExport(a,e);l=m.getElementsByTagName("image");try{if(l.length)for(h=0,n=l.length;h #mq-test-1 { width: 42px; }',c.insertBefore(e,d),b=42===f.offsetWidth,c.removeChild(e),{matches:b,media:a}}}(a.document)}(this),function(a){"use strict";function b(){u(!0)}var c={};a.respond=c,c.update=function(){};var d=[],e=function(){var b=!1;try{b=new a.XMLHttpRequest}catch(c){b=new a.ActiveXObject("Microsoft.XMLHTTP")}return function(){return b}}(),f=function(a,b){var c=e();c&&(c.open("GET",a,!0),c.onreadystatechange=function(){4!==c.readyState||200!==c.status&&304!==c.status||b(c.responseText)},4!==c.readyState&&c.send(null))};if(c.ajax=f,c.queue=d,c.regex={media:/@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi,keyframes:/@(?:\-(?:o|moz|webkit)\-)?keyframes[^\{]+\{(?:[^\{\}]*\{[^\}\{]*\})+[^\}]*\}/gi,urls:/(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,findStyles:/@media *([^\{]+)\{([\S\s]+?)$/,only:/(only\s+)?([a-zA-Z]+)\s?/,minw:/\([\s]*min\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/,maxw:/\([\s]*max\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/},c.mediaQueriesSupported=a.matchMedia&&null!==a.matchMedia("only all")&&a.matchMedia("only all").matches,!c.mediaQueriesSupported){var g,h,i,j=a.document,k=j.documentElement,l=[],m=[],n=[],o={},p=30,q=j.getElementsByTagName("head")[0]||k,r=j.getElementsByTagName("base")[0],s=q.getElementsByTagName("link"),t=function(){var a,b=j.createElement("div"),c=j.body,d=k.style.fontSize,e=c&&c.style.fontSize,f=!1;return b.style.cssText="position:absolute;font-size:1em;width:1em",c||(c=f=j.createElement("body"),c.style.background="none"),k.style.fontSize="100%",c.style.fontSize="100%",c.appendChild(b),f&&k.insertBefore(c,k.firstChild),a=b.offsetWidth,f?k.removeChild(c):c.removeChild(b),k.style.fontSize=d,e&&(c.style.fontSize=e),a=i=parseFloat(a)},u=function(b){var c="clientWidth",d=k[c],e="CSS1Compat"===j.compatMode&&d||j.body[c]||d,f={},o=s[s.length-1],r=(new Date).getTime();if(b&&g&&p>r-g)return a.clearTimeout(h),h=a.setTimeout(u,p),void 0;g=r;for(var v in l)if(l.hasOwnProperty(v)){var w=l[v],x=w.minw,y=w.maxw,z=null===x,A=null===y,B="em";x&&(x=parseFloat(x)*(x.indexOf(B)>-1?i||t():1)),y&&(y=parseFloat(y)*(y.indexOf(B)>-1?i||t():1)),w.hasquery&&(z&&A||!(z||e>=x)||!(A||y>=e))||(f[w.media]||(f[w.media]=[]),f[w.media].push(m[w.rules]))}for(var C in n)n.hasOwnProperty(C)&&n[C]&&n[C].parentNode===q&&q.removeChild(n[C]);n.length=0;for(var D in f)if(f.hasOwnProperty(D)){var E=j.createElement("style"),F=f[D].join("\n");E.type="text/css",E.media=D,q.insertBefore(E,o.nextSibling),E.styleSheet?E.styleSheet.cssText=F:E.appendChild(j.createTextNode(F)),n.push(E)}},v=function(a,b,d){var e=a.replace(c.regex.keyframes,"").match(c.regex.media),f=e&&e.length||0;b=b.substring(0,b.lastIndexOf("/"));var g=function(a){return a.replace(c.regex.urls,"$1"+b+"$2$3")},h=!f&&d;b.length&&(b+="/"),h&&(f=1);for(var i=0;f>i;i++){var j,k,n,o;h?(j=d,m.push(g(a))):(j=e[i].match(c.regex.findStyles)&&RegExp.$1,m.push(RegExp.$2&&g(RegExp.$2))),n=j.split(","),o=n.length;for(var p=0;o>p;p++)k=n[p],l.push({media:k.split("(")[0].match(c.regex.only)&&RegExp.$2||"all",rules:m.length-1,hasquery:k.indexOf("(")>-1,minw:k.match(c.regex.minw)&&parseFloat(RegExp.$1)+(RegExp.$2||""),maxw:k.match(c.regex.maxw)&&parseFloat(RegExp.$1)+(RegExp.$2||"")})}u()},w=function(){if(d.length){var b=d.shift();f(b.href,function(c){v(c,b.href,b.media),o[b.href]=!0,a.setTimeout(function(){w()},0)})}},x=function(){for(var b=0;bc?!1:!0}function v(c,b,a,k,d,e,f,m){return r(c,b,d,e,f,m)!==r(a,k,d,e,f,m)&&r(c,b,a,k,d,e)!==r(c,b,a,k,f,m)}function z(c,b,a,k,d,e,f,m){return v(c,b,c+a,b,d,e,f,m)||v(c+a,b,c+a,b+k,d,e,f,m)||v(c,b+k,c+a,b+k,d,e,f,m)|| v(c,b,c,b+k,d,e,f,m)}var C=n.addEvent,A=n.extend,w=n.isNumber,x=n.pick,y=n.Series,D=n.SVGRenderer,B=n.Chart;n.setOptions({plotOptions:{series:{label:{enabled:!0,connectorAllowed:!1,connectorNeighbourDistance:24,minFontSize:null,maxFontSize:null,onArea:null,style:{fontWeight:"bold"},boxesToAvoid:[]}}}});D.prototype.symbols.connector=function(c,b,a,k,d){var e=d&&d.anchorX;d=d&&d.anchorY;var f,m,h=a/2;w(e)&&w(d)&&(f=["M",e,d],m=b-d,0>m&&(m=-k-m),mb+k?f.push("L",c+h,b+k):d