diff --git a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java index 4ff850e4b..e8e002ddd 100644 --- a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java +++ b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java @@ -548,16 +548,12 @@ public class TrafficStatisticsInfoController extends BaseController { if(o1!=null&&o2==null){ return -1; } - if(o1==null&&o2==null){ + if(o1==o2&&o1==null){ return 0; } Map m1=(Map)o1; Map m2=(Map)o2; - if((Double)m1.get("byteCount")==(Double)m2.get("byteCount")){ - return 0; - } - int result=((Double)m1.get("byteCount")-(Double)m2.get("byteCount"))>0?-1:1; - return result; + return -((Double)m1.get("byteCount")).compareTo((Double)m2.get("byteCount")); } }); } catch (Exception e) { diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp index 7d9302717..d10904252 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp @@ -701,9 +701,8 @@
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/form.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/form.jsp index fe68ca6d2..89d184c8c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/form.jsp @@ -133,7 +133,8 @@ $(function(){
diff --git a/src/main/webapp/WEB-INF/views/home.jsp b/src/main/webapp/WEB-INF/views/home.jsp index 4d55a13e9..b4ee08349 100644 --- a/src/main/webapp/WEB-INF/views/home.jsp +++ b/src/main/webapp/WEB-INF/views/home.jsp @@ -298,7 +298,7 @@ background:#3d3d3d; data-original-title="" class="tooltips" data-placement="right"> <%-- ${menu.name } --%><%-- --%> - ${fns:abbr(menuName,15)} + ${fns:abbr(menuName,50) } @@ -326,7 +326,7 @@ background:#3d3d3d; " class="tooltips" data-placement="bottom"> <%-- ${menu.name } --%><%-- --%> - ${fns:abbr(menuName,15)} + ${fns:abbr(menuName,50) }