|
@@ -264,7 +264,7 @@ class ChooseSpaceVM(
|
|
|
|
|
|
val tunableSpace = TunableSpace()
|
|
val tunableSpace = TunableSpace()
|
|
tunableSpace.outLine = info.outline[0]
|
|
tunableSpace.outLine = info.outline[0]
|
|
- tunableSpace.name = ObjectNameUtils.getEquipName(objEntity.infos)
|
|
|
|
|
|
+ tunableSpace.name = ObjectNameUtils.getEquipName(objEntity)
|
|
tunableSpace.id = objEntity.id
|
|
tunableSpace.id = objEntity.id
|
|
val floor = repo.getFloorById(objEntity.floorId!!)
|
|
val floor = repo.getFloorById(objEntity.floorId!!)
|
|
tunableSpace.floorName = floor.localName
|
|
tunableSpace.floorName = floor.localName
|
|
@@ -329,13 +329,13 @@ class ChooseSpaceVM(
|
|
if (from == null) {
|
|
if (from == null) {
|
|
rel.objFromLocalId = "该设备"
|
|
rel.objFromLocalId = "该设备"
|
|
} else {
|
|
} else {
|
|
- rel.objFromLocalId = ObjectNameUtils.getEquipName(from.infos)
|
|
|
|
|
|
+ rel.objFromLocalId = ObjectNameUtils.getEquipName(from)
|
|
}
|
|
}
|
|
val to = repo.getObject(rel.objTo!!)
|
|
val to = repo.getObject(rel.objTo!!)
|
|
if (to == null) {
|
|
if (to == null) {
|
|
rel.objToLocalId = "该设备"
|
|
rel.objToLocalId = "该设备"
|
|
} else {
|
|
} else {
|
|
- rel.objToLocalId = ObjectNameUtils.getEquipName(to.infos)
|
|
|
|
|
|
+ rel.objToLocalId = ObjectNameUtils.getEquipName(to)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|