From 999d8a80d9a1c1f20033c29e7e2a08951766bee8 Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Mon, 13 Nov 2017 16:16:34 +0800
Subject: [PATCH] Merge branch 'master' of http://fengxiang@blit.7drlb.com:8888/r/task.git
---
src/main/java/com/moral/monitor/controller/Dashboard.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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..eff59a3 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);
--
Gitblit v1.8.0