|
@@ -14,42 +14,42 @@
|
|
|
<div class="main">
|
|
|
<el-table ref="multipleTable" :data="tableData" v-loading='loading' stripe height="100%"
|
|
|
:span-method="objectSpanMethod" :header-cell-style="headerStyle">
|
|
|
- <el-table-column prop="EquipLocalName" label="设备本地名称" show-overflow-tooltip width="150">
|
|
|
+ <el-table-column prop="localName" label="设备本地名称" show-overflow-tooltip width="150">
|
|
|
<!-- <template slot-scope="scope">{{ scope.row.EquipLocalName?scope.row.EquipLocalName:scope.row.EquipName }}</template> -->
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="EquipLocalID" label="设备本地编码" show-overflow-tooltip max-width="150">
|
|
|
+ <el-table-column prop="localId" label="设备本地编码" show-overflow-tooltip max-width="150">
|
|
|
<!-- <template slot-scope="scope">{{ scope.row.EquipLocalID?scope.row.EquipLocalID:scope.row.EquipID }}</template> -->
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="EquipCategory.EquipName" label="设备类" show-overflow-tooltip
|
|
|
+ <el-table-column prop="equipCategory.name" label="设备类" show-overflow-tooltip
|
|
|
width="100"></el-table-column>
|
|
|
- <el-table-column prop="CADID" label="设计图纸中编码" show-overflow-tooltip max-width="150"></el-table-column>
|
|
|
+ <el-table-column prop="cADID" label="设计图纸中编码" show-overflow-tooltip max-width="150"></el-table-column>
|
|
|
<el-table-column label="所属建筑楼层">
|
|
|
<template slot-scope="scope">
|
|
|
{{
|
|
|
- scope.row.Building ? scope.row.Building.BuildLocalName : ''
|
|
|
- }}-{{ scope.row.Floor ? scope.row.Floor.FloorLocalName : '' }}
|
|
|
+ scope.row.building ? scope.row.building.localName : ''
|
|
|
+ }}-{{ scope.row.floor ? scope.row.floor.localName : '' }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="PropertyItem.EquipLocalName" label="资产本地名称" show-overflow-tooltip width="150">
|
|
|
+ <el-table-column prop="PropertyItem.localName" label="资产本地名称" show-overflow-tooltip width="150">
|
|
|
<!-- <template slot-scope="scope">{{ scope.row.AssetsLocalName }}</template> -->
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="PropertyItem.EquipLocalID" label="资产本地编码" show-overflow-tooltip max-width="150">
|
|
|
+ <el-table-column prop="PropertyItem.localId" label="资产本地编码" show-overflow-tooltip max-width="150">
|
|
|
<!-- <template slot-scope="scope">{{ scope.row.AssetsLocalId }}</template> -->
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="PropertyItem.FamilyName.Name" label="设备族" show-overflow-tooltip
|
|
|
+ <el-table-column prop="PropertyItem.familyName.name" label="设备族" show-overflow-tooltip
|
|
|
width="100"></el-table-column>
|
|
|
- <el-table-column prop="PropertyItem.CADID" label="设计图纸中编码" show-overflow-tooltip
|
|
|
+ <el-table-column prop="PropertyItem.cADID" label="设计图纸中编码" show-overflow-tooltip
|
|
|
max-width="150"></el-table-column>
|
|
|
<el-table-column label="所属建筑楼层" show-overflow-tooltip width="200">
|
|
|
<template slot-scope="scope">
|
|
|
{{
|
|
|
- scope.row.PropertyItem.Building ? scope.row.PropertyItem.Building.BuildLocalName : ''
|
|
|
- }}-{{ scope.row.PropertyItem.Floor ? scope.row.PropertyItem.Floor.FloorLocalName : '' }}
|
|
|
+ scope.row.PropertyItem.building ? scope.row.PropertyItem.building.localName : ''
|
|
|
+ }}-{{ scope.row.PropertyItem.floor ? scope.row.PropertyItem.floor.localName : '' }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="address" label="操作" width="100">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-radio v-model="radio[scope.row.EquipID]" :label="scope.row.PropertyItem.EquipID"
|
|
|
+ <el-radio v-model="radio[scope.row.id]" :label="scope.row.PropertyItem.id"
|
|
|
:disabled="scope.row.disabled" @change="handleChangeLink(scope.row)">
|
|
|
</el-radio>
|
|
|
</template>
|
|
@@ -74,9 +74,9 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { mapGetters } from "vuex"
|
|
|
+import {mapGetters} from "vuex"
|
|
|
//api
|
|
|
-import { countEquip, equipCategoryProperty, equipRproperty } from "@/api/scan/request";
|
|
|
+import {equipCategoryProperty, equipRproperty} from "@/api/scan/request";
|
|
|
|
|
|
export default {
|
|
|
components: {},
|
|
@@ -167,21 +167,21 @@ export default {
|
|
|
// Projection: [ "FloorLocalName", "FloorName", "FloorID" ]
|
|
|
// }
|
|
|
// ],
|
|
|
- Orders: "createTime desc, EquipID asc",
|
|
|
- PageNumber: pageNum,
|
|
|
- PageSize: 1000
|
|
|
+ orders: "createTime desc, id asc",
|
|
|
+ pageNumber: pageNum,
|
|
|
+ pageSize: 1000
|
|
|
},
|
|
|
category: this.params.deviceType
|
|
|
}
|
|
|
|
|
|
if (this.params.buildFloor[0] == "noKnow") {
|
|
|
- param.data.Filters = `buildingId isNull`
|
|
|
+ param.data.filters = `buildingId isNull`
|
|
|
} else if (this.params.buildFloor[0] && this.params.buildFloor[0] != "all") {
|
|
|
- param.data.Filters = `buildingId='${this.params.buildFloor[0]}'`
|
|
|
+ param.data.filters = `buildingId='${this.params.buildFloor[0]}'`
|
|
|
if (this.params.buildFloor[1] == "noKnow") {
|
|
|
- param.data.Filters += `;floorId isNull`
|
|
|
+ param.data.filters += `;floorId isNull`
|
|
|
} else if (this.params.buildFloor[1] && this.params.buildFloor[1] != "all") {
|
|
|
- param.data.Filters += `;floorId='${this.params.buildFloor[1]}'`
|
|
|
+ param.data.filters += `;floorId='${this.params.buildFloor[1]}'`
|
|
|
}
|
|
|
}
|
|
|
if (this.params.hasOwnProperty('spaceList')) {
|
|
@@ -218,7 +218,7 @@ export default {
|
|
|
item.disabled = false
|
|
|
if (Object.keys(this.radio).length) {
|
|
|
for (let key in this.radio) {
|
|
|
- if (item.EquipID != key && item.PropertyItem.EquipID == this.radio[key]) {
|
|
|
+ if (item.id != key && item.PropertyItem.id == this.radio[key]) {
|
|
|
item.disabled = true
|
|
|
}
|
|
|
}
|
|
@@ -235,14 +235,15 @@ export default {
|
|
|
//创建已选
|
|
|
handleClickCreate() {
|
|
|
let params = {
|
|
|
- Content: []
|
|
|
+ content: []
|
|
|
}
|
|
|
if (Object.keys(this.radio).length) {
|
|
|
for (let key in this.radio) {
|
|
|
- params.Content.push({
|
|
|
- EquipId: this.radio[key],
|
|
|
- EquipmentId: key
|
|
|
+ params.content.push({
|
|
|
+ equipId: this.radio[key],
|
|
|
+ equipmentId: key
|
|
|
})
|
|
|
+ console.log(params.content)
|
|
|
}
|
|
|
equipRproperty(params, res => {
|
|
|
this.radio = {}
|