|
@@ -164,8 +164,8 @@
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: '设备内码',
|
|
title: '设备内码',
|
|
- dataIndex: 'sbjbm',
|
|
|
|
- key: 'sbjbm',
|
|
|
|
|
|
+ dataIndex: 'assetnum',
|
|
|
|
+ key: 'assetnum',
|
|
width: '25%',
|
|
width: '25%',
|
|
},
|
|
},
|
|
],
|
|
],
|
|
@@ -232,14 +232,15 @@
|
|
const lists = [];
|
|
const lists = [];
|
|
let arr = [];
|
|
let arr = [];
|
|
arr = JSON.parse(JSON.stringify(this.arrList))
|
|
arr = JSON.parse(JSON.stringify(this.arrList))
|
|
|
|
+ console.log(arr);
|
|
arr.map(item => {
|
|
arr.map(item => {
|
|
- if (item.wzjc) {
|
|
|
|
- lists.push({id: item.location || item.assetnum, name: item.wzjc || item.sbjc, type: 'Zone'})
|
|
|
|
|
|
+ if (item.type=='Zone') {
|
|
|
|
+ lists.push({id: item.location, name: item.wzjc , type: 'Zone'})
|
|
}
|
|
}
|
|
- if (item.sbjc) {
|
|
|
|
|
|
+ if (item.type=='Image') {
|
|
lists.push({
|
|
lists.push({
|
|
- id: item.location || item.assetnum,
|
|
|
|
- name: item.wzjc || item.sbjc,
|
|
|
|
|
|
+ id: item.assetnum,
|
|
|
|
+ name: item.sbjc,
|
|
type: 'Image'
|
|
type: 'Image'
|
|
})
|
|
})
|
|
}
|
|
}
|
|
@@ -256,11 +257,11 @@
|
|
console.log(this.selectList);
|
|
console.log(this.selectList);
|
|
arr = JSON.parse(JSON.stringify(this.selectList))
|
|
arr = JSON.parse(JSON.stringify(this.selectList))
|
|
arr.map(item => {
|
|
arr.map(item => {
|
|
- if (item.wzjc) {
|
|
|
|
- lists.push({id: item.location || item.assetnum, name: item.wzjc || item.sbjc, type: 'Zone'})
|
|
|
|
|
|
+ if (item.type=='Zone') {
|
|
|
|
+ lists.push({id: item.location , name: item.wzjc , type: 'Zone'})
|
|
}
|
|
}
|
|
- if (item.sbjc) {
|
|
|
|
- lists.push({id: item.location || item.assetnum, name: item.wzjc || item.sbjc, type: 'Image'})
|
|
|
|
|
|
+ if (item.type=='Image') {
|
|
|
|
+ lists.push({id: item.assetnum, name: item.sbjc, type: 'Image'})
|
|
}
|
|
}
|
|
|
|
|
|
})
|
|
})
|
|
@@ -412,8 +413,17 @@
|
|
paramData = {classstructureid: this.classstructureid};
|
|
paramData = {classstructureid: this.classstructureid};
|
|
paramDataLocal = {locfl: this.locfl};
|
|
paramDataLocal = {locfl: this.locfl};
|
|
}else {
|
|
}else {
|
|
- paramData = {classstructureid: this.classstructureid, gname: this.floorId};
|
|
|
|
- paramDataLocal = {locfl: this.locfl, gname: this.floorId};
|
|
|
|
|
|
+ let gcname = '';
|
|
|
|
+ // 取gcname
|
|
|
|
+ this.dataFloor.forEach(item=>{
|
|
|
|
+ console.log('xxxxxxxx',item,this.floorId)
|
|
|
|
+ if(item.gname == this.floorId){
|
|
|
|
+ gcname=item.gcname
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ paramData = {classstructureid: this.classstructureid, gname: gcname};
|
|
|
|
+ console.log('gcname',gcname)
|
|
|
|
+ paramDataLocal = {locfl: this.locfl, gname: gcname};
|
|
}
|
|
}
|
|
|
|
|
|
this.loading = true;
|
|
this.loading = true;
|
|
@@ -587,6 +597,7 @@
|
|
item.children = item.data;
|
|
item.children = item.data;
|
|
item.open = false;
|
|
item.open = false;
|
|
item.checked = 'unchecked';
|
|
item.checked = 'unchecked';
|
|
|
|
+ item.type='Image';
|
|
if (item.children) {
|
|
if (item.children) {
|
|
recursion(item.children);
|
|
recursion(item.children);
|
|
}
|
|
}
|
|
@@ -634,6 +645,7 @@
|
|
newObj.map(item => {
|
|
newObj.map(item => {
|
|
item.label = item.name;
|
|
item.label = item.name;
|
|
item.checked = 'unchecked';
|
|
item.checked = 'unchecked';
|
|
|
|
+ item.type='Zone';
|
|
if (item.children) {
|
|
if (item.children) {
|
|
recursion(item.children);
|
|
recursion(item.children);
|
|
}
|
|
}
|
|
@@ -653,6 +665,7 @@
|
|
}
|
|
}
|
|
},
|
|
},
|
|
created() {
|
|
created() {
|
|
|
|
+ // 取gcname
|
|
this.floorId = getUrlMsg().FloorID;
|
|
this.floorId = getUrlMsg().FloorID;
|
|
//如果有专业就带过来
|
|
//如果有专业就带过来
|
|
if (this.GraphElementId) {
|
|
if (this.GraphElementId) {
|
|
@@ -663,6 +676,7 @@
|
|
this.selectedRowKeys.push(item.location || item.assetnum)
|
|
this.selectedRowKeys.push(item.location || item.assetnum)
|
|
})
|
|
})
|
|
this.arrList = JSON.parse(JSON.stringify(this.attrCards));
|
|
this.arrList = JSON.parse(JSON.stringify(this.attrCards));
|
|
|
|
+ console.log(this.arrList);
|
|
this.selectList = JSON.parse(JSON.stringify(this.attrCards));
|
|
this.selectList = JSON.parse(JSON.stringify(this.attrCards));
|
|
} else {
|
|
} else {
|
|
this.selectedRowKeys = [];
|
|
this.selectedRowKeys = [];
|