diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 798382fdd..a1ffa89d6 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1479,4 +1479,6 @@ ip_existed=IP has existed! user_check=In use, Can not be deleted! deletedAsnTip=The asnId ASN configuration with ID cfgId is deleted; reedit=Please re-edit! -intercep_domain_required_tip=Domain is required \ No newline at end of file +intercep_domain_required_tip=Domain is required +packets=packets +GByte=GByte \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 1ef760efa..9a64ba511 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -605,8 +605,8 @@ direct=\u041d\u0430\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 stream_type=\u0422\u0438\u043f \u043f\u043e\u0442\u043e\u043a\u0430 clj_ip=IP \u043f\u0440\u043e\u0446\u0435\u0441\u0441\u043e\u0440\u0430 nest_addr_list=\u0412\u043b\u043e\u0436\u0435\u043d\u043d\u044b\u0439 \u0441\u0438\u0441\u043e\u043a \u0430\u0434\u0440\u0435\u0441\u043e\u0432 -server_locate=\u041C\u0435\u0441\u0442\u043E\u043F\u043E\u043B\u043E\u0436\u0435\u043D\u0438\u0435 \u0421\u0435\u0440\u0432\u0435\u0440\u0430 -client_locate=\u041C\u0435\u0441\u0442\u043E\u043F\u043E\u043B\u043E\u0436\u0435\u043D\u0438\u0435 \u041A\u043B\u0438\u0435\u043D\u0442\u0430 +server_locate=\u041c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0421\u0435\u0440\u0432\u0435\u0440\u0430 +client_locate=\u041c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u041a\u043b\u0438\u0435\u043d\u0442\u0430 user_region=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0439 \u0440\u0435\u0433\u0438\u043e\u043d version=\u0412\u0435\u0440\u0441\u0438\u044f encrypt_mode=\u0420\u0435\u0436\u0438\u043c \u0448\u0438\u0444\u0440\u043e\u0432\u0430\u043d\u0438\u044f @@ -1483,4 +1483,6 @@ ip_existed=IP \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u044 user_check=\u0414\u0430\u043d\u043d\u044b\u0439 \u043e\u0431\u044a\u0435\u043a\u0442 \u0437\u0430\u043d\u044f\u0442, \u043d\u0435\u043b\u044c\u0437\u044f \u0443\u0434\u0430\u043b\u0438\u0442\u044c! deletedAsnTip=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u2116 cfgId \u0441 ASN asnId \u0431\u044b\u043b\u0430 \u0443\u0434\u0430\u043b\u0435\u043d\u0430; reedit=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0443\u0439\u0442\u0435 \u0437\u0430\u043d\u043e\u0432\u043e! -intercep_domain_required_tip=Domain is required \ No newline at end of file +intercep_domain_required_tip=Domain is required +packets=packets +GByte=GByte \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 6a7dfe01a..74fbc44b0 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1479,4 +1479,6 @@ ip_existed=IP\u5df2\u5b58\u5728\uff01 user_check=\u6b63\u5728\u4f7f\u7528\uff0c\u4e0d\u80fd\u5220\u9664\uff01 deletedAsnTip=\u914d\u7f6eID\u4e3acfgId\u7684asnId ASN\u914d\u7f6e\u5df2\u88ab\u5220\u9664; reedit=\u8bf7\u91cd\u65b0\u7f16\u8f91\uff01 -intercep_domain_required_tip=\u57df\u540d\u4fe1\u606f\u5fc5\u987b\u914d\u7f6e \ No newline at end of file +intercep_domain_required_tip=\u57df\u540d\u4fe1\u606f\u5fc5\u987b\u914d\u7f6e +packets=packets +GByte=GByte \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp index 1b506a8a5..6f4a23c02 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp @@ -980,61 +980,63 @@ function unit1000(id,inNum){ var inNumG=inNumM/1000; var inNumT=inNumG/1000; var inNumP=inNumT/1000; - var unit="lnk/h"; + var unit=" lnk/h"; if(inNumK>1){ - inNum=inNumK; - unit="Klnk/h"; + inNum=inNumK.toFixed(2);; + unit="K lnk/h"; }; if(inNumM>1){ - inNum=inNumM; - unit="Mlnk/h"; + inNum=inNumM.toFixed(2);; + unit="M lnk/h"; }; if(inNumG>1){ - inNum=inNumG; - unit="Glnk/h"; + inNum=inNumG.toFixed(2);; + unit="G lnk/h"; }; if(inNumT>1){ - inNum=inNumT; - unit="Tlnk/h"; + inNum=inNumT.toFixed(2);; + unit="T lnk/h"; }; if(inNumP>1){ - inNum=inNumP; - unit="Plnk/h"; + inNum=inNumP.toFixed(2);; + unit="P lnk/h"; }; - dataScroll(id,Math.round(inNum)); - $(id).append(" "+unit); + dataScroll2(id,inNum); + $(id).append(""+unit); } // 1024单位转换 function unit1024(id,inNum){ + console.log(inNum) var inNum=Math.round(inNum); var inNumK=inNum/1024; var inNumM=inNumK/1024; var inNumG=inNumM/1024; var inNumT=inNumG/1024; var inNumP=inNumT/1024; - var unit="pkt/h"; + var unit=" pkt/h"; if(inNumK>1){ - inNum=inNumK; - unit="Kpkt/h"; + inNum=inNumK.toFixed(2); + unit="K pkt/h"; }; if(inNumM>1){ - inNum=inNumM; - unit="Mpkt/h"; + inNum=inNumM.toFixed(2); + unit="M pkt/h"; }; if(inNumG>1){ - inNum=inNumG; - unit="Gpkt/h"; + inNum=inNumG.toFixed(2); + unit="G pkt/h"; }; if(inNumT>1){ - inNum=inNumT; - unit="Tpkt/h"; + inNum=inNumT.toFixed(2); + unit="T pkt/h"; }; if(inNumP>1){ - inNum=inNumP; - unit="Ppkt/h"; + inNum=inNumP.toFixed(2); + unit="P pkt/h"; }; - dataScroll(id,Math.round(inNum)); - $(id).append(" "+unit); + console.log(inNum) + dataScroll2(id,inNum); + $(id).append(""+unit); } diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp index 795adf9a9..255dd573e 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp @@ -322,7 +322,7 @@ function showIpActiveChart(xData,series){ }, yAxis: { title: { - text: 'Link Times' + text: '' } }, credits:{//是否有水印 diff --git a/src/main/webapp/static/pages/css/dashboard.css b/src/main/webapp/static/pages/css/dashboard.css index af9082ff4..3550ae1e4 100644 --- a/src/main/webapp/static/pages/css/dashboard.css +++ b/src/main/webapp/static/pages/css/dashboard.css @@ -1,5 +1,5 @@ /*数字滚动插件的CSS可调整样式*/ -.mt-number-animate{ font-family: 'Microsoft YaHei'; line-height:20px; height: 16px;/*设置数字显示高度*/; /*设置数字大小*/ overflow: hidden; display: inline-block; position: relative; } +.mt-number-animate{ font-family: 'Microsoft YaHei'; line-height:20px; height: 15px;/*设置数字显示高度*/; /*设置数字大小*/ overflow: hidden; display: inline-block; position: relative; } .mt-number-animate .mt-number-animate-dot{ width: 10px;/*设置分割符宽度*/ line-height: 20px; float: left; text-align: center;} .mt-number-animate .mt-number-animate-dom{ width: 10px;/*设置单个数字宽度*/ text-align: center; float: left; position: relative; top: -1px;} .mt-number-animate .mt-number-animate-dom .mt-number-animate-span{ width: 100%; float: left;}