From c3131b47eeacf8f795e42994107809f248a4c9b7 Mon Sep 17 00:00:00 2001
From: dongxiaoyan <dongxiaoyan@192.168.11.154>
Date: Wed, 26 Dec 2018 18:52:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E9=A6=96=E9=A1=B5=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=9A=E6=B5=81=E9=87=8F=E5=8D=95=E4=BD=8D=E6=8F=90?=
 =?UTF-8?q?=E5=8F=96=E5=88=B0y=E8=BD=B4=E9=A1=B6=E7=AB=AF=EF=BC=9B?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=E5=8A=A0=E5=8D=95=E4=BD=8D=EF=BC=9B=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA=E5=8A=A0=E5=8D=95=E4=BD=8D=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dynamicpage/DynamicIndexController.java   |  3 +--
 .../views/dynamicpage/dynamicIndex.jsp        | 25 +++++++++----------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/dynamicpage/DynamicIndexController.java b/src/main/java/com/nis/web/controller/dynamicpage/DynamicIndexController.java
index b9da34d00..678c320d2 100644
--- a/src/main/java/com/nis/web/controller/dynamicpage/DynamicIndexController.java
+++ b/src/main/java/com/nis/web/controller/dynamicpage/DynamicIndexController.java
@@ -101,8 +101,7 @@ public class DynamicIndexController extends BaseController {
 		
 		if (hour == null || hour <= 0) {
 			hour = 2;
-		}
-		
+		}		
 		Date now = new Date();
 		Date start = new Date(now.getTime()-(hour*60*60*1000)-(5*60*1000));
 		now = new Date(now.getTime()-5*60*1000);
diff --git a/src/main/webapp/WEB-INF/views/dynamicpage/dynamicIndex.jsp b/src/main/webapp/WEB-INF/views/dynamicpage/dynamicIndex.jsp
index fd48f8735..4540d763f 100644
--- a/src/main/webapp/WEB-INF/views/dynamicpage/dynamicIndex.jsp
+++ b/src/main/webapp/WEB-INF/views/dynamicpage/dynamicIndex.jsp
@@ -10,7 +10,6 @@
     <link rel="stylesheet" href="${pageContext.request.contextPath}/static/pages/css/data_text.css">
     <link rel="stylesheet" href="${pageContext.request.contextPath}/static/pages/css/dashboard.css">
     <script src="${pageContext.request.contextPath}/static/pages/scripts/dashboard.js"></script>
-
     <!--[if lt IE 9]>
     <script src="js/html5shiv.min.js"></script>
     <script src="js/respond.min.js"></script>
@@ -270,7 +269,7 @@
 				color:#ffffff;
 				position: relative;
 				top: 2.2%;
-    			left: 43%;
+    			left: 35%;
     			font-size: 24px;
 			}
 			/* #dataNumsStr span{
@@ -1246,31 +1245,31 @@
 		function animalNum(dropNum){
 			var unitStr = "";
 			if (dropNum > 1000 && dropNum <= 1000000) {
-        		//dropNum = Math.round(dropNum/1000);//K取整
-        		(dropNum/1000).toFixed(1);
+        		dropNum = Math.round(dropNum/1000);//K取整
+        		//dropNum = (dropNum/1000).toFixed(1);alert(dropNum);
         		unitStr = "K";
         	}
         	if (dropNum > 1000000 && dropNum <= 1000000000) {
-        		//dropNum = Math.round(dropNum/1000000);//M
-        		(dropNum/1000000).toFixed(1);
+        		dropNum = Math.round(dropNum/1000000);//M
+        		//dropNum = (dropNum/1000000).toFixed(1);
         		unitStr = "M";
         	}
         	if (dropNum > 1000000000 && dropNum <= 1000000000000) {
-        		//dropNum = Math.round(dropNum/1000000000);//G
-        		(dropNum/1000000000).toFixed(1);
+        		dropNum = Math.round(dropNum/1000000000);//G
+        		//dropNum = (dropNum/1000000000).toFixed(1);
         		unitStr = "G";
         	}
         	if (dropNum > 1000000000000 && dropNum <= 1000000000000000) {
-        		//dropNum = Math.round(dropNum/1000000000000);//T
-        		(dropNum/1000000000000).toFixed(1);
+        		dropNum = Math.round(dropNum/1000000000000);//T
+        		//dropNum = (dropNum/1000000000000).toFixed(1);
         		unitStr = "T";
         	}
         	if (dropNum > 1000000000000000) {
-        		//dropNum = Math.round(dropNum/1000000000000000);//P
-        		(dropNum/1000000000000000).toFixed(1);
+        		dropNum = Math.round(dropNum/1000000000000000);//P
+        		//dropNum = (dropNum/1000000000000000).toFixed(1);
         		unitStr = "P";
         	}
-        	//dropNum = rand(1000,99999);
+        	//dropNum = rand(100,999);
         	//dropNum= dropNum+"M";
 			$("#dataNums").empty();
 	        $("#dataNums").rollNum({