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 |
|
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 |
|