1

js/main_2020_show.js

@@ -73,6 +73,9 @@ var getAjax = function(url, data, success, errorString, method){
       url: url,
         success: (data)=> {
             success(data)
+            if(data.code != 0){
+                alert(errorString)
+            }
             $(".waiting").removeClass('showloading')
         },
         error:(e)=>{ 
@@ -15802,7 +15805,7 @@ window.Modernizr = function(n, e, t) {
                                         }
                                     }
                                     , "获取视频地址失败")
-
+                                    var calendar;
                                     var getCalendar = function(year,month) {//回放
                                        
                                         if (month.toString().length == 1) {
@@ -15820,9 +15823,15 @@ window.Modernizr = function(n, e, t) {
                                                 if (data2.code == 0) { // [{date: "1", status: "2"}, {date: "2", status: "2"},
                                                     console.log(data2.data) 
                                                     var hasMonitorDays = data2.data.filter(e=>e.status == '1');
-                                                    hasMonitorDays = hasMonitorDays.map(e=>{return {startDate:year + '-' + month + '-' + e.date, id:e.date}})//有监控的日期 
+                                                    hasMonitorDays = hasMonitorDays.map(e=>{
+                                                        var day = e.date
+                                                        if (day.toString().length == 1) {
+                                                            day = "0" + day;
+                                                        }
+                                                        return {startDate:year + '-' + month + '-' + day, id:day}
+                                                    })//有监控的日期 
                                                     
-                                                    loadCalendar({
+                                                    calendar = loadCalendar({
                                                         data: hasMonitorDays,
                                                         /* [{
                                                             'startDate': "2021-5-18",//有监控的日期 
@@ -15830,20 +15839,17 @@ window.Modernizr = function(n, e, t) {
                                                         }], */ 
                                                         cellCb: (item)=>{//点击日期
                                                             console.log(item);
-                                                            if (item) { 
-                                                                var day = item.startDate
-                                                                if (day.toString().length == 1) {
-                                                                    day = "0" + day;
-                                                                }
+                                                            if (item) {  
                                                                 getAjax(`/api/device/camera/queryVideoList`, 
                                                                     {
                                                                         "channelId": hardware.code,
-                                                                        "time": year + '-' + month +  '-' + day,  
+                                                                        "time": item.startDate,
                                                                         "type": "day"
                                                                     }, 
                                                                     (data3)=>{
+                                                                        console.log(data3) 
                                                                         if(data3.code == 0){
-                                                                            console.log(data3.data) 
+                                                                            
                                                                             /* address: null
                                                                             creationTime: null
                                                                             deviceId: null
@@ -15857,21 +15863,25 @@ window.Modernizr = function(n, e, t) {
                                                                             sumNum: null
                                                                             type: null */
                                                                             var timeList = data3.data;
-                                                                            
-                                                                            
-                                                                            /* channelId: "34020000001320010059"
-                                                                            endTime: "2021-05-13 13:00:01"
-                                                                            startTime: "2021-05-13 12:00:01" */
-                                                                            
-                                                                            getAjax(`/api/device/camera/playBack`, (data4)=>{
-                                                                                if (data4.code == 0) {
-                                                                                    loadMonitor({
-                                                                                        id: "monitor",
-                                                                                        url: data4.result.external.hls //'http://14.215.216.123:18080/rtp/00A153DF/hls.m3u8'
-                                                                                    })
-                                                                                }
+                                                                            if(timeList){ 
+                                                                                /* channelId: "34020000001320010059"
+                                                                                endTime: "2021-05-13 13:00:01"
+                                                                                startTime: "2021-05-13 12:00:01" */
                                                                                 
-                                                                            }, "获取视频地址失败")
+                                                                                getAjax(`/api/device/camera/playBack`, {
+                                                                                    "channelId": hardware.code,
+                                                                                    "endTime": "2021-05-13 13:00:01",
+                                                                                    "startTime": "2021-05-13 12:00:01"
+                                                                                },(data4)=>{
+                                                                                    if (data4.code == 0) {
+                                                                                        loadMonitor({
+                                                                                            id: "monitor",
+                                                                                            url: data4.result.external.hls //'http://14.215.216.123:18080/rtp/00A153DF/hls.m3u8'
+                                                                                        })
+                                                                                    }
+                                                                                    
+                                                                                }, "获取视频地址失败")
+                                                                            }
                                                                         }
                                                                             
                                                                             
@@ -15885,8 +15895,10 @@ window.Modernizr = function(n, e, t) {
                                                         }
                                                         ,
                                                         monthCb: (item)=>{
-                                                            console.log(item);
-                                                            getCalendar(item)
+                                                            console.log(item); 
+                                                            console.log(calendar.options.currentDate)
+                                                            //getCalendar(item)
+                                                            
 
                                                         }
                                                       

js/showHardware.js

@@ -414,7 +414,7 @@ $(function () {
   }
 
   
-  let ret = window.loadCalendar({
+  /* let ret = window.loadCalendar({
     data:[{
         'startDate': "2021-05-18",//有监控的日期
         id:'传对应的id'
@@ -429,9 +429,9 @@ $(function () {
     },
     monthCb: (nextMonth)=> {
       console.log(nextMonth);
-    }
+    } 
  
-  }) 
+  }) */