xzw 4 gadi atpakaļ
vecāks
revīzija
b7043851e2
2 mainītis faili ar 12 papildinājumiem un 2 dzēšanām
  1. 4 2
      js/main_2020_show.js
  2. 8 0
      js/showHardware.js

+ 4 - 2
js/main_2020_show.js

@@ -15802,7 +15802,7 @@ window.Modernizr = function(n, e, t) {
                                                 id: "monitor",
                                                 url: data2.data.external.hls //'http://14.215.216.123:18080/rtp/00A153DF/hls.m3u8'
                                             })
-                                        }
+                                        } 
                                     }
                                     , "获取视频地址失败")
                                     var calendar;
@@ -15876,8 +15876,10 @@ window.Modernizr = function(n, e, t) {
                                                                     
                                                                     }, '获取视频日历day失败', 'POST'
                                                                 )
-                                                                
                                                                  
+                                                            }else{
+                                                                window.loadHistoryList()
+                                                                loadMonitor({id: "monitor", url:null })
                                                             }
                                                         }
                                                         ,

+ 8 - 0
js/showHardware.js

@@ -368,6 +368,12 @@ $(function () {
     let {id,url} = params 
     console.log(id,url);
     var video = document.getElementById(id);
+    if(!params.url){
+        video.src = '';  video.pause();
+        return;
+    }
+    
+    
       if (Hls.isSupported()) {
         var hls = new Hls();
         hls.loadSource(url||'http://14.215.216.123:18080/rtp/00A153DF/hls.m3u8');
@@ -417,6 +423,8 @@ $(function () {
     let {data=[],clickItem=()=>{}} =  params
     if (!data||data.length<=0) {
       return $('.histcon').hide()
+    }else{
+        $('.histcon').show()
     }
     let html = ''