Merge pull request '1' (#77) from pc-master into portal

Reviewed-on: #77
portal
xiaomeng 2023-12-16 10:07:18 +00:00
commit 16d2b0b4ed
1 changed files with 10 additions and 11 deletions

View File

@ -723,13 +723,12 @@ export default {
} else {
if (el.targetValue == 1) {
name = '1#目标' + el.environmentDataId
name = el.equipmentNumber + '#目标' + el.environmentDataId
} else{
name = el.equipmentNumber + '#' + el.environmentDataId
}
}
this.list.push({
...el,
name: name,
@ -804,7 +803,7 @@ export default {
} else {
if (el.targetValue == 1) {
name = '1#目标' + el.environmentDataId
name = el.equipmentNumber + '#目标' + el.environmentDataId
} else{
name = el.equipmentNumber + '#' + el.environmentDataId
}