Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/scene_wisdom

js/edit.js

@@ -174,7 +174,7 @@ EditTools.prototype.initSaveAll = function() {
                     order: hotLength++//因为热点保存后在hots里的顺序会被修改，所以使用order来记录顺序 
                 }
                 if (hot.visiblePanos)
-                    hots[sid].visiblePanos = hot.visiblePanos
+                    hots[i].visiblePanos = hot.visiblePanos
 
                 if (hot.infoAttribute) {
                     delete hot.infoAttribute.position;

js/main_2020_show.js

@@ -8,10 +8,11 @@ hardwareHotList = {}
 
 //热点  设备控制
 
-$("#hotPannel .close, #hotPannel .iconquxiao").on('click',()=>{//关闭
+$("#hotPannel .close, #hotPannel .iconquxiao").on('click',(e)=>{//关闭
     $("#hotPannel>div").css("display","");
+    loadMonitor({id: "monitor", url:null })
     window.hotNeedUpdatePannel = null;
-     
+    $(".hardware-list .hard-body").css("display",'block')//展开列表
 })
 
 $("#hotPannel input.mui-switch").on('change',(e)=>{//灯
@@ -15684,6 +15685,10 @@ window.Modernizr = function(n, e, t) {
                         getAjax(`/api/device/getStatus/${hardware.code}`, null, (data)=>{
                             console.log(data)
                             if (data.code === 0) {
+                                
+                                $(".hardware-list .hard-body").css("display",'none')//收起列表
+                                
+                                
                                 data = data.data;
                                 var devType = hardwareTypes.find(type=>type.id == hardware.devTypeId).name
                                 $("#hotPannel>div").addClass("hide")
@@ -15715,6 +15720,9 @@ window.Modernizr = function(n, e, t) {
                                         } 
                                     }
                                     , "获取视频地址失败")
+                                    
+                                    window.loadHistoryList()//clear
+                                    
                                     var calendar;
                                     var getCalendar = function(year,month) {//回放
                                        
@@ -15789,7 +15797,7 @@ window.Modernizr = function(n, e, t) {
                                                                  
                                                             }else{//clear
                                                                 window.loadHistoryList()
-                                                                loadMonitor({id: "monitor", url:null })
+                                                                //loadMonitor({id: "monitor", url:null })
                                                             }
                                                         }
                                                         ,
@@ -15979,7 +15987,7 @@ window.Modernizr = function(n, e, t) {
             
             var hasHardware;
             if(window.MP_PREFETCHED_MODELDATA.flyInOnlyBySwitch){ 
-                hasHardware = this.showPannel();
+                hasHardware = this.showPannel({focus:true});
                 if(player.mode != 'panorama' || !player.currentPano)return; 
             }else{