Merge remote-tracking branch 'origin/master'

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

@@ -116,6 +116,8 @@ img {display:block;border:none; margin:0 auto;}
 .timing{
 	/* width: 655px; */
 	height: 86px;
+	position: absolute;
+	right: 0px;
 }
 .time {
     color: #fff;
@@ -633,7 +635,16 @@ img {display:block;border:none; margin:0 auto;}
 	outline: 2px solid #ccc;
 }
 
-#qt_iframe{width: 410px;height: 100%;border: 0px;overflow: hidden;padding: 0px;margin: 0px;z-index: 9;/* position: absolute; *//* right: 0px; *//* top: 3%; */}
+#qt_iframe{
+	width: 360px;
+
+	height: 100%;
+	border: 0px;overflow: scroll;padding: 0px;margin: 0px;z-index: 9;/* position: absolute; *//* right: 0px; *//* top: 3%; */}
+
+
+
+
+
 
 /*漂浮框*/
 .div_tittle{
@@ -720,13 +731,17 @@ img {display:block;border:none; margin:0 auto;}
 /*通用*/
 .zhly_k {
 	background: url(zhly_12.png) 0 0 / 100% 100% no-repeat;
-	width: 405px;
-	height:820px;
+	width: 360px;
+	height: 47rem;
 	position: fixed;
 	right: 0px;
-	top:8%;
+	top: 11%;
 	padding: 20px;
-	/*	overflow-y: hidden;*/
+		overflow-y: scroll;
+}
+.zhly_k::-webkit-scrollbar{
+	width: 0px;
+	height: 0px;
 }
 .zhly_close {
 	position: absolute;
@@ -741,7 +756,7 @@ img {display:block;border:none; margin:0 auto;}
 	border-left: 4px solid #1a96ff;
 	padding-left: 10px;
 	margin-bottom: 20px;
-	font-size: 22px;
+	font-size: 20px;
 }
 .header .logo img{
 	position: relative;
@@ -755,7 +770,7 @@ img {display:block;border:none; margin:0 auto;}
 	width:-moz-fit-content;
 	height: 86px;
 	background: url(zhly_tit.png) repeat-x;
-	font-size: 35px;
+	font-size: 26px;
 	padding: 0 20px;
 	float: left;
 	color:#fff;
@@ -772,3 +787,12 @@ img {display:block;border:none; margin:0 auto;}
 
 .iclient-leaflet-logo img{display: none!important;}
 .leaflet-touch .leaflet-control-attribution, .leaflet-touch .leaflet-control-layers, .leaflet-touch .leaflet-bar {display: none!important;}
+
+
+@media screen and (max-width:1366px){
+	.zhly_k {
+		width: 360px;
+		height: 35rem;
+		top: 12%;
+	}
+}

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

@@ -53,16 +53,17 @@
 	height: 22px;
 	line-height: 22px;
 	color: #fff;
-	font-size: 14px;
+	font-size: 12px;
 	overflow: hidden;
 	white-space: nowrap;
 	text-overflow: ellipsis;
 }
+
 .zhly_list2 li .list_xl .list_txt p:nth-child(odd) {
-	background: #242453;
+	background: #242428;
 }
 .zhly_list2 li .list_xl .list_txt p:nth-child(even) {
-	background: #2d2d63;
+	background: #161622;
 }
 .zhly_list2 li .list_xl .list_txt p b {
 	display: block;
@@ -110,10 +111,10 @@
 	transition: transform .2s ease-in;
 }
 .zhly_list3 li .list_xl .list_txt p:nth-child(odd) {
-	background: #242453;
+	background: #1e1e24;
 }
 .zhly_list3 li .list_xl .list_txt p:nth-child(even) {
-	background: #2d2d63;
+	background: #282828;
 }
 .zhly_list3 li {
 	position: relative;
@@ -162,7 +163,7 @@
 	/* height: 20px; */
 	line-height: 22px;
 	color: #fff;
-	font-size: 14px;
+	font-size: 12px;
 	overflow: hidden;
 	white-space: nowrap;
 	text-overflow: ellipsis;
@@ -196,6 +197,28 @@
 	line-height: 18px;
 	border-radius: 2px;
 }
+.zhly_list3 li .list_xl .list_txt h5 {
+	text-align: center;
+	width: 100%;
+	height: 22px;
+	line-height: 22px;
+	color: #fff;
+	background:none;
+	padding: 10px 0px;
+}
+.zhly_list3 li .list_xl .list_txt h5 button{
+	background: #e34111;
+	border: 0px;
+	width: 100%;
+	height: 25px;
+	line-height: 25px;
+	color: #fff;
+	border-radius: 3px;
+}
+.zhly_list3 li .list_xl .list_txt h5 button:hover{
+	background: #a44111;
+
+}
 .right_btn {
 	position: absolute;
 	bottom:1%;
@@ -216,7 +239,7 @@
 	background: #00479d;
 	color: #fff;
 }
-/*分页*/
+/*分页*/
 .fenye {
 	width: 100%;
 	margin: 5px auto;
@@ -262,9 +285,9 @@
 	background-color: #076874;
 }
 
-/*环形进度条*/
+/*环形进度条*/
 .ring {
-	width: 133px;
+	width: 117px;
 	height: 110px;
 	display: flex;
 	align-items: center;
@@ -420,7 +443,7 @@
 	position: absolute;
 }
 
-/*事件*/
+/*事件*/
 .jk_div {
 	width: 50%;
 	text-align: left;
@@ -451,21 +474,30 @@
 	position: relative;
 	color: #fff;
 	background-image: -webkit-linear-gradient(bottom, #026fec, #02b5f6, #02dffd);
-	/*必需加前缀 -webkit- 才支持这个text值 */
+	/*必需加前缀 -webkit- 才支持这个text值 */
 	-webkit-background-clip: text;
-	/*text-fill-color会覆盖color所定义的字体颜色： */
+	/*text-fill-color会覆盖color所定义的字体颜色： */
 	-webkit-text-fill-color: transparent;
 	display: block;
 }
+.zhly_list1{
+	overflow: auto;
+	max-height: 15rem;
+}
+.zhly_list1::-webkit-scrollbar{
+	height: 0px;
+	width:0px;
+}
 .zhly_list1 li {
 	padding: 10px;
 	border-bottom: 1px solid #02021c;
+	width: 94%;
 }
 .zhly_list1 li:nth-child(odd) {
-	background: #02022a;
+	background: #171722;
 }
 .zhly_list1 li:nth-child(even) {
-	background: #121233;
+	background: #17171a;
 }
 .zhly_list1 li a {
 	text-align: left;
@@ -514,7 +546,7 @@
 	color: #999;
 	margin-top: 6px;
 }
-/*瞭望塔*/
+/*瞭望塔*/
 .sp_an {
 	margin: 20px 0px;
 }
@@ -603,7 +635,7 @@
 	border: 0px;
 	cursor: pointer;
 }
-/*摄像头*/
+/*摄像头*/
 
 .sxt_4 {
 	margin-bottom: 20px;
@@ -700,7 +732,7 @@
 .sxt_4 .luz6 h4 span {
 	color: #e8980c;
 }
-/*水源及救援渠道管理*/
+/*水源及救援渠道管理*/
 .syjjy_3 {
 	margin-bottom: 20px;
 	margin-top: 30px;
@@ -737,7 +769,7 @@
 	color: #ffb000;
 }
 .list_tab {
-	width: 100%;
+	width: 99%;
 	height: 35px;
 	line-height: 35px;
 	background: url(zhly_67.png) repeat;
@@ -757,7 +789,7 @@
 	background: #0297c6;
 	border-radius: 5px;
 }
-/*森林资源管理*/
+/*森林资源管理*/
 .sl_ztit {
 	font-size: 24px;
 	color: #02f0ff;
@@ -788,7 +820,7 @@
 .sxt_4 .ylzs h4 span {
 	color: #ed5a02;
 }
-/*车辆管理*/
+/*车辆管理*/
 
 .syjjy_3 .syjjy_div4 .syjjy_img {
 	background: url(zhly_74.png) no-repeat 8px 5px;
@@ -812,7 +844,7 @@
 	position: relative;
 }
 .ss_form label span {
-	width: 20%;
+	width: 24%;
 	text-align: left;
 	margin-right: 1%;
 	color: #02bdef;
@@ -823,7 +855,7 @@
 	line-height: 25px;
 }
 .ss_form label input {
-	width: 76%;
+	width: 71%;
 	text-align: left;
 	padding-left: 1%;
 	border: 1px solid #02bdef;
@@ -843,6 +875,7 @@
 	line-height: 28px;
 	color: #fff;
 	cursor: pointer;
+	width: 73%;
 }
 .p_an a {
 	float: left!important;
@@ -857,7 +890,7 @@
 	margin-top: 6px;
 	font-size: 14px!important;
 }
-/*部门人员*/
+/*部门人员*/
 
 .syjjy_3 .syjjy_div7 .syjjy_img {
 	background: url(zhly_76.png) no-repeat 8px 5px;
@@ -872,7 +905,7 @@
 	color: #ffb000;
 }
 .ss_form label i {
-	width: 10%;
+	width: 9%;
 	display: block;
 	float: left;
 	color: #02bdef;
@@ -881,9 +914,11 @@
 	line-height: 27px;
 }
 .ss_form label input.xcsd {
-	width: 32%;
+	width: 30%;
 }
-/*流程详情*/
+
+
+/*流程详情*/
 .mod18 {
 	width: 900px;
 	position: relative;
@@ -1122,7 +1157,7 @@
 
 /*2021/1/5*/
 .sxt_select{
-	width: 77.5%;
+	width: 73.1%;
 	margin-top:2px;
 	background: #cae5ff;
 	height: 25px;
@@ -1134,7 +1169,7 @@
 }
 
 
-/* new01-08 森林林斑列表*/
+/* new01-08 森林林斑列表*/
 .list_txt_fo {
 	margin-left: 2%;
 	width: 100%;
@@ -1188,26 +1223,29 @@
 .fst_list{
 	margin-top:10px;
 	/*height: 375px;*/
-	overflow-y: scroll;
+	/*overflow-y: scroll;*/
+}
+.zhly_tit{
+	margin-bottom: 15px;
 }
-
 .fst_list .zhly_tit h3 {
 	color: #fff;
 	border-left: 4px solid #1a96ff;
 	padding-left: 10px;
 	margin: 10px 0;
-	font-size: 22px;
+	font-size: 20px;
 }
 .btn_reset{
 	position: absolute;
-	right: 12px;
-	top: 2px;
-	width: 40px;
-	height: 22px;
+	right: 9px;
+	top: 1px;
+	width: 45px;
+	height: 25px;
 	font-size: 12px;
-	border-radius: 5px;
+	border-radius: 3px;
 	border: none;
-
+	background: #4191a7;
+	color: #fff;
 }
 
 
@@ -1242,3 +1280,55 @@
 
 }
 
+.canvas-menu{
+	overflow-y: scroll;
+}
+#scroll{
+	/*overflow-y: scroll;*/
+}
+
+
+#scroll::-webkit-scrollbar {/*滚动条整体样式*/
+	width: 0px;     /*高宽分别对应横竖滚动条的尺寸*/
+	height: 0px;
+}
+#scroll::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
+	width: 0px;     /*高宽分别对应横竖滚动条的尺寸*/
+	height: 0px;
+}
+#scroll::-webkit-scrollbar-track {/*滚动条里面轨道*/
+	width: 0px;     /*高宽分别对应横竖滚动条的尺寸*/
+	height: 0px;
+}
+
+.lwt_div{
+	overflow-y: scroll;height: 600px;
+}
+.lwt_div::-webkit-scrollbar {/*滚动条整体样式*/
+	width: 0px;     /*高宽分别对应横竖滚动条的尺寸*/
+	height: 0px;
+}
+.lwt_div::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
+	width: 0px;     /*高宽分别对应横竖滚动条的尺寸*/
+	height: 0px;
+}
+.lwt_div::-webkit-scrollbar-track {/*滚动条里面轨道*/
+	width: 0px;     /*高宽分别对应横竖滚动条的尺寸*/
+	height: 0px;
+}
+
+.ry_div{
+	overflow-y: scroll;height: 350px;
+}
+.ry_div::-webkit-scrollbar {/*滚动条整体样式*/
+	width: 0px;     /*高宽分别对应横竖滚动条的尺寸*/
+	height: 0px;
+}
+.ry_div::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
+	width: 0px;     /*高宽分别对应横竖滚动条的尺寸*/
+	height: 0px;
+}
+.ry_div::-webkit-scrollbar-track {/*滚动条里面轨道*/
+	width: 0px;     /*高宽分别对应横竖滚动条的尺寸*/
+	height: 0px;
+}

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

