From 717c617f8f79387ac08c29a24647ea1f4be6a7b9 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 30 Apr 2020 08:42:29 +0800
Subject: [PATCH] update维保改为离线
---
src/main/webapp/js/moralmap.js | 2 +-
src/main/webapp/view/map.jsp | 2 +-
src/main/java/com/moral/controller/ScreenController.java | 2 --
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 3643322..93fe8e5 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -842,8 +842,6 @@
parameters.put("sensors", Arrays.asList(sensorKeys));
parameters.put("sensors2", s);
List<Map<String, Object>> monitorList = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
- System.out.println("monitorlist" + monitorList);
-
for (Map<String, Object> monitorMap : monitorList) {
String time = monitorMap.get("time").toString();
time = time.substring(time.length() - 2);
diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index 6737c74..b0ed81a 100644
--- a/src/main/webapp/js/moralmap.js
+++ b/src/main/webapp/js/moralmap.js
@@ -415,7 +415,7 @@
break;
case 4:
state = 'state04';
- stateName = '������';
+ stateName = '������';
break;
}
return {
diff --git a/src/main/webapp/view/map.jsp b/src/main/webapp/view/map.jsp
index 2e3442b..e3bdcb0 100644
--- a/src/main/webapp/view/map.jsp
+++ b/src/main/webapp/view/map.jsp
@@ -179,7 +179,7 @@
}
.list .state04 {
- background-color: #738d99;
+ background-color: #488FD2;
}
/*
--
Gitblit v1.8.0