1.修改bps计算方式 改为Gbps

2.调动pps以及bps页面位置

(cherry picked from commit e0661fbed4)

src/main/java/com/nis/web/controller/dashboard/DashboardController.java

@@ -267,7 +267,7 @@ public class DashboardController extends BaseController{
 				//两个时间段之间的秒数
 				double allSeconds = DateUtils.getSecondsOfTwoDate(sdf.parse(beginDate),sdf.parse(endDate));
 				for(TrafficIpActiveStatistic data:list) {
-					data.setAvgByte(lf.format(Long.parseLong(data.get_byte())*8/allSeconds));
+					data.setAvgByte(lf.format(Long.parseLong(data.get_byte())/1024/1024/1024/allSeconds));
 					data.setAvgPacket(lf.format(Long.parseLong(data.get_packet())/allSeconds));
 				}
 			}