pull/77/head
parent
18c8159b0b
commit
7f718fd082
|
@ -713,8 +713,8 @@ export default {
|
|||
// } else {
|
||||
// name = el.equipmentNumber + '#' + el.environmentDataId
|
||||
// }
|
||||
if (el.equipmentNumber == 0) {
|
||||
|
||||
if (el.equipmentNumber == 0) {
|
||||
|
||||
name = '1#平均' + el.environmentDataId
|
||||
|
||||
} else if (el.equipmentNumber == 15) {
|
||||
|
@ -722,14 +722,13 @@ export default {
|
|||
name = '2#平均' + el.environmentDataId
|
||||
|
||||
} else {
|
||||
if (el.targetValue == 1) {
|
||||
name = '1#目标' + el.environmentDataId
|
||||
if (el.targetValue == 1) {
|
||||
name = el.equipmentNumber + '#目标' + el.environmentDataId
|
||||
} else{
|
||||
name = el.equipmentNumber + '#' + el.environmentDataId
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
this.list.push({
|
||||
...el,
|
||||
name: name,
|
||||
|
@ -794,8 +793,8 @@ 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) {
|
||||
|
@ -803,11 +802,11 @@ export default {
|
|||
name = '2#平均' + el.environmentDataId
|
||||
|
||||
} else {
|
||||
if (el.targetValue == 1) {
|
||||
name = '1#目标' + el.environmentDataId
|
||||
if (el.targetValue == 1) {
|
||||
name = el.equipmentNumber + '#目标' + el.environmentDataId
|
||||
} else{
|
||||
name = el.equipmentNumber + '#' + el.environmentDataId
|
||||
}
|
||||
}
|
||||
}
|
||||
this.list.push({
|
||||
...el,
|
||||
|
|
Loading…
Reference in New Issue