Merge remote-tracking branch 'origin/master'

mybusiness/src/main/resources/templates/business/visualization/map.html

@@ -194,11 +194,11 @@
      * 添加秸秆焚烧mark
      * */
     function jgfsMarker(option,func){
-        var iconUrl = '[[@{/visualization/images/bug.gif}]]';
+        var iconUrl = '[[@{/visualization/images/hn_hgjs.gif}]]';
         if(option.status == 'event_status_1'){
-            iconUrl = '[[@{/visualization/images/bug-h.gif}]]';
+            iconUrl = '[[@{/visualization/images/hn_hgjs.gif}]]';
         }else if(option.status == 'event_status_4'){
-            iconUrl = '[[@{/visualization/images/bug-ok.gif}]]';
+            iconUrl = '[[@{/visualization/images/hn_hgjs.gif}]]';
         }
         var icon = L.icon({
             iconUrl: iconUrl,
@@ -236,11 +236,11 @@
      * 添加防汛防控mark
      * */
     function fxfkMarker(option,func){
-        var iconUrl = '[[@{/visualization/images/bug.gif}]]';
+        var iconUrl = '[[@{/visualization/images/hn_fxfk.png}]]';
         if(option.status == 'event_status_1'){
-            iconUrl = '[[@{/visualization/images/bug-h.gif}]]';
+            iconUrl = '[[@{/visualization/images/hn_fxfk.png}]]';
         }else if(option.status == 'event_status_4'){
-            iconUrl = '[[@{/visualization/images/bug-ok.gif}]]';
+            iconUrl = '[[@{/visualization/images/hn_fxfk.png}]]';
         }
         var icon = L.icon({
             iconUrl: iconUrl,
@@ -278,11 +278,11 @@
      * 添加野生动物mark
      * */
     function ysdwMarker(option,func){
-        var iconUrl = '[[@{/visualization/images/bug.gif}]]';
+        var iconUrl = '[[@{/visualization/images/hn_ysdw.png}]]';
         if(option.status == 'event_status_1'){
-            iconUrl = '[[@{/visualization/images/bug-h.gif}]]';
+            iconUrl = '[[@{/visualization/images/hn_ysdw.png}]]';
         }else if(option.status == 'event_status_4'){
-            iconUrl = '[[@{/visualization/images/bug-ok.gif}]]';
+            iconUrl = '[[@{/visualization/images/hn_ysdw.png}]]';
         }
         var icon = L.icon({
             iconUrl: iconUrl,