Commit Graph

844 Commits

Author SHA1 Message Date
zhangxuelin 616fb36c55 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2025-01-10 14:05:26 +08:00
zhangxuelin f8f98b400c 语音npm包跟新 2025-01-09 17:04:21 +08:00
zhangxuelin 4c62c109a8 Merge pull request 'zxl' (#215) from zxl into main
Reviewed-on: #215
2025-01-09 16:55:32 +08:00
zhangxuelin a4b1a5bb30 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2025-01-09 16:54:09 +08:00
zhangxuelin cde8f13f8e Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2025-01-09 16:54:00 +08:00
lyc 33f4ae42db Merge pull request 'edit 框架设计' (#214) from lyc-dev into main 2025-01-09 16:53:25 +08:00
lyc 96e71ff45e edit 框架设计 2025-01-09 16:49:43 +08:00
朱浩 38e17585f2 Merge remote-tracking branch 'origin/main' 2025-01-09 16:00:23 +08:00
朱浩 b85b95e817 BUG修复 2025-01-09 16:00:15 +08:00
zhangxuelin 6575f2e479 Merge pull request '语音合成' (#213) from zxl into main
Reviewed-on: #213
2025-01-09 15:50:39 +08:00
zhangxuelin aee58d2443 语音合成 2025-01-09 15:50:06 +08:00
zhangxuelin f9ab056a07 Merge pull request 'zxl' (#212) from zxl into main
Reviewed-on: #212
2025-01-09 15:47:02 +08:00
zhangxuelin f344163e6d Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
# Conflicts:
#	src/renderer/src/main.js
2025-01-09 15:45:17 +08:00
zhangxuelin f47cd1213b 添加语音生成 2025-01-09 15:42:29 +08:00
lyc 33d7c8c96c Merge pull request 'lyc-dev' (#211) from lyc-dev into main 2025-01-09 15:27:19 +08:00
lyc 3e8f8529fa edit 框架设计 2025-01-09 15:26:54 +08:00
lyc 6d1cc7e21b Merge branch 'main' into lyc-dev 2025-01-09 15:17:34 +08:00
lyc 5179e6407d edit 框架设计 2025-01-09 15:16:34 +08:00
朱浩 0c3b017a28 打包管理 2025-01-09 15:14:58 +08:00
zhengdegang 525d98dc41 Merge pull request 'zdg_dev' (#210) from zdg_dev into main
Reviewed-on: #210
2025-01-08 16:54:05 +08:00
zdg b286dbcce2 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2025-01-08 16:49:11 +08:00
zdg dbaf861bef 课堂点名 2025-01-08 16:48:31 +08:00
yangws f4d62410fb Merge pull request 'fix:修改学科学段的方式;' (#209) from yws_dev into main
Reviewed-on: #209
2025-01-08 14:02:52 +08:00
小杨 01e7dfbc2b fix:修改学科学段的方式; 2025-01-08 14:02:23 +08:00
朱浩 946eb0d072 Merge remote-tracking branch 'origin/main' 2025-01-08 13:45:51 +08:00
朱浩 510f02a530 打包管理 2025-01-08 13:45:40 +08:00
yangws c2a3ffb0a0 Merge pull request 'fix:修改个人中心学科方式;' (#208) from yws_dev into main
Reviewed-on: #208
2025-01-07 17:20:06 +08:00
小杨 8106fb0c41 fix:修改个人中心学科方式; 2025-01-07 17:19:41 +08:00
lyc 284ae40519 Merge pull request 'lyc-dev' (#207) from lyc-dev into main 2025-01-07 16:57:54 +08:00
lyc dc2831c101 edit 框架设计 2025-01-07 16:57:04 +08:00
lyc 49facdffa9 edit 框架设计 2025-01-07 16:25:07 +08:00
baigl a9f9bb49d5 Merge pull request 'baigl' (#206) from baigl into main
Reviewed-on: #206
2025-01-07 16:08:41 +08:00
白了个白 9be6648a75 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2025-01-07 16:07:11 +08:00
白了个白 7c1d669a56 课程超长提示 优化 2025-01-07 16:06:40 +08:00
朱浩 1132dc2c0d 生成ppt 2025-01-07 15:24:26 +08:00
朱浩 2b17cc103d Merge remote-tracking branch 'origin/main' 2025-01-07 11:03:13 +08:00
朱浩 57caed47dd 生成ppt 2025-01-07 11:03:05 +08:00
lyc b8750bdadd Merge pull request 'lyc-dev' (#205) from lyc-dev into main 2025-01-07 11:02:38 +08:00
lyc 586ce134f8 edit 框架设计 2025-01-07 11:02:11 +08:00
baigl 518308c277 Merge pull request 'baigl' (#204) from baigl into main
Reviewed-on: #204
2025-01-07 10:54:41 +08:00
白了个白 912d32bc9c Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2025-01-07 10:53:17 +08:00
白了个白 fb428ba5ca 修改 单元课程鼠标移入提示与超长…展示 2025-01-07 10:52:36 +08:00
lyc 7be60a3d72 edit 2025-01-06 17:24:56 +08:00
zouyf ea75329ebd Merge pull request '判断题答案优化' (#203) from zouyf_dev into main
Reviewed-on: #203
2025-01-06 16:20:36 +08:00
“zouyf” 7d1848277e 判断题答案优化 2025-01-06 16:18:54 +08:00
朱浩 1814f811d4 Merge remote-tracking branch 'origin/main' 2025-01-06 14:51:26 +08:00
朱浩 b13eb11633 版本升级 2025-01-06 14:51:20 +08:00
lyc cd748afb51 Merge pull request '框架设计' (#202) from lyc-dev into main 2025-01-06 10:51:12 +08:00
lyc 8119c6c835 框架设计 2025-01-06 10:50:45 +08:00
baigl ac03a6ec08 Merge pull request 'baigl' (#201) from baigl into main
Reviewed-on: #201
2025-01-06 09:57:59 +08:00