Merge remote-tracking branch 'origin/master'

leiSP-admin/src/main/resources/templates/index.html

@@ -194,7 +194,7 @@
                     <li><a title="插件下载" href="http://117.78.49.164:9091/soft/slfhplug.zip" target="_blank">插件下载</a></li>
                     <li><a title="安卓APP" onclick="showappcode()" onmouseover="$('#appcode').show(100)"
                            onmouseout="$('#appcode').hide(100)">安卓APP</a>
-                        <image src="img/appcode.png" id="appcode"
+                        <image src="img/hnlyapp.png" id="appcode"
                                style="display: none; position: absolute;float: bottom;z-index: 100">
                         </image>
                     </li>

mybusiness/src/main/java/com/business/slfh/manager/firemanager/service/impl/TUEventFireServiceImpl.java

@@ -161,13 +161,17 @@ public class TUEventFireServiceImpl implements ITUEventFireService {
             if ("reserveplan_type_2".equals(tUEventOthers.getReserveplanType())) {
                 type = "病虫害";
             } else if ("reserveplan_type_3".equals(tUEventOthers.getReserveplanType())) {
-                type = "水利监控";
+                type = "偷盗";
             } else if ("reserveplan_type_4".equals(tUEventOthers.getReserveplanType())) {
-                type = "违法建筑";
+                type = "乱砍乱伐";
+            } else if ("reserveplan_type_5".equals(tUEventOthers.getReserveplanType())) {
+                type = "偷沙采石";
             } else if ("reserveplan_type_6".equals(tUEventOthers.getReserveplanType())) {
                 type = "秸秆禁烧";
             } else if ("reserveplan_type_7".equals(tUEventOthers.getReserveplanType())) {
-                type = "粪污处理";
+                type = "防汛防控";
+            } else if ("reserveplan_type_8".equals(tUEventOthers.getReserveplanType())) {
+                type = "野生动物";
             }
             title = type + "——" + tUEventOthers.getName();
             message = tUEventOthers.getReportContent();

mybusiness/src/main/java/com/business/slfh/manager/othersmanager/service/impl/TUEventOthersServiceImpl.java

@@ -73,6 +73,10 @@ public class TUEventOthersServiceImpl implements ITUEventOthersService
         tUEventOthers.setCreateBy(sysUser.getUserName());
         tUEventOthers.setCreateUserId(sysUser.getUserId());
         tUEventOthers.setDeptId(sysUser.getDeptId());
+        tUEventOthers.setReportType("report_type_1");
+        tUEventOthers.setReportTime(DateUtils.getNowDate());
+        tUEventOthers.setReportor(sysUser.getUserName());
+        tUEventOthers.setEventStatus("event_status_1");
         return tUEventOthersMapper.insertTUEventOthers(tUEventOthers);
     }
 

mybusiness/src/main/resources/templates/business/manager/othersmanager/add.html

@@ -35,24 +35,24 @@
                 <input name="name" class="form-control" type="text">
             </div>
         </div>
-        <div class="form-group">
+        <!--<div class="form-group">
             <label class="col-sm-3 control-label">上报方式类型：</label>
             <div class="col-sm-8">
                 <select name="reportType" class="form-control m-b" th:with="type=${@dict.getType('report_type')}">
                     <option value="">所有</option>
                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                 </select>
-                <!--<select name="reportType" class="form-control m-b">
+                <select name="reportType" class="form-control m-b">
                     <option value="">所有</option>
                 </select>
-                <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>-->
+                <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
             </div>
-        </div>
+        </div>-->
         <div class="form-group" th:hidden="${reserveplanType}=='reserveplan_type_6'?false:true">
             <label class="col-sm-3 control-label">事发区域：</label>
             <div class="col-sm-8">
                 <select name="reportArea" class="form-control m-b" th:with="type=${@dict.getType('report_area')}">
-                    <option value="">所有</option>
+                    <!--<option value="">所有</option>-->
                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                 </select>
             </div>
@@ -63,7 +63,7 @@
                 <textarea name="reportContent" class="form-control" ></textarea>
             </div>
         </div>
-        <div class="form-group">
+        <!--<div class="form-group">
             <label class="col-sm-3 control-label">上报时间：</label>
             <div class="col-sm-8">
                 <div class="input-group date">
@@ -71,13 +71,13 @@
                     <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                 </div>
             </div>
-        </div>
-        <div class="form-group">
+        </div>-->
+        <!--<div class="form-group">
             <label class="col-sm-3 control-label">上报人：</label>
             <div class="col-sm-8">
                 <input name="reportor" class="form-control" type="text">
             </div>
-        </div>
+        </div>-->
         <!--<div class="form-group">
             <label class="col-sm-3 control-label">${comment}：</label>
             <div class="col-sm-8">
@@ -90,14 +90,14 @@
                 <input name="latitude" class="form-control" type="text">
             </div>
         </div>-->
-        <div class="form-group">
+        <!--<div class="form-group">
             <label class="col-sm-3 control-label">事件状态：</label>
             <div class="col-sm-8">
                 <select name="eventStatus" class="form-control m-b" th:with="type=${@dict.getType('event_status')}">
                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                 </select>
             </div>
-        </div>
+        </div>-->
         <div class="form-group">
             <label class="col-sm-3 control-label">事件等级：</label>
             <div class="col-sm-8">

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

@@ -163,7 +163,7 @@
     </div>
     <ul class="zhly_list1">
         <li th:each="vpl : ${Visualization_Pending_List}" th:if="${vpl.EVENT_STATUS} eq 'event_status_2'" >
-            <a th:if="${vpl.EVENT_STATUS eq 'event_status_2' && vpl.EVENT_SIGN eq '1'}" th:onclick="flyTo([[${vpl.LATITUDE}]],[[${vpl.LONGITUDE}]])">
+            <a th:if="${vpl.EVENT_STATUS eq 'event_status_2' || vpl.EVENT_SIGN eq '1'}" 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>
                 <i th:if="${vpl.RESERVEPLAN_TYPE} eq 'reserveplan_type_3'" class="tdao">偷盗偷猎</i>