|
@@ -2,29 +2,29 @@
|
|
|
<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="FolderName" label="所属模型文件夹" show-overflow-tooltip min-width="80"></el-table-column>
|
|
|
- <el-table-column prop="FileName" label="模型文件名" show-overflow-tooltip min-width="80"></el-table-column>
|
|
|
+ <el-table-column prop="folderName" label="所属模型文件夹" show-overflow-tooltip min-width="80"></el-table-column>
|
|
|
+ <el-table-column prop="fileName" label="模型文件名" show-overflow-tooltip min-width="80"></el-table-column>
|
|
|
<el-table-column :label="`${inSpaceType}本地名称`" show-overflow-tooltip min-width="100">
|
|
|
<template slot-scope="scope">
|
|
|
<div>
|
|
|
- {{scope.row.EquipLocalName}}
|
|
|
- <el-badge v-if="scope.row.Component&&scope.row.Component.length?true:false"
|
|
|
- :value="scope.row.Component&&scope.row.Component.length?scope.row.Component.length:0"
|
|
|
+ {{scope.row.localName}}
|
|
|
+ <el-badge v-if="scope.row.component&&scope.row.component.length?true:false"
|
|
|
+ :value="scope.row.component&&scope.row.component.length?scope.row.component.length:0"
|
|
|
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="80"></el-table-column>
|
|
|
- <el-table-column prop="BIMID" label="BIM ID" show-overflow-tooltip min-width="220"></el-table-column>
|
|
|
- <el-table-column prop="TaskState" label="任务执行情况" show-overflow-tooltip min-width="60"></el-table-column>
|
|
|
+ <el-table-column prop="localId" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
|
|
|
+ <el-table-column prop="equipCategory.name" :label="`${inSpaceType}类型`" show-overflow-tooltip min-width="80"></el-table-column>
|
|
|
+ <el-table-column prop="bimId" label="BIM ID" show-overflow-tooltip min-width="220"></el-table-column>
|
|
|
+ <el-table-column prop="taskState" label="任务执行情况" show-overflow-tooltip min-width="60"></el-table-column>
|
|
|
<el-table-column prop="action" label="操作" min-width="100">
|
|
|
<template slot-scope="scope">
|
|
|
- <i v-if="scope.row.TaskState == '待验证' || scope.row.TaskState == '未找到'" title="查看详情" class="iconfont icon-xiangqing table-button" @click="handleDetail(scope.$index, scope.row)"></i>
|
|
|
- <i v-if="scope.row.TaskState == '未找到'" title="重新生成任务" class="iconfont icon-Update table-button" @click="handleRegenerate(scope.$index, scope.row)"></i>
|
|
|
- <i v-if="scope.row.TaskState == '待验证'" title="删除任务" class="iconfont icon-delete table-button" @click="handleDelete(scope.$index, scope.row)"></i>
|
|
|
- <i v-if="scope.row.TaskState == '未找到'" title="认可此任务执行情况" class="iconfont icon-lijiqueren table-button" @click="handleConfirm(scope.$index, scope.row)"></i>
|
|
|
+ <i v-if="scope.row.taskState == '待验证' || scope.row.taskState == '未找到'" title="查看详情" class="iconfont icon-xiangqing table-button" @click="handleDetail(scope.$index, scope.row)"></i>
|
|
|
+ <i v-if="scope.row.taskState == '未找到'" title="重新生成任务" class="iconfont icon-Update table-button" @click="handleRegenerate(scope.$index, scope.row)"></i>
|
|
|
+ <i v-if="scope.row.taskState == '待验证'" title="删除任务" class="iconfont icon-delete table-button" @click="handleDelete(scope.$index, scope.row)"></i>
|
|
|
+ <i v-if="scope.row.taskState == '未找到'" title="认可此任务执行情况" class="iconfont icon-lijiqueren table-button" @click="handleConfirm(scope.$index, scope.row)"></i>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<template slot="empty">
|
|
@@ -45,22 +45,22 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
- import {createModelTask, deleteModelTask, queryModelTask, updateModelTask} from "@/api/data_admin/buildTaskApi"
|
|
|
- import tools from "@/utils/tools"
|
|
|
- import {mapGetters} from "vuex"
|
|
|
- import deviceDetail from '../detail/deviceDetail'
|
|
|
+import { createModelTask, deleteModelTask, queryModelTask, updateModelTask } from "@/api/data_admin/buildTaskApi"
|
|
|
+import tools from "@/utils/tools"
|
|
|
+import { mapGetters } from "vuex"
|
|
|
+import deviceDetail from '../detail/deviceDetail'
|
|
|
|
|
|
- export default {
|
|
|
- components: {
|
|
|
- deviceDetail
|
|
|
- },
|
|
|
- computed: {
|
|
|
- ...mapGetters("layout", ["projectId", "userInfo"])
|
|
|
- },
|
|
|
- props: {
|
|
|
- paramsData: Object,
|
|
|
- },
|
|
|
- data() {
|
|
|
+export default {
|
|
|
+ components: {
|
|
|
+ deviceDetail
|
|
|
+ },
|
|
|
+ computed: {
|
|
|
+ ...mapGetters("layout", ["projectId", "userInfo"])
|
|
|
+ },
|
|
|
+ props: {
|
|
|
+ paramsData: Object,
|
|
|
+ },
|
|
|
+ data() {
|
|
|
return {
|
|
|
inSpaceType: '设备',
|
|
|
loading: false, // loading
|
|
@@ -93,44 +93,46 @@
|
|
|
getTableData() {
|
|
|
this.loading = true
|
|
|
let params = {
|
|
|
- Filters: `ProjectId='${this.projectId}'`,
|
|
|
- Cascade: [
|
|
|
+ filters: `projectId='${this.projectId}'`,
|
|
|
+ cascade: [
|
|
|
{
|
|
|
- Name: 'component'
|
|
|
+ name: 'component'
|
|
|
}, {
|
|
|
- Name: 'scanScheme'
|
|
|
+ name: 'scanScheme'
|
|
|
}, {
|
|
|
- Name: 'equipCategory'
|
|
|
+ name: 'equipCategory'
|
|
|
}
|
|
|
],
|
|
|
- Orders: "CreateTime desc, TaskId asc",
|
|
|
- PageNumber: this.page.pageNumber,
|
|
|
- PageSize: this.page.pageSize
|
|
|
+ orders: "createTime desc, id asc",
|
|
|
+ pageNumber: this.page.pageNumber,
|
|
|
+ pageSize: this.page.pageSize
|
|
|
}
|
|
|
if(this.paramsData.taskState !== ''){
|
|
|
- params.Filters += `;TaskState=${this.paramsData.taskState}`
|
|
|
+ params.filters += `;taskState=${this.paramsData.taskState}`
|
|
|
}
|
|
|
if(this.paramsData.modelFile){
|
|
|
- params.Filters += `;FileId='${this.paramsData.modelFile}'`
|
|
|
+ params.filters += `;fileId='${this.paramsData.modelFile}'`
|
|
|
}
|
|
|
if(this.paramsData.modelCategory){
|
|
|
- params.Filters += `;Category='${this.paramsData.modelCategory}'`
|
|
|
+ params.filters += `;category='${this.paramsData.modelCategory}'`
|
|
|
}
|
|
|
queryModelTask(params, res => {
|
|
|
this.loading = false
|
|
|
- this.page.total = res.Total;
|
|
|
- this.tableData = res.Content.map(item => {
|
|
|
- if(item.Component && item.Component.length){
|
|
|
+ this.page.total = res.total;
|
|
|
+ this.tableData = res.content.map(item => {
|
|
|
+ if (item.component && item.component.length) {
|
|
|
item.ComponentCount = []
|
|
|
- item.Component.map(parts => {
|
|
|
- if(parts.EquipCategory && parts.EquipCategory.EquipCode && parts.EquipCategory.EquipName){
|
|
|
- let index = item.ComponentCount.findIndex(c => {return c.code == parts.EquipCategory.EquipCode})
|
|
|
- if(index != -1){
|
|
|
+ item.component.map(parts => {
|
|
|
+ if (parts.equipCategory && parts.equipCategory.code && parts.equipCategory.name) {
|
|
|
+ let index = item.ComponentCount.findIndex(c => {
|
|
|
+ return c.code == parts.equipCategory.code
|
|
|
+ })
|
|
|
+ if (index != -1) {
|
|
|
item.ComponentCount[index].count++
|
|
|
} else {
|
|
|
item.ComponentCount.push({
|
|
|
- name: parts.EquipCategory.EquipName,
|
|
|
- code: parts.EquipCategory.EquipCode,
|
|
|
+ name: parts.equipCategory.name,
|
|
|
+ code: parts.equipCategory.code,
|
|
|
count: 1
|
|
|
})
|
|
|
}
|