From 28f0818ba47d9d3f0f3c187356fa89cba2db748a Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Mon, 26 Oct 2020 16:06:58 +0800
Subject: [PATCH] 设备图标增加和风场风向计算更新

---
 src/main/webapp/js/newmoralmap.js |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/js/newmoralmap.js b/src/main/webapp/js/newmoralmap.js
index 1c68869..9cdac74 100644
--- a/src/main/webapp/js/newmoralmap.js
+++ b/src/main/webapp/js/newmoralmap.js
@@ -657,7 +657,11 @@
             state = state == null ? 0 : state;
             var icon = _option["icon"];
             //var url = icon["stateIcons"][state];
-            var url = icon["url"] + state + ".png";
+            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;

--
Gitblit v1.8.0