Merge remote-tracking branch 'origin/test'
This commit is contained in:
commit
ee58c53b83
@ -308,12 +308,12 @@ export default {
|
|||||||
queryMapFunctionList({mapId: this.$route.params.mapId, detail: true}).then(resp => {
|
queryMapFunctionList({mapId: this.$route.params.mapId, detail: true}).then(resp => {
|
||||||
this.systemList = resp.data;
|
this.systemList = resp.data;
|
||||||
this.systemList.forEach(item => {
|
this.systemList.forEach(item => {
|
||||||
if (item.subset && this.subsetList.includes(item.subset)) {
|
if (item.subset && this.subsetList.includes(item.subset) && item.name !== '实训室') {
|
||||||
this.subsetMap[item.subset].push(item);
|
this.subsetMap[item.subset].push(item);
|
||||||
} else if (item.subset) {
|
} else if (item.subset && item.name !== '实训室') {
|
||||||
this.subsetList.push(item.subset);
|
this.subsetList.push(item.subset);
|
||||||
this.subsetMap[item.subset] = [item];
|
this.subsetMap[item.subset] = [item];
|
||||||
} else {
|
} else if ( item.name !== '实训室') {
|
||||||
if (!this.subsetList.includes('默认')) {
|
if (!this.subsetList.includes('默认')) {
|
||||||
this.subsetList.push('默认');
|
this.subsetList.push('默认');
|
||||||
this.subsetMap['默认'] = [];
|
this.subsetMap['默认'] = [];
|
||||||
|
Loading…
Reference in New Issue
Block a user