1

js/main_2020_show.js

@@ -38,7 +38,7 @@ $.ajax({//设备类型列表
     },
     dataType: "json",
     contentType: "application/json",
-    url: `/api/device/getType`,
+    url: g_Prefix+`/api/device/getType`,
     success: function (data) {
         if (data.code === 0) { 
             hardwareTypes = data.data 
@@ -15457,9 +15457,9 @@ window.Modernizr = function(n, e, t) {
                 
             } 
             if(d.infoAttribute.hardware){
-                var code = d.infoAttribute.hardware.code;
-                if(code!= void 0){
-                    window.hardwareHotList[code] = this//硬件列表
+                var id = d.infoAttribute.hardware.code;
+                if(id!= void 0){
+                    window.hardwareHotList[id] = this//硬件列表
                 }
             }
             
@@ -15568,7 +15568,7 @@ window.Modernizr = function(n, e, t) {
                   success: (data)=> {
                     console.log(data)  
                     if (data.code === 0) {
-
+                        var info = data.data.find(device=>device.id==hardware.id)
                         var devType = hardwareTypes.find(type=>type.id == hardware.devTypeId).name
                         $("#hotPannel>div").addClass("hide")
                         if(devType == "灯控"){
@@ -15580,6 +15580,19 @@ window.Modernizr = function(n, e, t) {
                                 id:"temperature",//dom Id
                                 val:70 //度数    
                             })
+                        }else if(devType == "摄像头"){
+                            $("#hotPannel>.m-con").removeClass("hide") 
+                            loadMonitor({
+                                id:"monitor",
+                                url:'http://14.215.216.123:18080/rtp/00A153DF/hls.m3u8'
+                            }) 
+                        }else if(devType == "空调"){
+                            $("#hotPannel>.ac-con").removeClass("hide") 
+                            loadAirConditioner({
+                                id:"air-conditioner",
+                                val:50,
+                                type:'冷风'
+                            }) 
                         }
                         $("#hotPannel>div").css("display","block");
                         $("#hotPannel .title").text(hardware.name); 
@@ -15594,9 +15607,9 @@ window.Modernizr = function(n, e, t) {
                             } 
                         } 
                     } else {
-                       
+                        alert('获取数据失败')
                     }
-                  },
+                  } 
                 });
 
                

js/showHardware.js

@@ -62,8 +62,8 @@ $(function () {
       e.currentTarget.parentElement.parentElement
     );
     console.log(row);
-    window.hardwareHotList[row.code] &&
-      window.hardwareHotList[row.code].showPannel({ focus: true });
+    window.hardwareHotList[row.id] &&
+      window.hardwareHotList[row.id].showPannel({ focus: true });
   });
 
   $(".hard-header").click(function () {