Commit Graph

2986 Commits

Author SHA1 Message Date
nisen
d906f4a21a Merge branch 'zcwy_0806_paihangb' into dev0515 2024-08-07 15:20:25 +08:00
zhangsir
5321716653 排行榜取消当前学习天数 2024-08-07 15:18:19 +08:00
nisen
631a09e01b Merge branch 'zcwy_0726_download' into dev0515 2024-08-06 17:11:35 +08:00
zhangsir
cd3f693b44 导出作业统一提示 2024-08-06 17:10:06 +08:00
nisen
bd68695e4c Merge branch 'zcwy_0806_paihangb' into dev0515
# Conflicts:
#	src/views/user/ranking.vue
2024-08-06 17:06:27 +08:00
zhangsir
8d4a6800d8 时长天数排行榜区分当前和累计 2024-08-06 17:01:01 +08:00
nisen
18a2d240ed Merge branch 'zcwy_0723_hotforum' into dev0515
# Conflicts:
#	src/components/Course/homework.vue
2024-08-06 15:58:29 +08:00
zhangsir
a82c970877 修改学习人员弹窗搜索参数 2024-08-06 15:53:44 +08:00
nisen
4203656c40 Merge branch 'zcwy_0726_download' into dev0515 2024-08-06 09:15:00 +08:00
zhangsir
184427d331 整体修改导出作业 2024-08-06 09:11:58 +08:00
nisen
82526c62a4 Merge branch 'zcwy_0726_download' into dev0515 2024-08-06 09:01:08 +08:00
zhangsir
7b6993e58d 整体修改导出作业 2024-08-06 08:58:56 +08:00
zhangsir
b38f32f6dd 合并pingcode上的bug 2024-08-05 17:56:54 +08:00
nisen
480132fd22 Merge branch 'zcwy_0726_download' into dev0515 2024-08-05 15:18:36 +08:00
zhangsir
30c4899ebc 作业提交发现切换作业时studyitemid取值上一个,修复 2024-08-05 15:17:03 +08:00
nisen
130d02886f Merge branch 'zcwy_0726_download' into dev0515 2024-08-05 15:05:27 +08:00
zhangsir
c1a0fe988f 作业提交studyitemid赋值 2024-08-05 15:03:44 +08:00
nisen
b641611c89 Merge branch 'zcwy_0726_download' into dev0515 2024-08-02 17:56:21 +08:00
zhangsir
94702ea288 在线课单层项目添加名称 2024-08-02 17:54:20 +08:00
zhangsir
c0833c56d8 导出新增不能重复点击 2024-08-02 17:51:14 +08:00
nisen
1f89f9f5e8 Merge branch 'zcwy_0726_download' into dev0515 2024-08-02 11:39:31 +08:00
zhangsir
6bf754b5dc 在线课单层项目添加名称 2024-08-02 11:25:34 +08:00
nisen
26a0dd4915 Merge branch 'zcwy_0726_download' into dev0515 2024-08-01 08:59:01 +08:00
zhangsir
485c401943 测试 2024-08-01 08:57:40 +08:00
nisen
f3da5f7faf Merge branch 'zcwy_0726_download' into dev0515 2024-07-31 19:25:53 +08:00
zhangsir
35010c7dd6 测试 2024-07-31 19:24:25 +08:00
nisen
6d41015537 Merge branch 'zcwy_0726_download' into dev0515 2024-07-31 19:16:07 +08:00
zhangsir
37b9dc8b50 测试 2024-07-31 19:14:19 +08:00
nisen
41847cd6c3 Merge branch 'zcwy_0726_download' into dev0515 2024-07-31 19:10:01 +08:00
zhangsir
2ad7225afd 打印 2024-07-31 19:08:48 +08:00
nisen
e09d0e9971 Merge branch 'zcwy_0726_download' into dev0515 2024-07-31 19:04:17 +08:00
zhangsir
40170ed786 完善 2024-07-31 19:01:38 +08:00
nisen
7728fce064 Merge branch 'zcwy_0726_download' into dev0515 2024-07-31 18:06:25 +08:00
zhangsir
d382b4f07d 打印 2024-07-31 17:59:37 +08:00
nisen
30d2efee10 Merge branch 'zcwy_0726_download' into dev0515 2024-07-31 17:39:51 +08:00
zhangsir
10d1e5fda8 打印 2024-07-31 17:38:42 +08:00
nisen
1cf5d2422b Merge branch 'zcwy_0726_download' into dev0515 2024-07-31 17:20:14 +08:00
zhangsir
a6a2ba574e 打印 2024-07-31 17:17:19 +08:00
nisen
35100706d8 Merge branch 'zcwy_0726_download' into dev0515 2024-07-31 14:43:20 +08:00
zhangsir
0bec37eb8d 导出作业信息等待错误信息,测试错误处理 2024-07-31 14:41:40 +08:00
nisen
b0e5b16b8a Merge branch 'zcwy_0726_download' into dev0515 2024-07-31 14:33:49 +08:00
zhangsir
e858021565 导出作业信息,报错处理 2024-07-31 14:29:46 +08:00
nisen
ae78edcc5d Merge branch 'zcwy_0726_download' into dev0515 2024-07-30 16:18:32 +08:00
zhangsir
02174f0793 查找下载报错问题 2024-07-30 16:17:27 +08:00
nisen
5bcf83ed3f Merge branch 'zcwy_0726_download' into dev0515 2024-07-30 16:05:31 +08:00
zhangsir
96a11b24e5 导出作业信息实时参数改为搜索参数 2024-07-30 16:04:14 +08:00
nisen
d9e3377ce0 Merge branch 'zcwy_0726_download' into dev0515 2024-07-30 15:39:07 +08:00
zhangsir
f8b74fa723 导出作业信息参数修改及报错处理 2024-07-30 15:35:14 +08:00
nisen
aba11444a5 Merge branch 'zcwy_0723_hotforum' into dev0515 2024-07-30 14:49:01 +08:00
zhangsir
8a2673020b 修改学习姓名也未置空,修改 2024-07-30 14:47:02 +08:00