|
@@ -158,7 +158,7 @@ export default {
|
|
|
watch: {
|
|
|
$route(val) {
|
|
|
if (val.name === "Home") return;
|
|
|
- if (this.$route.name === HOME_PAGE_ROUTE) {
|
|
|
+ if (val.name === HOME_PAGE_ROUTE) {
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -362,13 +362,13 @@ export default {
|
|
|
},
|
|
|
routerChange() {
|
|
|
this.updateBreadcrumbs();
|
|
|
- if (!this.curMenu.url) {
|
|
|
- // 从HomePage快捷菜单跳转过来的
|
|
|
- const curMenu = this.menus.find(
|
|
|
- menu => menu.url === this.breadcrumbs[0].url
|
|
|
- );
|
|
|
- this.menuChange(curMenu);
|
|
|
- }
|
|
|
+ // console.log(this.breadcrumbs);
|
|
|
+ // console.log(this.curMenu);
|
|
|
+
|
|
|
+ const curMenu = this.menus.find(
|
|
|
+ menu => menu.url === this.breadcrumbs[0].url
|
|
|
+ );
|
|
|
+ this.menuChange(curMenu);
|
|
|
|
|
|
if (
|
|
|
this.validRoutes.includes("WaitTask") &&
|