xzw 4 роки тому
батько
коміт
23e82c0a50
3 змінених файлів з 16 додано та 3 видалено
  1. 3 2
      js/main_2020_edit.js
  2. 7 0
      js/main_2020_show.js
  3. 6 1
      js/myShow.js

+ 3 - 2
js/main_2020_edit.js

@@ -6,7 +6,7 @@ hardwareHotList = {}
 
 $("#hotPannel .close").on('click',()=>{
     $("#hotPannel>div").css("display","");
-    window.hotNeedUpdatePanel = null;
+    window.hotNeedUpdatePannel = null;
      
 })
 
@@ -14948,11 +14948,12 @@ function o(a, s, l) {
                 $("#hotPannel>div").css("display","block");
                 $("#hotPannel .title").text(hardware.name);
                 
-                this.updatePannel()
+                this.updatePannel() 
                 window.hotNeedUpdatePannel = this
                 return true
             }else{
                 $("#hotPannel>div").css("display","");
+                window.hotNeedUpdatePannel = null
             }
         }
         n.prototype.updatePannel = function(){

+ 7 - 0
js/main_2020_show.js

@@ -15537,6 +15537,13 @@ window.Modernizr = function(n, e, t) {
             var hardware = this.infoAttribute.hardware
             console.log(window.hotNeedUpdatePannel)
             if(hardware && hardware.id!=void 0){
+                if(hardware.devTypeName == "温湿度"){
+                    
+                }else/*  if(hardware.devTypeName == "温湿度") */{
+                    
+                }   
+                
+                
                 $("#hotPannel>div").css("display","block");
                 $("#hotPannel .title").text(hardware.name); 
                 this.updatePannel()

+ 6 - 1
js/myShow.js

@@ -1,7 +1,12 @@
 var g_ProjectName=window.location.pathname.substring(window.location.pathname.indexOf("/")+1,window.location.pathname.lastIndexOf("/"));
+  
+  
+  
   // var g_Prefix="https://super.4dage.com/";
 // var g_Prefix=window.location.href.substring(0,window.location.href.indexOf("/index.html")+1);
-var g_Prefix=window.location.origin+'/';
+//var g_Prefix=window.location.origin+'/';
+
+var g_Prefix= "http://8.135.106.227:8004/"
 
 var s = window.location.href.split('/');
 s.pop();