Commit Graph

5834 Commits

Author SHA1 Message Date
joshen
f04d775e8e Merge remote-tracking branch 'yx/250605-added-yzt' into test20250220 2025-06-15 13:19:16 +08:00
chensg
6678a68d08 去掉组织机构学习汇总数值 2025-06-15 13:15:10 +08:00
joshen
6126dc503e Merge remote-tracking branch 'yx/250605-added-yzt' into test20250220 2025-06-15 12:59:41 +08:00
chensg
64fd654ce2 修改组织机构学习和员工学习页面布局、添加字段筛选排序功能 2025-06-15 12:55:45 +08:00
joshen
26e987428f Merge remote-tracking branch 'yx/250605-added-yzt' into test20250220 2025-06-13 18:34:34 +08:00
chensg
22f6f89e40 项目任务和人员关联弹框互换 2025-06-13 18:33:43 +08:00
joshen
c6f9922478 Merge remote-tracking branch 'yx/250605-added-yzt' into test20250220 2025-06-13 18:04:04 +08:00
chensg
d48c721948 员工学习数据田间接口调用 2025-06-13 17:53:31 +08:00
joshen
fd82c6a4f7 Merge remote-tracking branch 'yx/250605-added-yzt' into test20250220 2025-06-13 17:26:49 +08:00
chensg
1b737e4a7a 修改接口方法为post 2025-06-13 17:19:36 +08:00
chensg
2e1d7d7a51 组织学习报表修改及添加弹框,学员学习报表修改及添加弹框 2025-06-13 16:40:52 +08:00
joshen
769a0247d5 Merge remote-tracking branch 'yx/250605-added-yzt' into test20250220 2025-06-09 09:34:04 +08:00
yztopen
67d6347519 组织机构学习数据报表
优化 列表点击数据弹出层
每个列表添加分页操作
微调
2025-06-08 23:53:06 +08:00
yztopen
1a65f578ee 组织机构学习数据报表
优化 列表点击数据弹出层
每个列表添加分页操作
2025-06-08 18:59:53 +08:00
yztopen
0dc231db97 组织机构学习数据报表
优化 列表点击数据弹出层
每个列表添加分页操作
2025-06-08 18:53:52 +08:00
yztopen
f041828faa 组织机构学习数据报表 列表点击数据弹出层 2025-06-08 02:29:26 +08:00
joshen
d9e1b47bc1 Merge remote-tracking branch 'yx/250605-added-yzt' into test20250220 2025-06-05 18:22:15 +08:00
joshen
ad4c24289a Merge remote-tracking branch '121/test20250220' into test20250220
# Conflicts:
#	src/views/report/Overvoewnew.vue
2025-06-05 18:19:40 +08:00
yztopen
68e6721e3a 报告维护加的几个echarts 2025-06-05 18:16:04 +08:00
joshen
062f9fc940 添加echarts 2025-06-05 15:02:51 +08:00
joshen
62d736df88 Merge branch '250605-added-yzt' into test20250220 2025-06-05 14:33:09 +08:00
yztopen
2336501ac8 报告维护加的几个echarts 2025-06-05 14:31:30 +08:00
joshen
5b7bface47 Merge remote-tracking branch 'yx/250605-added-yzt' into test20250220 2025-06-05 11:33:33 +08:00
yztopen
3f3e8506dd 报告维护加的几个echarts 2025-06-05 11:32:20 +08:00
yztopen
09d9e1e5a1 Merge branch 'refs/heads/250429-report-wjh' into 250605-added-yzt 2025-06-05 11:04:13 +08:00
joshen
5dc42e4af6 Merge remote-tracking branch 'yx/250605-added-yzt' into test20250220 2025-06-05 10:24:38 +08:00
sunhonglai
f11c11e7ff 报告加了几个echarts 2025-06-05 10:17:50 +08:00
joshen
26e5b65f13 Merge branch '250507-bugfix-shl' into test20250220 2025-05-14 16:09:29 +08:00
sunhonglai
0f6b22f388 修改更换小组查询 2025-05-14 16:07:12 +08:00
sunhonglai
d77f7e9651 Merge branch '250427-bugfix-shl' into 250507-bugfix-shl
# Conflicts:
#	src/views/lecturer/InsideLecturer.vue
#	src/views/lecturer/LecturerFee.vue
2025-05-12 09:21:35 +08:00
wangjh12
aa06cedc34 报告 2025-05-11 15:21:57 +08:00
wangjh12
63b5d38313 报告 2025-05-11 14:59:51 +08:00
wangjh12
71fd29a536 报告 2025-05-11 10:32:58 +08:00
wangjh12
bc33c9c4f1 报告 2025-05-11 10:15:10 +08:00
wangjh12
cc88a0de81 报告 2025-05-10 19:53:12 +08:00
wangjh12
959d29edd9 报告 2025-05-10 15:33:48 +08:00
wangjh12
772d57a166 报告 2025-05-10 15:33:05 +08:00
joshen
59e8cbe274 Merge remote-tracking branch 'yx/250429-report-wjh' into test20250220 2025-05-09 18:07:38 +08:00
wangjh12
2d763eacfb 报告 2025-05-09 18:04:53 +08:00
joshen
aee58266c9 Merge remote-tracking branch 'yx/250429-report-wjh' into test20250220 2025-05-09 17:55:49 +08:00
wangjh12
609da635c1 报告 2025-05-09 17:50:23 +08:00
joshen
04c1b94d7e Merge remote-tracking branch 'yx/250429-report-wjh' into test20250220 2025-05-09 17:31:31 +08:00
wangjh12
f4ef27c75c 报告 2025-05-09 17:29:54 +08:00
joshen
427913c768 Merge remote-tracking branch 'yx/250429-report-wjh' into test20250220 2025-05-09 17:20:51 +08:00
wangjh12
92845e27ef 报告 2025-05-09 17:12:59 +08:00
joshen
05e9af99bf Merge remote-tracking branch 'yx/250429-report-wjh' into test20250220 2025-05-09 16:55:51 +08:00
wangjh12
d1247e85c4 报告 2025-05-09 16:48:59 +08:00
wangjh12
4d49b3b757 报告 2025-05-09 16:40:12 +08:00
wangjh12
2dca1f4a86 报告 2025-05-09 16:17:13 +08:00
joshen
bb155ea44b Merge branch '250507-bugfix-shl' into test20250220 2025-05-09 11:29:06 +08:00