|
@@ -14,7 +14,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="LocalId" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
|
|
|
<el-table-column prop="Category" :label="`${inSpaceType}类型`" show-overflow-tooltip min-width="100"></el-table-column>
|
|
|
- <el-table-column prop="CadId" label="BIM ID" show-overflow-tooltip min-width="100"></el-table-column>
|
|
|
+ <el-table-column prop="BIMID" label="BIM ID" show-overflow-tooltip min-width="100"></el-table-column>
|
|
|
<el-table-column prop="TaskState" label="任务执行情况" show-overflow-tooltip min-width="100"></el-table-column>
|
|
|
<el-table-column prop="action" label="操作" min-width="100">
|
|
|
<template slot-scope="scope">
|
|
@@ -103,11 +103,9 @@ export default {
|
|
|
{
|
|
|
Name: 'equipment',
|
|
|
Cascade: [{ Name: 'component' }]
|
|
|
- }, {
|
|
|
- Name: 'equipmentList'
|
|
|
}
|
|
|
],
|
|
|
- Orders: "createTime desc, Id asc",
|
|
|
+ Orders: "CreateTime desc, TaskId asc",
|
|
|
PageNumber: this.page.pageNumber,
|
|
|
PageSize: this.page.pageSize
|
|
|
}
|
|
@@ -121,9 +119,11 @@ export default {
|
|
|
params.Filters += `;Category='${this.paramsData.category}'`
|
|
|
}
|
|
|
queryModelTask(params, res => {
|
|
|
- debugger
|
|
|
this.page.total = res.Total;
|
|
|
- this.tableData = res.Content[0].EquipmentList || []
|
|
|
+ this.tableData = res.Content.map(item => {
|
|
|
+ item.TaskState = this.taskStateMap[item.TaskState]
|
|
|
+ return item
|
|
|
+ })
|
|
|
})
|
|
|
},
|
|
|
// 删除关系
|