hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-20 00:06:47 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,369 Commits 77 Branches 1 Tag
fd3ef9de10e102aed1f25c3ebbae91bd57f7e9bd
Commit Graph

4369 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yuping
5e493cd549 -- 环境更改1 2022-12-15 22:18:50 +08:00
yuping
ba0106957a Merge remote-tracking branch 'origin/develop' into develop 2022-12-15 22:17:43 +08:00
yuping
6f00cb21c2 -- 环境更改1 2022-12-15 22:17:36 +08:00
zhangyc
e98d3cd5ea 撤回的评估 还在添加评估列表里 2022-12-15 20:05:08 +08:00
dongruihua
622ba9bdc9 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2022-12-15 15:21:35 +08:00
zhangyc
59f4ad9d09 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-15 11:55:33 +08:00
zhangyc
00c122042c 测评增加type字段 2022-12-15 11:55:27 +08:00
yuping
fd19dd049c -- 环境更改1 2022-12-14 23:55:02 +08:00
dongruihua
f880b1809d Merge branch 'manage-release' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into release 
# Conflicts:
#	package.json
#	src/api/config.js
#	src/components/NavTop.vue
#	src/views/projectcenter/templateAdd.vue
#	vue.config.js
 2022-12-14 23:31:14 +08:00
yuping
86260c8a19 -- 环境更改 2022-12-14 23:29:06 +08:00
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
lixg
8804507d97 feat:合并 2022-12-14 23:16:49 +08:00
dongruihua
200bd0cff9 Merge branch 'manage-release' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into release 
# Conflicts:
#	src/api/config.js
#	src/components/NavTop.vue
#	src/views/projectcenter/templateAdd.vue
#	vue.config.js
 2022-12-14 23:12:40 +08:00
lixg
6cf0aacec0 feat:合并 2022-12-14 23:12:21 +08:00
dongruihua
5a4443cb8c Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2022-12-14 21:24:05 +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
dongruihua
0f814a236d Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 
# Conflicts:
#	package.json
 2022-12-14 21:05:35 +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
dongruihua
94c4216a38 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 
# Conflicts:
#	vue.config.js
 2022-12-14 20:41:22 +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
huangshengfa
b6cdcc2b05 Merge branch 'pre-dev' into 'develop' 
Pre dev

See merge request !21
 2022-12-14 17:34:35 +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
dongruihua
df87d1a212 预发布配置修改 2022-12-14 16:48:41 +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