|
@@ -280,19 +280,20 @@ getClassificationFloorList({}).then(async (res) => {
|
|
|
item.planList = [];
|
|
item.planList = [];
|
|
|
item.detectList = [];
|
|
item.detectList = [];
|
|
|
item.tabList = [];
|
|
item.tabList = [];
|
|
|
|
|
+ item.labelList = [];
|
|
|
item.margin = {
|
|
item.margin = {
|
|
|
top: 15
|
|
top: 15
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
- if (item.floorLabel) {
|
|
|
|
|
- item.labelList = [];
|
|
|
|
|
- item.floorLabel.split(',').forEach((item1: any, index1: any) => {
|
|
|
|
|
- item.labelList.push({
|
|
|
|
|
- title: item1,
|
|
|
|
|
- url: ''
|
|
|
|
|
- });
|
|
|
|
|
- });
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ // if (item.floorLabel) {
|
|
|
|
|
+ // item.labelList = [];
|
|
|
|
|
+ // item.floorLabel.split(',').forEach((item1: any, index1: any) => {
|
|
|
|
|
+ // item.labelList.push({
|
|
|
|
|
+ // title: item1,
|
|
|
|
|
+ // url: ''
|
|
|
|
|
+ // });
|
|
|
|
|
+ // });
|
|
|
|
|
+ // }
|
|
|
try {
|
|
try {
|
|
|
const datas1 = await getClassificationFloorDetail(item.floorNo);
|
|
const datas1 = await getClassificationFloorDetail(item.floorNo);
|
|
|
if (datas1.code == 200 && datas1.data.length > 0) {
|
|
if (datas1.code == 200 && datas1.data.length > 0) {
|
|
@@ -314,12 +315,20 @@ getClassificationFloorList({}).then(async (res) => {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
const datas2 = await getClassificationFloorLabel(item.floorNo);
|
|
const datas2 = await getClassificationFloorLabel(item.floorNo);
|
|
|
|
|
+ console.log(datas2.data, '??????????????');
|
|
|
if (datas2.code == 200) {
|
|
if (datas2.code == 200) {
|
|
|
datas2.data.forEach((item1: any) => {
|
|
datas2.data.forEach((item1: any) => {
|
|
|
- item.tabList.push({
|
|
|
|
|
- title: item1.labelName,
|
|
|
|
|
- url: item1.labelLink ? item1.labelLink : ''
|
|
|
|
|
- });
|
|
|
|
|
|
|
+ if (item1.position == 0) {
|
|
|
|
|
+ item.tabList.push({
|
|
|
|
|
+ title: item1.labelName,
|
|
|
|
|
+ url: item1.labelLink ? item1.labelLink : ''
|
|
|
|
|
+ });
|
|
|
|
|
+ } else {
|
|
|
|
|
+ item.labelList.push({
|
|
|
|
|
+ title: item1.labelName,
|
|
|
|
|
+ url: item1.labelLink ? item1.labelLink : ''
|
|
|
|
|
+ });
|
|
|
|
|
+ }
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
item.navList = datas2.data;
|
|
item.navList = datas2.data;
|