Commit Graph

4697 Commits

Author SHA1 Message Date
zhangsir
ecabc8414b 细节 2024-05-17 13:28:45 +08:00
zhangsir
9023772e28 完善功能点 2024-05-16 22:42:55 +08:00
zhangsir
d59afb226d Merge branch 'zcwy-0511-out' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/fe-manage into zcwy-0511-out
# Conflicts:
#	src/views/gratefulteacher/AddLevelImportTec.vue
2024-05-16 17:49:39 +08:00
zhangsir
0bce613fda 讲师认证 2024-05-16 17:47:15 +08:00
zhangsir
6b88258d55 讲师认证 2024-05-16 17:40:20 +08:00
zhangsir
d2002edd8d 讲师认证 2024-05-16 17:21:38 +08:00
zhangsir
979c7e6a33 测试 2024-05-15 22:37:31 +08:00
zhangsir
a012774256 考勤请假修改参数 2024-05-15 20:59:25 +08:00
zhangsir
0d185d38e5 测评导出数据增加参数 2024-05-15 19:44:44 +08:00
zhangsir
fb2be4eb95 测评修改参数 2024-05-15 19:24:26 +08:00
zhangsir
2b4ae863f4 导出讲师修改 2024-05-15 17:17:01 +08:00
zhangsir
37446d3961 修改细节 2024-05-15 17:09:38 +08:00
zhangsir
a046dfe479 修改细节 2024-05-15 16:19:00 +08:00
zhangsir
2e900f969b 修改权限 2024-05-15 16:13:08 +08:00
zhangsir
8ffdff4016 面包屑 2024-05-15 15:20:12 +08:00
zhangsir
7efea85e61 Merge branch 'zcwy-0511-out' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/fe-manage into zcwy-0511-out 2024-05-15 14:15:43 +08:00
zhangsir
3fb33edc46 整合代码 2024-05-15 14:15:18 +08:00
zhangsir
b0757c70e6 图片回显 2024-05-15 14:12:41 +08:00
zhangsir
363ee432fd 修改页面显示 2024-05-15 11:41:40 +08:00
zhangsir
154027ee7c 修改 2024-05-15 10:01:25 +08:00
zhangsir
5ec155dc2a Merge remote-tracking branch 'origin/zcwy-0511-out' into zcwy-0511-out
# Conflicts:
#	src/views/gratefulteacher/InstructorCertification.vue
#	src/views/gratefulteacher/LecturerManagement.vue
#	src/views/gratefulteacher/tablemodel.vue
2024-05-15 09:47:32 +08:00
zhangsir
c57eac8da6 修改 2024-05-15 09:40:47 +08:00
zhangsir
99fb00aeda 修改接口 2024-05-15 09:36:18 +08:00
zhangsir
df68abccf1 修改 2024-05-15 09:06:35 +08:00
zhangsir
3bc3954fe9 修改 2024-05-15 08:54:57 +08:00
zhangsir
aafca5b2d1 修改 2024-05-15 08:51:50 +08:00
zhangsir
5dd3f02bf7 修改 2024-05-15 00:47:02 +08:00
zhangsir
b4b614d18e 细节修改,并且查漏 2024-05-15 00:44:58 +08:00
zhangsir
3799fd7c2b Merge branch 'zcwy-0511-out' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/fe-manage into zcwy-0511-out 2024-05-14 23:06:58 +08:00
zhangsir
d06ea86148 讲师认证 2024-05-14 20:26:00 +08:00
zhangsir
210c2c82d4 讲师认证 2024-05-14 20:25:35 +08:00
zhangsir
1276279733 Merge branch 'zcwy-0511-out' into dev0223 2024-05-14 20:21:44 +08:00
zhangsir
5807987c5a 讲师认证 2024-05-14 20:21:16 +08:00
zhangsir
50b154d470 Merge branch 'zcwy-0511-out' into dev0223 2024-05-14 19:23:56 +08:00
zhangsir
9adc7de7bc 讲师认证 2024-05-14 19:21:33 +08:00
zhangsir
b1c05c3fbc Merge branch 'zcwy-0511-out' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/fe-manage into zcwy-0511-out
# Conflicts:
#	src/api/examineApi.js
#	src/views/gratefulteacher/InstructorCertification.vue
2024-05-14 18:26:52 +08:00
zhangsir
ddef0cd1fd 讲师管理 2024-05-14 18:24:10 +08:00
zhangsir
7b83673353 Merge remote-tracking branch 'origin/zcwy-0511-out' into zcwy-0511-out 2024-05-14 18:02:09 +08:00
zhangsir
a046bd648a 提交 2024-05-14 18:01:45 +08:00
zhangsir
28221766b6 讲师管理 2024-05-14 16:58:10 +08:00
zhangsir
df191dd843 Merge branch 'zcwy-0415' into dev0223 2024-05-14 15:34:41 +08:00
zhangsir
bd9f9d16d8 修改项目学院状态,带参数 2024-05-14 15:33:56 +08:00
zhangsir
c209b15811 Merge branch 'zcwy-0511-out' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/fe-manage into zcwy-0511-out 2024-05-14 13:41:56 +08:00
zhangsir
17a5e51ee0 讲师认证管理认证 2024-05-14 13:41:42 +08:00
zhangsir
133bccd0aa 提交 2024-05-14 13:40:34 +08:00
zhangsir
3d0915f7ec 讲师认证管理认证 2024-05-13 22:39:57 +08:00
joshen
a763412381 Merge branch 'zcwy-zsx0223' into 'master'
Zcwy zsx0223

See merge request !175
2024-05-13 20:58:32 +08:00
zhangsir
3033a32a7f Merge branch 'zcwy-0511-out' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/fe-manage into zcwy-0511-out 2024-05-13 20:04:38 +08:00
zhangsir
9091e9398d 讲师认证管理认证 2024-05-13 20:04:23 +08:00
zhangsir
72635c6c87 Merge branch 'zcwy-0511-out' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/fe-manage into zcwy-0511-out
# Conflicts:
#	src/views/gratefulteacher/LecturerManagement.vue
2024-05-13 20:01:56 +08:00