Commit Graph

4117 Commits

Author SHA1 Message Date
BOE\10867418
b87f11da8a 统一处理报错 2023-09-21 15:13:50 +08:00
joshen
9cc01e7ec5 Merge branch 'boe_dongwu0919' into 'master'
Boe dongwu0919

See merge request !135
2023-09-20 17:32:36 +08:00
joshen@zcwytd.com
96a5f7445c Merge branch 'dw_master' into boe_dongwu0919 2023-09-20 17:26:31 +08:00
yuping
a0cc831f33 fix bug 2023-09-20 15:53:37 +08:00
joshen
d4c21db20d Merge branch 'zcwyMaster' into 'master'
Zcwy master

See merge request !133
2023-09-20 15:14:44 +08:00
yuping
7eb3f493e1 Merge remote-tracking branch 'origin/user-modify' into user-modify 2023-09-19 17:05:52 +08:00
yuping
9ab862397b fix bug 2023-09-19 17:05:40 +08:00
nisen
fcdce3f082 修改推送接口时间 2023-09-19 14:21:31 +08:00
BOE\10867418
2df6036127 Merge branch 'report-master' 2023-09-19 09:21:13 +08:00
BOE\10867418
4dcb2a9932 修改表格 2023-09-19 09:21:03 +08:00
BOE\10867418
77904d0ad4 Merge branch 'report-master' 2023-09-18 15:20:42 +08:00
BOE\10867418
1cdc56b101 修改导出文件名称 2023-09-18 15:20:15 +08:00
joshen
b5521cf21f Merge branch 'zcwy0918' into 'master'
持续时间放开

See merge request !131
2023-09-18 12:31:26 +08:00
nisen
d7ad0c992c 持续时间放开 2023-09-18 11:50:05 +08:00
yuping
0112a88185 ---fix bug 2023-09-14 15:00:39 +08:00
BOE\10867418
2781b8f277 Merge branch 'report-master' 2023-09-13 17:19:21 +08:00
BOE\10867418
6c4b36fbf3 获取当天 2023-09-13 17:17:19 +08:00
BOE\10867418
0206adf740 Merge branch 'report-master' 2023-09-13 13:45:57 +08:00
BOE\10867418
81d1646b23 时间 2023-09-13 13:35:26 +08:00
nisen
77121a63d2 案例选所有人 2023-09-13 11:31:34 +08:00
nisen
df3db82902 解代码抛出异常问题 2023-09-12 17:37:51 +08:00
NiSen
47e788f764 修改npm报错问题 2023-09-12 17:21:21 +08:00
BOE\10867418
522aefce53 Merge branch 'report-master' 2023-09-12 11:14:01 +08:00
weixiaobo@boe.com.cn
95c8a26d70 报表数据概览checkbox切换不调接口 2023-09-12 11:13:03 +08:00
BOE\10867418
a39f07c7d7 Merge branch 'report-master' 2023-09-12 09:20:46 +08:00
BOE\10867418
a4398bd7b6 12时制改24时制 2023-09-12 09:20:37 +08:00
NiSen
4b99a415e2 修改gitignore 2023-09-11 17:56:56 +08:00
BOE\10867418
3a002f5686 Merge branch 'report-master' 2023-09-11 17:34:24 +08:00
BOE\10867418
6121bc5afb 课程停用标志 2023-09-11 17:34:03 +08:00
joshen
448f709467 Merge branch 'zcwy0906' into 'master'
限制上传大小

See merge request !128
2023-09-07 17:34:24 +08:00
nisen
e37b953c91 限制上传大小 2023-09-07 17:04:48 +08:00
joshen
54853b4825 Merge branch 'report-master' into 'master'
Report master

See merge request !127
2023-09-07 16:02:18 +08:00
BOE\10867418
2a50f04e0c 报表合并到生产 2023-09-07 14:45:53 +08:00
joshen
a91ce75800 Merge branch 'zcwy0906' into 'master'
Zcwy0906

See merge request !126
2023-09-07 14:30:28 +08:00
nisen
6a653d4295 通知请求问题 2023-09-07 13:51:13 +08:00
nisen
98759fc83d 图片显示 2023-09-07 10:41:39 +08:00
joshen
a7c4bb563c Merge branch 'zcwy0906' into 'master'
提交小数问题

See merge request !124
2023-09-06 23:49:17 +08:00
nisen
cf17d75f0e 提交小数问题 2023-09-06 23:48:37 +08:00
joshen
c8522db1d3 Merge branch 'zcwy0906' into 'master'
Zcwy0906

See merge request !123
2023-09-06 19:17:23 +08:00
nisen
1f79694327 通知标题字数 2023-09-06 18:19:38 +08:00
nisen
92e49253e6 修改认证讲师库 2023-09-06 18:09:09 +08:00
nisen
4709e99cc3 修改 2023-09-06 17:48:16 +08:00
joshen@zcwytd.com
f543d1ee5b 新增教师节 2023-09-06 17:21:30 +08:00
BOE\10867418
aed27a4794 调整课程筛选框顺序 2023-09-05 15:52:13 +08:00
BOE\10867418
cb58a1c56a 调整筛选框顺序 2023-09-05 15:45:59 +08:00
BOE\10867418
136e412c27 案例导出隐藏 2023-09-05 15:20:23 +08:00
BOE\10867418
e8e3c0b6b6 Merge branch 'wsbx' into report_test0818
# Conflicts:
#	src/views/report/Overvoew.vue
2023-09-04 08:54:11 +08:00
BOE\10867418
0312f6de02 修改组织请求参数,添加发布时间 2023-09-04 08:49:30 +08:00
weixiaobo@boe.com.cn
1780a14ddc 运营数据概览按日显示问题 2023-09-01 18:25:58 +08:00
weixiaobo@boe.com.cn
a85eabdd4e 报表组织权限控制 2023-09-01 18:09:42 +08:00