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

1、修改用户统计界面，2.修改流量统计加载问题，3、配置异常增加error提示

Browse Source
This commit is contained in:
zhanghongqing
2018-11-08 14:52:58 +08:00
parent b7fc16e681
commit 22d1228097
19 changed files with 172 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -421,7 +421,7 @@ function ajaxinfo(){
url:'${ctx}/dashboard/traffic/info',
type : "get" ,
dataType:'json',
cache:false,async:true,
cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
success:function (data){
var loopConnNum =loopConnNum= data.loopConnNum;
var rejectNum =data.rejectNum;
@@ -547,16 +547,19 @@ function protocolList(){
url: '${ctx}/dashboard/protocol',
type : "get" ,
dataType:"json",
cache:false,async:true,
cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
success:function (rs) {
if(rs!=null&&rs.length>0&&rs[0].error!=null){
top.$.jBox.tip("<spring:message code='request_service_failed'/>", "<spring:message code='info'/>");
return;
}else{
echart_1(rs);
closeTip();
}
},
closeTip();
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
}
@@ -567,16 +570,19 @@ function ipActiveList(){
url: '${ctx}/dashboard/ipActive',
type : "get" ,
dataType:"json",
cache:false,async:true,
cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
success:function (rs) {
if(rs!=null&&rs.length>0&&rs[0].error!=null){
top.$.jBox.tip("<spring:message code='request_service_failed'/>", "<spring:message code='info'/>");
return;
}else{
echart_main(rs);
closeTip();
}
},
closeTip();
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
}
@@ -587,7 +593,7 @@ function portActiveList(){
url: '${ctx}/dashboard/portActive',
type : "get" ,
dataType:"json",
cache:false,async:true,
cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
beforeSend: function () {
var msg = "Reloading...";
@@ -632,7 +638,10 @@ function portActiveList(){
}
}
closeTip();
},
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
}
@@ -643,16 +652,19 @@ function appTypeList(){
url: '${ctx}/dashboard/app',
type : "get" ,
dataType:"json",
cache:false,async:true,
cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
success:function (rs) {
if(rs!=null&&rs.length>0&&rs[0].error!=null){
top.$.jBox.tip("<spring:message code='request_service_failed'/>", "<spring:message code='info'/>");
return;
}else{
echart_3(rs);
closeTip();
}
},
closeTip();
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
}
@@ -663,7 +675,7 @@ function systemList(){
url: '${ctx}/dashboard/osList',
type : "get" ,
dataType:"json",
cache:false,async:true,
cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
beforeSend: function () {
var msg = "Reloading...";
@@ -709,9 +721,12 @@ function systemList(){
}
//终端图-操作系统
echart_2(rs.reverse());
closeTip();
}
},
closeTip();
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
}
// 点击操作系统列表右侧显示 浏览器图
@@ -726,11 +741,14 @@ function osClick(osType,obj){
type : "get" ,
data:{"osType":osType},
dataType:"json",
cache:false,async:true,
cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
success:function (rs) {
echart_5(rs.reverse());
closeTip();
},
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
}
//点击浏览器列表右侧显示 操作系统图
@@ -743,11 +761,14 @@ function bsClick(bsType,obj){
type : "get" ,
data:{"bsType":bsType},
dataType:"json",
cache:false,async:true,
cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
success:function (rs) {
echart_2(rs.reverse());
closeTip();
},
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
}
@@ -759,7 +780,7 @@ function browserList() {
url: '${ctx}/dashboard/bsList',
type : "get" ,
dataType:"json",
cache:false,async:true,
cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
beforeSend: function () {
var msg = "Reloading...";
@@ -805,9 +826,12 @@ function browserList() {
}
//终端图-浏览器
echart_5(rs.reverse());
closeTip();
}
},
closeTip();
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
}
@@ -818,7 +842,7 @@ function websiteList() {
url: '${ctx}/dashboard/websiteList',
type : "get" ,
dataType:"json",
cache:false,async:true,
cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
beforeSend: function () {
var msg = "ReLoading...";
var trLen = $("#tbodyData2 tr").length;
@@ -861,9 +885,12 @@ function websiteList() {
}
//网站统计图
echart_4(rs.reverse());
closeTip();
}
},
closeTip();
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
}
//点击http网站列表-显示域名图
@@ -878,11 +905,14 @@ function webClick(websiteServiceId,obj){
type : "get" ,
data:{"websiteServiceId":websiteServiceId},
dataType:"json",
cache:false,async:true,
cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
success:function (rs) {
echart_6(rs);
closeTip();
},
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
}
//网站主题
@@ -892,12 +922,15 @@ function topicAndDomainList(){
url: '${ctx}/dashboard/topicAndDomainList',
type : "get" ,
dataType:"json",
cache:false,async:true,
cache:false,async:true,timeout:10000,//超时时间设置，查询接口时间过长超时
success:function (rs) {
//主题域名流量统计图
echart_topic_domain(rs);
closeTip();
},
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
}

