hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-07 01:46:43 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,562 Commits 66 Branches 1 Tag
04fa60d838bc563db41f4e4b758053b8f29d46c6
Commit Graph

1562 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yuping
04fa60d838 Merge branch 'develop' into manage-release 
# Conflicts:
#	src/App.vue
#	src/api/config.js
#	src/api/method.js
#	src/components/NavTop.vue
#	src/router/index.js
#	src/views/projectcenter/templateAdd.vue
 2022-12-14 23:25:53 +08:00
yuping
12c3a1ce72 -- 环境更改 2022-12-14 21:21:58 +08:00
yuping
62253c8be9 -- 环境更改 2022-12-14 21:12:15 +08:00
yuping
a542608dfe -- 环境更改 2022-12-14 21:11:15 +08:00
yuping
13009685a8 Merge remote-tracking branch 'origin/develop' into develop 2022-12-14 21:08:46 +08:00
yuping
dbe1a9b0cd -- 环境更改 2022-12-14 21:08:37 +08:00
zhangyc
d67b751a4e Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-14 21:00:56 +08:00
zhangyc
2264a83499 课程搜索 2022-12-14 21:00:49 +08:00
yuping
635cf2040f -- 环境更改 2022-12-14 20:57:40 +08:00
yuping
d8c63030f8 -- 环境更改 2022-12-14 20:57:25 +08:00
yuping
fbfcab09cf Merge remote-tracking branch 'origin/develop' into develop 2022-12-14 20:56:59 +08:00
yuping
5c6abd7b8b -- 环境更改 2022-12-14 20:56:48 +08:00
lixg
d05fd14aae feat:合并 2022-12-14 20:56:22 +08:00
lixg
eece67eb22 fix:修改添加任务项目列表 2022-12-14 20:55:34 +08:00
yuping
f484534754 -- bug 2022-12-14 20:54:00 +08:00
yuping
29461f594e -- bug 2022-12-14 20:53:07 +08:00
yuping
fffc5c66b2 -- bug 2022-12-14 20:50:46 +08:00
yuping
74e41e9abe Merge remote-tracking branch 'origin/develop' into develop 2022-12-14 20:36:58 +08:00
yuping
42340e38d0 -- bug 2022-12-14 20:36:37 +08:00
yuping
613a1f285d Merge remote-tracking branch 'origin/manage-release' into manage-release 2022-12-14 19:26:38 +08:00
yuping
f34add84f0 -- bug 2022-12-14 19:26:13 +08:00
lixg
652282773f feat:修改 2022-12-14 17:52:13 +08:00
lixg
4b4c146ca8 feat:hebing 2022-12-14 17:43:38 +08:00
lixg
dd11f3577e fix:修改url 2022-12-14 17:42:12 +08:00
lixg
6dda7355a6 feat:合并 2022-12-14 17:37:25 +08:00
lixg
a97d9d023d feat:合并 2022-12-14 17:24:27 +08:00
lixg
37cb81763a fix:修改版本号 2022-12-14 17:24:00 +08:00
yuping
ea244ad566 -- bug 2022-12-14 17:12:13 +08:00
yuping
1ce9bf7c4d Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	src/components/project/ProjectLevel.vue
#	src/views/projectcenter/templateAdd.vue
 2022-12-14 17:04:34 +08:00
yuping
6909dedb98 -- bug 2022-12-14 17:03:28 +08:00
zhangyc
9b426e5695 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-14 16:04:15 +08:00
zhangyc
4b12a51f51 merge 2022-12-14 16:04:10 +08:00
zhangyc
117dd5f184 隐藏缺失字段 2022-12-14 16:00:23 +08:00
lixg
16b329ff24 feat:合并 2022-12-14 15:48:40 +08:00
lixg
497b7449cb fix:修改未审核课程预览附件名称显示问题 2022-12-14 15:46:33 +08:00
yuping
3b750a61bd Merge remote-tracking branch 'origin/develop' into develop 2022-12-14 15:31:20 +08:00
yuping
474a360dc6 -- bug 2022-12-14 15:17:03 +08:00
lixg
f0603eda14 feat:合并 2022-12-14 15:10:22 +08:00
lixg
5bbe79f325 fix:修改面授课开课附件显示以及待审核课程附件下载 2022-12-14 15:09:36 +08:00
yuping
a573498512 -- bug 2022-12-14 14:28:58 +08:00
yuping
57d83419dc -- bug 2022-12-14 14:27:05 +08:00
zhangyc
6d855e37c0 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-14 14:12:40 +08:00
zhangyc
233d334840 修复提示请选中关卡问题 2022-12-14 14:09:01 +08:00
lixg
ad8f211a82 feat:合并 2022-12-14 13:51:32 +08:00
lixg
a665762f01 fix:修改项目未通过筛选问题 2022-12-14 12:10:27 +08:00
zhangyc
8310728551 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-14 11:59:40 +08:00
zhangyc
5c4a51b0f7 审核意见 2022-12-14 11:59:31 +08:00
lixg
ea3315ac32 fix:修改创建评估及编辑评估回显 2022-12-14 11:55:48 +08:00
lixg
a70b55906f feat:合并 2022-12-14 09:04:17 +08:00
lixg
0382f7ae12 feat:修改版本号 2022-12-14 09:03:23 +08:00