Commit Graph

5323 Commits

Author SHA1 Message Date
zhangsir
6af2490e9e 面授增加输入框回车搜索 2024-09-30 12:01:30 +08:00
zhangsir
4aa433428e 面授细节优化 2024-09-30 11:14:44 +08:00
zhangsir
8465dfa0a8 Merge remote-tracking branch 'zcwy/zcwy-teacher-manage' into zcwy-teacher-manage 2024-09-29 19:38:38 +08:00
zhangsir
e125ab0e2b 打印 2024-09-29 19:38:18 +08:00
zhangsir
beaac1e773 面授开课修改 2024-09-29 19:04:05 +08:00
zhangsir
20304f9ba9 面授开课修改 2024-09-29 19:02:30 +08:00
wangxuemei
850a6bc280 9291调整 2024-09-29 18:58:00 +08:00
zhangsir
93830a7e33 面授开课修改评分导出参数 2024-09-29 18:36:03 +08:00
zhangsir
b7458f622b 面授开课页面实现 2024-09-29 18:01:17 +08:00
wangxuemei
1ed9eaa76f 929t调整 2024-09-29 17:49:19 +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
0ee5ad528c 面授开课,等待接口联调 2024-09-27 16:13:33 +08:00
zhangsir
18e69264c7 Merge remote-tracking branch 'origin/zcwy_0712' into zcwy_0827_pingcode817 2024-09-27 16:11:23 +08:00
zhangsir
0ee26671ce 合并代码 2024-09-27 10:30:55 +08:00
wangxuemei
1dd863b98a 体系调整 2024-09-26 17:24:40 +08:00
wangxuemei
c6f2d087f8 体系细节调整 2024-09-26 17:19:54 +08:00
wangxuemei
908998d9bf 体系调整 2024-09-26 16:49:45 +08:00
wangxuemei
8f15476af8 体系调整 2024-09-26 16:40:00 +08:00
nisen
6a3aef05fb 解决项目回滚产生的问题 2024-09-24 17:49: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
b9dec2abee 创建项目异常处理,防止确定按钮一直转圈 2024-09-23 17:02:16 +08:00
wangxuemei
17e75a106f 整体细节调整 2024-09-20 17:12:41 +08:00
nisen
79c593efc2 Merge branch 'zcwy_0802_pingcode' into dev_master 2024-09-19 18:13:44 +08:00
zhangsir
76a54aaac1 项目编号修改 2024-09-19 17:28:18 +08:00
nisen
35e16bd24c Merge branch 'zcwy_0712_bug' into dev_master 2024-09-18 17:44:10 +08:00
zhangsir
18dc3e9607 课程报表中心增加异常处理 2024-09-18 17:21:02 +08:00
zhangsir
444c4758b0 课程报表中心内容分类再次修改属性 2024-09-18 17:04:02 +08:00
zhangsir
87172644f2 课程报表中心内容分类修改属性 2024-09-18 16:13:39 +08:00
zhangsir
366de3d5e1 课程报表中心修改 2024-09-18 16:04:30 +08:00
zhangsir
aefb8a6616 开课切换时新增加载 2024-09-13 14:28:30 +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
wangxuemei
f939f6ade0 细节修改2 2024-09-11 17:22:16 +08:00
zhangsir
15fbdcfde0 项目导出学习信息增加参数 2024-09-11 16:53:40 +08:00
wangxuemei
ba7add01b7 细节调整1 2024-09-10 17:46:17 +08:00
wangxuemei
1b0d87221f 细节调整 2024-09-10 14:37:22 +08:00
zhangsir
dac3f8292f 修改项目编号,只存编号 2024-09-09 15:39:36 +08:00
nisen
9775d0c52e 在线课搜索状态 2024-09-08 21:29:54 +08:00
nisen
780bd34bb7 Merge branch 'zcwy_0712_bug' into dev_master 2024-09-08 19:01:29 +08:00
zhangsir
23218791ed 改为查询一个月 2024-09-08 18:57:17 +08:00
nisen
766ff177c1 回退的喝不过来,手动合并 2024-09-08 14:20:39 +08:00
nisen
4401cef26b u.boe 2024-09-08 14:01:02 +08:00
nisen
9822aa2cad Merge branch 'master-0705' into dev_master 2024-09-08 13:59:28 +08:00
nisen
00b05a7b42 Merge branch 'zcwy_0712_bug' into master-0705 2024-09-06 13:30:46 +08:00
nisen
fac0a060e4 回退 2024-09-05 15:31:50 +08:00