Commit Graph

1749 Commits

Author SHA1 Message Date
yuping
bf1d3a70e3 -- bug 2022-12-18 17:00:06 +08:00
yuping
a013339aaa Merge remote-tracking branch 'origin/develop' into develop 2022-12-18 16:31:47 +08:00
yuping
a19b1afe69 -- bug 2022-12-18 16:31:19 +08:00
yuping
034a75424a -- 添加学员 2022-12-18 13:49:23 +08:00
zhangyc
e840fa2cc1 merge 2022-12-17 21:27:31 +08:00
zhangyc
79d4a0db00 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-17 21:21:44 +08:00
zhangyc
3a4ad2e7af 评估列表 2022-12-17 21:20:36 +08:00
lixg
85f84ddee4 feat:合并 2022-12-17 20:50:43 +08:00
yuping
d057c9b66c Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/views/projectcenter/TaskPage.vue
2022-12-17 17:41:47 +08:00
yuping
c1983082a5 -- 添加学员 2022-12-17 17:40:47 +08:00
lixg
9b8d2a700d feat:合并 2022-12-17 15:26:14 +08:00
zhangyc
94e0982817 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-16 17:47:35 +08:00
zhangyc
6bd7df51f9 直播时间 2022-12-16 16:24:35 +08:00
yuping
9090261a8f -- 修改 2022-12-16 14:27:06 +08:00
yuping
47aa65ff43 -- 修改 2022-12-16 14:13:00 +08:00
yuping
faab473261 -- 修改 2022-12-16 14:11:46 +08:00
yuping
3a7c6e4601 -- 修改 2022-12-16 14:00:55 +08:00
yuping
eaf36fe377 Merge remote-tracking branch 'origin/develop' into develop 2022-12-16 13:55:00 +08:00
yuping
9784f84db3 -- 修改 2022-12-16 13:54:26 +08:00
lixg
7d45e954c9 feat:合并 2022-12-16 10:09:47 +08:00
zhangyc
db5f335e1a 版本号 2022-12-16 09:22:29 +08:00
zhangyc
4622244be1 基础信息归属组织打印 2022-12-16 09:16:18 +08:00
zhangyc
e90aaf83e4 归属组织打印 2022-12-16 08:51:44 +08:00
zhangyc
e7a3d00140 课程名、项目名称修改提示重复 2022-12-16 01:21:02 +08:00
zhangyc
50c1583c46 时间去掉秒 2022-12-16 00:59:45 +08:00
zhangyc
7000aae903 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-16 00:02:02 +08:00
zhangyc
b3e568176e 项目时间搜索 2022-12-16 00:01:56 +08:00
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
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
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
lixg
6cf0aacec0 feat:合并 2022-12-14 23:12:21 +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