Merge remote-tracking branch 'origin/master'

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

@@ -116,11 +116,11 @@ img {display: block;border:none; margin:0 auto;}
 	background-position: center center;
 	background-attachment: fixed;
 	background-size: cover;
-	background-color: #34d473;
+	background-color: #0054d7;
 }
 
 .dl_logo{
-	margin: 13% auto 20px auto;
+	margin: 6% auto 50px auto;
 	text-align: center;
 
 }
@@ -128,7 +128,9 @@ img {display: block;border:none; margin:0 auto;}
 
 }
 .dl-logo-con img{
-	position: absolute}
+	position: absolute;
+	width: 60px;
+}
 .dl-logo-con span{
 	margin-left: 80px;
 	line-height: 60px;
@@ -138,16 +140,16 @@ img {display: block;border:none; margin:0 auto;}
 	/*display: block;*/
 /*}*/
 .dl_con{
-	background:url(lydl_3.png) repeat;
+	background:url(lydl_3.png) no-repeat center;
 	padding: 2%;
-
+	background-size: 100% 100%;
 	border-radius: 18px;
 	margin: 50px auto;
 	display: table;
 
 }
 .dl_con .name_div,.dl_con .password_div,.dl_con .yhm_div,.dl_con .dl_dl{
-	width:422px;
+	width:380px;
 	position: relative;
 	margin-bottom: 5%;
 	font-size: 14px;
@@ -158,12 +160,12 @@ img {display: block;border:none; margin:0 auto;}
       user-select:none;
 }
 .dl_con .name_div input,.dl_con .password_div input{
-	width:90%;
+	width: 87%;
 	height: 50px;
 	background: #fff;
-	border:1px solid #2970f0;
+	border: 0px;
 	border-radius: 10px;
-	padding-left: 10%;
+	padding-left: 12%;
 	font-size: 16px;
 }
 .dl_con .name_div i,.dl_con .password_div i{
@@ -186,22 +188,239 @@ img {display: block;border:none; margin:0 auto;}
 }
 .dl_con .dl_dl{
 	width: 100%;
-	height: 65px;
-	border:1px solid #2970f0;
-	font-size: 30px;
+	height: 50px;
+	border: 0px;
+	font-size: 18px;
 	color: #fff;
 	font-weight: 900;
-	text-indent: 4px;
+	text-indent: 0px;
 	text-align: center;
-	background:url(lydl_6.png) repeat-x;
-	border-radius: 18px;
+	background: #ff9835;
+	border-radius: 9px;
 	cursor: pointer;
 	margin-top: 2%;
 }
+.dl_con .dl_dl:hover{
+	background: #ff842d;
+}
 
 .logo-tit{
 	font-size: 42px;
 	font-weight: bolder;
-	color: #2970f0;
+	color: #fff;
+
+}
+.dl_left{
+	float: left;
+	width: 600px;
+	position: relative;
+}
+.dl_con{
+	float: right;
+}
+.dl_d i{
+	position: relative;
+	width: 8px;
+	height: 8px;
+	background: #0ffff3;
+	border-radius: 50%;
+	margin: auto;
+	display: table;
+}
+.dl_d i::before {
+	content: "";
+	display: block;
+	width: 15px;
+	height: 15px;
+	position: absolute;
+	left: 50%;
+	top: 50%;
+	transform: translate(-50%, -50%);
+	border-radius: 50%;
+	border: 1px solid #0ffff3;
+	animation: 2s linear 0s infinite normal none running scale;
+	background: rgba(10, 255, 220, 0.5);
+
+}
+.dl_d{
+	position: absolute;
+}
+.dl_d p{
+	width: 95px;
+	text-align: center;
+	font-size: 14px;
+	color: #4ed5ff;
+
+}
+.dl_01{
+	top: 39px;
+	left: 91px;
+ }
+.dl_01 p{
+	position: absolute;
+	top: -46px;
+	left: -46px;
+}
+.dl_02{
+	top:88px;
+	right: 186px;
+}
+.dl_02 p{
+	position: absolute;
+	top: -46px;
+	left: -39px;
+}
+.dl_03{
+	bottom: 147px;
+	right: 60px;
+}
+.dl_03 p{
+	position: absolute;
+	top: -8px;
+	left: 6px;
+}
+.dl_04{
+	bottom: 42px;
+	left: 235px;
+}
+.dl_04 p{
+	position: absolute;
+	top: 23px;
+	left: -43px;
+}
+.dl_05{
+	bottom: 154px;
+	left: -2px;
+}
+.dl_05 p{
+	position: absolute;
+	top: -9px;
+	left: -90px;
+}
+
+@keyframes float {
+	0% {
+		transform: translateY(0%);
+	}
+
+	50% {
+		transform: translateY(60%);
+	}
+
+	100% {
+		transform: translateY(0%);
+	}
+}
+
+@keyframes float2 {
+	0% {
+		transform: translateY(0%);
+	}
+
+	50% {
+		transform: translateY(-50%);
+	}
+
+	100% {
+		transform: translateY(0%);
+	}
+}
+
+@keyframes float3 {
+	0% {
+		transform: translateY(0%);
+	}
+
+	50% {
+		transform: translateY(-50%);
+	}
+
+	100% {
+		transform: translateY(0%);
+	}
+}
+
+@keyframes float4 {
+	0% {
+		transform: translateY(0%);
+	}
+
+	50% {
+		transform: translateY(60%);
+	}
+
+	100% {
+		transform: translateY(0%);
+	}
+}
 
+@keyframes float5 {
+	0% {
+		transform: translateY(0%);
+	}
+
+	50% {
+		transform: translateY(-60%);
+	}
+
+	100% {
+		transform: translateY(0%);
+	}
+}
+
+@keyframes circle {
+	0% {
+		transform: rotateX(70deg) rotateZ(0deg);
+	}
+
+	100% {
+		transform: rotateX(70deg) rotateZ(360deg);
+	}
+}
+
+@keyframes scale {
+	0% {
+		transform: translate(-50%, -50%) scale(0.9);
+		opacity: 1;
+	}
+
+	100% {
+		transform: translate(-50%, -50%) scale(1.5);
+		opacity: 0;
+	}
+}
+.dl_map1{
+	position: absolute;
+	top: 60px;
+	left: 63px;
+	animation: myfirst1 15s infinite linear;
+	z-index: -1;
+}
+.dl_map2{
+	position: absolute;
+	top: 60px;
+	left: 63px;
+	animation: myfirst2 15s infinite linear;
+	z-index: -1;
+}
+@keyframes myfirst1
+{
+	from {transform: rotate(0deg);}
+	to {transform: rotate(359deg);}
+}
+@keyframes myfirst2
+{
+	from {transform: rotate(359deg);}
+	to {transform: rotate(0deg);}
+}
+.dl_content{
+	width: 1100px;
+	margin: 20px auto 0px auto;
+}
+.dl_con h4{
+	text-align: center;
+	color: #222;
+	font-size: 20px;
+	margin-bottom: 20px;
+	font-weight: 900;
 }

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

@@ -13,28 +13,42 @@
 <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" >辉南数字乡村<br/>高空“鹰眼”综合管理平台</span>
     </div>
 </div>
-<div class="dl_con">
-    <form id="signupForm" autocomplete="off">
-        <div class="name_div">
-            <i><img src="../static/syslogin/lydl_4.png" th:src="@{/syslogin/lydl_4.png}"/></i>
-            <input name="username"  placeholder="请输入用户名" type="text" />
-            <!--<input name="username" value="admin" placeholder="请输入用户名" type="text"/>-->
-            <!--<input name="username" value="shaoye062908" placeholder="请输入用户名" type="text"/>-->
-        </div>
-        <div class="password_div">
-            <i><img src="../static/syslogin/lydl_5.png" th:src="@{/syslogin/lydl_5.png}"/></i>
-            <input name="password"  placeholder="请输入密码" type="password" />
-        </div>
-        <!--<div class="yhm_div clearfix">-->
-            <!--<a class="fl">找回密码</a>-->
-            <!--<label class="fr"><input type="checkbox" checked/><span>记住用户名</span></label>-->
-        <!--</div>-->
-        <button class="dl_dl" id="btnSubmit" data-loading="正在验证登录，请稍后...">登&nbsp;&nbsp;&nbsp;&nbsp;录</button>
+<div class="dl_content">
+    <div class="dl_left">
+        <img th:src="@{/syslogin/lydl_left.png}" />
+        <div class="dl_d dl_01"><i></i><p>森林防火<br>事件管理</p></div>
+        <div class="dl_d dl_02"><i></i><p>秸秆焚烧<br>事件管理</p></div>
+        <div class="dl_d dl_03"><i></i><p>防汛防控<br>事件管理</p></div>
+        <div class="dl_d dl_04"><i></i><p>野生动物<br>事件管理</p></div>
+        <div class="dl_d dl_05"><i></i><p>热感云台<br>事件管理</p></div>
+        <img th:src="@{/syslogin/lydl_leftcon1.png}" class="dl_map1" />
+        <img th:src="@{/syslogin/lydl_leftcon2.png}" class="dl_map2" />
+    </div>
+    <div class="dl_con">
+        <form id="signupForm" autocomplete="off">
+            <h4>用户登录</h4>
+            <div class="name_div">
+                <i><img src="../static/syslogin/lydl_4.png" th:src="@{/syslogin/lydl_4.png}"/></i>
+                <input name="username"  placeholder="请输入用户名" type="text" />
+                <!--<input name="username" value="admin" placeholder="请输入用户名" type="text"/>-->
+                <!--<input name="username" value="shaoye062908" placeholder="请输入用户名" type="text"/>-->
+            </div>
+            <div class="password_div">
+                <i><img src="../static/syslogin/lydl_5.png" th:src="@{/syslogin/lydl_5.png}"/></i>
+                <input name="password"  placeholder="请输入密码" type="password" />
+            </div>
+            <!--<div class="yhm_div clearfix">-->
+                <!--<a class="fl">找回密码</a>-->
+                <!--<label class="fr"><input type="checkbox" checked/><span>记住用户名</span></label>-->
+            <!--</div>-->
+            <button class="dl_dl" id="btnSubmit" data-loading="正在验证登录，请稍后...">登&nbsp;&nbsp;&nbsp;&nbsp;录</button>
 
-    </form>
+        </form>
+    </div>
+    <div style="clear: both"></div>
 </div>
 <script th:inline="javascript"> var ctx = [[@{/}]]; var captchaType = [[${captchaType}]]; </script>
 <!-- 全局js -->

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

@@ -31,6 +31,9 @@
                     <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_3'">偷盗偷猎:</span>
                     <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_4'">乱砍乱伐:</span>
                     <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_5'">偷砂采石:</span>
+                    <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_6'">秸秆焚烧:</span>
+                    <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_7'">防汛防控:</span>
+                    <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_8'">野生动物:</span>
                     [[${veec.COUNT}]]
                 </li>
             </ul>
@@ -51,6 +54,9 @@
                     <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_3'">偷盗偷猎:</span>
                     <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_4'">乱砍乱伐:</span>
                     <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_5'">偷砂采石:</span>
+                    <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_6'">秸秆焚烧:</span>
+                    <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_7'">防汛防控:</span>
+                    <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_8'">野生动物:</span>
                     [[${veec.COUNT}]]
                 </li>
             </ul>
@@ -131,7 +137,7 @@
         <h3>新事件</h3>
     </div>
     <ul class="zhly_list1" id="newEvent">
-        <li th:each="vpl : ${Visualization_Pending_List}">
+        <li th:each="vpl : ${Visualization_Pending_List}" th:if="${vpl.EVENT_STATUS eq 'event_status_1' || vpl.EVENT_SIGN eq '0'}">
             <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>
@@ -141,7 +147,7 @@
                 <span th:text="${vpl.NAME}"/>
             </a>
             <div class="clear"></div>
-            <p>
+            <p th:if="${vpl.EVENT_STATUS eq 'event_status_1' || vpl.EVENT_SIGN eq '0'}">
                 <span class="fr">上报时间：<span th:text="${vpl.REPORT_TIME}"/></span>
             </p>
             <script>
@@ -153,7 +159,7 @@
         <h3>处理中</h3>
     </div>
     <ul class="zhly_list1">
-        <li th:each="vpl : ${Visualization_Pending_List}">
+        <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}]])">
                 <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>
