From fcc36d28e7bc406f8ee70476e7d489d6643dbe99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E8=90=8C?= <525441437@qq.com> Date: Thu, 7 Mar 2024 15:27:14 +0800 Subject: [PATCH] 1 --- src/views/page/realTime.vue | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/views/page/realTime.vue b/src/views/page/realTime.vue index a5761aa..e2d4280 100644 --- a/src/views/page/realTime.vue +++ b/src/views/page/realTime.vue @@ -1324,7 +1324,7 @@ export default { fandata.open = res.data.data['1023'] fandata.id = el.id fandata.type = 1 - fandata.name = el.name + fandata.name = el.nickName fandata.status = [] var num = res.data.data['1024'] ? res.data.data['1024'] : 0 var num1 = this.padString(num.toString(2), 5) @@ -1338,7 +1338,7 @@ export default { fandata.open = res.data.data['1078'] fandata.id = el.id fandata.type = 1 - fandata.name = el.name + fandata.name = el.nickName fandata.status = [] var num = res.data.data['1079'] ? res.data.data['1079'] : 0 var num1 = this.padString(num.toString(2), 5) @@ -1352,7 +1352,7 @@ export default { fandata.open = res.data.data['1068'] fandata.id = el.id fandata.type = 8 - fandata.name = el.name + fandata.name = el.nickName fandata.status = [] var num = res.data.data['1069'] ? res.data.data['1069'] : 0 var num1 = this.padString(num.toString(2), 8) @@ -1362,63 +1362,63 @@ export default { statusList.push(fandata) } else if (el.id == 2 || el.id == 3 || el.id == 4 || el.id == 5) { //顶卷膜 - var statusData = { name: el.name, type: 2, id: el.id, open: res.data.data[(1025 + ((el.id - 2) * 3))], progress: res.data.data[(1027 + ((el.id - 2) * 3))], index: res.data.data[(1026 + ((el.id - 2) * 3))], count: 0 } + var statusData = { name: el.nickName, type: 2, id: el.id, open: res.data.data[(1025 + ((el.id - 2) * 3))], progress: res.data.data[(1027 + ((el.id - 2) * 3))], index: res.data.data[(1026 + ((el.id - 2) * 3))], count: 0 } statusList.push(statusData) } else if (el.id == 6) { //加温水泵 - var statusData = { name: el.name, type: 3, id: el.id, open: res.data.data['1000'], progress: 0, index: res.data.data['1001'], count: 0 } + var statusData = { name: el.nickName, type: 3, id: el.id, open: res.data.data['1000'], progress: 0, index: res.data.data['1001'], count: 0 } statusList.push(statusData) } else if (el.id == 7) { //地热风机 - var statusData = { name: el.name, type: 4, id: el.id, open: res.data.data['1002'], progress: 0, index: res.data.data['1003'], count: 0 } + var statusData = { name: el.nickName, type: 4, id: el.id, open: res.data.data['1002'], progress: 0, index: res.data.data['1003'], count: 0 } statusList.push(statusData) } else if (el.id == 8) { //上风口 - var statusData = { name: el.name, type: 5, id: el.id, open: res.data.data['1004'], progress: res.data.data['1006'], index: res.data.data['1005'], count: 0 } + var statusData = { name: el.nickName, type: 5, id: el.id, open: res.data.data['1004'], progress: res.data.data['1006'], index: res.data.data['1005'], count: 0 } statusList.push(statusData) } else if (el.id == 9) { //下风口 - var statusData = { name: el.name, type: 5, id: el.id, open: res.data.data['1007'], progress: res.data.data['1009'], index: res.data.data['1008'], count: 0 } + var statusData = { name: el.nickName, type: 5, id: el.id, open: res.data.data['1007'], progress: res.data.data['1009'], index: res.data.data['1008'], count: 0 } statusList.push(statusData) } else if (el.id == 10) { //卷被 - var statusData = { name: el.name, type: 6, id: el.id, open: res.data.data['1010'], progress: res.data.data['1012'], index: res.data.data['1011'], count: 0 } + var statusData = { name: el.nickName, type: 6, id: el.id, open: res.data.data['1010'], progress: res.data.data['1012'], index: res.data.data['1011'], count: 0 } statusList.push(statusData) } else if (el.id == 11) { //除雪 - var statusData = { name: el.name, type: 7, id: el.id, open: res.data.data['1013'], progress: 0, index: res.data.data['1014'], count: 0 } + var statusData = { name: el.nickName, type: 7, id: el.id, open: res.data.data['1013'], progress: 0, index: res.data.data['1014'], count: 0 } statusList.push(statusData) } else if (el.id == 13 || el.id == 14) { //高压微雾 - var statusData = { name: el.name, type: 9, id: el.id, open: res.data.data[(1070 + ((el.id - 13) * 2))], progress: 0, index: res.data.data[(1071 + ((el.id - 13) * 2))], count: 0 } + var statusData = { name: el.nickName, type: 9, id: el.id, open: res.data.data[(1070 + ((el.id - 13) * 2))], progress: 0, index: res.data.data[(1071 + ((el.id - 13) * 2))], count: 0 } statusList.push(statusData) } else if (el.id == 15 || el.id == 16) { //环流风扇 - var statusData = { name: el.name, type: 10, id: el.id, open: res.data.data[(1074 + ((el.id - 15) * 2))], progress: 0, index: res.data.data[(1075 + ((el.id - 15) * 2))], count: 0 } + var statusData = { name: el.nickName, type: 10, id: el.id, open: res.data.data[(1074 + ((el.id - 15) * 2))], progress: 0, index: res.data.data[(1075 + ((el.id - 15) * 2))], count: 0 } statusList.push(statusData) } else if (el.id == 18 || el.id == 19) { //湿帘泵 - var statusData = { name: el.name, type: 11, id: el.id, open: res.data.data[(1080 + ((el.id - 18) * 2))], progress: 0, index: res.data.data[(1081 + ((el.id - 18) * 2))], count: 0 } + var statusData = { name: el.nickName, type: 11, id: el.id, open: res.data.data[(1080 + ((el.id - 18) * 2))], progress: 0, index: res.data.data[(1081 + ((el.id - 18) * 2))], count: 0 } statusList.push(statusData) } else if (el.id == 20 || el.id == 21) { //湿帘外翻窗 - var statusData = { name: el.name, type: 12, id: el.id, open: res.data.data[(1084 + ((el.id - 20) * 3))], progress: res.data.data[(1086 + ((el.id - 20) * 3))], index: res.data.data[(1085 + ((el.id - 20) * 3))], count: 0 } + var statusData = { name: el.nickName, type: 12, id: el.id, open: res.data.data[(1084 + ((el.id - 20) * 3))], progress: res.data.data[(1086 + ((el.id - 20) * 3))], index: res.data.data[(1085 + ((el.id - 20) * 3))], count: 0 } statusList.push(statusData) } else if (el.id == 22 || el.id == 23) { //内遮阳 - var statusData = { name: el.name, type: 13, id: el.id, open: res.data.data[(1090 + ((el.id - 22) * 3))], progress: res.data.data[(1092 + ((el.id - 22) * 3))], index: res.data.data[(1091 + ((el.id - 22) * 3))], count: 0 } + var statusData = { name: el.nickName, type: 13, id: el.id, open: res.data.data[(1090 + ((el.id - 22) * 3))], progress: res.data.data[(1092 + ((el.id - 22) * 3))], index: res.data.data[(1091 + ((el.id - 22) * 3))], count: 0 } statusList.push(statusData) } else if (el.id == 24 || el.id == 25) { //外遮阳 - var statusData = { name: el.name, type: 14, id: el.id, open: res.data.data[(1096 + ((el.id - 24) * 3))], progress: res.data.data[(1098 + ((el.id - 24) * 3))], index: res.data.data[(1097 + ((el.id - 24) * 3))], count: 0 } + var statusData = { name: el.nickName, type: 14, id: el.id, open: res.data.data[(1096 + ((el.id - 24) * 3))], progress: res.data.data[(1098 + ((el.id - 24) * 3))], index: res.data.data[(1097 + ((el.id - 24) * 3))], count: 0 } statusList.push(statusData) } else if (el.id == 26 || el.id == 27 || el.id == 28 || el.id == 29) { //通风窗 - var statusData = { name: el.name, type: 15, id: el.id, open: res.data.data[(1102 + ((el.id - 26) * 3))], progress: res.data.data[(1104 + ((el.id - 26) * 3))], index: res.data.data[(1103 + ((el.id - 26) * 3))], count: res.data.data[1115 + (el.id - 26)] } + var statusData = { name: el.nickName, type: 15, id: el.id, open: res.data.data[(1102 + ((el.id - 26) * 3))], progress: res.data.data[(1104 + ((el.id - 26) * 3))], index: res.data.data[(1103 + ((el.id - 26) * 3))], count: res.data.data[1115 + (el.id - 26)] } statusList.push(statusData) } else if (el.id == 30 || el.id == 31) { //内保温 - var statusData = { name: el.name, type: 16, id: el.id, open: res.data.data[(1182 + ((el.id - 30) * 3))], progress: res.data.data[(1184 + ((el.id - 30) * 3))], index: res.data.data[(1183 + ((el.id - 30) * 3))], count: 0 } + var statusData = { name: el.nickName, type: 16, id: el.id, open: res.data.data[(1182 + ((el.id - 30) * 3))], progress: res.data.data[(1184 + ((el.id - 30) * 3))], index: res.data.data[(1183 + ((el.id - 30) * 3))], count: 0 } statusList.push(statusData) }