Merge remote-tracking branch 'origin/master'

leiSP-admin/src/main/resources/static/syslogin/lydl_base.css

@@ -161,7 +161,7 @@ img {display: block;border:none; margin:0 auto;}
 	width:90%;
 	height: 50px;
 	background: #fff;
-	border:1px solid #48bf73;
+	border:1px solid #2970f0;
 	border-radius: 10px;
 	padding-left: 10%;
 	font-size: 16px;
@@ -187,7 +187,7 @@ img {display: block;border:none; margin:0 auto;}
 .dl_con .dl_dl{
 	width: 100%;
 	height: 65px;
-	border:1px solid #48bf73;
+	border:1px solid #2970f0;
 	font-size: 30px;
 	color: #fff;
 	font-weight: 900;
@@ -202,6 +202,6 @@ img {display: block;border:none; margin:0 auto;}
 .logo-tit{
 	font-size: 42px;
 	font-weight: bolder;
-	color: #fff;
+	color: #2970f0;
 
 }

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

@@ -188,7 +188,7 @@
                         <i class="fa fa-bars"></i>
                     </a>
                 </div>
-                <span class="index-tit">集安市智慧林业综合管理平台</span>
+                <span class="index-tit">辉南县数字乡村高空“鹰眼”综合服务平台</span>
                 <ul class="nav navbar-top-links navbar-right welcome-message">
                     <!--<li><a id="dsq" title="电视墙" onclick="window.open('https://122.141.177.213:9090/dahua/demo-dsd.html?deptId=100')">电视墙</a></li>-->
                     <li><a title="插件下载" href="https://122.141.177.213:9090/soft/slfhplug.zip" target="_blank">插件下载</a></li>
@@ -200,8 +200,8 @@
                     </li>
 
 
-                    <li><a title="大数据平台" th:href="@{/bigdata/inspection/getBigDataInspection}" target="_blank">大数据平台</a>
-                    </li>
+                    <!--<li><a title="大数据平台" th:href="@{/bigdata/inspection/getBigDataInspection}" target="_blank">大数据平台</a>
+                    </li>-->
                     <li><a title="可视化平台" th:href="@{/visualization/event/getVisualizationEvent}"
                            target="_blank">可视化平台</a></li>
                     <li><a title="全屏显示" href="javascript:void(0)" id="fullScreen"><i class="fa fa-arrows-alt"></i>

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

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>智慧林业森林防火</title>
+    <title>高空鹰眼</title>
     <link rel="stylesheet" href="../static/syslogin/lydl_base.css" th:href="@{/syslogin/lydl_base.css}">
 
 </head>
@@ -13,7 +13,7 @@
 <div class="dl_logo">
     <div class="dl-logo-con">
      <img src="../static/syslogin/logo-64.png" th:src="@{/syslogin/logo-64.png}"  >
-      <span class="logo-tit" >集安市智慧林业综合管理平台</span>
+      <span class="logo-tit" >辉南县数字乡村高空“鹰眼”综合服务平台</span>
     </div>
 </div>
 <div class="dl_con">

mybusiness/src/main/java/com/business/slfh/dahua/controller/DahuaMQController.java

@@ -13,7 +13,7 @@ import java.util.Date;
 import java.util.Timer;
 import java.util.TimerTask;
 //
-@Component
+//@Component
 public class DahuaMQController implements ApplicationRunner {
 
     private static final String USERNAME = "admin";// 默认连接用户名

mybusiness/src/main/java/com/business/slfh/manager/othersmanager/controller/TUEventOthersController.java

@@ -93,6 +93,18 @@ public class TUEventOthersController extends BaseController
         mmap.put("reserveplanType", "reserveplan_type_6");
         return prefix + "/index";
     }
+    @GetMapping("/flood")
+    public String othersflood(ModelMap mmap)
+    {
+        mmap.put("reserveplanType", "reserveplan_type_7");
+        return prefix + "/index";
+    }
+    @GetMapping("/animal")
+    public String othersanimal(ModelMap mmap)
+    {
+        mmap.put("reserveplanType", "reserveplan_type_8");
+        return prefix + "/index";
+    }
 
     /**
      * 发起帮助【请填写功能名称】

mybusiness/src/main/resources/static/visualization/images/zhly_body.css

@@ -795,4 +795,10 @@ img {display:block;border:none; margin:0 auto;}
 		height: 35rem;
 		top: 12%;
 	}
+}
+
+
+
+#iframe_body{
+	background: url(hn_bg.png) repeat;
 }

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

@@ -188,7 +188,7 @@
     <script>
         //	iframe高度
         var hei = $(document).height();
-        $("#background").height(hei - 200);
+        $("#background").height(hei - 180);
     </script>
 </div>
 <!--	头部  开始-->

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

@@ -7,7 +7,7 @@
     <link rel="stylesheet" th:href="@{/visualization/images/zhly_body.css}">
     <link th:href="@{/css/bootstrap.min.css}" rel="stylesheet">
 </head>
-<body style=" margin: 0;overflow: hidden;background: #000033;width: 100%;height:100%;position: absolute;top: 0;">
+<body id="iframe_body" style=" margin: 0;overflow: hidden;width: 100%;height:100%;position: absolute;top: 0;">
 <label id="distanceLength"></label>
 
 <div id="map" style="margin:0 auto;width: 100%;height: 100%;background: none;"></div>
@@ -30,23 +30,24 @@
     var centerPoint = getSuperMapCenterPoint("[[${centerPoint}]]");
     var featureIds = new Array();
     var map, resultLayer,pop,themeLayer,infoView,lbtThemeLayer,lbtInfoView,lzMarker;
-    var yxt = L.supermap.tiledMapLayer(basePath+"/吉林84", {
+    var yxt = L.supermap.tiledMapLayer(basePath+"/HuiNan", {
+        // opacity:0.6,
         noWrap: true
     });
-    var lkt = L.supermap.tiledMapLayer(basePath+"/吉林84", {
+    var lkt = L.supermap.tiledMapLayer(basePath+"/HuiNan", {
         transparent:true,
         opacity:0.6,
         noWrap: true
     });
-    var xzt = L.supermap.tiledMapLayer(basePath+"/吉林84", {
+    var xzt = L.supermap.tiledMapLayer(basePath+"/HuiNan", {
         transparent:true,
         opacity:0.6,
         noWrap: true
     });
-    var lwt = L.supermap.tiledMapLayer(basePath+"/吉林84", {
+    var lwt = L.supermap.tiledMapLayer(basePath+"/HuiNan", {
         noWrap: true
     });
-    var lbt = L.supermap.tiledMapLayer(basePath+"/吉林84", {
+    var lbt = L.supermap.tiledMapLayer(basePath+"/HuiNan", {
         transparent:true,
         opacity:1,
         noWrap: true