|
@@ -138,13 +138,13 @@
|
|
|
import {
|
|
|
BeatchQueryParam,
|
|
|
deleteEquip,
|
|
|
- getDataDictionary,
|
|
|
getEquipBelongs,
|
|
|
getEquipTableCon,
|
|
|
- queryEquip,
|
|
|
queryUpdate,
|
|
|
updateEquip,
|
|
|
} from '@/api/scan/request'
|
|
|
+ import { queryEquip } from '@/api/object/equip'
|
|
|
+ import { getDataDictionary } from '@/api/dict'
|
|
|
|
|
|
import tools from '@/utils/scan/tools'
|
|
|
import handsonUtils from '@/utils/hasontableUtils'
|
|
@@ -380,19 +380,14 @@
|
|
|
this.changeCader()
|
|
|
if (this.mess.deviceId) {
|
|
|
let params = {
|
|
|
- data: {
|
|
|
- Orders: 'sort asc, InfoPointName desc',
|
|
|
- PageNumber: 1,
|
|
|
- PageSize: 1000,
|
|
|
- },
|
|
|
- type: this.mess.deviceId,
|
|
|
+ type: this.mess.deviceId
|
|
|
}
|
|
|
getDataDictionary(params, (res) => {
|
|
|
- this.tableHeader = res.Content
|
|
|
+ this.tableHeader = res.content
|
|
|
console.log(this.tableHeader)
|
|
|
this.tableHeader.forEach((item) => {
|
|
|
- if (item.Path) {
|
|
|
- this.inputMap[item.Path] = item
|
|
|
+ if (item.path) {
|
|
|
+ this.inputMap[item.path] = item
|
|
|
}
|
|
|
})
|
|
|
this.getTableData()
|
|
@@ -414,12 +409,12 @@
|
|
|
getTableData() {
|
|
|
this.loading = true
|
|
|
//type存在发送请求
|
|
|
- if (!!this.mess.deviceId) {
|
|
|
+ if (this.mess.deviceId) {
|
|
|
let param = {
|
|
|
- PageSize: this.page.size,
|
|
|
- Orders: 'createTime desc,EquipID desc,EquipLocalID desc,EquipLocalName desc',
|
|
|
- PageNumber: this.page.currentPage,
|
|
|
- Filters: `category='${this.mess.deviceId}'`,
|
|
|
+ pageSize: this.page.size,
|
|
|
+ orders: 'createTime desc,id desc,localId desc,localName desc',
|
|
|
+ pageNumber: this.page.currentPage,
|
|
|
+ filters: `classCode='${this.mess.deviceId}'`,
|
|
|
}
|
|
|
|
|
|
if (this.mess.buildId == 'noKnow') {
|
|
@@ -433,7 +428,9 @@
|
|
|
} else if (this.mess.floorId && this.mess.floorId != 'all') {
|
|
|
param.Filters += `;floorId='${this.mess.floorId}'`
|
|
|
}
|
|
|
- getEquipTableCon(param, (res) => {
|
|
|
+ // getEquipTableCon(param, (res) => {
|
|
|
+ queryEquip(param, (res) => {
|
|
|
+ debugger
|
|
|
this.loading = false
|
|
|
this.showParts = res.Message == '1' ? true : false // 判断是否显示包含的部件列
|
|
|
this.tableData = res.Content.map((item) => {
|