Merge remote-tracking branch 'origin/master'

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

@@ -42,8 +42,6 @@
             };
             jsonArray.push(json);
         }
-    </script>
-    <script>
         var loginName = "[[${loginName}]]";
         $(function(){
             openSocket(loginName);

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

@@ -427,7 +427,7 @@
         markName.on("click", function(){
             try{
                 $.ajax({
-                    url : 'http://localhost:8899/camera_id='+option.hik_ip+","+option.hik_port+","+option.hik_username+","+option.hik_password+","+option.hik_deviceport,
+                    url : 'http://localhost:9090/business/manager/hikcameracontroller/demo_window_simple_preview_wall_special_user?ID='+option.hik_camera_id,
                     error :function () {
 
                     }