Przeglądaj źródła

fix: 路由处理更新

lanceJiang 1 rok temu
rodzic
commit
37c636c42c

+ 2 - 2
src/api/login/index.ts

@@ -33,9 +33,9 @@ export function getGeetConfig(): AxiosPromise {
 	})
 }
 
-export function getMenuPermissions(): AxiosPromise {
+/*export function getMenuPermissions(): AxiosPromise {
 	return request({
 		url: `/sys/resource/list-menu-permissions`,
 		method: 'get'
 	})
-}
+}*/

+ 53 - 52
src/router/index.ts

@@ -142,43 +142,67 @@ export const constantRoutes: Array<AppRouteRecordRaw> = [
 							meta: { title: 'resizeParentHeightTable' }
 						}
 					]
+				},
+				{
+					// demo演示
+					path: '/demo',
+					component: Layout,
+					redirect: '/demo/adminManage',
+					meta: { title: 'demo', icon: 'peoples' },
+					children: [
+						{
+							path: 'pageConfig',
+							component: () => import('@/views/demo/pageConfig/index'),
+							// component: 'demo/pageConfig/index',
+							name: 'pageConfig',
+							meta: { title: 'demo_pageConfig' }
+						},
+						{
+							// 管理员管理
+							path: 'adminManage',
+							name: 'adminManage',
+							component: () => import('@/views/demo/adminManage/index'),
+							// component: 'demo/adminManage/index',
+							meta: { title: 'demo_adminManage' }
+						}
+					]
 				}
 		  ]
 		: [])
 	// 仅用于研发测试 START
 	/*{
-		path: '/test',
-		component: Layout,
-		// meta: {hidden: true, title: 'test', icon: 'system'},
-		meta: { title: 'test', icon: 'system' },
-		redirect: '/test/testSetup',
-		children: [
-			{
-				path: 'testSetup',
-				component: () => import('@/views/test/testSetup.vue'),
-				name: 'testSetup',
-				meta: { title: 'testSetup' }
-			},
-			{
-				path: 'componentCommunication',
-				component: () => import('@/views/test/componentCommunication/index.vue'),
-				name: 'componentCommunication',
-				meta: { title: '组件通信方式' }
-			}
-		]
-	},*/
+        path: '/test',
+        component: Layout,
+        // meta: {hidden: true, title: 'test', icon: 'system'},
+        meta: { title: 'test', icon: 'system' },
+        redirect: '/test/testSetup',
+        children: [
+            {
+                path: 'testSetup',
+                component: () => import('@/views/test/testSetup.vue'),
+                name: 'testSetup',
+                meta: { title: 'testSetup' }
+            },
+            {
+                path: 'componentCommunication',
+                component: () => import('@/views/test/componentCommunication/index.vue'),
+                name: 'componentCommunication',
+                meta: { title: '组件通信方式' }
+            }
+        ]
+    },*/
 	// 仅用于研发测试 END
 	// 外部链接
 	/*{
-		path: '/external-link',
-		component: Layout,
-		children: [
-			{
-				path: 'https://github.com/LanceJiang/vue3_element_admin',
-				meta: { title: '外部链接', icon: 'link' }
-			}
-		]
-	}*/
+        path: '/external-link',
+        component: Layout,
+        children: [
+            {
+                path: 'https://github.com/LanceJiang/vue3_element_admin',
+                meta: { title: '外部链接', icon: 'link' }
+            }
+        ]
+    }*/
 ]
 
 export const noFoundRouters = [
@@ -196,29 +220,6 @@ export const noFoundRouters = [
  * (若想要调试 接口数据 请在 env.development.local 修改 VITE_APP_USE_LOCAL_ROUTES 不为 1即可)
  */
 export const local_permissionsRoutes: Array<AppRouteRecordRaw> = [
-	{
-		// demo演示
-		path: '/demo',
-		component: 'Layout',
-		redirect: '/demo/adminManage',
-		meta: { title: 'demo', icon: 'peoples' },
-		children: [
-			{
-				path: 'pageConfig',
-				// component: () => import('@/views/demo/pageConfig/index'),
-				component: 'demo/pageConfig/index',
-				name: 'pageConfig',
-				meta: { title: 'demo_pageConfig' }
-			},
-			{
-				// 管理员管理
-				path: 'adminManage',
-				name: 'adminManage',
-				component: 'demo/adminManage/index',
-				meta: { title: 'demo_adminManage' }
-			}
-		]
-	},
 	// todo 请添加相关新路由描述
 	// 设置 权限
 	{

+ 0 - 282
src/router/test_routes.ts

@@ -1,286 +1,4 @@
 // 当前系统 menu 接口
-/*const routers = [
-	{
-		name: 'main',
-		path: '/main',
-		component: '',
-		meta: { icon: 'el-icon-guide', title: '统计页面', type: 'menu' }
-	},
-	{ name: 'about', path: '/other/about', component: 'other/about', meta: { icon: 'el-icon-info-filled', title: '关于', type: 'menu' } },
-	{
-		name: 'flowcenter',
-		path: '/flowcenter',
-		component: '',
-		meta: { icon: 'el-icon-help-filled', title: '审批中心', type: 'menu' },
-		children: [
-			{
-				name: 'flowForm',
-				path: '/flowcenter/flowForm',
-				component: 'flowcenter/flowForm',
-				meta: { icon: 'el-icon-document', title: '流程表单', type: 'menu' }
-			},
-			{
-				name: 'flowCategory',
-				path: '/flowcenter/flowCategory',
-				component: 'flowcenter/flowCategory',
-				meta: { icon: 'el-icon-operation', title: '流程分类', type: 'menu' }
-			},
-			{
-				name: 'flowIns',
-				path: '/flowcenter/flowIns',
-				component: 'flowcenter/flowIns',
-				meta: { icon: 'el-icon-briefcase', title: '流程实例', type: 'menu' }
-			},
-			{
-				name: 'flowMode',
-				path: '/flowcenter/flowMode',
-				component: 'flowcenter/flowMode',
-				meta: { icon: 'el-icon-element-plus', title: '流程模型', type: 'menu' }
-			},
-			{
-				name: 'flowTask',
-				path: '/flowcenter/flowTask',
-				component: 'flowcenter/flowTask',
-				meta: { icon: 'el-icon-tickets', title: '流程任务', type: 'menu' }
-			},
-			{
-				name: 'flowDef',
-				path: '/flowcenter/flowDef',
-				component: 'flowcenter/flowDef',
-				meta: { icon: 'el-icon-set-up', title: '流程定义', type: 'menu' }
-			}
-		]
-	},
-	{
-		name: 'flowManage',
-		path: '',
-		component: '',
-		meta: { icon: 'el-icon-eleme', title: '流程管理', type: 'menu' },
-		children: [
-			{ name: 'flowGroups', path: '/flow/groups/index', component: 'flow/groups/index', meta: { title: '流程组', type: 'menu' } },
-			{ name: 'flowList', path: '/flow/list/index', component: 'flow/list/index', meta: { title: '流程列表', type: 'menu' } },
-			{ name: 'flowCreate', path: '/flow/create/index', component: 'flow/create/index', meta: { title: '创建流程', type: 'menu' } }
-		]
-	},
-	{
-		path: '/setting',
-		component: '',
-		meta: { icon: 'el-icon-setting', title: '配置', type: 'menu' },
-		children: [
-			{ name: 'user', path: '/setting/user', component: 'setting/user', meta: { icon: 'el-icon-user-filled', title: '用户管理', type: 'menu' } },
-			{ name: 'role', path: '/setting/role', component: 'setting/role', meta: { icon: 'el-icon-files', title: '角色管理', type: 'menu' } },
-			{
-				name: 'department',
-				path: '/setting/department',
-				component: 'setting/department',
-				meta: { icon: 'el-icon-notebook', title: '部门管理', type: 'menu' }
-			},
-			{ name: 'post', path: '/setting/post', component: 'setting/post', meta: { icon: 'el-icon-user', title: '岗位管理', type: 'menu' } },
-			{ name: 'menu', path: '/setting/menu', component: 'setting/menu', meta: { icon: 'el-icon-fold', title: '菜单管理', type: 'menu' } },
-			{
-				name: 'region',
-				path: '/setting/region',
-				component: 'setting/region',
-				meta: { icon: 'el-icon-map-location', title: '行政区域', type: 'menu' }
-			},
-			{ name: 'dict', path: '/setting/dict', component: 'setting/dict', meta: { icon: 'el-icon-document', title: '字典管理', type: 'menu' } },
-			{
-				name: 'configure',
-				path: '/setting/configure',
-				component: 'setting/configure',
-				meta: { icon: 'el-icon-tools', title: '扩展配置', type: 'menu' }
-			},
-			{ path: '/setting/table', component: 'setting/table', meta: { icon: 'el-icon-scale-to-original', title: '表格列管理', type: 'menu' } },
-			{ name: 'app', path: '/setting/app', component: 'setting/app', meta: { icon: 'el-icon-help-filled', title: '应用管理', type: 'menu' } }
-		]
-	},
-	{
-		path: '/monitor',
-		component: '',
-		meta: { icon: 'el-icon-data-analysis', title: '监控', type: 'menu' },
-		children: [
-			{ path: '/setting/task', component: 'setting/task', meta: { icon: 'el-icon-alarm-clock', title: '计划任务', type: 'menu' } },
-			{ name: 'server', path: '/template/server', component: 'template/server', meta: { icon: 'el-icon-cpu', title: '服务器监控', type: 'menu' } },
-			{ name: 'log', path: '/setting/log', component: 'setting/log', meta: { icon: 'el-icon-warning', title: '系统日志', type: 'menu' } }
-		]
-	},
-	{
-		path: '/test',
-		component: '',
-		meta: { icon: 'el-icon-mouse', title: '实验室', type: 'menu' },
-		children: [
-			{ name: 'codebug', path: '/test/codebug', component: 'test/codebug', meta: { icon: 'sc-icon-bug-line', title: '异常处理', type: 'menu' } },
-			{
-				name: 'autocode',
-				path: '/test/autocode',
-				component: '',
-				meta: { icon: 'sc-icon-code', title: '代码生成器', type: 'menu' },
-				children: [
-					{
-						name: 'autocode-index',
-						path: '/test/autocode/index',
-						component: 'test/autocode',
-						meta: { icon: '', title: '代码生成器', type: 'menu' }
-					},
-					{ name: 'autocode-list', path: '/test/autocode/list', component: 'test/autocode/list', meta: { title: '列表生成器', type: 'menu' } }
-				]
-			}
-		]
-	},
-	{
-		path: '/other',
-		component: '',
-		meta: { icon: 'el-icon-more-filled', title: '其他', type: 'menu' },
-		children: [
-			{
-				name: 'directive',
-				path: '/other/directive',
-				component: 'other/directive',
-				meta: { icon: 'el-icon-price-tag', title: '指令', type: 'menu' }
-			},
-			{ path: '/other/viewTags', component: 'other/viewTags', meta: { icon: 'el-icon-files', title: '标签操作', type: 'menu' } },
-			{
-				name: 'link',
-				path: '',
-				component: '',
-				meta: { icon: 'el-icon-link', title: '外部链接', type: 'menu' },
-				children: [
-					{ path: 'https://baidu.com', component: '', meta: { icon: '', title: '百度', type: 'link' } },
-					{ path: 'https://www.google.cn', component: '', meta: { title: '谷歌', type: 'link' } }
-				]
-			},
-			{
-				name: 'iframe',
-				path: '/iframe',
-				component: '',
-				meta: { icon: 'el-icon-position', title: 'Iframe', type: 'menu' },
-				children: [
-					{ name: 'scuidoc', path: 'https://lolicode.gitee.io/scui-doc', component: '', meta: { title: 'SCUI文档', type: 'iframe' } },
-					{ name: 'elementplus', path: 'https://element-plus.gitee.io', component: '', meta: { title: 'Element Plus', type: 'iframe' } },
-					{ name: 'vue3', path: 'https://v3.cn.vuejs.org', component: '', meta: { icon: '', title: 'VUE 3', type: 'iframe' } }
-				]
-			}
-		]
-	},
-	{
-		name: 'template',
-		path: '/template',
-		component: '',
-		meta: { icon: 'el-icon-files', title: '模板', type: 'menu' },
-		children: [
-			{
-				name: 'svgmap',
-				path: '/template/svgmap',
-				component: 'template/svgmap',
-				meta: { icon: 'el-icon-map-location', title: '地理信息', type: 'menu' }
-			},
-			{
-				name: 'blankTemplate',
-				path: '/template/blank',
-				component: 'template/blank',
-				meta: { icon: 'el-icon-folder', title: '空白模板', type: 'menu' }
-			},
-			{
-				name: 'chartlist',
-				path: '/template/chartlist',
-				component: 'template/chartlist',
-				meta: { icon: 'el-icon-data-analysis', title: '统计列表', type: 'menu' }
-			},
-			{
-				name: 'calendar',
-				path: '/template/calendar',
-				component: 'template/calendar',
-				meta: { icon: 'el-icon-calendar', title: '日历计划', type: 'menu' }
-			},
-			{ name: 'list', path: '/template/list', component: 'template/list', meta: { icon: 'el-icon-fold', title: '详细列表', type: 'menu' } },
-			{
-				name: 'tabinfo',
-				path: '/template/tabinfo',
-				component: 'template/tabinfo',
-				meta: { icon: 'el-icon-document', title: '分栏明细', type: 'menu' }
-			},
-			{
-				name: 'stepform',
-				path: '/template/stepform',
-				component: 'template/stepform',
-				meta: { icon: 'el-icon-switch', title: '分步表单', type: 'menu' }
-			}
-		]
-	},
-	{
-		path: '/vab',
-		component: '',
-		meta: { icon: 'el-icon-takeaway-box', title: '组件', type: 'menu' },
-		children: [
-			{ name: 'mini', path: '/vab/mini', component: 'vab/mini', meta: { icon: 'el-icon-magic-stick', title: '原子组件', type: 'menu' } },
-			{ name: 'iconfont', path: '/vab/iconfont', component: 'vab/iconfont', meta: { icon: 'el-icon-orange', title: '扩展图标', type: 'menu' } },
-			{
-				name: 'data',
-				path: '/vab/data',
-				component: '',
-				meta: { icon: 'el-icon-histogram', title: 'Data 数据展示', type: 'menu' },
-				children: [
-					{ name: 'chart', path: '/vab/chart', component: 'vab/chart', meta: { icon: '', title: '图表 Echarts', type: 'menu' } },
-					{ name: 'statistic', path: '/vab/statistic', component: 'vab/statistic', meta: { title: '统计数值', type: 'menu' } },
-					{ name: 'video', path: '/vab/video', component: 'vab/video', meta: { icon: '', title: '视频播放器', type: 'menu' } },
-					{ name: 'qrcode', path: '/vab/qrcode', component: 'vab/qrcode', meta: { title: '二维码', type: 'menu' } }
-				]
-			},
-			{
-				name: 'chart',
-				path: '/vab/chart',
-				component: 'vab/chart',
-				meta: { icon: 'el-icon-edit', title: 'Form 数据录入', type: 'menu' },
-				children: [
-					{ name: 'tableselect', path: '/vab/tableselect', component: 'vab/tableselect', meta: { icon: '', title: '表格选择器', type: 'menu' } },
-					{ name: 'formtable', path: '/vab/formtable', component: 'vab/formtable', meta: { title: '表单表格', type: 'menu' } },
-					{ name: 'filterBar', path: '/vab/filterBar', component: 'vab/filterBar', meta: { icon: '', title: '过滤器v2', type: 'menu' } },
-					{ name: 'upload', path: '/vab/upload', component: 'vab/upload', meta: { title: '上传', type: 'menu' } },
-					{ name: 'select', path: '/vab/select', component: 'vab/select', meta: { title: '异步选择器', type: 'menu' } },
-					{ name: 'iconselect', path: '/vab/iconselect', component: 'vab/iconselect', meta: { title: '图标选择器', type: 'menu' } },
-					{ name: 'editor', path: '/vab/editor', component: 'vab/editor', meta: { title: '富文本编辑器', type: 'menu' } }
-				]
-			},
-			{
-				name: 'feedback',
-				path: '/vab/feedback',
-				component: 'vab/feedback',
-				meta: { icon: 'el-icon-mouse', title: 'Feedback 反馈', type: 'menu' },
-				children: [
-					{ name: 'drag', path: '/vab/drag', component: 'vab/drag', meta: { icon: '', title: '拖拽排序', type: 'menu' } },
-					{ name: 'contextmenu', path: '/vab/contextmenu', component: 'vab/contextmenu', meta: { title: '右键菜单', type: 'menu' } },
-					{ name: 'cropper', path: '/vab/cropper', component: 'vab/cropper', meta: { title: '图像剪裁', type: 'menu' } },
-					{ name: 'fileselect', path: '/vab/fileselect', component: 'vab/fileselect', meta: { title: '资源库选择器', type: 'menu' } },
-					{ name: 'dialog', path: '/vab/dialog', component: 'vab/dialog', meta: { title: '弹窗扩展', type: 'menu' } }
-				]
-			},
-			{
-				name: 'others',
-				path: '/vab/others',
-				component: 'vab/others',
-				meta: { icon: 'el-icon-more-filled', title: 'Others 其他', type: 'menu' },
-				children: [
-					{ name: 'print', path: '/vab/print', component: 'vab/print', meta: { icon: '', title: '打印', type: 'menu' } },
-					{ name: 'watermark', path: '/vab/watermark', component: 'vab/watermark', meta: { icon: 'el-icon-finished', title: '水印', type: 'menu' } }
-				]
-			},
-			{ name: 'form', path: '/vab/form', component: 'vab/form', meta: { icon: 'el-icon-message-box', title: '动态表单(Beta)', type: 'menu' } },
-			{ path: '/vab/workflow', component: 'vab/workflow', meta: { icon: 'el-icon-share', title: '工作流设计器', type: 'menu' } }
-		]
-	},
-	{
-		name: '啊',
-		path: '/home',
-		component: '111',
-		meta: { icon: 'el-icon-eleme-filled', title: '首页', type: 'menu', hidden: true },
-		children: [
-			{ name: 'dashboard', path: '/dashboard', component: 'home', meta: { icon: 'el-icon-menu', title: '控制台', type: 'menu' } },
-			{ name: 'usercenter', path: '/usercenter', component: 'userCenter', meta: { icon: 'el-icon-user', title: '个人信息', type: 'menu' } }
-		]
-	},
-	// todo...
-	{ path: '', component: '', meta: { title: '未命名1', type: 'menu' } }
-]*/
 /**
  * /sys/resource/list-tree  -> /sys/resource/list-menu-permissions
  * 数据 对标

+ 1 - 1
src/store/modules/permission.ts

@@ -35,7 +35,7 @@ export const filterAsyncRoutes = (routes: AppRouteRecordRaw[], roles: string[])
 			tmp.component = Layout
 		} else {
 			const component = modules[`/src/views/${tmp.component}.vue`] as any
-			console.error(component, 'component....')
+			// console.error(component, 'component....')
 			if (component) {
 				tmp.component = component
 			} else {