Commit Graph

149 Commits

Author SHA1 Message Date
wenhua
3403ca7ecb Merge pull request 'xqhz' (#113) from xqhz into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/113
2024-05-09 09:33:33 +00:00
lilinyuan
28b4637e01 feat: 初始化需求汇总主页面 2024-05-09 17:33:01 +08:00
lilinyuan
639caadc46 fix: 修复bug 2024-05-09 17:32:36 +08:00
lilinyuan
6557b5d2c8 fix: 修复bug 2024-05-09 17:32:21 +08:00
4f6b2dcc27 Merge pull request 'feat : 新增首页界面' (#111) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/111
2024-05-09 09:17:30 +00:00
dcc6866211 feat : 新增首页界面 2024-05-09 17:16:39 +08:00
wenhua
0e0e1f9bb9 Merge pull request 'feat: 初始化项目需求目录及页面文件' (#110) from master into xqhz
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/110
2024-05-09 08:19:28 +00:00
lilinyuan
0e0d206cc7 feat: 初始化项目需求目录及页面文件 2024-05-09 16:14:48 +08:00
wenhua
bfe24e1207 Merge pull request 'role' (#109) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/109
2024-05-09 07:30:12 +00:00
lilinyuan
d2521765be Merge branch 'role' of http://git.feashow.cn/clay/mosr-web into role 2024-05-09 15:29:05 +08:00
lilinyuan
5c1b66b03d feat: 新增sidermenu首页项 2024-05-09 15:29:00 +08:00
clay
2bb86ced15 feat : 测试sso单点登录之后的重定向路径4 2024-04-29 11:49:46 +08:00
clay
929228974a feat : 测试sso单点登录之后的重定向路径3 2024-04-29 11:27:56 +08:00
clay
eee3c3852e feat : 测试sso单点登录之后的重定向路径 2024-04-29 10:31:18 +08:00
clay
57bfb6f4a0 feat : 测试sso单点登录之后的重定向路径 2024-04-29 10:20:58 +08:00
clay
5d3ab890f3 feat : 测试sso单点登录之后的重定向路径 2024-04-29 10:10:50 +08:00
clay
3eecc3f4b9 Merge pull request 'role' (#102) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/102
2024-04-29 02:04:03 +00:00
clay
29ea0d5fe4 feat : 测试sso单点登录之后的重定向路径 2024-04-29 10:03:46 +08:00
lilinyuan
8c1d2eeabe feat: 新增登录重定向之前被拦截的页面 2024-04-29 09:58:18 +08:00
wenhua
9217f019e5 Merge pull request 'fix: 按钮逻辑' (#100) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/100
2024-04-01 07:31:24 +00:00
lilinyuan
24dfaac98a fix: 按钮逻辑 2024-04-01 15:30:56 +08:00
wenhua
26b50d6103 Merge pull request 'fix: 调整菜单权限按钮' (#98) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/98
2024-04-01 07:08:40 +00:00
lilinyuan
b5acea2e47 fix: 调整菜单权限按钮 2024-04-01 15:02:09 +08:00
wenhua
12053b81b9 Merge pull request 'role' (#96) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/96
2024-04-01 06:36:33 +00:00
lilinyuan
39bc3011dd fix: 去掉操作列悬浮 2024-04-01 14:36:02 +08:00
lilinyuan
6e42dd43f7 fix: 组件调整 2024-04-01 14:28:08 +08:00
lilinyuan
1b10b9aa2b fix: 角色管理调整 2024-04-01 14:27:52 +08:00
lilinyuan
8964cbe4bd fix: 注释install 2024-04-01 13:58:03 +08:00
wenhua
360f0dd92d Merge pull request 'fix: 修改依赖源地址' (#94) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/94
2024-04-01 05:48:54 +00:00
lilinyuan
de971d224e fix: 修改依赖源地址 2024-04-01 13:48:34 +08:00
wenhua
68c4ca5dc9 Merge pull request 'fix: 修改依赖源' (#92) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/92
2024-04-01 05:41:49 +00:00
lilinyuan
5977480404 fix: 修改依赖源 2024-04-01 13:41:23 +08:00
wenhua
8f922a8815 Merge pull request 'role' (#90) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/90
2024-04-01 03:28:24 +00:00
lilinyuan
508e391823 feat: 恢复 2024-04-01 11:27:06 +08:00
lilinyuan
2560ed701f fix: 暂时删除 2024-04-01 11:25:27 +08:00
lilinyuan
9123149565 feat: up dependencies 2024-04-01 11:23:51 +08:00
lilinyuan
f1e1def32c feat: up dependencies 2024-04-01 11:20:55 +08:00
wenhua
c3e582ad33 Merge pull request 'feat: up' (#85) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/85
2024-04-01 03:00:32 +00:00
lilinyuan
e787128011 feat: up 2024-04-01 11:00:10 +08:00
wenhua
fde73bd7b0 Merge pull request 'fix: 再试一次' (#83) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/83
2024-04-01 02:20:57 +00:00
lilinyuan
90f6bd344e fix: 再试一次 2024-04-01 10:20:32 +08:00
wenhua
ef46911a5b Merge pull request 'fix: 使用原始ui库' (#81) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/81
2024-04-01 02:14:17 +00:00
lilinyuan
ffc5600b9b fix: 使用原始ui库 2024-04-01 10:13:53 +08:00
wenhua
a3c4a79fd0 Merge pull request 'fix: 添加调试log' (#78) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/78
2024-04-01 01:53:04 +00:00
lilinyuan
fbae33730d fix: 添加调试log 2024-04-01 09:52:01 +08:00
wenhua
450d483f39 Merge pull request 'fix: 菜单分配父子联动' (#76) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/76
2024-03-30 16:36:29 +00:00
lilinyuan
64c735eb74 fix: 菜单分配父子联动 2024-03-31 00:36:08 +08:00
wenhua
699c7ecc7d Merge pull request 'fix: 同步退出登录后再登录不同权限账号时菜单不更新问题' (#74) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/74
2024-03-30 16:24:00 +00:00
lilinyuan
ed0a5e1a7d fix: 同步退出登录后再登录不同权限账号时菜单不更新问题 2024-03-31 00:23:31 +08:00
wenhua
0ffbdbbcc7 Merge pull request 'fix: 修复角色分配菜单父子关联不生效的问题' (#72) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/72
2024-03-30 16:13:08 +00:00