@@ -350,7 +350,7 @@
 <!--	iframe嵌套 开始-->
 <div class="zhly_k">
     <span class="zhly_close "><img th:src="@{/visualization/images/zhly_06.png}"/></span>
-    <iframe th:src="@{/visualization/event/getVisualizationFrame}" id="qt_iframe" scrolling="no"></iframe>
+    <iframe th:src="@{/visualization/event/getVisualizationFrame}" id="qt_iframe" scrolling="yes" ></iframe>
 </div>
 <!--	iframe嵌套 结束-->
 <audio id="fireaudio" loop  th:src="@{/audio/firelong.wav}" controls="controls" refs="audio" style="display: none;"/>

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

@@ -8,7 +8,7 @@
     <link rel="stylesheet" th:href="@{/visualization/images/zhly_body.css}">
     <link rel="stylesheet" th:href="@{/visualization/images/zhly_page.css}">
 </head>
-<body>
+<body id="scroll">
 
 <!--  右侧内容 开始-->
 <div class="zhly_tit">
@@ -130,9 +130,9 @@
     <div class="zhly_tit">
         <h3>新事件</h3>
     </div>
-    <ul class="zhly_list1" id="newEvent" th:each="vpl : ${Visualization_Pending_List}">
-        <li th:if="${vpl.EVENT_STATUS eq 'event_status_1' || vpl.EVENT_SIGN eq '0'}">
-            <a th:onclick="flyTo([[${vpl.LATITUDE}]],[[${vpl.LONGITUDE}]])">
+    <ul class="zhly_list1" id="newEvent">
+        <li th:each="vpl : ${Visualization_Pending_List}">
+            <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>
                 <i th:if="${vpl.RESERVEPLAN_TYPE} eq 'reserveplan_type_3'" class="tdao">偷盗偷猎</i>
