zhuhao
/
AIx_Smarttalk_WS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity
783 Commits 10 Branches 6 Tags 33 MiB
Commit Graph

783 Commits

Author SHA1 Message Date
zdg b8a9c60c5b Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2025-01-02 16:12:05 +08:00
zdg e5fc73bab0 新需求 2025-01-02 16:11:58 +08:00
zhengdegang b50cc8c330 Merge pull request 'zdg_dev' (#197) from zdg_dev into main 
Reviewed-on: #197
 2025-01-02 13:04:40 +08:00
zdg d0418b0ea2 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2025-01-02 13:03:24 +08:00
zdg c5babd9926 修复本地资源-生产环境异常问题 2025-01-02 13:03:14 +08:00
zhengdegang 96acc14fcf Merge pull request '紧急修改功能' (#196) from zdg_dev into main 
Reviewed-on: #196
 2025-01-02 12:37:04 +08:00
zdg 3800b99dfb 紧急修改功能 2025-01-02 12:35:45 +08:00
zouyf 2affc1d9d2 Merge pull request 'zouyf_dev' (#195) from zouyf_dev into main 
Reviewed-on: #195
 2024-12-30 16:42:15 +08:00
“zouyf” 75edc957fb Merge branch 'main' into zouyf_dev 2024-12-30 16:34:09 +08:00
“zouyf” d67f2c5a52 [作业设计] - 知识点获取优化 2024-12-30 16:33:56 +08:00
朱浩 1cc36bcfb3 版本升级 2024-12-30 16:14:53 +08:00
lyc 3c2bc11c5f Merge pull request 'lyc-dev' (#194) from lyc-dev into main 2024-12-30 10:26:47 +08:00
“zouyf” ccaab05847 Merge branch 'main' into zouyf_dev 2024-12-30 09:39:52 +08:00
lyc c1c18582d8 edit 教学框架 2024-12-30 01:47:03 +08:00
lyc 7fe2f27311 edit 2024-12-29 13:19:01 +08:00
zouyf 8fc1a22d2f Merge pull request 'zouyf_dev' (#193) from zouyf_dev into main 
Reviewed-on: #193
 2024-12-27 16:49:46 +08:00
“zouyf” 2d615923e7 Merge branch 'main' into zouyf_dev 2024-12-27 16:43:06 +08:00
“zouyf” c625fb5787 [教学实践] - 优化教学活动中修改任务 2024-12-27 16:42:51 +08:00
朱浩 7f525d4a98 Merge remote-tracking branch 'origin/main' 2024-12-27 15:28:52 +08:00
zhengdegang b6ab46e4a0 Merge pull request 'zdg_dev' (#192) from zdg_dev into main 
Reviewed-on: #192
 2024-12-27 15:26:13 +08:00
zdg dbf2874282 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-27 15:25:14 +08:00
zdg c584e3fec9 动画触发方式：暂时只使用主动触发 其他屏蔽 2024-12-27 15:25:08 +08:00
zhengdegang 21323ffac0 Merge pull request 'zdg_dev' (#191) from zdg_dev into main 
Reviewed-on: #191
 2024-12-27 15:22:44 +08:00
zdg c5e1e00190 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-27 15:22:01 +08:00
zdg 1d10dff4dc 优化ppt上课 2024-12-27 15:21:55 +08:00
朱浩 b73a057a9b 文件同步功能BUG修复 2024-12-27 15:09:56 +08:00
朱浩 d07944e4ad 文件同步功能BUG修复 2024-12-27 15:04:13 +08:00
zhangxuelin 2463feb0b7 Merge pull request 'zxl' (#190) from zxl into main 
Reviewed-on: #190
 2024-12-26 17:25:27 +08:00
zhangxuelin d866f546bc Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-26 16:49:31 +08:00
baigl 991bbd179f Merge pull request 'baigl' (#189) from baigl into main 
Reviewed-on: #189
 2024-12-26 16:29:10 +08:00
白了个白 bf39850d2f Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-26 16:28:06 +08:00
白了个白 0f51892d96 课堂展示：白板bug修复 2024-12-26 16:27:39 +08:00
zhengdegang 2224de7144 Merge pull request 'zdg_dev' (#188) from zdg_dev into main 
Reviewed-on: #188
 2024-12-26 16:08:17 +08:00
zdg 14cf608c62 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-26 16:07:34 +08:00
zdg eca310928e 修复模版新增 异常 2024-12-26 16:07:27 +08:00
zhangxuelin 35e63e3587 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-26 15:15:49 +08:00
zhengdegang 52f9a1493d Merge pull request 'zdg_dev' (#187) from zdg_dev into main 
Reviewed-on: #187
 2024-12-26 15:15:32 +08:00
zdg 0acde1952c Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-26 15:14:28 +08:00
zdg 719693bf63 1.分享邀请码 
2.优化ppt上课
 2024-12-26 15:14:22 +08:00
“zouyf” 6da745ced8 Merge branch 'main' into zouyf_dev 
# Conflicts:
#	src/renderer/src/views/classTask/newClassTaskAssign/index.vue
 2024-12-26 14:52:06 +08:00
“zouyf” f065762663 1 2024-12-26 14:49:56 +08:00
zhangxuelin 1999104ee4 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-26 14:49:54 +08:00
zhangxuelin 65643279ce 切换幻灯片关闭弹窗 2024-12-26 14:49:40 +08:00
“zouyf” bde39cc2e6 [教学大模型] - 优化无自主试题下的单元章节显示 2024-12-26 14:49:10 +08:00
“zouyf” 48cd120eed 1 2024-12-26 14:23:43 +08:00
baigl 53ccb2236e Merge pull request 'baigl' (#185) from baigl into main 
Reviewed-on: #185
 2024-12-26 14:20:33 +08:00
白了个白 00119e4a49 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-26 14:18:47 +08:00
白了个白 4bbe89ed31 课堂展示：画布选中物品，移除优化 2024-12-26 14:18:12 +08:00
zhangxuelin 49e16c458f Merge pull request '1' (#184) from zxl into main 
Reviewed-on: #184
 2024-12-26 14:13:31 +08:00
zhangxuelin 5fb447d5e6 1 2024-12-26 14:12:47 +08:00