40
src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp
View File

@@ -127,10 +127,10 @@
</head>
<body>
<div class="page-content">
<div class="theme-panel hidden-xs hidden-sm">
<%-- <div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onClick="javascript:window.location='${ctx}/traffic/userBehavior'"><spring:message code="refresh"/></button>
<button type="button" class="btn btn-default" onClick="javascript:window.history.go(-1)"><spring:message code="back"/></button>
</div>
</div> --%>
<h3 class="page-title">
<spring:message code="traffic_user_behavior"></spring:message>
</h3>
@@ -249,11 +249,10 @@
<div class="httpReqCfg">
<div class="row">
<div class="col-md-4" style="padding-right: 1px;">
<div class="panel panel-default" style="height: 500px;">
<div class="col-md-1">
<div class=" " style="height: 500px;">
<div class="panel-body" style="max-height:460px;overflow-y:auto;overflow-x:hidden;">
<h5 class="ng-binding"><spring:message code="user_behavior_data"/></h5>
<div id="deviceRank" class="drank hm-scroll">
<%-- <h5 class="ng-binding"><spring:message code="user_behavior_data"/></h5> --%>
<!-- <div class="table-responsive"> -->
<%-- <table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
@@ -280,14 +279,12 @@
<thead>
<tr>
<th><spring:message code="account"/></th>
<th><spring:message code="link_num"/></th>
</tr>
</thead>
<tbody>
<c:forEach items="${accountList}" var="data">
<tr>
<td>${data.account}</td>
<td><fmt:formatNumber type="number" value="${data.num}" minFractionDigits="0"></fmt:formatNumber></td>
<td title="${data.account}">${data.account}</td>
</tr>
</c:forEach>
@@ -297,13 +294,12 @@
<div class="none-data"><i class="fa fa-warning font-red-flamingo"></i>&nbsp;&nbsp;<spring:message code="noneData"/></div>
</c:if>
<!-- </div> -->
</div>
</div>
</div>
</div>
<div class="col-md-8" style="padding-left: 8px;">
<div class="panel panel-default">
<div class="col-md-11" >
<div class=" ">
<div class="panel-body" style="height:500px">
<h5 class="ng-binding"><spring:message code="account"/> : ${searchAccount}</h5>
<div id="trend" style="height: 400px; position: relative;" >
@@ -329,7 +325,7 @@
<span class="year" title="<spring:message code="link_num"/>: <fmt:formatNumber type='number' value='${us.num}' minFractionDigits='0'/>">${us.reportTime}</span>
</div>
</div>
<div class="process-noyear">
<div class="process-noyear" title="${us.nasIp}">
${us.nasIp}
</div>
</div>
@@ -354,10 +350,10 @@
<!-- IP -->
<div class="httpResCfg">
<div class="row">
<div class="col-md-4" style="padding-right: 1px; ">
<div class="panel panel-default" style="height: 500px;">
<div class="panel-body" style="max-height:460px;overflow-y:auto;overflow-x:hidden;">
<h5 class="ng-binding"><spring:message code="ip_behavior_data"/></h5>
<div class="col-md-1">
<div class=" " style="height: 500px;">
<div class="panel-body" style="max-height:460px;overflow-y:auto;overflow-x:auto;">
<%-- <h5 class="ng-binding"><spring:message code="ip_behavior_data"/></h5> --%>
<div id="deviceRank" class="drank hm-scroll">
<!-- <div class="table-responsive"> -->
@@ -385,15 +381,13 @@
<thead>
<tr>
<th><spring:message code="ip"/></th>
<th><spring:message code="link_num"/></th>
</tr>
</thead>
<tbody>
<c:forEach items="${nasIpList}" var="data">
<tr>
<td>${data.nasIp}</td>
<td><fmt:formatNumber type="number" value="${data.num}" minFractionDigits="0"></fmt:formatNumber></td>
<td title="${data.nasIp}">${data.nasIp}</td>
</tr>
</c:forEach>
@@ -408,8 +402,8 @@
</div>
</div>
<div class="col-md-8" style="padding-left: 8px;">
<div class="panel panel-default">
<div class="col-md-11" >
<div class=" ">
<div class="panel-body" style="height: 500px">
<h5 class="ng-binding"><spring:message code="ip"/> : ${searchNasIp}</h5>
<div id="trend" style="height: 400px; position: relative;" >
@@ -437,7 +431,7 @@
</div>
</div>
<div class="process-noyear">
<div class="process-noyear" title="${it.account}">
${it.account}
</div>
</div>