@@ -152,9 +152,9 @@
     <div class="zhly_tit">
         <h3>处理中</h3>
     </div>
-    <ul class="zhly_list1" th:each="vpl : ${Visualization_Pending_List}">
-        <li th:if="${vpl.EVENT_STATUS eq 'event_status_2' && vpl.EVENT_SIGN eq '1'}">
-            <a th:onclick="flyTo([[${vpl.LATITUDE}]],[[${vpl.LONGITUDE}]])">
+    <ul class="zhly_list1">
+        <li th:each="vpl : ${Visualization_Pending_List}">
+            <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>
@@ -171,9 +171,9 @@
     <div class="zhly_tit">
         <h3>已办结</h3>
     </div>
-    <ul class="zhly_list1" th:each="vpl : ${Visualization_Pending_List}">
-        <li th:if="${vpl.EVENT_STATUS} eq 'event_status_4'">
-            <a th:onclick="flyTo([[${vpl.LATITUDE}]],[[${vpl.LONGITUDE}]])">
+    <ul class="zhly_list1">
+        <li th:each="vpl : ${Visualization_Pending_List}">
+            <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>
                 <i th:if="${vpl.RESERVEPLAN_TYPE} eq 'reserveplan_type_3'" class="tdao">偷盗偷猎</i>
