ZhuDongming
2020-04-30 717c617f8f79387ac08c29a24647ea1f4be6a7b9
update维保改为离线
3 files modified
6 ■■■■■ changed files
src/main/java/com/moral/controller/ScreenController.java 2 ●●●●● patch | view | raw | blame | history
src/main/webapp/js/moralmap.js 2 ●●● patch | view | raw | blame | history
src/main/webapp/view/map.jsp 2 ●●● patch | view | raw | blame | history
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);
src/main/webapp/js/moralmap.js
@@ -415,7 +415,7 @@
                    break;
                case 4:
                    state = 'state04';
                    stateName = '维保';
                    stateName = '离线';
                    break;
            }
            return {
src/main/webapp/view/map.jsp
@@ -179,7 +179,7 @@
    }
    .list .state04 {
        background-color: #738d99;
        background-color: #488FD2;
    }
    /*