Merge remote-tracking branch 'origin/master'

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

@@ -200,7 +200,6 @@
 
 
 <div class="hn_tk">
-    <!--<span class="hn_close close_x"></span>-->
     <h2>请您先关闭自动轮巡功能,随后再调取固定摄像头画面。</h2>
     <span class="hn_close">知道了</span>
 </div>
@@ -216,11 +215,13 @@
     function my_clickLogin(hikIp,hikPort,hikUsername,hikPassword){
         console.log("my_chick:",isLunBo)
         if(isLunBo == true){
-            alert("请您先关闭自动轮巡功能,随后再调取固定摄像头画面。");
+            // alert("请您先关闭自动轮巡功能,随后再调取固定摄像头画面。");
+            $(".hn_tk").show();
         }
       else{
             clickLogin(hikIp,hikPort,hikUsername,hikPassword);
-            $("#divPlugin").hide();
+            $(".hn_tk").hide();
+
         }
 
     }
@@ -293,7 +294,10 @@
         var con_hei = $(".con_list").height( hei );
         $("#list").height( hei - 115);
 
+    $(".hn_close").on('click', function(){
 
+        $(".hn_tk").hide();
+    })
 
 
         GetRequest();

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

@@ -369,6 +369,7 @@ body{
 	background: #041a3d;
 	border: 1px solid #023c59;
 	box-shadow: 0px 0px 4px #0a5bac;
+	display: none;
 }
 .hn_tk h2{
 	font-size: 15px;