Sfoglia il codice sorgente

首页查看视频

yf_zd 5 anni fa
parent
commit
d44e91c80d

+ 9 - 2
templates/backstageNet/jk/equipmanage_jk.html

@@ -480,6 +480,7 @@
             </div>
             </div>
         </div>
         </div>
     </div>
     </div>
+    <input type="text" name="" id="currid" value="{{equip_id|default:''}}">
 
 
 
 
     <script src="{% static '/lib/js/jquery-2.1.4.min.js'%}"></script>
     <script src="{% static '/lib/js/jquery-2.1.4.min.js'%}"></script>
@@ -870,7 +871,9 @@
                         // StartPlay(data);
                         // StartPlay(data);
                         setHtml(data.ids);
                         setHtml(data.ids);
                         $("#dataFillDiv >li").removeClass("select-c");
                         $("#dataFillDiv >li").removeClass("select-c");
-                        $("#dataFillDiv >li").eq(0).addClass("select-c");
+                        if(!$('#currid').val()){
+                            $("#dataFillDiv >li").eq(0).addClass("select-c");
+                        }
                         // getVideoResource(data.ids[0].equip_id,data.ids[0].equip_name);
                         // getVideoResource(data.ids[0].equip_id,data.ids[0].equip_name);
                         menuTotalPage = Math.ceil(data.nums / 10);
                         menuTotalPage = Math.ceil(data.nums / 10);
                         if (menuTotalPage > 1) {
                         if (menuTotalPage > 1) {
@@ -977,7 +980,11 @@
                     html += '<li data-id="'+data[i].equip_id+'" data-name = "'+data[i].equip_name+'">'+equip_name+'</li>';
                     html += '<li data-id="'+data[i].equip_id+'" data-name = "'+data[i].equip_name+'">'+equip_name+'</li>';
                     if (i == data.length - 1) {
                     if (i == data.length - 1) {
                         $('#dataFillDiv').html(html);
                         $('#dataFillDiv').html(html);
-                        getVideoResource(data[0].equip_id,data[0].equip_name)
+                        if($('#currid').val()){
+                            getVideoResource($('#currid').val(),'')
+                        }else{
+                            getVideoResource(data[0].equip_id,data[0].equip_name)
+                        }
                     }
                     }
                 }
                 }
             } else {
             } else {

+ 4 - 4
templates/backstageNet/map/map.html

@@ -174,7 +174,7 @@
         var data = {
         var data = {
             "Status": true,
             "Status": true,
             "list": [{
             "list": [{
-                "id": "1_658",
+                "id": "D08652664",
                 "markType": 6,
                 "markType": 6,
                 "title": "监控",
                 "title": "监控",
                 "theName": "监控",
                 "theName": "监控",
@@ -230,7 +230,7 @@
                     if (markType == "6") {   //监控
                     if (markType == "6") {   //监控
                         var DeviceSerial = markObj.DeviceSerial;
                         var DeviceSerial = markObj.DeviceSerial;
                         var CameraNo = markObj.CameraNo;
                         var CameraNo = markObj.CameraNo;
-                        marker = createCameraMarker(lng, lat, icon, title, DeviceSerial, CameraNo);
+                        marker = createCameraMarker(lng, lat, icon, title, id, CameraNo);
                     }
                     }
                     else //气象站
                     else //气象站
                         marker = createMarker(lng, lat, icon, title, content);
                         marker = createMarker(lng, lat, icon, title, content);
@@ -291,7 +291,7 @@
         });
         });
         return markerx;
         return markerx;
     }
     }
-    function createCameraMarker(lng, lat, icon, title, DeviceSerial, CameraNo) {
+    function createCameraMarker(lng, lat, icon, title, id, CameraNo) {
 
 
         var markerx = new BMap.Marker(new BMap.Point(lng, lat), { icon: icon });
         var markerx = new BMap.Marker(new BMap.Point(lng, lat), { icon: icon });
         markerx.addEventListener("click", function (e) {
         markerx.addEventListener("click", function (e) {
@@ -300,7 +300,7 @@
                 layer.open({
                 layer.open({
                     type: 2,
                     type: 2,
                     area: ['1200px', '600px'],
                     area: ['1200px', '600px'],
-                    content: 'jkview' //这里content是一个URL,如果你不想让iframe出现滚动条,你还可以content: ['http://sentsin.com', 'no']
+                    content: 'jkview?equip_id='+id //这里content是一个URL,如果你不想让iframe出现滚动条,你还可以content: ['http://sentsin.com', 'no']
                 });
                 });
             })
             })
         });
         });