pull/76/head
home孙 2023-12-16 13:36:54 +08:00
parent ce46ebeae3
commit 2295d61251
1 changed files with 25 additions and 9 deletions

View File

@ -697,22 +697,38 @@ export default {
// num=this.countType3(el.environmentData)+el1.unit // num=this.countType3(el.environmentData)+el1.unit
// }else{ // }else{
num = el.environmentData + el1.unit num = el.environmentData + el1.unit
// }
// 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) { if (el.equipmentNumber == 0) {
name = '1#平均' + el.environmentDataId
} else if (el.equipmentNumber == 15) {
name = '2#平均' + el.environmentDataId
} else {
if (el.targetValue == 1) { if (el.targetValue == 1) {
name = '1#目标' + el.environmentDataId name = '1#目标' + el.environmentDataId
} else { } 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 name = el.equipmentNumber + '#' + el.environmentDataId
} }
}
this.list.push({ this.list.push({
...el, ...el,