diff --git a/src/views/page/realTime.vue b/src/views/page/realTime.vue index a350952..7cf1e81 100644 --- a/src/views/page/realTime.vue +++ b/src/views/page/realTime.vue @@ -698,14 +698,38 @@ export default { // }else{ num = el.environmentData + el1.unit // } - if (el.equipmentNumber == 0) { + // if (el.equipmentNumber == 0) { + // if (el.targetValue == 1) { + // name = '1#目标' + el.environmentDataId + // } else { + // name = '1#平均' + el.environmentDataId + // } + // } else if (el.equipmentNumber == 15) { + // if (el.targetValue == 1) { + // name = '2#目标' + el.environmentDataId + // } else { + // name = '2#平均' + el.environmentDataId + // } + // } else { + // name = el.equipmentNumber + '#' + el.environmentDataId + // } + if (el.equipmentNumber == 0) { + name = '1#平均' + el.environmentDataId + } else if (el.equipmentNumber == 15) { + name = '2#平均' + el.environmentDataId + } else { + if (el.targetValue == 1) { + name = '1#目标' + el.environmentDataId + } else{ name = el.equipmentNumber + '#' + el.environmentDataId + } } + this.list.push({ ...el, name: name, @@ -770,14 +794,21 @@ export default { // }else{ num = el.environmentData + el1.unit // } - if (el.equipmentNumber == 0) { + if (el.equipmentNumber == 0) { + name = '1#平均' + el.environmentDataId + } else if (el.equipmentNumber == 15) { + name = '2#平均' + el.environmentDataId + } else { + if (el.targetValue == 1) { + name = '1#目标' + el.environmentDataId + } else{ name = el.equipmentNumber + '#' + el.environmentDataId + } } - this.list.push({ ...el, name: name,