Merge remote-tracking branch 'origin/master'

mybusiness/src/main/resources/templates/dahua/css/demo.css

@@ -437,4 +437,4 @@ fieldset
 .list_ul::-webkit-scrollbar{
     width: 0px;
     height: 0px;
-}
+}

mybusiness/src/main/resources/templates/dahua/css/jquery-ui.css

@@ -333,7 +333,7 @@ button.ui-button::-moz-focus-inner {
 }
 .ui-controlgroup > .ui-controlgroup-item:focus,
 .ui-controlgroup > .ui-controlgroup-item.ui-visual-focus {
-	z-index: 9999;
+	z-index: 9998;
 }
 .ui-controlgroup-vertical > .ui-controlgroup-item {
 	display: block;
@@ -874,7 +874,7 @@ button.ui-button::-moz-focus-inner {
 .ui-tooltip {
 	padding: 8px;
 	position: absolute;
-	z-index: 9999;
+	z-index: 9998;
 	max-width: 300px;
 }
 body .ui-tooltip {

mybusiness/src/main/resources/templates/dahua/demo-dsd.html

@@ -197,6 +197,15 @@
  <div id="opinfo" class="opinfo">
 	</div>
 -->
+
+
+<div class="hn_tk">
+    <!--<span class="hn_close close_x"></span>-->
+    <h2>请您先关闭自动轮巡功能,随后再调取固定摄像头画面。</h2>
+    <span class="hn_close">知道了</span>
+</div>
+
+
 <script src="module/foundation.js"></script>
 <script src="module/WebVideoCtrl.js"></script>
 <script src="module/modifyUI.js"></script>
@@ -207,9 +216,10 @@
     function my_clickLogin(hikIp,hikPort,hikUsername,hikPassword){
         console.log("my_chick:",isLunBo)
         if(isLunBo == true){
-            alert("请您先关闭自动轮训功能,随后再调取固定摄像头画面.");
+            alert("请您先关闭自动轮巡功能,随后再调取固定摄像头画面。");
         }else{
-            clickLogin(hikIp,hikPort,hikUsername,hikPassword)
+            clickLogin(hikIp,hikPort,hikUsername,hikPassword);
+            $("#divPlugin").hide();
         }
 
     }
@@ -285,7 +295,6 @@
 
 
 
-
         GetRequest();
 
 

mybusiness/src/main/resources/templates/dahua/images/ja_ja.css

@@ -1,355 +1,396 @@
 @charset "utf-8";
 /* CSS Document */
 
-	body{
-			padding:0px!important;
-			margin: 0px!important;
-			background: #040522;
-		}
-		.con_left{
-			width:76%;
-			margin-right: 2%;
-			float:left;
-			padding: 1%;
-		}
-		.con_right{
-			width:18%;
-			float: right;
-			padding: 1%;
-		}
-		.con_right input[type="button"]{
-    outline: 0px;
-    color: #ffffff;
-    border: 0px;
-    margin: 2px auto;
-    cursor: pointer;
-    width: 100%;
-    height: 100%;
-		}
-		.ja_table1{
-			width: 100%;
-			margin-bottom: 20px;
-		}
-		.ja_table1 td.tt{
-			font-size: 16px;
-			padding-right: 5px;
-			color: #12abe3;
-			width: 70px;
-			height: 30px;
-			line-height: 30px;
-		}
-		.ja_table1 td select {
-    color: #22adf7;
-    width: 98%;
-    padding: 1%;
-    border: 1px solid #21acf4;
-    background: none;
-    font-size: 12px;
-    border-radius: 4px;
-    outline: 0px;
-    height: 28px;
-    line-height: 28px;
-}
-		.ja_table1 td select option{
-    color: #22adf7;
+body{
+	padding:0px!important;
+	margin: 0px!important;
+	background: #040522;
+}
+.con_left{
+	width:76%;
+	margin-right: 2%;
+	float:left;
+	padding: 1%;
+}
+.con_right{
+	width:18%;
+	float: right;
+	padding: 1%;
+}
+.con_right input[type="button"]{
+	outline: 0px;
+	color: #ffffff;
+	border: 0px;
+	margin: 2px auto;
+	cursor: pointer;
+	width: 100%;
+	height: 100%;
+}
+.ja_table1{
+	width: 100%;
+	margin-bottom: 20px;
+}
+.ja_table1 td.tt{
+	font-size: 16px;
+	padding-right: 5px;
+	color: #12abe3;
+	width: 70px;
+	height: 30px;
+	line-height: 30px;
+}
+.ja_table1 td select {
+	color: #22adf7;
+	width: 98%;
+	padding: 1%;
+	border: 1px solid #21acf4;
+	background: none;
+	font-size: 12px;
+	border-radius: 4px;
+	outline: 0px;
+	height: 28px;
+	line-height: 28px;
+}
+.ja_table1 td select option{
+	color: #22adf7;
 }
 
-		.ja_table2{
-    background:url(ja_bg.png) no-repeat center;
-    background-size: 100% 100%;
-    width: 255px!important;
-    height: 244px!important;
-    margin: 14px auto;
-    float: none;
+.ja_table2{
+	background:url(ja_bg.png) no-repeat center;
+	background-size: 100% 100%;
+	width: 255px!important;
+	height: 244px!important;
+	margin: 14px auto;
+	float: none;
 }
 .ja_table2 div{
-    float:left;
-    position:relative;
-    height: 81px;
-    width: 82px;
+	float:left;
+	position:relative;
+	height: 81px;
+	width: 82px;
 }
 .ja_table2 div span{
-    position: absolute;
+	position: absolute;
 }
 .ja_table2 div span img{
-    width: 33px;
+	width: 33px;
 }
 .ja_table2 div:hover span img{
-    /*	box-shadow: 3px 3px 3px #eee;*/
+	/*	box-shadow: 3px 3px 3px #eee;*/
 }
 .ja_table2 input[type="button"]{
-    text-indent: -999em;
-    background: none!important;
-    position: absolute;
-    width: 100%!important;
+	text-indent: -999em;
+	background: none!important;
+	position: absolute;
+	width: 100%!important;
 }
 .ja_table2 input[type="button"]:hover{
-    background: none!important;
-    box-shadow: 0px 0px 0px;
+	background: none!important;
+	box-shadow: 0px 0px 0px;
 }
 .ja_table2 .center{
-    text-indent: 1px!important;
-    line-height: 68px;
-    padding-left: 5px;
+	text-indent: 1px!important;
+	line-height: 68px;
+	padding-left: 5px;
 }
 .zs_btn span{
-    top: 48px;
-    left: 51px;
+	top: 48px;
+	left: 51px;
 }
 .zs_btn span img{
-    transform: rotate(-45deg);
+	transform: rotate(-45deg);
 }
 .s_btn span {
-    top: 28px;
-    left: 28px;
+	top: 28px;
+	left: 28px;
 }
 .s_btn span img{
-    transform: rotate(0deg);
+	transform: rotate(0deg);
 }
 .ys_btn span{
-    top: 48px;
-    right: 45px;
+	top: 48px;
+	right: 45px;
 }
 .ys_btn span img{
-    transform: rotate(47deg);
+	transform: rotate(47deg);
 }
 .z_btn span{
-   top: 23px;
-   left: 25px;
+	top: 23px;
+	left: 25px;
 }
 .z_btn span img{
-    transform: rotate(-90deg);
+	transform: rotate(-90deg);
 }
 .y_btn span{
-    top: 20px;
-    right: 18px;
+	top: 20px;
+	right: 18px;
 }
 .y_btn span img{
-    transform: rotate(90deg);
+	transform: rotate(90deg);
 }
 .zx_btn span{
-    top: 0px;
-    left: 49px;
+	top: 0px;
+	left: 49px;
 }
 .zx_btn span img{
-    transform: rotate(-140deg);
+	transform: rotate(-140deg);
 }
 .x_btn span{
-   top: 23px;
-   left: 29px;
+	top: 23px;
+	left: 29px;
 }
 .x_btn span img{
-    transform: rotate(180deg);
+	transform: rotate(180deg);
 }
 .yx_btn span{
-    top: -5px;
-    right: 45px;
+	top: -5px;
+	right: 45px;
 }
 .yx_btn span img{
-    transform: rotate(252deg);
-}
-		.zsc_btn{
-			background: url(ja_con.png) no-repeat 23px 19px;
-			background-size: 45px;
-}
-		.zsc_btn:hover{
-			background: url(ja_con2.png) no-repeat 23px 19px;
-			background-size: 45px;
-		}
-		.ja_table3{
-			width:90%;
-			margin: 20px auto;
+	transform: rotate(252deg);
+}
+.zsc_btn{
+	background: url(ja_con.png) no-repeat 23px 19px;
+	background-size: 45px;
+}
+.zsc_btn:hover{
+	background: url(ja_con2.png) no-repeat 23px 19px;
+	background-size: 45px;
+}
+.ja_table3{
+	width:90%;
+	margin: 20px auto;
 
 }
-		.ja_table3 td{
-    position: relative;
-    width: 70px;
-    text-align: center;
-    height: 60px;
-    line-height: 1px;
-    font-size: 16px;
-    color: #129fea;
-			font-weight: 900;
+.ja_table3 td{
+	position: relative;
+	width: 70px;
+	text-align: center;
+	height: 60px;
+	line-height: 1px;
+	font-size: 16px;
+	color: #129fea;
+	font-weight: 900;
 }
 .ja_table3 td span img{
-    width:34px;
+	width:34px;
 }
 .ja_table3 input[type="button"]{
-    text-indent: -999em;
-    background: none!important;
-    position: absolute;
-    width:100%;
-    left: 0px;
-    top:0px;
-}
-		.ja_zt{
-			margin-bottom:20px;
-		}
-		.ja_zt input{
-			width:100%;
-			background: repeating-linear-gradient(#e4e8f3,#dcdee3,#acb0b9);
-    height: 35px!important;
-    line-height: 30px;
-    border-radius: 5px;
-    color: #129fea!important;
-    font-size: 16px;
-    font-weight: 900;
-    letter-spacing: 4px;
-    border: 2px solid #a8d8f9!important;
-		}
-		.ja_zt input:hover{
-			background: repeating-linear-gradient(#bbbdc3,#c2c9da,#c8d1e4);
-    border: 2px solid #91cff9!important;
-		}
-		.ja_div,.ja_table1,.ja_zt{
-			width:80%;
-			margin: 20px auto 0px auto;
+	text-indent: -999em;
+	background: none!important;
+	position: absolute;
+	width:100%;
+	left: 0px;
+	top:0px;
+}
+.ja_zt{
+	margin-bottom:20px;
+}
+.ja_zt input{
+	width:100%;
+	background: repeating-linear-gradient(#e4e8f3,#dcdee3,#acb0b9);
+	height: 35px!important;
+	line-height: 30px;
+	border-radius: 5px;
+	color: #129fea!important;
+	font-size: 16px;
+	font-weight: 900;
+	letter-spacing: 4px;
+	border: 2px solid #a8d8f9!important;
+}
+.ja_zt input:hover{
+	background: repeating-linear-gradient(#bbbdc3,#c2c9da,#c8d1e4);
+	border: 2px solid #91cff9!important;
+}
+.ja_div,.ja_table1,.ja_zt{
+	width:80%;
+	margin: 20px auto 0px auto;
 
 
-		}
-		.ja_div p{
-			font-size: 16px;
-    color: #3aa4f1;
-    margin: 20px 0px 10px 0px;
+}
+.ja_div p{
+	font-size: 16px;
+	color: #3aa4f1;
+	margin: 20px 0px 10px 0px;
 
-		}
-		.ja_div .ja_inp{
-			width:100%;
-			height: 30px;
-			position: relative;
-		}
-		.ja_div .ja_inp .ja_txt{
-			width:90%;
-			padding: 1%;
-    border: 1px solid #bbbec4;
-    background: none;
-    font-size: 12px;
-    border-radius: 4px;
-    outline: 0px;
-    height: 28px;
-    line-height: 28px;
-			position: absolute;
-			top:0px;
-			left: 0px;
-		}
-		.ja_div .ja_inp .ja_btn{
-			width: 60px;
-    position: absolute;
-    top: -2px;
-    right: 0px;
-    height: 36px;
-    z-index: 9;
-    background: repeating-linear-gradient(#bbbdc3,#c2c9da,#c8d1e4);
-    color: #129fe8;
-    font-weight: 900;
-    letter-spacing: 2px;
-		}
+}
+.ja_div .ja_inp{
+	width:100%;
+	height: 30px;
+	position: relative;
+}
+.ja_div .ja_inp .ja_txt{
+	width:90%;
+	padding: 1%;
+	border: 1px solid #bbbec4;
+	background: none;
+	font-size: 12px;
+	border-radius: 4px;
+	outline: 0px;
+	height: 28px;
+	line-height: 28px;
+	position: absolute;
+	top:0px;
+	left: 0px;
+}
+.ja_div .ja_inp .ja_btn{
+	width: 60px;
+	position: absolute;
+	top: -2px;
+	right: 0px;
+	height: 36px;
+	z-index: 9;
+	background: repeating-linear-gradient(#bbbdc3,#c2c9da,#c8d1e4);
+	color: #129fe8;
+	font-weight: 900;
+	letter-spacing: 2px;
+}
 
-		.plugin {
-    width: 100%;
-    height: 600px;
-}
-		.opinfo{
-			background: #e2e2e2;
-    padding: 5px;
-    line-height: 20px;
-    color: #333;
-			width: 98%;
-			margin: 0px auto;
-			height: 100px;
-			overflow-y: auto;
-		}
-		.opinfo::-webkit-scrollbar{display:none}
-		.con_list{
-			float:left;
-			width: 10%;
-			background:url(ja_b.png) no-repeat center;
-			padding: 0px 1%;
-			background-size: 100% 100%;
-		}
-		.con_list h1{
-			text-align: center;
-			font-size: 18px;
-			height: 45px;
-			line-height: 45px;
-			color: #69ccef;
-			padding-top: 20px;
-		}
-		.con_list h1 i{
-			margin:0px 5px;
-		}
-		.con_tent{
-			float:left;
-			width: 64%;
-		}
-		.con_right2{
-			width:18%;
-			padding: 0px 1%;
-			background: #0000001a;
-		}
-		.list_ul{
-			margin: 20px 0px;
-			padding-left: 0px;
-			overflow-y: scroll;
-		}
+.plugin {
+	width: 100%;
+	height: 600px;
+}
+.opinfo{
+	background: #e2e2e2;
+	padding: 5px;
+	line-height: 20px;
+	color: #333;
+	width: 98%;
+	margin: 0px auto;
+	height: 100px;
+	overflow-y: auto;
+}
+.opinfo::-webkit-scrollbar{display:none}
+.con_list{
+	float:left;
+	width: 10%;
+	background:url(ja_b.png) no-repeat center;
+	padding: 0px 1%;
+	background-size: 100% 100%;
+}
+.con_list h1{
+	text-align: center;
+	font-size: 18px;
+	height: 45px;
+	line-height: 45px;
+	color: #69ccef;
+	padding-top: 20px;
+}
+.con_list h1 i{
+	margin:0px 5px;
+}
+.con_tent{
+	float:left;
+	width: 64%;
+}
+.con_right2{
+	width:18%;
+	padding: 0px 1%;
+	background: #0000001a;
+}
+.list_ul{
+	margin: 20px 0px;
+	padding-left: 0px;
+	overflow-y: scroll;
+}
 
 .list_ul::-webkit-scrollbar{
 	width: 0px;
 	height: 0px;
 }
-		.list_ul li{
-			list-style: none;
-    background: url(webcam_128px_28911_easyicon.net.png) no-repeat 0px 1px;
-    padding-left: 40px;
-    background-size: 30px 30px;
-    margin-bottom: 15px;
-    min-height: 35px;
-    display: table;
-    width: 72%;
-    padding-top: 1%;
-    padding-bottom: 3%;
-    padding-right: 1%;
-    border-bottom: 1px solid #333;
-    /* background: #000; */
-    box-shadow: 1px 5px 5px #01232f;
-		}
-		.list_ul li a{
-			cursor: pointer;
-			font-size: 15px;
-			color: #fff;
-			display: block;
-		}
-		.list_ul li a:hover{
-			color: #1eb8f9;
-		}
-		.top_ul{
-			height: 100px;
-			margin: 20px 0px;
-			padding: 0px;
+.list_ul li{
+	list-style: none;
+	background: url(webcam_128px_28911_easyicon.net.png) no-repeat 0px 1px;
+	padding-left: 40px;
+	background-size: 30px 30px;
+	margin-bottom: 15px;
+	min-height: 35px;
+	display: table;
+	width: 72%;
+	padding-top: 1%;
+	padding-bottom: 3%;
+	padding-right: 1%;
+	border-bottom: 1px solid #333;
+	/* background: #000; */
+	box-shadow: 1px 5px 5px #01232f;
+}
+.list_ul li a{
+	cursor: pointer;
+	font-size: 15px;
+	color: #fff;
+	display: block;
+}
+.list_ul li a:hover{
+	color: #1eb8f9;
+}
+.top_ul{
+	height: 100px;
+	margin: 20px 0px;
+	padding: 0px;
+
+}
+.top_ul li{
+	float:left;
+	width:100%;
+	text-align: center;
+	color: #fff;
+	list-style: none;
+	margin: 2%;
+}
+.top_ul li a{
+	display: block;
+	width: 100%;
+	border: 1px solid #4b4c4e;
+	height: 35px;
+	line-height: 35px;
+	font-size: 16px;
+	border-radius: 4px;
+	text-shadow: 1px 2px 4px #73cee4;
+	cursor: pointer;
+}
+.top_ul li.on a{
+	background: #05A7DF;
+}
+.top_ul li a:hover{
+	background: #05A7DF;
+}
+
+
+.hn_tk{
+	width: 558px;
+	height: 200px;
+	position: fixed;
+	top:50%;
+	left: 50%;
+	margin-left: -300px;
+	border-radius: 3px;
+	margin-top:-150px;
+	z-index: auto;
+	background: #041a3d;
+	border: 1px solid #023c59;
+	box-shadow: 0px 0px 4px #0a5bac;
+}
+.hn_tk h2{
+	font-size: 16px;
+	color: #fff;
+	text-align: center;
+	height: 140px;
+	line-height: 150px;
+	letter-spacing: 2px;
+}
+.hn_close{
+	width: 110px;
+	height: 35px;
+	line-height: 35px;
+	display: block;
+	background: #0e90d2;
+	color: #fff;
+	font-size: 16px;
+	text-align: center;
+	cursor: pointer;
+	margin: 0px auto;
+	border-radius: 3px;
+}
+.hn_close:hover{
+	background: #3275d2;
 
-		}
-		.top_ul li{
-			float:left;
-			width:100%;
-			text-align: center;
-			color: #fff;
-			list-style: none;
-			margin: 2%;
-		}
-		.top_ul li a{
-			display: block;
-			width: 100%;
-			border: 1px solid #4b4c4e;
-			height: 35px;
-			line-height: 35px;
-			font-size: 16px;
-			border-radius: 4px;
-			text-shadow: 1px 2px 4px #73cee4;
-			cursor: pointer;
-		}
-		.top_ul li.on a{
-			background: #05A7DF;
-		}
-		.top_ul li a:hover{
-			background: #05A7DF;
-		}
+}