|
@@ -158,20 +158,21 @@ watch(
|
|
|
// 对比和store中开关状态
|
|
|
const compareStatus = data => {
|
|
|
lampList.value = data.map(item => {
|
|
|
- const currentStatus = allLampStatus.value[item.id]
|
|
|
-
|
|
|
+ const currentStatus = allLampStatus.value[item.id]
|
|
|
+ let isOpen = item.brightValue!==0
|
|
|
// 基础状态对象
|
|
|
const baseStatus = {
|
|
|
...item,
|
|
|
- isOpen: item.runStatus == 1
|
|
|
+ isOpen: isOpen
|
|
|
}
|
|
|
|
|
|
if (!currentStatus) {
|
|
|
return baseStatus
|
|
|
}
|
|
|
|
|
|
+
|
|
|
// 如果最后切换状态与当前运行状态相同,重置状态
|
|
|
- if (currentStatus.lastSwitchStatus == item.runStatus) {
|
|
|
+ if (currentStatus.lastSwitchStatus == isOpen) {
|
|
|
store.dispatch('taiguv1/setLampStatus', {
|
|
|
id: item.id,
|
|
|
status: {
|
|
@@ -185,7 +186,7 @@ const compareStatus = data => {
|
|
|
// 如果有待处理的切换状态,使用该状态
|
|
|
return {
|
|
|
...item,
|
|
|
- isOpen: currentStatus.lastSwitchStatus ?? (item.runStatus == 1)
|
|
|
+ isOpen: currentStatus.lastSwitchStatus ?? isOpen
|
|
|
}
|
|
|
|
|
|
})
|