Commit Graph

96 Commits

Author SHA1 Message Date
clay
736798b540 Merge pull request 'build : 修改dm发布' (#66) from master into dm
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/66
2024-03-29 12:50:19 +00:00
clay
0c56e6a161 build : 修改dm发布 2024-03-29 20:50:06 +08:00
clay
190c77d71d Merge pull request 'build : 修改dm发布' (#65) from master into dm
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/65
2024-03-29 12:48:05 +00:00
clay
bba369abaa build : 修改dm发布 2024-03-29 20:47:49 +08:00
clay
6df354ec1b Merge pull request 'build : 修改dm发布' (#64) from master into dm
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/64
2024-03-29 12:45:11 +00:00
clay
fcff8c9cc4 build : 修改dm发布 2024-03-29 20:44:33 +08:00
clay
13d3428d7a build : 环境区分 2024-03-29 18:22:23 +08:00
clay
99cf83a563 Merge remote-tracking branch 'origin/master' 2024-03-29 18:10:33 +08:00
clay
f98103c61f build : 环境区分 2024-03-29 18:10:26 +08:00
wenhua
5986ab1eb4 Merge pull request 'fix: 生产环境禁用debugger' (#61) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/61
2024-03-29 09:14:28 +00:00
lilinyuan
2282f1c834 fix: 生产环境禁用debugger 2024-03-29 17:14:04 +08:00
wenhua
ecf3fecd40 Merge pull request 'fix: 调整删除按钮展示逻辑' (#58) from uesr into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/58
2024-03-29 08:49:50 +00:00
lilinyuan
658f7de3c0 fix: 调整删除按钮展示逻辑 2024-03-29 16:49:15 +08:00
wenhua
46a6745f17 Merge pull request 'role' (#56) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/56
2024-03-29 07:46:43 +00:00
lilinyuan
d6ce782681 feat: 添加request 2024-03-29 15:45:14 +08:00
lilinyuan
aa3194dcc1 fix: 暂时删除request 2024-03-29 15:42:33 +08:00
lilinyuan
e418b588f6 fix: 修改request提示 2024-03-29 15:41:21 +08:00
lilinyuan
a5a2e099a2 fix: 修改请求报错提示 2024-03-29 15:34:34 +08:00
lilinyuan
19822a539c fix: 修改tablecol显示bug 2024-03-29 15:34:17 +08:00
clay
fa56d63dbb Merge remote-tracking branch 'origin/master' 2024-03-29 15:21:02 +08:00
clay
2ad0dbf8ab feat : 403 权限校验 2024-03-29 15:20:52 +08:00
wenhua
89b42dba2a Merge pull request 'uesr' (#52) from uesr into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/52
2024-03-29 07:19:39 +00:00
lilinyuan
c28b0e306d fix: 调整user编辑逻辑OA用户只能修改角色 2024-03-29 15:19:17 +08:00
wenhua
c88be616fc Merge pull request 'fix: 修复role新增编辑bug' (#50) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/50
2024-03-29 06:32:08 +00:00
lilinyuan
0fc918b576 fix: 修复role新增编辑bug 2024-03-29 14:31:45 +08:00
wenhua
38b5e2d2af Merge pull request 'role' (#48) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/48
2024-03-29 06:15:51 +00:00
lilinyuan
4c17bf7f6a fix: 修改默认用户名为super 2024-03-29 14:15:23 +08:00
lilinyuan
878940c34b fix: 固定role列表操作列 2024-03-29 14:15:04 +08:00
wenhua
b1b039a897 Merge pull request 'master' (#47) from master into uesr
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/47
2024-03-29 06:09:34 +00:00
wenhua
1e23fe08e3 Merge pull request 'fix: 修复role新增编辑bug, 调整列表页' (#45) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/45
2024-03-29 06:07:24 +00:00
lilinyuan
47a4c311af fix: 修复role新增编辑bug, 调整列表页 2024-03-29 14:06:47 +08:00
wenhua
5fc036d12d Merge pull request 'role' (#43) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/43
2024-03-28 08:42:48 +00:00
lilinyuan
51cf038bed feat: 角色crud对接完成 2024-03-28 16:41:22 +08:00
lilinyuan
c412b8652d fix: tablelayout 改为auto 2024-03-28 16:40:48 +08:00
wenhua
610b1a66b6 Merge pull request 'role' (#41) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/41
2024-03-28 01:32:17 +00:00
lilinyuan
e8270fbe0b fix: 重构role 2024-03-27 17:30:52 +08:00
lilinyuan
46765952e5 fix: 修复路由bug 2024-03-27 17:30:29 +08:00
wenhua
4eff7d3751 Merge pull request 'uesr' (#39) from uesr into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/39
2024-03-27 06:22:28 +00:00
lilinyuan
a22d80710b fix: 调整user列表编辑删除按钮显示 2024-03-27 14:20:50 +08:00
lilinyuan
e1f5c48a6e fix: 优化user新增修改 2024-03-27 14:20:23 +08:00
wenhua
73f5c4d493 Merge pull request 'uesr' (#37) from uesr into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/37
2024-03-26 08:32:30 +00:00
lilinyuan
462c2e2110 feat: 完成user新增编辑详情接口对接 2024-03-26 16:31:16 +08:00
lilinyuan
f782587b79 feat: 添加公共组件title 2024-03-26 16:30:53 +08:00
lilinyuan
103b24fdb3 fix: 调整tagsViewvue文件 2024-03-26 16:30:33 +08:00
lilinyuan
03b9eae07d fix: 删除自定义指令consolelog 2024-03-26 16:30:13 +08:00
lilinyuan
ed0d51d47d fix: 调整组件 2024-03-26 16:29:09 +08:00
lilinyuan
82947fe5b6 fix: 调整tagsView文件 2024-03-26 16:28:46 +08:00
lilinyuan
eda3b43e73 fix: 样式调整 2024-03-26 16:28:15 +08:00
08edc44670 Merge pull request 'fix : 细节优化' (#35) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/35
2024-03-26 06:47:51 +00:00
45f95fa297 fix : 细节优化 2024-03-26 14:37:38 +08:00