|
@@ -6,27 +6,25 @@
|
|
|
<el-table-column type="selection" width="55"></el-table-column>
|
|
|
<el-table-column type="expand">
|
|
|
<template slot-scope="props">
|
|
|
- <p v-if="props.row.partsList && props.row.partsList.length" style="color:#99a9bf;line-height:32px;font-size:14px;">包含的部件:</p>
|
|
|
- <el-form label-position="left" inline class="demo-table-expand" v-if="props.row.partsList && props.row.partsList.length">
|
|
|
- <el-form-item v-for="item in props.row.partsList" :key="item.name" :label="`${item.name}:`">
|
|
|
- <span>{{ item.number }}</span>
|
|
|
+ <p v-if="props.row.ComponentCount && props.row.ComponentCount.length" style="color:#99a9bf;line-height:32px;font-size:14px;">包含的部件:</p>
|
|
|
+ <el-form label-position="left" label-width="auto" inline class="demo-table-expand" v-if="props.row.ComponentCount && props.row.ComponentCount.length">
|
|
|
+ <el-form-item v-for="item in props.row.ComponentCount?props.row.ComponentCount:[]" :key="item.code" :label="`${item.name}:`">
|
|
|
+ <span>{{ item.count }}</span>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="所属模型文件夹" width="110" show-overflow-tooltip>
|
|
|
- <template slot-scope="scope">{{ scope.row.build }}</template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="模型文件名" width="100" show-overflow-tooltip>
|
|
|
- <template slot-scope="scope">{{ scope.row.floor }}</template>
|
|
|
- </el-table-column>
|
|
|
+ <el-table-column prop="FolderName" label="所属模型文件夹" width="110" show-overflow-tooltip></el-table-column>
|
|
|
+ <el-table-column prop="FileName" label="模型文件名" width="100" show-overflow-tooltip></el-table-column>
|
|
|
<el-table-column prop="EquipLocalName" label="设备本地名称" show-overflow-tooltip width="100"></el-table-column>
|
|
|
- <el-table-column prop="EquipLocalId" label="设备本地编码" show-overflow-tooltip></el-table-column>
|
|
|
- <el-table-column prop="EquipName" label="设备类" show-overflow-tooltip></el-table-column>
|
|
|
- <el-table-column prop="installation" label="BIM ID" show-overflow-tooltip></el-table-column>
|
|
|
+ <el-table-column prop="EquipLocalID" label="设备本地编码" show-overflow-tooltip width="100"></el-table-column>
|
|
|
+ <el-table-column prop="EquipCategory.EquipName" label="设备类"></el-table-column>
|
|
|
+ <el-table-column prop="BimId" label="BIM Id" show-overflow-tooltip width="100"></el-table-column>
|
|
|
<el-table-column prop="type" label="现场验证操作规定" width="150">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-button @click.native.prevent="handleOpenDetail(scope.row, tableData)" type="text" size="small">详情</el-button>
|
|
|
+ <el-select style="width:100px;" v-model="scope.row.SchemeId" placeholder="请选择">
|
|
|
+ <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
|
|
|
+ </el-select>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<template slot="empty">
|
|
@@ -49,7 +47,7 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { } from "@/api/scan/request";
|
|
|
+import { queryEquip } from "@/api/scan/request";
|
|
|
import { mapGetters } from "vuex";
|
|
|
export default {
|
|
|
components: {
|
|
@@ -61,55 +59,11 @@ export default {
|
|
|
data() {
|
|
|
return {
|
|
|
title: "确认创建任务",
|
|
|
- tableData: [{
|
|
|
- build: 'A栋',
|
|
|
- floor: '12F',
|
|
|
- EquipLocalName: 'XXXXXXXXXXX',
|
|
|
- EquipLocalId: '5484161891',
|
|
|
- EquipName: '低压开关柜',
|
|
|
- installation: '王小虎夫妻店',
|
|
|
- type: '1'
|
|
|
- }, {
|
|
|
- build: 'A栋',
|
|
|
- floor: '12F',
|
|
|
- EquipLocalName: 'XXXXXXXXXXX',
|
|
|
- EquipLocalId: '5484161891',
|
|
|
- EquipName: '低压开关柜',
|
|
|
- installation: '王小虎夫妻店',
|
|
|
- type: '1',
|
|
|
- partsList: [{
|
|
|
- name: '部件1',
|
|
|
- number: 6
|
|
|
- }, {
|
|
|
- name: '部件2',
|
|
|
- number: 23
|
|
|
- }, {
|
|
|
- name: '部件3',
|
|
|
- number: 5
|
|
|
- }, {
|
|
|
- name: '部件4',
|
|
|
- number: 9
|
|
|
- }, {
|
|
|
- name: '部件5',
|
|
|
- number: 1
|
|
|
- }]
|
|
|
- }, {
|
|
|
- build: 'A栋',
|
|
|
- floor: '12F',
|
|
|
- EquipLocalName: 'XXXXXXXXXXX',
|
|
|
- EquipLocalId: '5484161891',
|
|
|
- EquipName: '低压开关柜',
|
|
|
- installation: '王小虎夫妻店',
|
|
|
- type: '1'
|
|
|
- }, {
|
|
|
- build: 'A栋',
|
|
|
- floor: '12F',
|
|
|
- EquipLocalName: 'XXXXXXXXXXX',
|
|
|
- EquipLocalId: '5484161891',
|
|
|
- EquipName: '低压开关柜',
|
|
|
- installation: '王小虎夫妻店',
|
|
|
- type: '1'
|
|
|
+ options: [{//方案
|
|
|
+ value: '1',
|
|
|
+ label: '标准'
|
|
|
}],
|
|
|
+ tableData: [],
|
|
|
loading: false,
|
|
|
selections: [], // 选中项
|
|
|
page: {
|
|
@@ -133,16 +87,66 @@ export default {
|
|
|
methods: {
|
|
|
getTableData() {
|
|
|
let params = {
|
|
|
- Cascade: [{ Name: 'equipCategory' }],
|
|
|
- Orders: "CreateTime desc, EquipID desc",
|
|
|
+ Cascade: [
|
|
|
+ {
|
|
|
+ Name: "equipCategory",
|
|
|
+ Projection: ["EquipCode", "EquipName"]
|
|
|
+ },
|
|
|
+ {
|
|
|
+ Name: "component",
|
|
|
+ Cascade: [{Name: "equipCategory"}]
|
|
|
+ },
|
|
|
+ {
|
|
|
+ Name: "building",
|
|
|
+ Projection: [ "BuildLocalName", "BuildName", "BuildID" ]
|
|
|
+ },
|
|
|
+ {
|
|
|
+ Name: "floor",
|
|
|
+ Projection: [ "FloorLocalName", "FloorName", "FloorID" ]
|
|
|
+ }
|
|
|
+ ],
|
|
|
+ Filters: `ProjectId='${this.projectId}'`,
|
|
|
+ Orders: "CreateTime desc, EquipID asc",
|
|
|
PageNumber: this.page.pageNumber,
|
|
|
- PageSize: this.page.pageSize,
|
|
|
+ PageSize: this.page.pageSize
|
|
|
+ }
|
|
|
+ debugger
|
|
|
+ if(this.params.spaceList && this.params.spaceList.length){
|
|
|
+ //通过平面图区域查询(接口未支持)
|
|
|
+ } else {
|
|
|
+ params.Filters += `;ModelId='${this.params.CurrentModelId}'`
|
|
|
}
|
|
|
- // unshaftInSys(params, res => {
|
|
|
- /**将模型文件夹和模型文件名加入到table数据中 */
|
|
|
- this.tableData = res.Content
|
|
|
+
|
|
|
+ if(this.params.device){
|
|
|
+ params.Filters += `;Category='${this.params.category}'`
|
|
|
+ }
|
|
|
+
|
|
|
+ queryEquip(params, res => {
|
|
|
+ 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.ComponentCount[index].count++
|
|
|
+ } else {
|
|
|
+ item.ComponentCount.push({
|
|
|
+ name: parts.EquipCategory.EquipName,
|
|
|
+ code: parts.EquipCategory.EquipCode,
|
|
|
+ count: 1
|
|
|
+ })
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
+ item.FolderName = this.params.modelFolderName
|
|
|
+ item.FileName = this.params.modelFileName
|
|
|
+ item.SchemeId = "1"
|
|
|
+ return item
|
|
|
+ })
|
|
|
this.page.total = res.Total
|
|
|
- // })
|
|
|
+ })
|
|
|
},
|
|
|
//选中项修改
|
|
|
handleSelectionChange(val) {
|
|
@@ -169,6 +173,7 @@ export default {
|
|
|
},
|
|
|
//改变pageno
|
|
|
handleCurrentChange(pageNo) {
|
|
|
+ this.page.pageNumber = 1
|
|
|
this.page.pageNumber = pageNo;
|
|
|
this.getTableData();
|
|
|
},
|
|
@@ -179,55 +184,7 @@ export default {
|
|
|
watch: {
|
|
|
dialogVisible(newData,oldData){
|
|
|
if(newData){
|
|
|
- this.tableData = [{
|
|
|
- build: 'A栋',
|
|
|
- floor: '12F',
|
|
|
- EquipLocalName: 'XXXXXXXXXXX',
|
|
|
- EquipLocalId: '5484161891',
|
|
|
- EquipName: '低压开关柜',
|
|
|
- installation: '王小虎夫妻店',
|
|
|
- type: '1'
|
|
|
- }, {
|
|
|
- build: 'A栋',
|
|
|
- floor: '12F',
|
|
|
- EquipLocalName: 'XXXXXXXXXXX',
|
|
|
- EquipLocalId: '5484161891',
|
|
|
- EquipName: '低压开关柜',
|
|
|
- installation: '王小虎夫妻店',
|
|
|
- type: '1',
|
|
|
- partsList: [{
|
|
|
- name: '部件1',
|
|
|
- number: 6
|
|
|
- }, {
|
|
|
- name: '部件2',
|
|
|
- number: 23
|
|
|
- }, {
|
|
|
- name: '部件3',
|
|
|
- number: 5
|
|
|
- }, {
|
|
|
- name: '部件4',
|
|
|
- number: 9
|
|
|
- }, {
|
|
|
- name: '部件5',
|
|
|
- number: 1
|
|
|
- }]
|
|
|
- }, {
|
|
|
- build: 'A栋',
|
|
|
- floor: '12F',
|
|
|
- EquipLocalName: 'XXXXXXXXXXX',
|
|
|
- EquipLocalId: '5484161891',
|
|
|
- EquipName: '低压开关柜',
|
|
|
- installation: '王小虎夫妻店',
|
|
|
- type: '1'
|
|
|
- }, {
|
|
|
- build: 'A栋',
|
|
|
- floor: '12F',
|
|
|
- EquipLocalName: 'XXXXXXXXXXX',
|
|
|
- EquipLocalId: '5484161891',
|
|
|
- EquipName: '低压开关柜',
|
|
|
- installation: '王小虎夫妻店',
|
|
|
- type: '1'
|
|
|
- }]
|
|
|
+ this.tableData = []
|
|
|
this.page.pageNumber = 1
|
|
|
this.getTableData()
|
|
|
}
|