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

css/hardware.css

@@ -60,14 +60,24 @@
   padding-bottom: 10px;
   text-align: center;
   border-radius: 5px;
+  min-height: 300px;
 }
 
+
+
 .ac-con .ac-body{
   width: 100%;
   height: 100%;
   padding: 0;
 }
 
+.ac-con .ac-switch{
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%,-50%);
+}
+
 #air-conditioner{
   width: 160px;
   height: 146px;

index.html

@@ -125,6 +125,10 @@
                     </div>
                 </div>
             </div>
+            <div class="ac-switch">
+                <div class="ac-title">二楼-大会议室-04-空调</div>
+                <span class="ac-btn">开</span>
+            </div>
         </div>
         <div class="m-con">
             <i class="iconfont iconquxiao"></i>

js/showHardware.js

@@ -268,6 +268,14 @@ $(function () {
     if (ifOn!='unset') {
       $('.ac-close').text(ifOn?'开':'关')
       $('.ac-close').addClass('activeTxt')
+      $('.ac-close').addClass('activeTxt')
+      if (ifOn) {
+          $('.ac-body').show()
+          $('.ac-switch').hide()
+      }else{
+          $('.ac-body').hide()
+          $('.ac-switch').show()
+      }
     }