Commit Graph

883 Commits

Author SHA1 Message Date
baigl ef7fbcfdbe Merge pull request 'baigl' (#227) from baigl into main
Reviewed-on: #227
2025-01-16 15:12:38 +08:00
白了个白 4af7220d1d Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2025-01-16 15:06:03 +08:00
白了个白 db712d9e1f 作业管理:界面UI调整 2025-01-16 15:03:02 +08:00
zhangxuelin a793e67a60 Merge pull request '桌面不发消息' (#226) from zxl into main
Reviewed-on: #226
2025-01-16 15:01:28 +08:00
zhangxuelin 95a80c2b99 桌面不发消息 2025-01-16 15:00:24 +08:00
白了个白 97405bb73b 自动组卷 2025-01-16 14:21:31 +08:00
lyc d1454a288f Merge pull request 'edit' (#225) from lyc-dev into main 2025-01-15 16:08:25 +08:00
lyc 5ff9a5387a edit 2025-01-15 16:07:47 +08:00
yangws eaca1fe133 Merge pull request 'fix:班级管理新增年级学段;' (#224) from yws_dev into main
Reviewed-on: #224
2025-01-14 14:58:13 +08:00
小杨 8df53373ce fix:班级管理新增年级学段; 2025-01-14 14:57:46 +08:00
lyc 5ea98048c3 Merge pull request 'lyc-dev' (#223) from lyc-dev into main 2025-01-14 11:26:57 +08:00
lyc d1bb8d2b63 Merge branch 'main' into lyc-dev 2025-01-14 11:26:10 +08:00
lyc 4ab07d247f edit 考试分析 2025-01-14 11:25:57 +08:00
yangws e521b4dac7 Merge pull request 'fix:修改选择按钮;' (#222) from yws_dev into main
Reviewed-on: #222
2025-01-14 09:59:41 +08:00
小杨 04000e7279 fix:修改选择按钮; 2025-01-14 09:58:52 +08:00
zouyf e1c717eec4 Merge pull request 'zouyf_dev' (#221) from zouyf_dev into main
Reviewed-on: #221
2025-01-13 14:56:12 +08:00
“zouyf” 8185cc458d [作业设计] - 优化图片显示 2025-01-13 14:49:56 +08:00
lyc e6c2e264d2 Merge pull request 'edit' (#220) from lyc-dev into main 2025-01-13 13:51:54 +08:00
lyc 5708850be9 edit 2025-01-13 13:51:16 +08:00
朱浩 afa1fd2f8d BUG修复 2025-01-10 15:24:44 +08:00
lyc 5d7533e2ab Merge pull request 'edit 框架设计' (#219) from lyc-dev into main 2025-01-10 15:14:48 +08:00
lyc 250f73cce6 edit 框架设计 2025-01-10 15:14:24 +08:00
zhangxuelin 125d360c52 Merge pull request 'zxl' (#218) from zxl into main
Reviewed-on: #218
2025-01-10 15:07:42 +08:00
zhangxuelin dcf6d5b45d Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2025-01-10 15:06:54 +08:00
zhangxuelin 07ab1b6a84 插入素材 2025-01-10 15:06:38 +08:00
lyc 4e85477a5a Merge pull request 'edit 框架设计' (#217) from lyc-dev into main 2025-01-10 14:57:51 +08:00
lyc d7c57896da edit 框架设计 2025-01-10 14:57:20 +08:00
朱浩 e40acda6ad BUG修复 2025-01-10 14:16:33 +08:00
zhangxuelin b9f0d76ee4 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2025-01-10 14:16:28 +08:00
zhangxuelin a5be937eb3 上传图片 2025-01-10 14:16:18 +08:00
朱浩 5b05b6a94b BUG修复 2025-01-10 14:09:39 +08:00
zhangxuelin de0a167cf5 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2025-01-10 14:06:11 +08:00
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
朱浩 336fbb0680 BUG修复 2025-01-10 10:35:19 +08:00
zhangxuelin 4650c47f70 Merge pull request '语音npm包跟新' (#216) from zxl into main
Reviewed-on: #216
2025-01-09 17:04:50 +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