更新

fengxiang

2017-10-30 52726ae732567295df1b104131393472cf9a1d11

 src/main/java/com/moral/monitor/controller/Dashboard.java

@@ -357,7 +357,7 @@
        for (History a:historys){

            String format = sdf.format(a.getTime());

            xtime.add(format);

            yvalue.add(a.getMacValue());

            yvalue.add(a.getMac_value());

        }

        s.put("xtime",xtime);

        s.put("yvalue",yvalue);