diff --git a/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java b/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java index 1c8e725bb..7ed1ceebb 100644 --- a/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java +++ b/src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java @@ -133,7 +133,6 @@ public class NtcSrcipDomesticReportController extends BaseController { } model.addAttribute("splitor", Constants.REPORT_TRIM_CONNECTOR); model.addAttribute("datas", showData); - model.addAttribute("dataLength", showData.size()); return "/report/srcIp"; } } diff --git a/src/main/java/com/nis/web/controller/report/NtcTagReportController.java b/src/main/java/com/nis/web/controller/report/NtcTagReportController.java index f897c4792..d31d973c2 100644 --- a/src/main/java/com/nis/web/controller/report/NtcTagReportController.java +++ b/src/main/java/com/nis/web/controller/report/NtcTagReportController.java @@ -125,7 +125,6 @@ public class NtcTagReportController extends BaseController { showData.put(label.getServiceDictId().toString(), _line); } model.addAttribute("datas", showData); - model.addAttribute("dataLength", showData.size()); return "/report/label"; } } diff --git a/src/main/webapp/WEB-INF/include/form/pageGroup.jsp b/src/main/webapp/WEB-INF/include/form/pageGroup.jsp index 173bd4a46..fbe36812c 100644 --- a/src/main/webapp/WEB-INF/include/form/pageGroup.jsp +++ b/src/main/webapp/WEB-INF/include/form/pageGroup.jsp @@ -5,15 +5,15 @@ function pagination() { pageNo = 1; count = $('tbody').children().size();// 总记录数 - //处理ajax时jquery选择器缓存的问题 - dataLength = "${dataLength}"; +/* dataLength = "${fn:length(datas)}"; preCount = 0; if (dataLength < count) { preCount = count - dataLength; count = count - preCount; - } - $('tbody').children().slice(0, preCount).remove(); + alert(count) + //$('tbody').children().slice(0, preCount).remove(); + } */ pageSize = 30; // 页面大小 diff --git a/src/main/webapp/WEB-INF/views/report/label.jsp b/src/main/webapp/WEB-INF/views/report/label.jsp index d50ee4e82..1f788094c 100644 --- a/src/main/webapp/WEB-INF/views/report/label.jsp +++ b/src/main/webapp/WEB-INF/views/report/label.jsp @@ -1,7 +1,6 @@ <%@ page contentType="text/html;charset=UTF-8"%> <%@ include file="/WEB-INF/include/taglib.jsp"%> <%@ include file="/WEB-INF/include/form/pageGroup.jsp"%> -<%-- --%> @@ -13,18 +12,25 @@ - - -
- - ${label.itemValue} +
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp index e37a6a9bb..af05fc72c 100644 --- a/src/main/webapp/WEB-INF/views/report/list.jsp +++ b/src/main/webapp/WEB-INF/views/report/list.jsp @@ -105,7 +105,7 @@ } var ajaxReport=function(url,target){ - loading(''); + //loading(''); $.ajax({ type:'post', async:false, @@ -119,8 +119,7 @@ var ajaxReport=function(url,target){ dataType:"html", success:function(data){ $(target).html(data);//#label - pagination(); - closeTip(); + //closeTip(); } }); }; diff --git a/src/main/webapp/WEB-INF/views/report/lwhh.jsp b/src/main/webapp/WEB-INF/views/report/lwhh.jsp index 6f241d27d..9cd990212 100644 --- a/src/main/webapp/WEB-INF/views/report/lwhh.jsp +++ b/src/main/webapp/WEB-INF/views/report/lwhh.jsp @@ -1,9 +1,6 @@ <%@ page contentType="text/html;charset=UTF-8"%> <%@ include file="/WEB-INF/include/taglib.jsp"%> - +<%@ include file="/WEB-INF/include/form/pageGroup.jsp"%> @@ -15,18 +12,25 @@ $(function(){ - - -
- - ${lwhh.requestTitle} +
${page}
diff --git a/src/main/webapp/WEB-INF/views/report/srcIp.jsp b/src/main/webapp/WEB-INF/views/report/srcIp.jsp index c5eda3462..86c65ff27 100644 --- a/src/main/webapp/WEB-INF/views/report/srcIp.jsp +++ b/src/main/webapp/WEB-INF/views/report/srcIp.jsp @@ -1,7 +1,6 @@ <%@ page contentType="text/html;charset=UTF-8"%> <%@ include file="/WEB-INF/include/taglib.jsp"%> <%@ include file="/WEB-INF/include/form/pageGroup.jsp"%> -<%-- --%> @@ -14,16 +13,23 @@ - - - - +
${location}