diff --git a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp index 6f4a23c02..253ba1d25 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp @@ -519,11 +519,12 @@ function ajaxinfo(){ $(".c2sNum").text(inoctetsNum); $(".s2cNum").text(outoctetsNum); -// $(".numberRun4-unit").text(" "+unit); + $(".numberRun4-unit").text(" "+unit); bandwidth=parseFloat(inoctetsNum)+parseFloat(outoctetsNum); dataScroll2(".numberRun4",bandwidth); - $(".numberRun4").append(" "+unit); +// $(".numberRun4").append(" "+unit); +// $(".numberRun4").append(""+unit+""); }, }); } @@ -1002,7 +1003,7 @@ function unit1000(id,inNum){ unit="P lnk/h"; }; dataScroll2(id,inNum); - $(id).append(""+unit); + $(id).append(""+unit+""); } // 1024单位转换 function unit1024(id,inNum){ @@ -1036,7 +1037,7 @@ function unit1024(id,inNum){ }; console.log(inNum) dataScroll2(id,inNum); - $(id).append(""+unit); + $(id).append(""+unit+""); } diff --git a/src/main/webapp/static/pages/css/dashboard.css b/src/main/webapp/static/pages/css/dashboard.css index 3550ae1e4..af9082ff4 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: 15px;/*设置数字显示高度*/; /*设置数字大小*/ overflow: hidden; display: inline-block; position: relative; } +.mt-number-animate{ font-family: 'Microsoft YaHei'; line-height:20px; height: 16px;/*设置数字显示高度*/; /*设置数字大小*/ 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;} diff --git a/src/main/webapp/static/pages/css/data_text.css b/src/main/webapp/static/pages/css/data_text.css index cf6f0a2de..bd60caee7 100644 --- a/src/main/webapp/static/pages/css/data_text.css +++ b/src/main/webapp/static/pages/css/data_text.css @@ -151,7 +151,6 @@ p{ overflow: hidden; white-space: nowrap; text-overflow: ellipsis; - margin: -2px; margin-left: 39px; } .data_content .data_info>div.info_1 p:nth-child(2){ @@ -171,6 +170,7 @@ p{ color:#ffffff; margin-top: 2.5em; margin-left: 0px; + padding-right: 13px; } .data_content .data_info .info_2 .fr_fc .numberRun3{ width:100%; @@ -180,6 +180,7 @@ p{ color:#ffffff; margin-top: 2.5em; margin-left: 0px; + padding-right: 33px; } .data_content .data_info .info_2 .fr_fc .numberRun5{ width:100%; @@ -189,6 +190,7 @@ p{ color:#ffffff; margin-top: 2.5em; margin-left: 0px; + padding-right: 28px; } .data_content .data_info .info_2 .fr_fc .numberRun6{ width:100%; @@ -198,6 +200,7 @@ p{ color:#ffffff; margin-top: 2.5em; margin-left: 0px; + padding-right: 25px; } .data_content .data_info .info_2 .fr_fc .numberRun7{ width:100%; @@ -207,6 +210,7 @@ p{ color:#ffffff; margin-top: 2.5em; margin-left: 0px; + padding-right: 33px; } .data_content .data_info .info_2 .fr_fc .numberRun8{ width:100%; @@ -216,6 +220,7 @@ p{ color:#ffffff; margin-top: 2.5em; margin-left: 0px; + padding-right: 10px; } .data_content .data_info .info_2 .fr_fc .numberRun{ width:100%; @@ -225,6 +230,7 @@ p{ color:#ffffff; margin-top: 2.5em; margin-left: 0px; + padding-right: 30px; } .data_content .data_info>div.info_1 .fl_fc .numberRun4{ width:100%; @@ -241,24 +247,45 @@ p{ font-size: 14px; /*color:#288dce;*/ color:#ffffff; - margin-top: 35px; + margin-top: 26px; margin-left: 0px; + padding-right: 4px; } -.data_content .data_info>div.info_1 .fl_fc .numberRun4-unit{ - font-weight: 500; - font-size: 16px; +.data_content .data_info>div.info_1 .fl_fc .inline-num .numberRun4-unit{ + font-weight: 600; + font-size: 13px; /*color:#288dce;*/ color:#ffffff; - margin-top: 0.6px; + margin-top: 0.3px; + position: fixed; + +} +.data_content .data_info>div.info_1 .fl_fc .numberRun1 .mt-number-unit{ + font-weight: 600; + font-size: 13px; + /*color:#288dce;*/ + color:#ffffff; + margin-top: 0.3px; + position: fixed; + +} +.data_content .data_info>div.info_2 .fl_fc .mt-number-unit{ + font-weight: 600; + font-size: 13px; + /*color:#288dce;*/ + color:#ffffff; + margin-top: 0.3px; + position: fixed; + } .data_content .data_info>div.info_1 .fl_fc .csNum{ font-size: 11px; /*color:#337ab7 !important;*/ color:#ffffff !important; - margin-top: -3px; + margin-top: -10px; text-align: center; margin-left: 6.3px; - width: 100% + width: 100%; } /* .data_info{ float: right;