|
@@ -322,13 +322,13 @@ class EquipDetailVM(
|
|
|
if (from == null) {
|
|
|
floorPipe.objFromLocalId = "该设备"
|
|
|
} else {
|
|
|
- floorPipe.objFromLocalId = ObjectNameUtils.getEquipName(from.infos)
|
|
|
+ floorPipe.objFromLocalId = ObjectNameUtils.getEquipName(from)
|
|
|
}
|
|
|
val to = repo.getObject(floorPipe.objTo!!)
|
|
|
if (to == null) {
|
|
|
floorPipe.objToLocalId = "该设备"
|
|
|
} else {
|
|
|
- floorPipe.objToLocalId = ObjectNameUtils.getEquipName(to.infos)
|
|
|
+ floorPipe.objToLocalId = ObjectNameUtils.getEquipName(to)
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -415,13 +415,13 @@ class EquipDetailVM(
|
|
|
if (from == null) {
|
|
|
rel.objFromLocalId = "该设备"
|
|
|
} else {
|
|
|
- rel.objFromLocalId = ObjectNameUtils.getEquipName(from.infos)
|
|
|
+ rel.objFromLocalId = ObjectNameUtils.getEquipName(from)
|
|
|
}
|
|
|
val to = repo.getObject(rel.objTo!!)
|
|
|
if (to == null) {
|
|
|
rel.objToLocalId = "该设备"
|
|
|
} else {
|
|
|
- rel.objToLocalId = ObjectNameUtils.getEquipName(to.infos)
|
|
|
+ rel.objToLocalId = ObjectNameUtils.getEquipName(to)
|
|
|
}
|
|
|
}
|
|
|
}
|