gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整流量统计滚动显示宽度显示更大数量级，调整界面table中tooltip与表头不互相遮挡

Browse Source
This commit is contained in:
zhanghongqing
2018-11-16 09:25:44 +08:00
parent 3cfc88ce29
commit e5215accb9
4 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
View File

@@ -38,8 +38,7 @@
<div class="fl_fc">
<%-- <a href="${ctx}/dashboard/bandwidthList"> 详情显示--%>
<p>
<label data-original-title="<spring:message code="bandwith"/>"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
<label data-original-title="<spring:message code="bandwith"/>" class="tooltips" data-flag="false" data-html="true" data-placement="top">
<!-- 网络带宽 --><spring:message code="bandwith"/>
</label>
</p>
@@ -53,7 +52,7 @@
</div>
<div class="fl_fc">
<!-- <a href="javacript:;"> -->
<p>
<p style="margin-left: 0px;width:100%">
<label data-original-title="<spring:message code="action_reject"/>"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
<!-- 阻断链接数 --><spring:message code="action_reject"/>

4
src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css vendored
View File

@@ -2227,7 +2227,7 @@ table th[class*="col-"] {
.table-responsive {
overflow-x: auto;
min-height: 0.01%;
position: fixed;
/* position: fixed; */
right: 14px;
left: 14px;
margin-top: 20px;
@@ -3182,7 +3182,7 @@ tbody.collapse.in {
position: absolute;
top: 100%;
left: 0/*rtl:auto*/;
z-index: 1000;
z-index: 2147483647;
display: none;
float: left;
min-width: 160px;

26
src/main/webapp/static/pages/css/data_text.css
View File

@@ -43,7 +43,7 @@ p{
margin-top: 15px;
}
.data_content .data_info .fr_fc .fl_fc{
width: 68%;
width: 70%;
height: 110px;
border-width: 0 1px;
margin-left: 0px;
@@ -105,58 +105,74 @@ p{
text-align: center;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
/* text-overflow: ellipsis; */
margin-left: -12px;
}
.data_content .data_info .info_1 label:nth-child(1){
width:100%;
color:#fff;
font-size: 18px;
text-align: center;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
margin: -3px;
margin-left: -20px;
}
.data_content .data_info>div.info_1 p:nth-child(2){
width:100%;
font-weight: 600;
font-size: 16px;
color:#288dce;
margin-top: 2.0em;
margin-top: 2.1em;
margin-left: 0px;
}
.data_content .data_info .info_2 .fr_fc .numberRun2{
width:100%;
font-weight: 600;
font-size: 16px;
color:#288dce;
margin-top: 2.1em;
margin-left: 0px;
}
.data_content .data_info .info_2 .fr_fc .numberRun3{
width:100%;
font-weight: 600;
font-size: 16px;
color:#288dce;
margin-top: 2.1em;
margin-left: 0px;
}
.data_content .data_info .info_2 .fr_fc .numberRun5{
width:100%;
font-weight: 600;
font-size: 16px;
color:#288dce;
margin-top: 2.1em;
margin-left: 0px;
}
.data_content .data_info .info_2 .fr_fc .numberRun6{
width:100%;
font-weight: 600;
font-size: 16px;
color:#288dce;
margin-top: 2.1em;
margin-left: 0px;
}
.data_content .data_info .info_2 .fr_fc .numberRun{
width:100%;
font-weight: 600;
font-size: 16px;
color:#288dce;
margin-top: 2.1em;
margin-left: 0px;
}
.data_content .data_info>div.info_1 .fl_fc .numberRun4{
width:100%;
font-weight: 600;
font-size: 16px;
color:#288dce;
margin-top: 1px;
margin-left: 0px;
}
.data_content .data_info>div.info_1 .fl_fc .numberRun4-unit{
font-weight: 500;
@@ -344,7 +360,7 @@ p{
margin-bottom: 5px;
}
.data_content .data_main1 .main_left1 div .main_title1{
width: 230px;
width: 250px;
height: 35px;
line-height: 33px;
background-color: #3D3D3D;

12
src/main/webapp/static/pages/scripts/echart.js
View File

@@ -47,7 +47,6 @@
},
exporting: {
allowHTML:true,
filename:'Protocol-Type',
chartOptions: {
plotOptions: {
@@ -233,8 +232,7 @@
},
exporting: {
allowHTML:true,
//
// filename:'Active-IP',
filename:'Active-IP',
chartOptions: {
plotOptions: {
series: {
@@ -396,7 +394,6 @@
},
exporting: {
allowHTML:true,
filename:'App',
chartOptions: {
plotOptions: {
@@ -555,7 +552,6 @@ function echart_2(rs){
},
exporting: {
allowHTML:true,
filename:'BS',
chartOptions: {
plotOptions: {
@@ -699,7 +695,6 @@ function echart_5(rs){
},
exporting: {
allowHTML:true,
filename:'BS',
chartOptions: {
plotOptions: {
@@ -845,7 +840,6 @@ function echart_4(rs){
},
exporting: {
allowHTML:true,
filename:'Website',
chartOptions: {
plotOptions: {
@@ -984,7 +978,6 @@ function echart_6(rs){
},
exporting: {
allowHTML:true,
filename:'Website',
chartOptions: {
plotOptions: {
@@ -1128,8 +1121,7 @@ function echart_topic_domain(rs){
},
exporting: {
allowHTML:true,
filename:'Topic',
chartOptions: {
plotOptions: {
series: {