@@ -162,7 +168,7 @@
                 <i th:if="${vpl.RESERVEPLAN_TYPE} eq 'reserveplan_type_5'" class="tscs">偷砂采石</i>
                 <span th:text="${vpl.NAME}"/>
                 <div class="clear"></div>
-                <p>
+                <p th:if="${vpl.EVENT_STATUS} eq 'event_status_2'" >
                     <span class="fr">上报时间：<span th:text="${vpl.REPORT_TIME}"/></span>
                 </p>
             </a>
@@ -173,7 +179,7 @@
         <h3>已办结</h3>
     </div>
     <ul class="zhly_list1">
-        <li th:each="vpl : ${Visualization_Pending_List}">
+        <li th:each="vpl : ${Visualization_Pending_List}" th:if="${vpl.EVENT_STATUS} eq 'event_status_4'" >
             <a th:if="${vpl.EVENT_STATUS} eq 'event_status_4'" 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>
@@ -182,7 +188,7 @@
                 <i th:if="${vpl.RESERVEPLAN_TYPE} eq 'reserveplan_type_5'" class="tscs">偷砂采石</i>
                 <span th:text="${vpl.NAME}"/>
                 <div class="clear"></div>
-                <p>
+                <p th:if="${vpl.EVENT_STATUS} eq 'event_status_4'" >
                     <span class="fr">上报时间：<span th:text="${vpl.REPORT_TIME}"/></span>
                 </p>
             </a>