Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage

This commit is contained in:
songwc
2022-10-08 18:20:48 +08:00
2 changed files with 47 additions and 29 deletions

View File

@@ -335,31 +335,46 @@ export default {
} }
}); });
let openpages = store.state.openpages; let openpages = store.state.openpages;
for (let i = 0; i < openpages.length; i++) { if (openpages.length === 0) {
openpages[i].active = false; let pagename = state.keysList.filter((a) => {
} return a.href === n.toLowerCase();
for (let i = 0; i < openpages.length; i++) { });
openpages[i].active = false; if (pagename && pagename.length !== 0) {
if (n.toLowerCase() === openpages[i].href) { let obj = {
console.log("已存在", openpages[i]); pagename: pagename[0].pagename,
openpages[i].active = true; href: n.toLowerCase(),
break; active: true,
} else { };
if (i === openpages.length - 1) { openpages.push(obj);
let pagename = state.keysList.filter((a) => { }
return a.href === n.toLowerCase(); } else {
}); for (let i = 0; i < openpages.length; i++) {
if (pagename && pagename.length !== 0) { openpages[i].active = false;
let obj = { }
pagename: pagename[0].pagename, for (let i = 0; i < openpages.length; i++) {
href: n.toLowerCase(), openpages[i].active = false;
active: true, if (n.toLowerCase() === openpages[i].href) {
}; console.log("已存在", openpages[i]);
openpages.push(obj); openpages[i].active = true;
break;
} else {
if (i === openpages.length - 1) {
let pagename = state.keysList.filter((a) => {
return a.href === n.toLowerCase();
});
if (pagename && pagename.length !== 0) {
let obj = {
pagename: pagename[0].pagename,
href: n.toLowerCase(),
active: true,
};
openpages.push(obj);
}
} }
} }
} }
} }
localStorage.setItem("openpages", JSON.stringify(openpages)); localStorage.setItem("openpages", JSON.stringify(openpages));
store.commit("chengeOpenpages", openpages); store.commit("chengeOpenpages", openpages);

View File

@@ -44,16 +44,19 @@ export default {
state.openList.map((item, key) => { state.openList.map((item, key) => {
if (item.href === value.href) { if (item.href === value.href) {
if (state.openList.length === 1) { if (state.openList.length === 1) {
state.openList.splice(key, 1); if (state.openList[0].href !== "/learningpath") {
$router.push({ path: "/learningpath" });
} else {
if (key === state.openList.length - 1) {
$router.push({ path: state.openList[key - 1].href });
state.openList.splice(key, 1);
} else {
$router.push({ path: state.openList[key + 1].href });
state.openList.splice(key, 1); state.openList.splice(key, 1);
} }
$router.push({ path: "/learningpath" });
} else {
if (value.active) {
if (key === state.openList.length - 1) {
$router.push({ path: state.openList[key - 1].href });
} else {
$router.push({ path: state.openList[key + 1].href });
}
}
state.openList.splice(key, 1);
} }
} }
}); });