Commit Graph

178 Commits

Author SHA1 Message Date
朱浩 60f2790b0c BUG修复 2024-11-21 15:43:28 +08:00
朱浩 adbb4f0067 Merge remote-tracking branch 'origin/main' 2024-11-21 13:52:29 +08:00
朱浩 def9433647 PPTist接入 2024-11-21 13:52:17 +08:00
baigl a34226f29f Merge pull request 'baigl' (#48) from baigl into main
Reviewed-on: #48
2024-11-21 11:22:15 +08:00
白了个白 30b2b9b964 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-21 11:21:16 +08:00
白了个白 cadb8088a6 习题上传:习题内容识别迁移 2024-11-21 11:20:58 +08:00
lyc a9732218f4 Merge pull request 'lyc-dev' (#47) from lyc-dev into main 2024-11-21 10:58:19 +08:00
lyc 538e9190c7 Merge branch 'main' into lyc-dev 2024-11-21 10:57:31 +08:00
lyc 5567e94235 模板 2024-11-21 10:56:35 +08:00
baigl a118afbc64 Merge pull request 'baigl' (#46) from baigl into main
Reviewed-on: #46
2024-11-21 10:38:09 +08:00
白了个白 ab8fe885cb 1 2024-11-21 10:36:00 +08:00
白了个白 853fb871ef 1 2024-11-20 17:35:08 +08:00
白了个白 41db306f77 1 2024-11-20 17:31:14 +08:00
白了个白 0f9c2a7d53 Merge branch 'zouyf_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-20 17:13:31 +08:00
白了个白 bf51f5084f 1 2024-11-20 17:13:07 +08:00
“zouyf” 96f25ab987 1 2024-11-20 16:51:51 +08:00
白了个白 2f2350531a 1 2024-11-20 16:20:45 +08:00
“zouyf” 0d0327f956 1 2024-11-20 16:20:09 +08:00
白了个白 5cbe56d1bf 作业管理 2024-11-20 15:30:18 +08:00
“zouyf” d5a8da438a Merge branch 'main' into zouyf_dev
# Conflicts:
#	package.json
2024-11-20 15:29:21 +08:00
lyc 45aa0a91a2 Merge pull request 'lyc-dev' (#45) from lyc-dev into main 2024-11-20 15:26:00 +08:00
lyc 0ccdbfe37a 冲突 2024-11-20 15:25:25 +08:00
lyc 1a0a2f9a67 模板 2024-11-20 15:23:42 +08:00
“zouyf” 51eea95a45 Merge branch 'main' into zouyf_dev
# Conflicts:
#	package.json
2024-11-20 15:10:50 +08:00
“zouyf” 3483076b66 1 2024-11-20 15:09:25 +08:00
白了个白 9534622067 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-20 14:33:08 +08:00
白了个白 761f19cf22 习题上传:待完善 2024-11-20 14:32:40 +08:00
“zouyf” 4bc5e3411f Merge branch 'baigl' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zouyf_dev 2024-11-20 09:55:42 +08:00
lyc c803ecd796 教学框架设计 2024-11-19 17:08:34 +08:00
yangws 5a09a7fecb Merge pull request 'yangws_ws' (#44) from yangws_ws into main
Reviewed-on: #44
2024-11-19 16:37:45 +08:00
小杨 639c07bccd fix:样式调整; 2024-11-19 16:37:17 +08:00
小杨 1f6427ff21 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yangws_ws 2024-11-19 16:37:06 +08:00
zhengdegang d2c54e83c5 Merge pull request '优化ppt相关代码' (#43) from zdg_dev into main
Reviewed-on: #43
2024-11-19 16:20:42 +08:00
zdg 13f4aa25b8 优化ppt相关代码 2024-11-19 16:19:13 +08:00
白了个白 fcc881a2fa 1 2024-11-19 15:49:53 +08:00
“zouyf” 769f77c190 Merge branch 'baigl' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zouyf_dev 2024-11-19 14:51:20 +08:00
白了个白 748a0b7a5f Merge branch 'yangws_ws' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-19 10:17:56 +08:00
白了个白 b8224dedd8 新增习题上传插件:vue-cropper 2024-11-19 10:17:30 +08:00
小杨 232c5690bf add:左侧的树; 2024-11-19 10:16:36 +08:00
lyc 19283456d4 Merge branch 'main' into lyc-dev 2024-11-19 10:01:09 +08:00
白了个白 bff83162d3 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-19 10:01:05 +08:00
朱浩 fd0499cefa Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS 2024-11-19 09:59:59 +08:00
朱浩 4baf9f0062 PPTist接入 2024-11-19 09:59:34 +08:00
lyc 1a88d63893 冲突 2024-11-19 09:57:36 +08:00
白了个白 d357a15f12 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-19 09:51:14 +08:00
白了个白 f8d0e846cd 新增习题:待完善 2024-11-19 09:50:47 +08:00
yangws c1ce87f640 Merge pull request 'fix:样式修改;' (#42) from yangws_ws into main
Reviewed-on: #42
2024-11-19 09:42:54 +08:00
小杨 da83bcec5c fix:样式修改; 2024-11-19 09:42:19 +08:00
lyc d283b60af7 模板 2024-11-18 17:31:01 +08:00
朱浩 6e3efe7843 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS 2024-11-18 17:29:10 +08:00