Commit Graph

702 Commits

Author SHA1 Message Date
zdg 82091fbef5 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-11-19 17:26:11 +08:00
zdg 76a14264d7 屏蔽git原始信息 2024-11-19 17:25:57 +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
朱浩 432dbcc6fa PPTist接入 2024-11-18 17:28:56 +08:00
lyc 0f63afd277 Merge branch 'main' into lyc-dev 2024-11-18 10:17:23 +08:00
“zouyf” bffa1a0aae Merge branch 'main' into zouyf_dev 2024-11-18 10:01:45 +08:00
lyc f168e04405 模板 2024-11-16 23:37:11 +08:00
zhangxuelin cae55eac0b Merge pull request 'zxl' (#41) from zxl into main
Reviewed-on: #41
2024-11-15 14:43:48 +08:00
zhangxuelin 2f3a2b7aae Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-11-15 14:42:59 +08:00
zhangxuelin 98b1155fb7 添加人机验证 2024-11-15 14:42:39 +08:00
baigl 135cc4802f Merge pull request 'baigl' (#40) from baigl into main
Reviewed-on: #40
2024-11-15 11:19:18 +08:00
白了个白 e322103089 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-15 11:16:22 +08:00
白了个白 640a8a6dd9 新增作业管理 2024-11-15 11:15:23 +08:00
lyc 7b65a19483 Merge pull request 'lyc-dev' (#39) from lyc-dev into main 2024-11-14 11:20:41 +08:00
lyc 18495d0811 编辑提示词 dialog 2024-11-14 11:17:52 +08:00
yangws 3b053531f9 Merge pull request 'fix:部分修改优化;' (#38) from yangws_ws into main
Reviewed-on: #38
2024-11-14 09:51:48 +08:00
小杨 27017fc946 fix:部分修改优化; 2024-11-14 09:51:13 +08:00
lyc 39efd18bc6 模板更多按钮 2024-11-13 17:30:15 +08:00
yangws c0c7fa3298 Merge pull request 'add:主页进入详情的页面;' (#37) from yangws_ws into main
Reviewed-on: #37
2024-11-13 17:07:30 +08:00
小杨 3d2b102355 add:主页进入详情的页面; 2024-11-13 17:07:06 +08:00
“zouyf” 3195159a1a 优化滚动条 2024-11-13 14:36:39 +08:00
yangws 4feeb2ef56 Merge pull request 'add:作业管理样式;' (#36) from yangws_ws into main
Reviewed-on: #36
2024-11-13 11:27:35 +08:00
小杨 af0dd7f565 add:作业管理样式; 2024-11-13 11:27:02 +08:00
朱浩 a2c14b0d0a Merge remote-tracking branch 'origin/main' 2024-11-13 11:23:16 +08:00
朱浩 fe04f8acbd 三方资源加入备课 2024-11-13 11:23:08 +08:00
lyc 3f6f6124b3 模板 2024-11-13 11:22:53 +08:00
lyc 54c2215668 Merge pull request '模板' (#35) from lyc-dev into main 2024-11-13 11:22:07 +08:00
lyc 31adcd8460 Merge pull request 'lyc-dev' (#34) from lyc-dev into main 2024-11-13 10:23:02 +08:00
lyc 601e9f023a 模板 2024-11-13 10:23:56 +08:00