pull/75/head
parent
5d6a6058c4
commit
e97ac08eb5
|
@ -699,17 +699,9 @@ export default {
|
||||||
num = el.environmentData + el1.unit
|
num = el.environmentData + el1.unit
|
||||||
// }
|
// }
|
||||||
if (el.equipmentNumber == 0) {
|
if (el.equipmentNumber == 0) {
|
||||||
if (el.targetValue == 1) {
|
|
||||||
name = '目标' + el.environmentDataId
|
|
||||||
} else {
|
|
||||||
name = '1#平均' + el.environmentDataId
|
name = '1#平均' + el.environmentDataId
|
||||||
}
|
|
||||||
} else if (el.equipmentNumber == 15) {
|
} else if (el.equipmentNumber == 15) {
|
||||||
if (el.targetValue == 1) {
|
|
||||||
name = '目标' + el.environmentDataId
|
|
||||||
} else {
|
|
||||||
name = '2#平均' + el.environmentDataId
|
name = '2#平均' + el.environmentDataId
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
name = el.equipmentNumber + '#' + el.environmentDataId
|
name = el.equipmentNumber + '#' + el.environmentDataId
|
||||||
}
|
}
|
||||||
|
@ -779,17 +771,9 @@ export default {
|
||||||
num = el.environmentData + el1.unit
|
num = el.environmentData + el1.unit
|
||||||
// }
|
// }
|
||||||
if (el.equipmentNumber == 0) {
|
if (el.equipmentNumber == 0) {
|
||||||
if (el.targetValue == 1) {
|
|
||||||
name = '目标' + el.environmentDataId
|
|
||||||
} else {
|
|
||||||
name = '1#平均' + el.environmentDataId
|
name = '1#平均' + el.environmentDataId
|
||||||
}
|
|
||||||
} else if (el.equipmentNumber == 15) {
|
} else if (el.equipmentNumber == 15) {
|
||||||
if (el.targetValue == 1) {
|
|
||||||
name = '目标' + el.environmentDataId
|
|
||||||
} else {
|
|
||||||
name = '2#平均' + el.environmentDataId
|
name = '2#平均' + el.environmentDataId
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
name = el.equipmentNumber + '#' + el.environmentDataId
|
name = el.equipmentNumber + '#' + el.environmentDataId
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue