|
@@ -221,7 +221,7 @@ export default {
|
|
this.page.pageNumber = response.PageNumber;
|
|
this.page.pageNumber = response.PageNumber;
|
|
this.page.total = response.Total;
|
|
this.page.total = response.Total;
|
|
if (this.tableData && this.tableData.length) {
|
|
if (this.tableData && this.tableData.length) {
|
|
- this.getBatch(response.Content)
|
|
|
|
|
|
+ this.getBatch(response.Content);
|
|
this.initTable();
|
|
this.initTable();
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
@@ -530,7 +530,7 @@ export default {
|
|
if (cur) {
|
|
if (cur) {
|
|
param.data.criterias.push({
|
|
param.data.criterias.push({
|
|
id: item.EquipID,
|
|
id: item.EquipID,
|
|
- code: head.Path
|
|
|
|
|
|
+ code: head.InfoPointCode
|
|
});
|
|
});
|
|
}
|
|
}
|
|
});
|
|
});
|
|
@@ -542,13 +542,21 @@ export default {
|
|
res.Content.map(child => {
|
|
res.Content.map(child => {
|
|
if (item.EquipID == child.id) {
|
|
if (item.EquipID == child.id) {
|
|
if (child.data || child.data == 0) {
|
|
if (child.data || child.data == 0) {
|
|
- tools.setDataForKey(item, child.code, child.data);
|
|
|
|
|
|
+ this.tableHeader.map(head => {
|
|
|
|
+ if (head.InfoPointCode == child.code) {
|
|
|
|
+ tools.setDataForKey(item, head.Path, child.data);
|
|
|
|
+ }
|
|
|
|
+ });
|
|
} else {
|
|
} else {
|
|
- tools.setDataForKey(
|
|
|
|
- item,
|
|
|
|
- child.code,
|
|
|
|
- child.error ? "表号功能号格式错误" : "表号功能号不存在"
|
|
|
|
- );
|
|
|
|
|
|
+ this.tableHeader.map(head => {
|
|
|
|
+ if (head.InfoPointCode == child.code) {
|
|
|
|
+ tools.setDataForKey(
|
|
|
|
+ item,
|
|
|
|
+ head.Path,
|
|
|
|
+ child.error ? "表号功能号格式错误" : "表号功能号不存在"
|
|
|
|
+ );
|
|
|
|
+ }
|
|
|
|
+ });
|
|
}
|
|
}
|
|
}
|
|
}
|
|
});
|
|
});
|