diff --git a/pages/timeEnvironment/timeEnvironment.vue b/pages/timeEnvironment/timeEnvironment.vue index dc562e2..06a7501 100644 --- a/pages/timeEnvironment/timeEnvironment.vue +++ b/pages/timeEnvironment/timeEnvironment.vue @@ -782,20 +782,24 @@ }, getStatusNew(el) { var name = '' - if (el.targetValue == 1) { - if (el.equipmentNumber == 0) { - name = '目标' + el.environmentDataId + if (el.equipmentName == 30) { + if (el.targetValue == 1) { + if (el.equipmentNumber == 0) { + name = '目标' + el.environmentDataId + } else { + name = '目标' + el.equipmentNumber + '#' + 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 { + name = el.equipmentNumber + '#' + el.environmentDataId + } } } else { - if (el.equipmentNumber == 0) { - name = '1#平均' + el.environmentDataId - } else if (el.equipmentNumber == 15) { - name = '2#平均' + el.environmentDataId - } else { - name = el.equipmentNumber + '#' + el.environmentDataId - } + name = el.environmentDataId } return name }, @@ -827,8 +831,7 @@ res1.data.forEach((el1, index) => { el.weatherListChild.push({ ...el1, - environmentDataId: this.getStatusNew( - el1), + environmentDataId: this.getStatusNew(el1), }) }) this.updateTimeWeather.push(res.data[0]) @@ -890,7 +893,12 @@ method: 'GET' }).then(res => { if (res.code == 200) { - el.equipmentName30ListChild = res.data; + res.data.forEach((el1, index) => { + el.equipmentName30ListChild.push({ + ...el1, + environmentDataId: this.getStatusNew(el1), + }) + }) this.updateTime30.push(res.data[0]) }