设备图标增加和风场风向计算更新

于紫祥_1901

2020-10-26 28f0818ba47d9d3f0f3c187356fa89cba2db748a

设备图标增加和风场风向计算更新

 src/main/java/com/moral/service/impl/DeviceServiceImpl.java

@@ -999,7 +999,7 @@
                if (tvoc==null){

                    tvoc=0.0;

                }

                Double dir = (270.0 + windDir * Math.PI / 180.0);

                Double dir = (270.0 - windDir * Math.PI / 180.0);



                U = windSpeed * Math.cos(dir);

                V = windSpeed * Math.sin(dir);


 src/main/webapp/img/ico005.png

 src/main/webapp/img/ico006.png

 src/main/webapp/js/newmoralmap.js

@@ -657,7 +657,11 @@
            state = state == null ? 0 : state;
            var icon = _option["icon"];
            //var url = icon["stateIcons"][state];
            if (state==5 || state==6){
                var url = icon["url"] + "0"+state + ".png";
            }else {
            var url = icon["url"] + state + ".png";
            }
            return new BMap.Icon(url, new BMap.Size(icon["width"], icon["height"]), {
                imageSize: new BMap.Size(icon["width"], icon["height"])
            });
@@ -782,7 +786,7 @@
            }
        }
        var icon = {};
        icon["stateIcons"] = ["/img/ico00.png", "/img/ico01.png", "/img/ico02.png", "/img/ico03.png", "/img/ico04.png"];
        icon["stateIcons"] = ["/img/ico00.png", "/img/ico01.png", "/img/ico02.png", "/img/ico03.png", "/img/ico04.png","/img/ico05.png", "/img/ico06.png"];
        icon["url"] = "/img/ico0";
        icon["width"] = 50;
        icon["height"] = 50;
@@ -907,7 +911,7 @@
            }
        }
        var icon = {};
        icon["stateIcons"] = ["/img/ico00.png", "/img/ico01.png", "/img/ico02.png", "/img/ico03.png", "/img/ico04.png"];
        icon["stateIcons"] = ["/img/ico00.png", "/img/ico01.png", "/img/ico02.png", "/img/ico03.png", "/img/ico04.png","/img/ico005.png", "/img/ico006.png"];
        icon["url"] = "/img/ico0";
        icon["width"] = 50;
        icon["height"] = 50;