~~

src/api/menu/index.ts

@@ -10,14 +10,16 @@ export function useMenuApi() {
 	return {
 		getMenuAdmin: (params?: object) => {
 			return request({
-				url: '/gitee/lyt-top/vue-next-admin-images/raw/master/menu/adminMenu.json',
+				// url: 'https://gitee.com/lyt-top/vue-next-admin-images/raw/master/menu/adminMenu.json',
+				url: 'getUserInfo',
 				method: 'get',
 				params,
 			});
 		},
 		getMenuTest: (params?: object) => {
 			return request({
-				url: '/gitee/lyt-top/vue-next-admin-images/raw/master/menu/testMenu.json',
+				// url: 'https://gitee.com/lyt-top/vue-next-admin-images/raw/master/menu/testMenu.json',
+				url: 'getUserInfo',
 				method: 'get',
 				params,
 			});

src/comps/bpm/view.vue

@@ -168,7 +168,7 @@ const state = reactive({
 		query: '',
 	},
 	audits: [] as any,
-	chtag: false,
+	chtag: true,
 	autag: true,
 	xml: null as any,
 	refNodes: [] as any,

src/pages/home/index.vue

@@ -0,0 +1,15 @@
+<template>
+<div>
+	这是主页
+</div>
+</template>
+
+<script>
+export default {
+	name: 'index.vue',
+};
+</script>
+
+<style scoped>
+
+</style>

src/router/backEnd.ts

@@ -3,7 +3,7 @@ import { storeToRefs } from 'pinia';
 import pinia from '/@/stores/index';
 import { useUserInfo } from '/@/stores/userInfo';
 import { useRequestOldRoutes } from '/@/stores/requestOldRoutes';
-import { Session } from '/@/utils/storage';
+import { Cookie, Session } from '/@/utils/storage';
 import { NextLoading } from '/@/utils/loading';
 import { dynamicRoutes, notFoundAndNoPower } from '/@/router/route';
 import { formatTwoStageRoutes, formatFlatteningRoutes, router } from '/@/router/index';
@@ -14,7 +14,8 @@ import { useMenuApi } from '/@/api/menu/index';
 const menuApi = useMenuApi();
 
 const layouModules: any = import.meta.glob('../layout/routerView/*.{vue,tsx}');
-const viewsModules: any = import.meta.glob('../views/**/*.{vue,tsx}');
+// const viewsModules: any = import.meta.glob('../views/**/*.{vue,tsx}');
+const viewsModules: any = import.meta.glob('../pages/**/*.{vue,tsx}');
 
 // 后端控制路由
 
@@ -38,15 +39,16 @@ export async function initBackEndControlRoutes() {
 	// 界面 loading 动画开始执行
 	if (window.nextLoading === undefined) NextLoading.start();
 	// 无 token 停止执行下一步
-	if (!Session.get('token')) return false;
+	// if (!Session.get('token')) return false;
+	if (!Cookie.get('token')) return false;
 	// 触发初始化用户信息 pinia
 	useUserInfo().setUserInfos();
 	// 获取路由菜单数据
 	const res = await getBackEndControlRoutes();
 	// 存储接口原始路由（未处理component），根据需求选择使用
-	useRequestOldRoutes().setRequestOldRoutes(JSON.parse(JSON.stringify(res.data)));
+	useRequestOldRoutes().setRequestOldRoutes(JSON.parse(JSON.stringify(res.menus)));
 	// 处理路由（component），替换 dynamicRoutes（/@/router/route）第一个顶级 children 的路由
-	dynamicRoutes[0].children = await backEndComponent(res.data);
+	dynamicRoutes[0].children = await backEndComponent(res.menus);
 	// 添加动态路由
 	await setAddRoute();
 	// 设置路由到 vuex routesList 中（已处理成多级嵌套路由）及缓存多级嵌套数组处理后的一维数组
@@ -107,7 +109,7 @@ export function getBackEndControlRoutes() {
 	const { userInfos } = storeToRefs(stores);
 	const auth = userInfos.value.roles[0];
 	// 管理员 admin
-	if (auth === 'admin') return menuApi.getMenuAdmin();
+	if (auth === 'admin'||auth === 'sa') return menuApi.getMenuAdmin();
 	// 其它用户 test
 	else return menuApi.getMenuTest();
 }
@@ -144,14 +146,19 @@ export function backEndComponent(routes: any) {
 export function dynamicImport(dynamicViewsModules: Record<string, Function>, component: string) {
 	const keys = Object.keys(dynamicViewsModules);
 	const matchKeys = keys.filter((key) => {
-		const k = key.replace(/..\/views|../, '');
+		// const k = key.replace(/..\/views|../, '');
+		const k = key.replace(/..\/pages|../, '');
+		console.log(k);
+		console.log(`${component}`);
 		return k.startsWith(`${component}`) || k.startsWith(`/${component}`);
 	});
+	console.log(matchKeys);
 	if (matchKeys?.length === 1) {
 		const matchKey = matchKeys[0];
 		return dynamicViewsModules[matchKey];
 	}
 	if (matchKeys?.length > 1) {
+		// return dynamicViewsModules[matchKeys[1]];
 		return false;
 	}
 }

src/router/index.ts

@@ -6,7 +6,7 @@ import { storeToRefs } from 'pinia';
 import { useKeepALiveNames } from '/@/stores/keepAliveNames';
 import { useRoutesList } from '/@/stores/routesList';
 import { useThemeConfig } from '/@/stores/themeConfig';
-import { Session } from '/@/utils/storage';
+import { Cookie, Session } from '/@/utils/storage';
 import { staticRoutes } from '/@/router/route';
 import { initFrontEndControlRoutes } from '/@/router/frontEnd';
 import { initBackEndControlRoutes } from '/@/router/backEnd';
@@ -93,6 +93,7 @@ router.beforeEach(async (to, from, next) => {
 	NProgress.configure({ showSpinner: false });
 	if (to.meta.title) NProgress.start();
 	const token = Session.get('token');
+	// const token = Cookie.get('token');
 	if (to.path === '/login' && !token) {
 		next();
 		NProgress.done();

src/stores/themeConfig.ts

@@ -124,6 +124,7 @@ export const useThemeConfig = defineStore('themeConfig', {
 			 */
 			// 是否开启后端控制路由
 			isRequestRoutes: false,
+			// isRequestRoutes: true,
 
 			/**
 			 * 全局网站标题 / 副标题