From dbc28ad9f10a7e4ae3d1c837f721b168343e961e Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Wed, 25 Oct 2017 14:41:31 +0800
Subject: [PATCH] 修正
---
src/main/java/com/moral/monitor/controller/Dashboard.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/moral/monitor/controller/Dashboard.java b/src/main/java/com/moral/monitor/controller/Dashboard.java
index 311a3b0..024b9e6 100644
--- a/src/main/java/com/moral/monitor/controller/Dashboard.java
+++ b/src/main/java/com/moral/monitor/controller/Dashboard.java
@@ -134,13 +134,13 @@
for(Equipment e:equipments){
int state = e.getState();
- if (state==0){
- e.setStatedesc("������");
- }else if(state==4){
- e.setStatedesc("������");
- }else if(state==1||state==2||state==3){
- e.setStatedesc("������");
- }
+// if (state==0){
+// e.setStatedesc("������");
+// }else if(state==4){
+// e.setStatedesc("������");
+// }else if(state==1||state==2||state==3){
+// e.setStatedesc("������");
+// }
}
s.put("rows",equipments);
@@ -357,7 +357,7 @@
for (History a:historys){
String format = sdf.format(a.getTime());
xtime.add(format);
- yvalue.add(a.getMac_value());
+ yvalue.add(a.getMacValue());
}
s.put("xtime",xtime);
s.put("yvalue",yvalue);
--
Gitblit v1.8.0