Commit Graph

5110 Commits

Author SHA1 Message Date
nisen
3849c3b664 Merge branch 'zcwy_0712_bug' into dev_master 2024-08-23 14:20:11 +08:00
zhangsir
0408cb0c8a 搜索教师无数据处理,考试无学员导出数据添加提示 2024-08-22 11:23:08 +08:00
zhangsir
af3013d3c4 修改在线课状态参数为null 2024-08-21 16:00:56 +08:00
nisen
5508ec2798 Merge branch 'zcwy_0712_bug' into master-0705 2024-08-20 18:18:57 +08:00
joshen
faf71187b6 Update .env.prod 2024-08-20 13:52:06 +08:00
zhangsir
9b51db209f 面授管理清空状态查询时删除status参数 2024-08-20 09:28:36 +08:00
zhangsir
f411747407 投票状态搜索修改参数,未开始改为3 2024-08-19 14:13:42 +08:00
zhangsir
66aac5dc34 Merge remote-tracking branch 'origin/zcwy-teacher-manage' into zcwy-teacher-manage
# Conflicts:
#	src/views/lecturer/InsideTeaching.vue
2024-08-19 14:11:50 +08:00
zhangsir
8643e5d14f 日期修复 2024-08-19 14:07:40 +08:00
wangxuemei
ca45fe102f Merge branch 'zcwy-teacher-manage' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/fe-manage into zcwy-teacher-manage 2024-08-19 13:55:32 +08:00
wangxuemei
5b1926426f 授课满意度调整 2024-08-19 13:55:19 +08:00
zhangsir
bebed23876 新增授课记录外部讲师搜索下拉框 2024-08-19 13:44:25 +08:00
zhangsir
7b051c205d 投票状态搜索修改参数 2024-08-19 11:39:28 +08:00
zhangsir
714425ac99 投票管理状态搜索值变更 2024-08-16 16:15:02 +08:00
wangxuemei
0985531a5b 接口联调 2024-08-15 18:04:20 +08:00
wangxuemei
63baa9f5d2 Merge branch 'zcwy-teacher-manage' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/fe-manage into zcwy-teacher-manage 2024-08-15 10:30:23 +08:00
wangxuemei
b0960898a9 讲师管理 2024-08-15 10:29:59 +08:00
zhangsir
1704fd339c 添加讲师返回组织 2024-08-14 17:01:07 +08:00
wangxuemei
ccefd8399f Merge branch 'zcwy-teacher-manage' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/fe-manage into zcwy-teacher-manage 2024-08-14 16:19:27 +08:00
zhangsir
2b971fda01 外链也取消进行中状态 2024-08-14 16:18:57 +08:00
zhangsir
e69f42a1ad 面授案例讨论取消进行中状态 2024-08-14 16:06:58 +08:00
wangxuemei
ca15f0ab9b 讲师调整 2024-08-14 15:55:20 +08:00
zhangsir
315115ef6d 选择组织树弹窗 2024-08-14 15:44:59 +08:00
zhangsir
85acaf6855 选择组织树弹窗 2024-08-14 11:43:57 +08:00
zhangsir
c8db86a10d 任务管理状态搜索统一添加进行中 2024-08-13 17:01:35 +08:00
zhangsir
a6b0878a76 新增讲师组件 2024-08-13 14:36:01 +08:00
zhangsir
a4cddab95f 作业管理状态新增进行中 2024-08-13 10:09:51 +08:00
wangxuemei
860cb821ae 富文本组件调整 2024-08-09 16:31:41 +08:00
zhangsir
5538124e72 报表课程搜索修改参数 2024-08-08 09:43:03 +08:00
wangxuemei
5adb182c1f 头像上传组件调整 2024-08-07 17:06:23 +08:00
wangxuemei
4e963fc9cf 讲师管理等级更新 2024-08-06 18:47:13 +08:00
nisen
10f278f772 Merge branch 'zcwy_0723_bug' into master-0705 2024-08-05 18:59:51 +08:00
wangxuemei
36200b08ef 讲师管理页面调整 2024-08-05 17:38:10 +08:00
zhangsir
6e7ebc15cf 面授开课管理批量录入成绩隐藏 2024-08-05 17:04:23 +08:00
wangxuemei
b0f6f56759 Merge branch 'zcwy-teacher-manage' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/fe-manage into zcwy-teacher-manage 2024-08-05 09:04:26 +08:00
wangxuemei
f1e052f18c 富文本菜单调整 2024-08-02 20:29:23 +08:00
wangxuemei
1acb4289f8 授课记录调整 2024-08-02 20:07:46 +08:00
wangxuemei
98575f9270 Merge branches 'zcwy-teacher-manage' and 'zcwy-teacher-manage' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/fe-manage into zcwy-teacher-manage 2024-08-02 19:51:47 +08:00
wangxuemei
26da972986 导入图标修改 2024-08-02 19:35:44 +08:00
wangxuemei
5e30b538f2 env 文件调整 2024-08-02 19:20:09 +08:00
wangxuemei
ddaa9e3908 接口联调802 2024-08-02 19:17:21 +08:00
wangxuemei
5723a20d5d 接口联调 2024-08-02 18:50:40 +08:00
zhangsir
99a4d76f7f 面授开课没有作业导入提示,不显示导入信息 2024-08-02 17:02:17 +08:00
zhangsir
9aa40d3977 报表中心课程新增类型搜索 2024-08-02 15:12:00 +08:00
zhangsir
cc15701ff4 修改学员导出文件名 2024-08-02 09:01:59 +08:00
wangxuemei
95895d1d5a 讲师体系管理页面调整 2024-08-01 17:54:39 +08:00
nisen
84419a4174 Merge branch 'zcwy_0712_bug' into master-0705 2024-08-01 17:39:47 +08:00
wangxuemei
d0c738380e 所属组织页面调整 2024-07-31 18:26:48 +08:00
zhangsir
fba2ae6032 评估管理基础信息报错 2024-07-31 15:24:48 +08:00
zhangsir
96afc3bfa7 修改导出学员参数 2024-07-31 13:46:38 +08:00