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

648 Commits

Author SHA1 Message Date
lyc a2639c097f edit 2024-12-30 17:25:56 +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
lyc 3c2bc11c5f Merge pull request 'lyc-dev' (#194) from lyc-dev into main 2024-12-30 10:26:47 +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
zdg c584e3fec9 动画触发方式：暂时只使用主动触发 其他屏蔽 2024-12-27 15:25:08 +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 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
白了个白 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
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
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
白了个白 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 5fb447d5e6 1 2024-12-26 14:12:47 +08:00
小杨 2a7fbc3577 fix：头像的样式问题； 2024-12-26 10:40:07 +08:00
白了个白 ccbafea3d4 Merge branch 'zouyf_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-26 10:26:19 +08:00
白了个白 1f9111a89d 课堂展示：画布拖选问题修复 2024-12-26 10:25:54 +08:00
“zouyf” be78520410 Merge branch 'main' into zouyf_dev 2024-12-26 10:08:10 +08:00
“zouyf” 4b935b9110 1 2024-12-25 17:30:42 +08:00
zhangxuelin 5686669563 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-25 17:29:43 +08:00
zhangxuelin eb7d6df355 添加推图片上屏 2024-12-25 17:29:34 +08:00
白了个白 1a3598d7c0 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-25 17:26:45 +08:00
白了个白 2fdd997c5e 1 2024-12-25 17:26:14 +08:00
lyc 960ab581c3 Merge pull request 'edit' (#181) from lyc-dev into main 2024-12-25 17:25:11 +08:00
lyc 0d6767170d edit 2024-12-25 17:24:48 +08:00
“zouyf” 96e01ae711 Merge branch 'main' into zouyf_dev 2024-12-25 17:04:50 +08:00
“zouyf” d8c4876119 [科学实验] - 更新作业学段学科回显 2024-12-25 17:04:29 +08:00
zhangxuelin ef670dee99 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-25 16:55:47 +08:00
朱浩 c81f393715 宫格插件 2024-12-25 14:38:29 +08:00
zhangxuelin 06bb6284c4 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-25 13:39:31 +08:00
朱浩 b5caa7ba80 Merge remote-tracking branch 'origin/main' 2024-12-25 12:04:41 +08:00
朱浩 53ff508635 宫格插件 2024-12-25 12:04:27 +08:00
“zouyf” d9a0f2f8c3 1 2024-12-25 11:20:18 +08:00
“zouyf” 89cba04b8c Merge branch 'main' into zouyf_dev 
# Conflicts:
#	src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue
 2024-12-25 11:02:19 +08:00
“zouyf” 171dc72ee7 [作业批改] - 替换自动批改完成 2024-12-25 10:33:20 +08:00
zhangxuelin c2750e3da6 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-25 10:27:02 +08:00
zhangxuelin 5550ca570c no message 2024-12-25 10:25:07 +08:00
“zouyf” dd0160865b Merge branch 'main' into zouyf_dev 2024-12-25 10:09:57 +08:00
“zouyf” ff0dd3600c 1 2024-12-25 10:06:03 +08:00
lyc 62a419356c Merge pull request 'edit' (#178) from lyc-dev into main 2024-12-24 17:32:25 +08:00
lyc 4b2d13db8e edit 2024-12-24 17:31:56 +08:00
zhangxuelin ab9bad467a Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 
# Conflicts:
#	src/renderer/src/AixPPTist/src/views/Editor/EditorHeader/index.vue
 2024-12-24 16:08:48 +08:00
zdg b3ffa9bdaa Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-24 16:07:00 +08:00
zdg 5510021566 上课允许不选班级开课 2024-12-24 16:06:53 +08:00
lyc 406e581182 edit 框架设计 2024-12-24 14:47:58 +08:00
lyc d4dce61555 Merge branch 'main' into lyc-dev 2024-12-24 14:37:06 +08:00
lyc d6d5d13232 pptList 插入素材 增加loading 2024-12-24 14:32:59 +08:00
zdg 11968879d8 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 
# Conflicts:
#	src/renderer/src/AixPPTist/src/views/Editor/EditorHeader/index.vue
 2024-12-24 11:33:49 +08:00
zdg db86299523 ppt缩略图生成 2024-12-24 11:32:52 +08:00
zdg c152a3d3ee aippt生成-缩略图 2024-12-24 11:24:53 +08:00
zhangxuelin a366d5d4d6 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-24 11:24:01 +08:00
zhangxuelin e0ec22c3ac 替换照片改为线上url 2024-12-24 11:23:52 +08:00
lyc 9c8872579f Merge pull request 'edit 框架设计' (#173) from lyc-dev into main 2024-12-24 10:21:42 +08:00
lyc 4f32927b49 edit 框架设计 2024-12-24 10:21:13 +08:00
zhangxuelin e132f3927b Merge pull request 'zxl' (#172) from zxl into main 
Reviewed-on: #172
 2024-12-24 10:07:31 +08:00
朱浩 c290c170d3 报错后及时回转loading按钮 2024-12-24 10:01:34 +08:00
朱浩 3867a9603f 报错后及时回转loading按钮 2024-12-24 09:58:31 +08:00
zhangxuelin f732520d8d Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-24 09:51:31 +08:00
lyc 1334becb54 Merge branch 'main' into lyc-dev 2024-12-23 17:01:53 +08:00
lyc c95508ed59 edit 模板 2024-12-23 17:01:40 +08:00
“zouyf” 63b8a0d5c6 Merge branch 'main' into zouyf_dev 2024-12-23 15:28:49 +08:00
zhangxuelin cf540d73df Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-23 15:26:47 +08:00
白了个白 e3c4706880 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-23 14:02:24 +08:00
白了个白 c507331fb5 作业设计：作业类型 tag颜色样式修改 2024-12-23 14:01:04 +08:00
lyc 92e8aa64d7 模板edit 2024-12-23 10:45:27 +08:00
“zouyf” f6b08169b6 Merge branch 'main' into zouyf_dev 2024-12-23 10:11:48 +08:00
zhangxuelin 83d3cd5df8 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-23 09:41:19 +08:00
朱浩 b1407706a8 永川个性化打包 2024-12-22 12:15:01 +08:00
朱浩 996b4006a2 永川个性化打包 2024-12-22 11:46:10 +08:00
朱浩 4531533382 大模型顺序问题修改 2024-12-21 21:42:07 +08:00
朱浩 a601a9f8dd Merge remote-tracking branch 'origin/main' 2024-12-21 21:40:07 +08:00
zdg acb0231304 1.pptList 实验室功能 
2.pplList 批量更新缩略图
 2024-12-21 12:15:58 +08:00
白了个白 ea5ed4b6ac Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-20 17:18:32 +08:00
白了个白 6b45fa61dd 1 2024-12-20 17:17:35 +08:00
白了个白 7aa75794dc 科学实验：批改优化 2024-12-20 17:16:57 +08:00
朱浩 a2c2c4eec7 Merge remote-tracking branch 'origin/main' 2024-12-20 17:14:40 +08:00
CYS 4095390f45 Merge pull request '插入素材' (#166) from cys_dev into main 
Reviewed-on: #166
 2024-12-20 17:12:50 +08:00
cys d75af2636d 插入素材 2024-12-20 17:12:07 +08:00
朱浩 1983dafbba Merge remote-tracking branch 'origin/main' 2024-12-20 16:52:18 +08:00
朱浩 6c7284383a 宫格图片插件 2024-12-20 16:52:02 +08:00
白了个白 f7a3aa6e53 科学实验：学科写死 2024-12-20 16:37:08 +08:00
白了个白 045b44b833 1 2024-12-20 16:06:41 +08:00
白了个白 5e954bab0b Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-20 16:02:07 +08:00