|
@@ -4,17 +4,17 @@
|
|
|
* @params hideMenu: 是否隐藏当前路由结点不在导航中展示
|
|
|
* @params alwaysShow: 只有一个子路由时是否总是展示菜单,默认false
|
|
|
*/
|
|
|
-import { createRouter, createWebHistory, RouteRecordRaw } from "vue-router";
|
|
|
+import {createRouter, createWebHistory, RouteRecordRaw} from "vue-router";
|
|
|
import NProgress from "@/utils/system/nprogress";
|
|
|
-import { changeTitle } from "@/utils/system/title";
|
|
|
+import {changeTitle} from "@/utils/system/title";
|
|
|
|
|
|
// 动态路由相关引入数据
|
|
|
// 引入modules
|
|
|
import Dashboard from "./modules/dashboard";
|
|
|
-import { getUserMenu, IntergrationMenu } from "@/api/settings/menu-settings";
|
|
|
-import { createVNode, defineComponent, h, Ref } from "vue";
|
|
|
-import { stringNotBlank } from "@/utils/blank-utils";
|
|
|
-import { useUserStore } from "@/pinia/user-store";
|
|
|
+import {getUserMenu, IntergrationMenu} from "@/api/settings/menu-settings";
|
|
|
+import {createVNode, defineComponent, h, Ref} from "vue";
|
|
|
+import {stringNotBlank} from "@/utils/blank-utils";
|
|
|
+import {useUserStore} from "@/pinia/user-store";
|
|
|
import XEUtils from "xe-utils";
|
|
|
|
|
|
const router = createRouter({
|
|
@@ -74,7 +74,7 @@ function convertToRouter(value: IntergrationMenu[]) {
|
|
|
path = paths[0];
|
|
|
}
|
|
|
const data: RouteRecordRaw = {
|
|
|
- path: path + item.pathParams,
|
|
|
+ path: path + (item.pathParams === null ? "" : item.pathParams),
|
|
|
name: item.name,
|
|
|
redirect: item.redirect,
|
|
|
meta: meta,
|