|
@@ -340,8 +340,16 @@
|
|
if (this.keyword) {
|
|
if (this.keyword) {
|
|
data.keyword = this.typeEdit == 'Image' ? `${this.keyword}:sbjc` : `${this.keyword}:wzjc`
|
|
data.keyword = this.typeEdit == 'Image' ? `${this.keyword}:sbjc` : `${this.keyword}:wzjc`
|
|
}
|
|
}
|
|
- const paramData = {classstructureid: this.classstructureid, gname: this.floorId};
|
|
|
|
- const paramDataLocal = {locfl: this.locfl, gname: this.floorId};
|
|
|
|
|
|
+ let paramData ;
|
|
|
|
+ let paramDataLocal;
|
|
|
|
+ if( this.floorId =='#'||this.floorId==''){
|
|
|
|
+ paramData = {classstructureid: this.classstructureid};
|
|
|
|
+ paramDataLocal = {locfl: this.locfl};
|
|
|
|
+ }else {
|
|
|
|
+ paramData = {classstructureid: this.classstructureid, gname: this.floorId};
|
|
|
|
+ paramDataLocal = {locfl: this.locfl, gname: this.floorId};
|
|
|
|
+ }
|
|
|
|
+
|
|
this.loading = true;
|
|
this.loading = true;
|
|
if (this.typeEdit == 'Image') {
|
|
if (this.typeEdit == 'Image') {
|
|
queryGlsmsasset(data, paramData).then(res => {
|
|
queryGlsmsasset(data, paramData).then(res => {
|
|
@@ -448,6 +456,7 @@
|
|
item.name = item.code;
|
|
item.name = item.code;
|
|
})
|
|
})
|
|
this.dataFloor = data;
|
|
this.dataFloor = data;
|
|
|
|
+ this.dataFloor.unshift({id:'#',name:'全部'})
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|
|
@@ -552,6 +561,7 @@
|
|
(function recursion(newObj) {
|
|
(function recursion(newObj) {
|
|
newObj.map(item => {
|
|
newObj.map(item => {
|
|
item.label = item.name;
|
|
item.label = item.name;
|
|
|
|
+ item.checked = 'unchecked';
|
|
if (item.children) {
|
|
if (item.children) {
|
|
recursion(item.children);
|
|
recursion(item.children);
|
|
}
|
|
}
|