|
@@ -60,9 +60,9 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="Datasource" label="数据源" show-overflow-tooltip min-width="100"></el-table-column>
|
|
|
<el-table-column prop="SubTypeName" :label="`数字字典${typeName}类型`" show-overflow-tooltip min-width="100"></el-table-column>
|
|
|
- <el-table-column prop="ObjectLocalName" :label="`对应的${typeName}实例`" show-overflow-tooltip min-width="100" class-name="td-bl">
|
|
|
+ <el-table-column prop="ObjectLocalName" :label="`对应的${typeName}实例`" show-overflow-tooltip min-width="125" class-name="td-bl">
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="实例所在建筑楼层" min-width="100">
|
|
|
+ <el-table-column label="实例所在建筑楼层" min-width="125">
|
|
|
<template slot-scope="scope">
|
|
|
<el-tooltip
|
|
|
:content="scope.row.BuildLocalName?scope.row.FloorLocalName?scope.row.BuildLocalName+'-'+scope.row.FloorLocalName:scope.row.BuildLocalName:''"
|
|
@@ -73,7 +73,7 @@
|
|
|
</el-tooltip>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="RoomLocalName" label="实例所在业务空间" show-overflow-tooltip min-width="200"></el-table-column>
|
|
|
+ <el-table-column prop="RoomLocalName" label="实例所在业务空间" show-overflow-tooltip min-width="150"></el-table-column>
|
|
|
<el-table-column prop="action" label="操作" min-width="100">
|
|
|
<template slot-scope="scope">
|
|
|
<el-tooltip class="item" effect="dark" content="清除对应规则" placement="left">
|
|
@@ -221,7 +221,11 @@ export default {
|
|
|
dyData.forEach(item => {
|
|
|
Data.forEach(t => {
|
|
|
if (t.EquipID == item.EquipID) {
|
|
|
- item.ObjectLocalName = t.EquipLocalName;
|
|
|
+ if (t.EquipLocalName && t.EquipLocalID) {
|
|
|
+ item.ObjectLocalName = t.EquipLocalName + '/' + t.EquipLocalID;
|
|
|
+ } else if (t.EquipLocalName || t.EquipLocalID) {
|
|
|
+ item.ObjectLocalName = t.EquipLocalName || t.EquipLocalID;
|
|
|
+ }
|
|
|
item.FloorLocalName = t.Floor ? t.Floor.FloorLocalName : '';
|
|
|
item.BuildLocalName = t.Building ? t.Building.BuildLocalName : '';
|
|
|
item.RoomLocalName = '';
|
|
@@ -238,8 +242,8 @@ export default {
|
|
|
this.tableData = dyData;
|
|
|
})
|
|
|
} else {
|
|
|
- this.loading = false;
|
|
|
- this.tableData = dyData;
|
|
|
+ this.loading = false;
|
|
|
+ this.tableData = dyData;
|
|
|
}
|
|
|
this.page.total = res.PageSize < 50 ? res.PageSize : res.Total;
|
|
|
});
|