|
@@ -2,20 +2,20 @@
|
|
|
<div class="table-container">
|
|
|
<div class="table-list" :style="tableData && tableData.length?'height:calc(100% - 50px);':'height:100%;'">
|
|
|
<el-table :data="tableData" style="width: 100%" height="100%" v-loading="loading" :header-cell-style="headerStyle">
|
|
|
- <el-table-column prop="build" label="所属模型文件夹" show-overflow-tooltip min-width="100"></el-table-column>
|
|
|
- <el-table-column prop="floor" label="模型文件名" show-overflow-tooltip min-width="100"></el-table-column>
|
|
|
+ <el-table-column prop="FolderName" label="所属模型文件夹" show-overflow-tooltip min-width="100"></el-table-column>
|
|
|
+ <el-table-column prop="FileName" label="模型文件名" show-overflow-tooltip min-width="100"></el-table-column>
|
|
|
<el-table-column :label="`${inSpaceType}本地名称`" show-overflow-tooltip min-width="100">
|
|
|
<template slot-scope="scope">
|
|
|
<div>
|
|
|
- {{scope.row.EquipLocalName}}
|
|
|
+ {{scope.row.LocalName}}
|
|
|
<el-badge :value="scope.row.partsNum" class="item" type="warning"></el-badge>
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="EquipLocalID" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
|
|
|
- <el-table-column prop="EquipCategory.EquipName" :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="taskType" label="任务执行情况" show-overflow-tooltip min-width="100"></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="TaskState" label="任务执行情况" show-overflow-tooltip min-width="100"></el-table-column>
|
|
|
<el-table-column prop="action" label="操作" min-width="100">
|
|
|
<template slot-scope="scope">
|
|
|
<i v-if="scope.row.taskType == '待验证' || scope.row.taskType == '未找到'" title="查看详情" class="iconfont icon-xiangqing table-button" @click="handleDetail(scope.$index, scope.row)"></i>
|
|
@@ -42,7 +42,7 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { } from "@/api/scan/request"
|
|
|
+import { queryModelTask } from "@/api/data_admin/buildTaskApi"
|
|
|
import { mapGetters } from "vuex"
|
|
|
import deviceDetail from '../detail/deviceDetail'
|
|
|
export default {
|
|
@@ -61,6 +61,11 @@ export default {
|
|
|
loading: false, // loading
|
|
|
drawer: false, // 详情侧弹窗
|
|
|
detailId: '',
|
|
|
+ taskStateMap: {
|
|
|
+ '-1': '未找到',
|
|
|
+ '0': '已完成',
|
|
|
+ '1': '待验证'
|
|
|
+ },
|
|
|
page: {
|
|
|
pageSize: 50,
|
|
|
pageSizes: [10, 20, 50, 100],
|
|
@@ -96,24 +101,28 @@ export default {
|
|
|
Filters: `ProjectId='${this.projectId}'`,
|
|
|
Cascade: [
|
|
|
{
|
|
|
- Name: 'equipmentList',
|
|
|
- Cascade: [{ Name: 'equipCategory' }]
|
|
|
+ Name: 'equipment',
|
|
|
+ Cascade: [{ Name: 'component' }]
|
|
|
+ }, {
|
|
|
+ Name: 'equipmentList'
|
|
|
}
|
|
|
],
|
|
|
- Orders: "createTime desc, EquipID asc",
|
|
|
+ Orders: "createTime desc, Id asc",
|
|
|
PageNumber: this.page.pageNumber,
|
|
|
PageSize: this.page.pageSize
|
|
|
}
|
|
|
- if(this.paramsData.taskState){
|
|
|
+ if(this.paramsData.taskState != ''){
|
|
|
params.Filters += `;TaskState='${this.paramsData.taskState}'`
|
|
|
}
|
|
|
if(this.paramsData.modelFile){
|
|
|
- params.Filters += `;ModelFile='${this.paramsData.modelFile}'`
|
|
|
+ params.Filters += `;FileName='${this.paramsData.modelFile}'`
|
|
|
}
|
|
|
if(this.paramsData.category){
|
|
|
params.Filters += `;Category='${this.paramsData.category}'`
|
|
|
}
|
|
|
- queryCenoteTableData(params, res => {
|
|
|
+ queryModelTask(params, res => {
|
|
|
+ debugger
|
|
|
+ this.page.total = res.Total;
|
|
|
this.tableData = res.Content[0].EquipmentList || []
|
|
|
})
|
|
|
},
|