xiaomeng/wszhyWx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: xiaomeng:9766cdd0eb1bb9b937326f7d2ef7576eccfa19f6
Branches Tags
xiaomeng:main
xiaomeng:portal
xiaomeng:pc-master
xiaomeng:wx-program
xiaomeng:mini-program
xiaomeng:fix
xiaomeng:master
xiaomeng:wxmaster
xiaomeng:0.0.1
..
compare: xiaomeng:03d29383d2ce4ae54d14506d2e786a85e2e4cad2
Branches Tags
xiaomeng:portal
xiaomeng:pc-master
xiaomeng:wx-program
xiaomeng:mini-program
xiaomeng:fix
xiaomeng:master
xiaomeng:wxmaster
xiaomeng:main
xiaomeng:0.0.1

No commits in common. "9766cdd0eb1bb9b937326f7d2ef7576eccfa19f6" and "03d29383d2ce4ae54d14506d2e786a85e2e4cad2" have entirely different histories.
9766cdd0eb ... 03d29383d2

2 changed files with 21 additions and 54 deletions
Show Stats Expand all files Collapse all files

71
src/views/page/air-conditioning.vue
View File

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

4
src/views/page/realTime.vue
View File

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