+
{{ $t('message.layout.fiveTagsStyle') }}
-
-
+ -->
+
+ 卡片
+ 灵动
+ 圆滑
+
{{ $t('message.layout.fiveAnimation') }}
- 右滑
左滑
透明
+ 右滑
diff --git a/template/admin/src/layout/navBars/breadcrumb/user.vue b/template/admin/src/layout/navBars/breadcrumb/user.vue
index dde1d1f9c..132c1c6a7 100644
--- a/template/admin/src/layout/navBars/breadcrumb/user.vue
+++ b/template/admin/src/layout/navBars/breadcrumb/user.vue
@@ -26,9 +26,7 @@
-
-
-
+
- {{ $t('message.user.dropdown1') }}
-
+
+ {{ $t('message.user.dropdown6') }}
+
+
+
+
{{ $t('message.user.dropdown5') }}
+
+
+
@@ -225,7 +227,8 @@ export default {
})
.catch(() => {});
}, 150);
- } else if (path === 'wareHouse') {
+ } else if (path === 'user') {
+ this.$router.push({ name: 'systemUser' });
} else {
this.$router.push(path);
}
diff --git a/template/admin/src/layout/navBars/tagsView/tagsView.vue b/template/admin/src/layout/navBars/tagsView/tagsView.vue
index ba45c569d..b2787ead7 100644
--- a/template/admin/src/layout/navBars/tagsView/tagsView.vue
+++ b/template/admin/src/layout/navBars/tagsView/tagsView.vue
@@ -252,8 +252,7 @@ export default {
this.closeCurrentTagsView(path);
break;
case 2:
- this.$router.push({ path, query: currentTag.query });
- this.closeOtherTagsView(path);
+ this.closeOtherTagsView(path, currentTag.query);
break;
case 3:
this.closeAllTagsView(path);
@@ -284,20 +283,22 @@ export default {
// this.addBrowserSetSession(this.tagNavList);
},
// 3、关闭其它 tagsView：如果是设置了固定的（isAffix），不进行关闭
- closeOtherTagsView(path) {
+ closeOtherTagsView(path, query) {
let tagsViewList = [];
this.tagsViewRoutesList.map((v) => {
- if (v.meta.isAffix && !v.meta.isHide) tagsViewList.push({ ...v });
- if ((v.path = path)) tagsViewList.push({ ...v });
+ if ((v.meta && v.meta.isAffix) || v.path === path) tagsViewList.push({ ...v });
});
+ console.log(tagsViewList, this.tagsViewRoutesList, path);
this.addBrowserSetSession(tagsViewList);
+ this.$router.push({ path, query });
+
// this.addTagsView(path);
},
// 4、关闭全部 tagsView：如果是设置了固定的（isAffix），不进行关闭
closeAllTagsView(path) {
let tagsViewList = [];
this.tagsViewRoutesList.map((v) => {
- if (v.meta.isAffix && !v.meta.isHide) {
+ if (v.meta.isAffix) {
tagsViewList.push({ ...v });
if (tagsViewList.some((v) => v.path === path)) this.$router.push({ path, query: this.$route.query });
else this.$router.push({ path: v.path, query: this.$route.query });
@@ -326,6 +327,9 @@ export default {