|
@@ -21,12 +21,12 @@
|
|
|
<el-table-column type="selection" width="55"></el-table-column>
|
|
|
<el-table-column :label="`${inSpaceType}名称`" show-overflow-tooltip min-width="100">
|
|
|
<template slot-scope="scope">
|
|
|
- <div>{{ scope.row.EquipLocalName || scope.row.EquipName || '' }}</div>
|
|
|
+ <div>{{ scope.row.localName || scope.row.name || '' }}</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="EquipLocalID" :label="`${inSpaceType}本地编码`" show-overflow-tooltip
|
|
|
+ <el-table-column prop="localId" :label="`${inSpaceType}本地编码`" show-overflow-tooltip
|
|
|
min-width="100"></el-table-column>
|
|
|
- <el-table-column prop="EquipCategory.EquipName" :label="`${inSpaceType}类`" show-overflow-tooltip
|
|
|
+ <el-table-column prop="equipCategory.name" :label="`${inSpaceType}类`" show-overflow-tooltip
|
|
|
min-width="100"></el-table-column>
|
|
|
<el-table-column prop="action" label="操作" min-width="100">
|
|
|
<template slot-scope="scope">
|
|
@@ -119,9 +119,9 @@ export default {
|
|
|
orders: "createTime desc, id desc",
|
|
|
pageNumber: this.page.pageNumber,
|
|
|
pageSize: this.page.pageSize,
|
|
|
- sysId: this.$route.query.SysID,
|
|
|
- shaftId: this.params.ShaftID,
|
|
|
},
|
|
|
+ id: this.$route.query.SysID,
|
|
|
+ shaftId: this.params.ShaftID,
|
|
|
};
|
|
|
if (this.Buildfloor[0] == "noKnow") {
|
|
|
params.data.filters += `;buildingId isNull`;
|
|
@@ -140,14 +140,13 @@ export default {
|
|
|
params.data.filters += `;classCode='${this.Equipcategory}'`;
|
|
|
}
|
|
|
unSysEq(params, res => {
|
|
|
- debugger
|
|
|
res.content.forEach(item => {
|
|
|
item.ShaftListName = "";
|
|
|
- if (item.ShaftList && item.ShaftList.length) {
|
|
|
- item.ShaftListName = item.ShaftList.map(shaft => {
|
|
|
- return shaft.ShaftLocalName
|
|
|
- ? shaft.ShaftLocalName
|
|
|
- : shaft.ShaftName;
|
|
|
+ if (item.shaftList && item.shaftList.length) {
|
|
|
+ item.ShaftListName = item.shaftList.map(shaft => {
|
|
|
+ return shaft.localName
|
|
|
+ ? shaft.localName
|
|
|
+ : shaft.name;
|
|
|
}).join("、");
|
|
|
}
|
|
|
});
|
|
@@ -162,9 +161,9 @@ export default {
|
|
|
savaRelation() {
|
|
|
if (this.selections.length) {
|
|
|
let params = {
|
|
|
- SysId: this.$route.query.SysID,
|
|
|
- EquipIdList: this.selections.map(item => {
|
|
|
- return item.EquipID;
|
|
|
+ id: this.$route.query.SysID,
|
|
|
+ equipIdList: this.selections.map(item => {
|
|
|
+ return item.id;
|
|
|
})
|
|
|
};
|
|
|
sysLinkEquip(params, res => {
|