Merge pull request 'pc-master' (#230) from pc-master into portal

Reviewed-on: #230

src/views/page/air-conditioning.vue

@@ -124,40 +124,71 @@
         </el-dropdown>
       </div>
     </div>
-      <div class="text-tips">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;手自动开启几区空调</div>
+       <div class="text-tips">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;手自动开启几区空调</div>
-
+        <div class="flex-view border-none">
-        <div class="flex-view">
+            <div class="input-sel  input-sel-w180">
-            <div class="input-sel input-sel-w180">
         <span></span><span></span>
       </div>
             <div class="input-btn ">
                 <div class="btn btn-w70" @click="changeIndexOpen2(0)" :class="actList2[0] == '1' ? 'blue' : 'off'">
-                    1区
+                    1#
                 </div>
                 <div class="btn btn-w70" @click="changeIndexOpen2(1)" :class="actList2[1] == '1' ? 'blue' : 'off'">
-                    2区
+                    2#
                 </div>
                 <div class="btn btn-w70" @click="changeIndexOpen2(2)" :class="actList2[2] == '1' ? 'blue' : 'off'">
-                    3区
+                    3#
                 </div>
                 <div class="btn btn-w70" @click="changeIndexOpen2(3)" :class="actList2[3] == '1' ? 'blue' : 'off'">
-                    4区
+                    4#
                 </div>
                 <div class="btn btn-w70" @click="changeIndexOpen2(4)" :class="actList2[4] == '1' ? 'blue' : 'off'">
-                    5区
+                    5#
                 </div>
                 <div class="btn btn-w70" @click="changeIndexOpen2(5)" :class="actList2[5] == '1' ? 'blue' : 'off'">
-                    6区
+                    6#
                 </div>
                 <div class="btn btn-w70" @click="changeIndexOpen2(6)" :class="actList2[6] == '1' ? 'blue' : 'off'">
-                    7区
+                    7#
                 </div>
                 <div class="btn btn-w70" @click="changeIndexOpen2(7)" :class="actList2[7] == '1' ? 'blue' : 'off'">
-                    8区
+                    8#
                 </div>
+
             </div>
         </div>
+<div class="flex-view padding-none">
+            <div class="input-sel input-sel-w180">
+        <span></span><span></span>
+      </div>
+            <div class="input-btn ">
+                  <div class="btn btn-w70" @click="changeIndexOpen2(8)" :class="actList2[8] == '1' ? 'blue' : 'off'">
+                   9#
+                </div>
+                  <div class="btn btn-w70" @click="changeIndexOpen2(9)" :class="actList2[9] == '1' ? 'blue' : 'off'">
+                    10#
+                </div>
+                  <div class="btn btn-w70" @click="changeIndexOpen2(10)" :class="actList2[10] == '1' ? 'blue' : 'off'">
+                    11#
+                </div>
+                  <div class="btn btn-w70" @click="changeIndexOpen2(11)" :class="actList2[11] == '1' ? 'blue' : 'off'">
+                    12#
+                </div>
+                  <div class="btn btn-w70" @click="changeIndexOpen2(12)" :class="actList2[12] == '1' ? 'blue' : 'off'">
+                    13#
+                </div>
+                  <div class="btn btn-w70" @click="changeIndexOpen2(13)" :class="actList2[13] == '1' ? 'blue' : 'off'">
+                    14#
+                </div>
+                  <div class="btn btn-w70" @click="changeIndexOpen2(14)" :class="actList2[14] == '1' ? 'blue' : 'off'">
+                    15#
+                </div>
+                <div class="btn btn-w70" @click="changeIndexOpen2(15)" :class="actList2[15] == '1' ? 'blue' : 'off'">
+                    16#
+                </div>
 
+            </div>
+        </div>
     <div class="title-tips-bold"><img src="@/assets/img/title-tips-bold-icon.png" alt="">自动设置</div>
     <div class="flex-view padding-none border-none shrink-none">
       <div class="input-main">
@@ -594,7 +625,7 @@ export default {
             this.actList2 = []
             var num = this.inputData[22063]
 
-            var num1 = this.padString(num.toString(2), 8)
+            var num1 = this.padString(num.toString(2), 16)
             var openListNew = []
             openListNew = num1.split("")
             this.actList2 = openListNew.reverse();

src/views/page/realTime.vue

@@ -737,6 +737,7 @@ export default {
             this.deviceName = store.equipmentList[this.indexs - 1].deviceName
             this.deviceState = store.equipmentList[this.indexs - 1].deviceState
             clearInterval(this.statusInterval) && this.statusInterval
+            this.nowDevicestatus=[]
             setTimeout(() => {
 
                 if (this.player) {
@@ -1794,7 +1795,7 @@ export default {
                     })
 
                     this.statusList = statusList
-                    this.$forceUpdate();
+                 
 
                     setTimeout(() => {
 
@@ -1807,6 +1808,7 @@ export default {
                             }
                         })
                     }, 10);
+                       this.$forceUpdate();
 
                 } else {
                     this.statusList = []