@@ -189,6 +189,9 @@
     </ul>
 </div>
 <!--  右侧内容  结束-->
+
+
+
 </body>
 
 <!-- 全局js -->

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

@@ -30,7 +30,7 @@
         }
     </script>
 </head>
-<body>
+<body id="scroll">
 <!--  右侧内容 开始-->
 <div class="zhly_tit">
     <h3>监控点（热感云台）信息</h3>
@@ -67,7 +67,7 @@
     </label>
 </form>
 <!--		搜索 结束-->
-<div style="overflow-y: scroll;height: 600px;">
+<div  class="lwt_div">
     <ul class="zhly_list2">
         <li th:each="vtl : ${Visualization_Camera_List}" th:onclick="flyTo([[${vtl.LATITUDE}]],[[${vtl.LONGITUDE}]])">
             <a><i>瞭望塔</i>[[${vtl.NAME}]]</a>

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

@@ -9,7 +9,7 @@
     <link rel="stylesheet" th:href="@{/visualization/images/zhly_page.css}">
     <link rel="stylesheet" th:href="@{/visualization/images/inputSelector.css}">
 </head>
-<body  >
+<body  id="scroll" >
 <!--  右侧内容 开始-->
 <div class="zhly_tit">
     <h3>部门人员</h3>
@@ -61,7 +61,7 @@
     </label>
 </form>
 <!--		搜索 结束-->
-<div style="overflow-y: scroll; height: 390px;">
+<div  class="ry_div">
     <ul class="zhly_list3">
         <li th:each="user : ${visualization_users}" >
             <div class="list_xl clearfix">
@@ -76,7 +76,7 @@
                         <i th:if="${user.OLSTATUS} eq '1'">在线</i>
                     </p>
                     <p><b>创建时间：</b><i>[[${user.CREATE_TIME}]]</i></p>
-                    <p><button th:onclick="livestream([[${user.USER_ID}]])">现场实时画面</button></p>
+                    <h5><button th:onclick="livestream([[${user.USER_ID}]])">现场实时画面</button></h5>
                 </div>
             </div>
         </li>