Commit Graph

3661 Commits

Author SHA1 Message Date
yuping
4153580d02 --fix bug 2023-04-11 18:27:30 +08:00
yuping
47a92b5673 --fix bug 2023-04-11 16:46:44 +08:00
yuping
19e9a63656 Merge remote-tracking branch 'origin/develop' into develop 2023-04-10 14:52:36 +08:00
wyx
7825bf7952 fix:修改版本号 2023-04-10 12:27:14 +08:00
yuping
7990759b3f --fix bug 2023-04-10 12:03:09 +08:00
yuping
92a0e5bd70 --fix bug 2023-04-10 11:43:08 +08:00
wyx
251b3179f7 style 2023-04-07 14:53:02 +08:00
wyx
6ccdaac1b9 fix:路径图结束时,更多操作栏内操作未变化问题修改 2023-04-07 11:24:14 +08:00
yuping
ec6398a7f3 Merge remote-tracking branch 'origin/develop' into develop 2023-04-07 02:00:54 +08:00
yuping
49c6e0756c --fix bug 2023-04-07 02:00:36 +08:00
wyx
6c5dbd8a1b fix 2023-04-06 20:47:35 +08:00
wyx
739a37664d fix:模板库点击编辑返回报错修改 2023-04-06 20:47:14 +08:00
wyx
69df7cddc6 fix:项目/学习路径返回跳转指点tab修改 2023-04-06 20:01:42 +08:00
yuping
cef42554e4 --fix bug 2023-04-06 16:49:27 +08:00
yuping
399339ae12 --fix bug 2023-04-06 16:07:58 +08:00
yuping
712425d71e --fix bug 2023-04-06 16:03:29 +08:00
yuping
bfcf84d3f5 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/components/drawers/project/ProjectOnlineManage.vue
2023-04-06 16:02:42 +08:00
yuping
1a5d006e05 --fix bug 2023-04-06 16:01:34 +08:00
wyx
cfde4bf659 fix:修改版本号 2023-04-06 15:00:08 +08:00
wyx
4efe89a630 fix:项目/路径图编辑任务-点击取消按钮返回任务大纲修改 2023-04-06 14:59:06 +08:00
wyx
ce44a8996a fix:考试及格线分数配置负数问题修改 2023-04-06 14:14:27 +08:00
wyx
062c94af75 fix:评估管理查看按钮样式修改 2023-04-06 14:04:37 +08:00
wyx
659c479474 fix:增加面授课开课学员成绩导入成功后提示及自动关闭抽屉获重新取数据 2023-04-04 15:39:46 +08:00
wyx
c12d58d2f0 fix:修改版本号 2023-04-04 13:49:04 +08:00
wyx
55cc6e3162 style 2023-04-04 12:15:11 +08:00
BOE\10867418
1a5d88344a Merge branch 'dongwu-develop' into develop
# Conflicts:
#	src/App.vue
2023-04-04 09:36:29 +08:00
wyx
7e4896797c fix:修改版本号 2023-04-04 08:55:07 +08:00
yuping
800c49e2d1 --fix bug 2023-04-04 00:02:35 +08:00
BOE\10867418
b7a2cbecf8 Merge branch 'dev_m' into develop 2023-04-03 18:17:41 +08:00
BOE\10867418
4abc6cd2fc 修改 2023-04-03 18:17:31 +08:00
yuping
908dd886af --fix bug 2023-04-03 18:12:54 +08:00
BOE\10867418
93f43f3cd5 Merge branch 'dev_m' into develop 2023-04-03 17:38:08 +08:00
BOE\10867418
406ed322cf 路径图添加创建人 2023-04-03 17:37:36 +08:00
BOE\10867418
6a94bb4979 Merge branch 'dongwu-develop' into develop
# Conflicts:
#	src/App.vue
2023-04-03 17:17:58 +08:00
wyx
25a8b57232 fix:修改版本号 2023-04-03 17:09:00 +08:00
yuping
8cd130562d --fix bug 2023-04-03 16:35:48 +08:00
yuping
afe3f9f2c1 --fix bug 2023-04-03 16:14:43 +08:00
yuping
82f66ca3af --fix bug 2023-04-03 14:57:52 +08:00
BOE\10867418
bc8d68c836 Merge branch 'dev_m' into develop 2023-04-03 14:18:58 +08:00
BOE\10867418
2629eca889 屏蔽去除,过滤导出 2023-04-03 14:18:13 +08:00
yuping
9e4344674d Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop
 Conflicts:
	src/App.vue
2023-04-03 13:46:35 +08:00
wyx
fca6a654fc fix:添加面授课的开课,无法配置作业问题 2023-04-03 13:40:29 +08:00
BOE\10867418
e2d6584d84 Merge branch 'dongwu-develop' into develop 2023-04-03 09:26:11 +08:00
wyx
c97df0dae8 fix:修改版本号 2023-04-03 09:06:51 +08:00
BOE\10867418
3b000afc13 Merge branch 'dev_m' into develop 2023-03-31 15:39:25 +08:00
mx00085@163.com
3cfbe61a7d fix: 项目状态更改 2023-03-31 15:13:15 +08:00
mx00085@163.com
9c72962978 fix: 项目状态更改 2023-03-31 15:01:36 +08:00
BOE\10867418
f86b4c77e8 Merge branch 'dev_m' into develop 2023-03-31 13:53:07 +08:00
mx00085@163.com
e83b300ea5 feat: 新增柱状图大窗口显示 2023-03-31 13:50:17 +08:00
yuping
b4ac4d36a3 --fix bug 2023-03-31 11:30:30 +08:00