diff --git a/src/main/webapp/WEB-INF/views/dashboard/ntcTotalReportDetailList.jsp b/src/main/webapp/WEB-INF/views/dashboard/ntcTotalReportDetailList.jsp index 059341e8f..babcb72d9 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/ntcTotalReportDetailList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/ntcTotalReportDetailList.jsp @@ -197,7 +197,7 @@ url : "${ctx}/dashboard/traffic/ajaxNtcTotalReportDetail?searchAction="+searchAction+"&beginDate="+beginDate+"&endDate="+endDate, type : "get", dataType : "json", - async : false, + async : true, success : function(rs) { var data = new Array(); var xData = new Array(); diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp index fd2353a19..4fe7ecee0 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp @@ -96,24 +96,7 @@ function searchList(){ } } // 局点信息 -function showActionTransChart(rs){ - var data=new Array(); - var xData=new Array(); - xData=rs[0].statTime; - var series=new Array(); - $(rs).each(function(i, d) { - var entrance=""; - if(d!=null&&d.entranceId==1){ - entrance="Astana"; - } - if(d!=null&&d.entranceId==2){ - entrance="Alamty"; - } - series.push({ - name: entrance, - data: d.count - }); - }) +function showActionTransChart(xData,series){ var chart = Highcharts.chart('chart', { chart:{ // type: 'area', @@ -184,10 +167,37 @@ function showActionTransChart(rs){ url: "${ctx}/dashboard/traffic/actionEntranceTrans?searchAction="+searchAction+"&beginDate="+beginDate+"&endDate="+endDate, type : "get" , dataType:"json", - cache:false, async:true, success:function (rs) { - showActionTransChart(rs); + var xData=new Array(); + var series=new Array(); + if(rs!=null&&rs.length>0){ + xData=rs[0].statTime; + $(rs).each(function(i, d) { + var entrance=""; + if(d!=null&&d.entranceId==1){ + entrance="Astana"; + } + if(d!=null&&d.entranceId==2){ + entrance="Alamty"; + } + series.push({ + name: entrance, + data: d.count + }); + }) + }else{ + series.push({ + name: "Astana", + data: [] + }); + series.push({ + name: "Alamty", + data: [] + }); + } + + showActionTransChart(xData,series); closeTip(); }, error: function(data, textStatus, errorThrown){ diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp index 57c35301f..60d7c83de 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp @@ -154,7 +154,7 @@ function ajaxAppList(start,end){ type: 'get', dataType: "json", data:{"beginDate":start,"endDate":end,"appType":appType}, - async:false, + async:true, timeout:10000, traditional:true, success:function (data){ diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp index 2e78423b6..d908074b5 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp @@ -54,14 +54,25 @@ $(document).ready(function(){ type : "get" , dataType:"json", data:{"beginDate":beginDate,"endDate":endDate,"entranceId":entranceId,"domain":domain}, - cache:false, - async:false, + async:true, timeout:40000, success:function (rs) { $("#tbodyData").html(""); + var xData=new Array(); + var series=new Array(); if(rs!=null&&rs.length>0){ - showDomainTrans(rs); + xData=rs[0].statTime; + series.push({ + name: 'unique', + data: rs[0].count + }); + }else{ + series.push({ + name: 'unique', + data: [] + }); } + showDomainTrans(xData,series); closeTip(); }, error: function(data, textStatus, errorThrown){ @@ -73,18 +84,8 @@ $(document).ready(function(){ }); } -function showDomainTrans(rs){ +function showDomainTrans(xData,series){ var domainName= $("#domainName").val(); - var data=new Array(); - var xData=new Array(); - xData=rs[0].statTime; - var series=new Array(); -// $(rs).each(function(i, d) { - series.push({ - name: 'unique', - data: rs[0].count - }); -// }) var chart = Highcharts.chart('chart', { chart:{ // type: 'area', diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficHttpStatisticList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficHttpStatisticList.jsp index c003653e2..e07489c50 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficHttpStatisticList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficHttpStatisticList.jsp @@ -129,7 +129,7 @@ function ajaxProtocolList(start,end){ type: 'get', dataType: "json", data:{"beginDate":start,"endDate":end}, - async:false, + async:true, timeout:10000, beforeSend:function(){ loading(); diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp index 70598d465..9f76549e5 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp @@ -52,7 +52,7 @@ -
+