zhuhao
/
AIx_Smarttalk_WS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity
744 Commits 10 Branches 3 Tags 32 MiB
Commit Graph

744 Commits

Author SHA1 Message Date
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
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
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
yangws 9aa17ed786 Merge pull request 'fix：头像的样式问题；' (#183) from yws_dev into main 
Reviewed-on: #183
 2024-12-26 10:40:29 +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 d0cbb5cbcd Merge pull request 'zxl' (#182) from zxl into main 
Reviewed-on: #182
 2024-12-25 17:30:13 +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 ae839825d4 Merge pull request 'zxl' (#180) from zxl into main 
Reviewed-on: #180
 2024-12-25 16:56:38 +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 9cce9c224c Merge pull request '[作业批改] - 替换自动批改完成' (#179) from zouyf_tmp into main 
Reviewed-on: #179
 2024-12-25 10:42:58 +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
zhengdegang f63bb69919 Merge pull request 'zdg_dev' (#177) from zdg_dev into main 
Reviewed-on: #177
 2024-12-24 16:08:38 +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 89e0b2f97c Merge pull request 'edit 框架设计' (#176) from lyc-dev into main 2024-12-24 14:48:25 +08:00
lyc 406e581182 edit 框架设计 2024-12-24 14:47:58 +08:00
lyc ea0e1c91cf Merge pull request 'lyc-dev' (#175) from lyc-dev into main 2024-12-24 14:38:20 +08:00
lyc d4dce61555 Merge branch 'main' into lyc-dev 2024-12-24 14:37:06 +08:00