Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

This commit is contained in:
zhangwei
2018-07-10 11:28:30 +08:00
6 changed files with 285 additions and 52 deletions

View File

@@ -28,8 +28,10 @@
ajaxGetLabelReport();
}else if("${bean.reportBusinessType}"=="lwhh_report"){
ajaxGetLwhhReport();
}else if("${bean.reportBusinessType}"=="src_ip_report"){
ajaxGetSrcIpReport();
}
$("input[name='reportType']").each(function(){
$("[name='reportType']").each(function(){
var type='${bean.reportType}';
if(type && type==$(this).val()){
$(this).parent(".btn").button("toggle");
@@ -38,13 +40,12 @@
$("a[data-toggle='tab']").on("click",function(){
$("#reportBusinessType").val($(this).data("bussiness"));
if(!$(this).parent("li").hasClass("active")){
//var action=$('select[name="action"]').val();
//var reportBusinessType=$("#reportBusinessType").val();
//var reportType=$('input[name="reportType"]:checked').val();
if($(this).data("bussiness")=="label_report"){
ajaxGetLabelReport();
}else if($(this).data("bussiness")=="lwhh_report"){
ajaxGetLwhhReport();
}else if($(this).data("bussiness")=="src_ip_report"){
ajaxGetSrcIpReport();
}
}
});
@@ -72,8 +73,8 @@ var ajaxGetLabelReport=function(){
async:false,
url:'${ctx}/report/ajaxNtcTagReport',
data:{
"action":$('select[name="action"]').val(),
"reportType":$('input[name="reportType"]:checked').val()
"action":$('[name="action"]').val(),
"reportType":$('[name="reportType"]').val()
},
dataType:"html",
success:function(data){
@@ -89,8 +90,8 @@ var ajaxGetLwhhReport=function(){
async:false,
url:'${ctx}/report/ajaxNtcLwhhReport',
data:{
"action":$('select[name="action"]').val(),
"reportType":$('input[name="reportType"]:checked').val()
"action":$('[name="action"]').val(),
"reportType":$('[name="reportType"]').val()
},
dataType:"html",
success:function(data){
@@ -99,6 +100,23 @@ var ajaxGetLwhhReport=function(){
}
});
}
var ajaxGetSrcIpReport=function(){
loading('<spring:message code="onloading"/>');
$.ajax({
type:'post',
async:false,
url:'${ctx}/report/ajaxNtcSrcipDomesticReport',
data:{
"action":$('[name="action"]').val(),
"reportType":$('[name="reportType"]').val()
},
dataType:"html",
success:function(data){
$("#srcIp").html(data);
closeTip();
}
});
}
</script>
</head>
<body>
@@ -239,7 +257,10 @@ var ajaxGetLwhhReport=function(){
<c:if test="${bean.reportBusinessType eq 'lwhh_report'}">
in active
</c:if>"></div>
<%@include file="/WEB-INF/views/report/srcIp.jsp" %>
<div id="srcIp" class="tab-pane fade
<c:if test="${bean.reportBusinessType eq 'src_ip_report'}">
in active
</c:if>"></div>
<%@include file="/WEB-INF/views/report/destIp.jsp" %>
<%@include file="/WEB-INF/views/report/entranceId.jsp" %>
</div>

View File

@@ -4,40 +4,28 @@
$(function(){
});
</script>
<div id="srcIp" class="tab-pane fade">
<table id="contentTable1" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>
<th>所属省</th>
<th>所属市</th>
<th>总量</th>
<th>0点</th>
<th>1点</th>
<th>2点</th>
<th>3点</th>
<th>4点</th>
<th>5点</th>
<th>6点</th>
<th>7点</th>
<th>8点</th>
<th>9点</th>
<th>10点</th>
<th>11点</th>
<th>12点</th>
<th>14点</th>
<th>15点</th>
<th>16点</th>
<th>17点</th>
<th>18点</th>
<th>19点</th>
<th>20点</th>
<th>21点</th>
<th>22点</th>
<th>23点</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
<div class="page">${page}</div>
</div>
<table id="contentTable1" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>
<th><spring:message code="src_province"/></th>
<th><spring:message code="src_city"/></th>
<th><spring:message code="log_total"/></th>
<c:forEach items="${titles}" var="title">
<th>${title}</th>
</c:forEach>
</tr>
</thead>
<tbody>
<c:forEach items="${datas}" var="data">
<tr>
<c:forEach items="${fn:split(data.key,splitor)}" var="location">
<td>${location}</td>
</c:forEach>
<c:forEach items="${data.value}" var="cloumn" varStatus="status">
<td>${cloumn}</td>
</c:forEach>
</tr>
</c:forEach>
</tbody>
</table>
<div class="page">${page}</div>