10
src/main/webapp/static/global/css/layout.css
View File

@@ -31,15 +31,15 @@ a:hover,a:focus{outline:none;text-decoration: none;}
/**
* 发展历程
*/
.process-timeline{ height: 387px; width: 98%; position: relative; overflow:hidden;margin-right: 10px}
.process-timeline:after{content:"";position:absolute;top:48%;left:0;margin-left:0;background:url('../img/development_timeline.png') repeat-x; height:15px; width:98%; display:block}
.process-timeline .process-body{ position: relative; height: 100%; margin-left: 0;}
.process-timeline{ height: 387px; width: 98%; position: relative; overflow:hidden;margin-right: 25px}
.process-timeline:after{content:"";position:absolute;top:48%;left:0;margin-left:0; overflow:hidden;background:url('../img/development_timeline.png') repeat-x; height:15px; width:98%; display:block}
.process-timeline .process-body{ position: relative; height: 100%; margin-left: 0; overflow:hidden;}
.process-timeline .process-row{ cursor:move; display: inline-block; width: 150px; float: left; margin-top: 30px; position: relative; height: 300px;overflow:hidden;}
.process-timeline .process-row .process-time{ position: absolute; top: 48.7%; left: 10%; -wekit-top:48.8%;}
.process-timeline .process-row .process-time .time-con{ position: relative; text-align: center; }
.process-timeline .process-row .process-time .time-con .pic{position: absolute; }
.process-timeline .process-row .process-time .time-con .pic i{ font-size: 100px; color: #666; }
.process-timeline .process-row .process-time .time-con .year{ position: absolute; font-size: 9px; color:#000; padding: 20px 5px 0 5px;margin-left: 5px;}
.process-timeline .process-row .process-time .time-con .year{ position: absolute; font-size: 9px; color:#000; padding: 20px 5px 0 5px;margin-left: 5px; overflow:hidden;}
.process-timeline .process-row .process-time .time-con .bgcolor{ position: absolute; border-radius: 100%; margin-top: 48px; margin-left: 10px; width: 40px; height: 40px; }
.process-timeline .process-row .process-time .time-con .bgcolor.red{ background: red;}
@@ -51,7 +51,7 @@ a:hover,a:focus{outline:none;text-decoration: none;}
.process-timeline .process-row .process-time .time-con .orange i{ color: #ff9900;}
.process-timeline .process-row .process-noyear { position: absolute; top: 43%; width: 200px; font-size: 16px;margin-left: 20px}
.process-timeline .process-row .process-noyear { position: absolute; top: 43%; width: 200px; font-size: 16px;margin-left: 20px; overflow:hidden;margin-right:20px}
.process-timeline .process-row .process-content{padding-bottom: 40px; }
.process-timeline .process-row .process-content h2{ font-size: 16px; text-align: center;}
.process-timeline .process-row .process-content p{text-indent: 0 !important; font-size: 11px !important; height: 180px;color: #888; white-space:normal; }