辉南林业

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

@@ -137,7 +137,7 @@
         <h3>新事件</h3>
     </div>
     <ul class="zhly_list1" id="newEvent">
-        <li th:each="vpl : ${Visualization_Pending_List}" th:if="${vpl.EVENT_STATUS eq 'event_status_1' || vpl.EVENT_SIGN eq '0'}">
+        <li th:each="vpl : ${Visualization_Pending_List}" th:if="${vpl.EVENT_STATUS} eq 'event_status_1'">
             <a th:if="${vpl.EVENT_STATUS eq 'event_status_1' || vpl.EVENT_SIGN eq '0'}" th:onclick="flyTo([[${vpl.LATITUDE}]],[[${vpl.LONGITUDE}]])">
                 <i th:if="${vpl.RESERVEPLAN_TYPE} eq 'reserveplan_type_1'" class="slfh">森林防火</i>
                 <i th:if="${vpl.RESERVEPLAN_TYPE} eq 'reserveplan_type_2'" class="bch">病虫害</i>
@@ -169,6 +169,9 @@
                 <i th:if="${vpl.RESERVEPLAN_TYPE} eq 'reserveplan_type_3'" class="tdao">偷盗偷猎</i>
                 <i th:if="${vpl.RESERVEPLAN_TYPE} eq 'reserveplan_type_4'" class="lklf">乱砍乱伐</i>
                 <i th:if="${vpl.RESERVEPLAN_TYPE} eq 'reserveplan_type_5'" class="tscs">偷砂采石</i>
+                <i th:if="${vpl.RESERVEPLAN_TYPE} eq 'reserveplan_type_6'" class="jgjs">秸秆禁烧</i>
+                <i th:if="${vpl.RESERVEPLAN_TYPE} eq 'reserveplan_type_7'" class="fxfk">防汛防控</i>
+                <i th:if="${vpl.RESERVEPLAN_TYPE} eq 'reserveplan_type_8'" class="ysdw">野生动物</i>
                 <span th:text="${vpl.NAME}"/>
                 <div class="clear"></div>
                 <p th:if="${vpl.EVENT_STATUS} eq 'event_status_2'" >
@@ -189,6 +192,9 @@
                 <i th:if="${vpl.RESERVEPLAN_TYPE} eq 'reserveplan_type_3'" class="tdao">偷盗偷猎</i>
                 <i th:if="${vpl.RESERVEPLAN_TYPE} eq 'reserveplan_type_4'" class="lklf">乱砍乱伐</i>
                 <i th:if="${vpl.RESERVEPLAN_TYPE} eq 'reserveplan_type_5'" class="tscs">偷砂采石</i>
+                <i th:if="${vpl.RESERVEPLAN_TYPE} eq 'reserveplan_type_6'" class="jgjs">秸秆禁烧</i>
+                <i th:if="${vpl.RESERVEPLAN_TYPE} eq 'reserveplan_type_7'" class="fxfk">防汛防控</i>
+                <i th:if="${vpl.RESERVEPLAN_TYPE} eq 'reserveplan_type_8'" class="ysdw">野生动物</i>
                 <span th:text="${vpl.NAME}"/>
                 <div class="clear"></div>
                 <p th:if="${vpl.EVENT_STATUS} eq 'event_status_4'" >

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

@@ -196,9 +196,9 @@
     function jgfsMarker(option,func){
         var iconUrl = '[[@{/visualization/images/hn_hgjs.gif}]]';
         if(option.status == 'event_status_1'){
-            iconUrl = '[[@{/visualization/images/hn_hgjs.gif}]]';
+            iconUrl = '[[@{/visualization/images/hn_hgjs2.gif}]]';
         }else if(option.status == 'event_status_4'){
-            iconUrl = '[[@{/visualization/images/hn_hgjs.gif}]]';
+            iconUrl = '[[@{/visualization/images/hn_hgjs3.gif}]]';
         }
         var icon = L.icon({
             iconUrl: iconUrl,
@@ -238,9 +238,9 @@
     function fxfkMarker(option,func){
         var iconUrl = '[[@{/visualization/images/hn_fxfk.png}]]';
         if(option.status == 'event_status_1'){
-            iconUrl = '[[@{/visualization/images/hn_fxfk.png}]]';
+            iconUrl = '[[@{/visualization/images/hn_fxfk2.png}]]';
         }else if(option.status == 'event_status_4'){
-            iconUrl = '[[@{/visualization/images/hn_fxfk.png}]]';
+            iconUrl = '[[@{/visualization/images/hn_fxfk3.png}]]';
         }
         var icon = L.icon({
             iconUrl: iconUrl,
@@ -280,9 +280,9 @@
     function ysdwMarker(option,func){
         var iconUrl = '[[@{/visualization/images/hn_ysdw.png}]]';
         if(option.status == 'event_status_1'){
-            iconUrl = '[[@{/visualization/images/hn_ysdw.png}]]';
+            iconUrl = '[[@{/visualization/images/hn_ysdw2.png}]]';
         }else if(option.status == 'event_status_4'){
-            iconUrl = '[[@{/visualization/images/hn_ysdw.png}]]';
+            iconUrl = '[[@{/visualization/images/hn_ysdw3.png}]]';
         }
         var icon = L.icon({
             iconUrl: iconUrl,