Commit Graph

2418 Commits

Author SHA1 Message Date
wangxuemei
435b673144 时间日期调整 2024-10-25 17:27:40 +08:00
zhangsir
53c7ba8f7c 暂时搁置 2024-10-25 16:46:50 +08:00
zhangsir
bd8706e5b9 培训发生组织创建抽屉修改 2024-10-25 14:48:45 +08:00
zhangsir
d540002690 新增讲师参数替换,多余参数,后期处理 2024-10-24 19:52:43 +08:00
wangxuemei
ca46e61d8d 接口调整 2024-10-23 17:05:10 +08:00
wangxuemei
40246afe39 导入导出调整 2024-10-23 14:13:41 +08:00
nisen
9e47b6fb8f Merge branch 'zcwy_1009_bug' into dev_master 2024-10-22 18:30:52 +08:00
zhangsir
8f9fd4f610 新建讲师临时调整讲师级别 2024-10-18 15:37:33 +08:00
zhangsir
32559a92c1 添加受众提示 2024-10-18 11:01:38 +08:00
zhangsir
048c6d3cbf 受众新增在职人数显示 2024-10-17 16:44:17 +08:00
zhangsir
efb9279dd2 新增讲师优化 2024-10-16 16:53:45 +08:00
zhangsir
a13b6c27db 讲师管理新建讲师修改 2024-10-16 13:44:53 +08:00
nisen
3a0a603860 Merge branch 'zcwy_0827_pingcode817' into dev_master 2024-10-15 19:15:15 +08:00
zhangsir
64dd7a2736 面授取消链接 2024-10-15 19:14:07 +08:00
nisen
f75be27803 Merge branch 'zcwy_0827_pingcode817' into dev_master 2024-10-15 18:37:21 +08:00
zhangsir
ac6bd15964 Merge remote-tracking branch 'zcwy/zcwy-teacher-manage' into zcwy-teacher-manage 2024-10-15 15:50:31 +08:00
zhangsir
f1dccc314e 讲师管理修改新增讲师接口 2024-10-15 15:50:09 +08:00
wangxuemei
a36b31a896 异常处理 2024-10-15 14:08:23 +08:00
wangxuemei
2c739fe666 授课记录调整 2024-10-15 10:41:24 +08:00
zhangsir
b070b73e7b 面授修改部门展示信息 2024-10-11 18:11:49 +08:00
nisen
c249640e99 Merge branch 'zcwy_1009_bug' into dev_master 2024-10-11 17:29:00 +08:00
zhangsir
f7e70a1495 面授结业修改 2024-10-11 16:44:24 +08:00
zhangsir
925ee7602b 项目编号排序规则修改 2024-10-11 11:34:05 +08:00
zhangsir
d9d694b214 项目编号新增排序功能 2024-10-11 10:00:25 +08:00
zhangsir
30cdad3eb3 面授修改 2024-10-10 17:53:24 +08:00
zhangsir
a120ab6707 面授修改 2024-10-10 15:27:57 +08:00
zhangsir
c9990113d5 面授修改 2024-10-10 12:18:56 +08:00
zhangsir
83bd1dd865 面授连同周边修改 2024-10-10 10:33:02 +08:00
zhangsir
29876bd0f3 面授连同周边修改 2024-10-09 18:03:01 +08:00
nisen
22a5ad1cb0 Merge remote-tracking branch 'zcwy/zcwy_1009_bug' into dev_master 2024-10-09 17:41:01 +08:00
nisen
34289ab1b2 Merge branch 'zcwy_0712_bug' into dev_master 2024-10-09 15:10:18 +08:00
zhangsir
dc2017e8e2 防抖的bug 2024-10-09 15:08:05 +08:00
zhangsir
d6794b338d 修改项目编号可支持名称搜索 2024-10-09 10:23:28 +08:00
nisen
f1328e2540 Merge branch 'zcwy_0712_bug' into dev_master 2024-10-08 17:58:55 +08:00
zhangsir
4af0e5992e 开课异常处理,防止一直转圈 2024-10-08 16:38:43 +08:00
zhangsir
9c509a9e09 方便测试,临时修改 2024-10-08 09:28:56 +08:00
wangxuemei
d2cb5d4067 细节调整 2024-10-08 08:59:09 +08:00
wangxuemei
850a6bc280 9291调整 2024-09-29 18:58:00 +08:00
nisen
c02b8d7a8d 补交文件 2024-09-27 17:44:16 +08:00
nisen
49dc169fa3 Merge remote-tracking branch 'boe121/master-0705' into zcwy-teacher-manage 2024-09-27 16:32:15 +08:00
zhangsir
18e69264c7 Merge remote-tracking branch 'origin/zcwy_0712' into zcwy_0827_pingcode817 2024-09-27 16:11:23 +08:00
wangxuemei
8f15476af8 体系调整 2024-09-26 16:40:00 +08:00
nisen
8ec930de6e Merge branch 'zcwy_0827_pingcode817' into dev_master
# Conflicts:
#	src/components/project/ProjectNumber.vue
#	src/views/projectcenter/ProjectAdd.vue
2024-09-24 17:41:06 +08:00
nisen
bab8d934db Merge branch 'zcwy_0712_bug' into dev_master 2024-09-24 16:37:28 +08:00
zhangsir
1be2e48b8b 删除2023 2024-09-24 16:34:35 +08:00
zhangsir
76a54aaac1 项目编号修改 2024-09-19 17:28:18 +08:00
nisen
77e19f025b Merge branch 'zcwy_0712_bug' into dev_master 2024-09-12 18:26:12 +08:00
wangxuemei
a23ed4275f 讲师列表调整 2024-09-11 18:19:34 +08:00
zhangsir
bcda1f06cf 项目导出学习信息参数为null改为‘’ 2024-09-11 17:38:12 +08:00
zhangsir
84f209f360 项目导出学习信息修改参数 2024-09-11 17:28:56 +08:00