diff --git a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp index e3dbc7999..e97b09ddc 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp @@ -44,7 +44,7 @@

In 0 | Out 0

- 0 bps + 0 bps
@@ -142,7 +142,7 @@
-    +   
@@ -394,7 +394,7 @@ $(document).ready(function(){ ajaxinfo(); setInterval(function(){ ajaxinfo(); - },20000); + },30000); protocolList();//协议统计 ipActiveList();//活跃IP @@ -448,61 +448,48 @@ function ajaxinfo(){ if(liveConnNum==null||liveConnNum==""){ liveConnNum=0; } - dataScroll(".numberRun",Math.floor(loopConnNum)); - dataScroll(".numberRun1",Math.floor(rejectNum)); - dataScroll(".numberRun2",Math.floor(monitorNum)); - dataScroll(".numberRun3",Math.floor(dropConnNum)); - dataScroll(".numberRun5",Math.floor(newUniConnNum)); - dataScroll(".numberRun6",Math.floor(liveConnNum)); - var bandwidth=data.bandwidth; - var bandwidthK=bandwidth/1024; - var bandwidthM=bandwidthK/1024; - var bandwidthG=bandwidthG/1024; - if(bandwidth==null||bandwidth==""){ - bandwidth=0; - } - if(bandwidthK>10){ - bandwidth=bandwidthK; - $(".numberRun4-unit").text(" Kbps"); - } - if(bandwidthM>10){ - bandwidth=bandwidthM; - $(".numberRun4-unit").text(" Mbps"); - } - if(bandwidthG>10){ - bandwidth=bandwidthG; - $(".numberRun4-unit").text(" Mbps"); - } - dataScroll(".numberRun4",Math.floor(bandwidth)); + dataScroll(".numberRun",Math.round(loopConnNum)); + dataScroll(".numberRun1",Math.round(rejectNum)); + dataScroll(".numberRun2",Math.round(monitorNum)); + dataScroll(".numberRun3",Math.round(dropConnNum)); + dataScroll(".numberRun5",Math.round(newUniConnNum)); + dataScroll(".numberRun6",Math.round(liveConnNum)); + //计算带宽进出口流量百分比 // $("#c2sColor").removeClass(); // $("#s2cColor").removeClass(); - var inoctetsNum=Math.floor(data.inoctetsNum); + var inoctetsNum=Math.round(data.inoctetsNum); var inoctetsNumK=inoctetsNum/1024; var inoctetsNumM=inoctetsNumK/1024; var inoctetsNumG=inoctetsNumM/1024; - var outoctetsNum=Math.floor(data.outoctetsNum); + var outoctetsNum=Math.round(data.outoctetsNum); var outoctetsNumK=outoctetsNum/1024; var outoctetsNumM=outoctetsNumK/1024; var outoctetsNumG=outoctetsNumM/1024; var unit="bps"; - if(inoctetsNumK>10){ - inoctetsNum=inoctetsNumK; - outoctetsNum=outoctetsNumK; + var bandwidth=inoctetsNum+outoctetsNum; + if(inoctetsNumK>1||outoctetsNumK>1){ + inoctetsNum=inoctetsNumK.toFixed(2); + outoctetsNum=outoctetsNumK.toFixed(2); unit="Kbps"; }; - if(inoctetsNumM>10){ - inoctetsNum=inoctetsNumM; - outoctetsNum=outoctetsNumM; + if(inoctetsNumM>1||outoctetsNumM>1){ + inoctetsNum=inoctetsNumM.toFixed(2); + outoctetsNum=outoctetsNumM.toFixed(2); unit="Mbps"; }; - if(inoctetsNumG>10){ - inoctetsNum=inoctetsNumG; - outoctetsNum=outoctetsNumG; - unit="Mbps"; + if(inoctetsNumG>1||outoctetsNumG>1){ + inoctetsNum=inoctetsNumG.toFixed(2); + outoctetsNum=outoctetsNumG.toFixed(2); + unit="Gbps"; }; - $(".c2sNum").text(Math.floor(inoctetsNum)+" "+unit); - $(".s2cNum").text(Math.floor(outoctetsNum)+" "+unit); + $(".c2sNum").text(inoctetsNum); + $(".s2cNum").text(outoctetsNum); + + $(".numberRun4-unit").text(" "+unit); + + bandwidth=parseFloat(inoctetsNum)+parseFloat(outoctetsNum); + dataScroll2(".numberRun4",bandwidth); /* if(data.inoctetsNum!=c2s){ $(".c2sNum").text(data.c2sNum); $(".s2cNum").text(100-data.c2sNum); @@ -533,6 +520,14 @@ function dataScroll(index,nums){ var numRun = $(index).numberAnimate({num:1, speed:3000, symbol:","}); numRun.resetData(nums); } +function dataScroll2(index,nums){ + if(typeof nums=='undefined'||nums==null||nums==""){ + nums=0; + } + var num=nums; + var numRun = $(index).numberAnimate({num:1, speed:3000, symbol:",",dot:2}); + numRun.resetData(nums); +} //切换下拉列表-操作系统与浏览器 function uaSelectChange(){ @@ -624,11 +619,11 @@ function portActiveList(){ tr += ""+itemObj.port+""; tr += ""+count+""; if(preCount"+""; + tr += ""+""+""; }else if(preCount>count){ - tr += ""+""+""; + tr += ""+""+""; }else{ - tr += ""+""+""; + tr += ""+"--"+""; } $("#tbodyDataPort").prepend(tr); }) @@ -700,11 +695,11 @@ function systemList(){ tr += ""+n+""; tr += ""+itemObj.osType+""; if(preCount"+""; + tr += ""+""+""; }else if(preCount>count){ - tr += ""+""+""; + tr += ""+""+""; }else{ - tr += ""+""+""; + tr += ""+"--"+""; } n=n-1; $("#tbodyData1").prepend(tr); @@ -796,11 +791,11 @@ function browserList() { tr += ""+n+""; tr += ""+itemObj.bsType.substring(0,18)+""; if(preCount"+""; + tr += ""+""+""; }else if(preCount>count){ - tr += ""+""+""; + tr += ""+""+""; }else{ - tr += ""+""+""; + tr += ""+"--"+""; } $("#tbodyData1").prepend(tr); n=n-1; @@ -851,11 +846,11 @@ function websiteList() { tr += ""+n+""; tr += ""+itemObj.websiteService.substring(0,18)+""; if(itemObj.preCount"+""; + tr += ""+""+""; }else if(itemObj.preCount>itemObj.count){ - tr += ""+""+""; + tr += ""+""+""; }else{ - tr += ""+""+""; + tr += ""+"--"+""; } $("#tbodyData2").prepend(tr); diff --git a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp index bc887ac63..e7c00f5e2 100644 --- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp +++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp @@ -179,7 +179,7 @@ $(document).ready(function(){ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp index 14c7fda91..11f031676 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp @@ -170,7 +170,7 @@ $(document).ready(function(){ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp index 59c9e8d53..b2abf998d 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp @@ -168,7 +168,7 @@ - + @@ -189,9 +189,9 @@ <%-- --%> - - - + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp index 88c7eb238..47926d54d 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp @@ -160,21 +160,21 @@ $(document).ready(function(){ - + - - - - - + + + + + <%-- --%> <%-- --%> <%-- --%> - + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp index ec947a387..d637ae276 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp @@ -177,7 +177,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp index b67fe53a9..05bed22ad 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp @@ -171,12 +171,12 @@ $(document).ready(function(){ - + - - + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp index 581886c08..7d635141c 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp @@ -202,11 +202,11 @@ - + - URL         + URL         <%-- @@ -215,7 +215,7 @@ --%> - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp index 021c33280..05cca2131 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp @@ -177,20 +177,20 @@ - + - URL         - - - - - - - - - + URL         + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp index d746980d3..1441c0611 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp @@ -170,7 +170,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp index 2f9c7cfec..88001a295 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp @@ -157,12 +157,12 @@ $(document).ready(function(){ - + - - + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp index 529897bb4..df41858cf 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp @@ -169,7 +169,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp index 9560930fb..a03331554 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp @@ -168,16 +168,16 @@ - + - - - - - - + + + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp index c93e7b660..63846dc45 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp @@ -169,20 +169,20 @@ $(document).ready(function(){ - + - - - - - - + + + + + + <%-- --%> - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp index 098ebb65e..2cfbe1c96 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp @@ -168,16 +168,16 @@ $(document).ready(function(){ - + - - - - - - + + + + + + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp index 778cc0d0b..0b0d2d29a 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp @@ -169,16 +169,16 @@ $(document).ready(function(){ - + - - - - - - + + + + + + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp index 60285e007..cd2d8c807 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp @@ -168,16 +168,16 @@ $(document).ready(function(){ - + - - - - - - + + + + + + <%-- --%> @@ -185,8 +185,8 @@ $(document).ready(function(){ - - + + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp index d7c125955..d349f3717 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp @@ -165,16 +165,16 @@ $(document).ready(function(){ - + - - - - - - + + + + + + <%-- --%> @@ -182,8 +182,8 @@ $(document).ready(function(){ - - + + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp index b1bd62924..b1351da0d 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp @@ -168,16 +168,16 @@ $(document).ready(function(){ - + - - - - - - + + + + + + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp index 11516715c..db33436db 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp @@ -168,16 +168,16 @@ $(document).ready(function(){ - + - - - - - - + + + + + + <%-- --%> diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp index 25f3c8c3c..173c631d4 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp @@ -225,32 +225,32 @@ class="table table-striped table-bordered table-condensed text-nowrap logTb"> - - - + + + - - - - - - + + + + + + <%-- --%> - - - - - - - + + + + + + + <%-- --%> - + <%-- --%> - - + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp index 7999b367c..e1aa7fcf0 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp @@ -167,32 +167,32 @@ $(document).ready(function(){ - - - + + + - - - - - - + + + + + + <%-- --%> - - - - - - - + + + + + + + <%-- --%> - + <%-- --%> - - + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp index 882e8c1dc..04c5eea9e 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp @@ -167,32 +167,32 @@ $(document).ready(function(){
- - - - + + + + - - - - - - + + + + + + <%-- --%> - - - - - - - + + + + + + + <%-- --%> - + <%-- --%> - - + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp index 89513cc0c..f1680fd92 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp @@ -166,32 +166,32 @@ $(document).ready(function(){
- - - - + + + + - - - - - - + + + + + + <%-- --%> - - - - - - - + + + + + + + <%-- --%> - + <%-- --%> - - + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp index d3e1e555e..19be727e6 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp @@ -167,32 +167,32 @@ $(document).ready(function(){
- - - - + + + + - - - - - - + + + + + + <%-- --%> - - - - - - - + + + + + + + <%-- --%> - + <%-- --%> - - + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp index 48b2bb1d8..ea087d3bd 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp @@ -167,32 +167,32 @@ $(document).ready(function(){
- - - - + + + + - - - - - - + + + + + + <%-- --%> - - - - - - - + + + + + + + <%-- --%> - + <%-- --%> - - + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp index 86eb7a7d7..aa5131e40 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp @@ -168,24 +168,24 @@ $(document).ready(function(){ - + - - - - - - + + + + + + <%-- --%> - - - - + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp index 4030c39f7..cfbe90294 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp @@ -168,24 +168,24 @@ $(document).ready(function(){ - + - - - - - - + + + + + + <%-- --%> <%-- --%> <%-- --%> <%-- --%> - - - - + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp index 453229b9c..7bd2bb400 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp @@ -168,24 +168,24 @@ $(document).ready(function(){ - + - - - - - - + + + + + + <%-- --%> <%-- --%> <%-- --%> <%-- --%> - - - - + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp index 6788eaf5f..fb4292b12 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp @@ -168,10 +168,10 @@ $(document).ready(function(){ - + - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp index 2cbfaf5ad..5917c2efc 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp @@ -170,14 +170,14 @@ $(document).ready(function(){ - + - - - - + + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp index d7090ee1b..7ebb25c42 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp @@ -185,13 +185,13 @@ - + - - - + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp index d4ae80dd8..b10b2160f 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp @@ -167,12 +167,12 @@ - + - - + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp index d962e0ea2..c1153dfc0 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp @@ -170,12 +170,12 @@ $(document).ready(function(){ - + <%-- --%> - + <%-- diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp index 85d59d294..795d1c23a 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp @@ -176,7 +176,7 @@ - + diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index 0789e4883..1b188535a 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -33,7 +33,7 @@ $(function(){ $("form input[name$='cfgKeywords']").attr("maxlength","1024"); $("form input[class~='domainCheck']").attr("maxlength","1024"); //截取过长的文字 使用id选择器;例如:tab对象->tr->td对象. 排除日志table .logTb - $("#contentTable").not(".logTb").find("td").each(function(i){ + $("#contentTable").find("td").each(function(i){ //获取td当前对象的文本,如果长度大于25; if($(this).text().trim().length>28){ //给td设置title属性,并且设置td的完整值.给title属性. diff --git a/src/main/webapp/static/pages/css/pageLogs.css b/src/main/webapp/static/pages/css/pageLogs.css index dd2e66f2e..f83f472f9 100644 --- a/src/main/webapp/static/pages/css/pageLogs.css +++ b/src/main/webapp/static/pages/css/pageLogs.css @@ -1,5 +1,5 @@ /* logs page */ -table.logTb { +/* table.logTb { table-layout: fixed; } @@ -13,7 +13,7 @@ table.logTb td ~td { -khtml-text-overflow: ellipsis; -moz-text-overflow: ellipsis; -webkit-text-overflow: ellipsis; -} +} */ /*列表标题首字母大写 */ table thead tr th{ text-transform: capitalize; diff --git a/src/main/webapp/static/pages/scripts/pageLogs.js b/src/main/webapp/static/pages/scripts/pageLogs.js index 954471ae1..b6e2f0c58 100644 --- a/src/main/webapp/static/pages/scripts/pageLogs.js +++ b/src/main/webapp/static/pages/scripts/pageLogs.js @@ -10,7 +10,7 @@ $(document).ready(function() { this.title=str; }); var fontSize = 0; - $("table.logTb th").each(function(j){ +/* $("table.logTb th").each(function(j){ // 判断是否支持currentStyle属性 是：IE 否：FF or Chrome var finalStyle = this.currentStyle ? this.currentStyle : document.defaultView.getComputedStyle(this , null); fontSize = (finalStyle.fontSize).replace("px",""); @@ -30,9 +30,9 @@ $(document).ready(function() { } }); }); - }); + });*/ - var tdString = ""; +/* var tdString = ""; $("table.logTb tbody tr").each(function(){ tdString = $(this).find('td:first').text(); }); @@ -47,7 +47,7 @@ $(document).ready(function() { var tdPx = getPixelsCount(tdString,fontSize)+45; this.setAttribute('width',tdPx+'px'); } - }); + });*/ // 添加由配置界面跳转到日志查询界面后的返回按钮 var isLogTotalSearch = $("#isLogTotalSearch").val();