Commit Graph

956 Commits

Author SHA1 Message Date
朱浩 f238e37fdd 版本升级 2025-02-19 16:59:16 +08:00
朱浩 03897d2aa5 Merge remote-tracking branch 'origin/main' 2025-02-19 16:55:38 +08:00
yangws a01d7f08da Merge pull request 'fix:空格问题;' (#240) from yws_dev into main
Reviewed-on: #240
2025-02-19 16:27:50 +08:00
小杨 055746144d fix:空格问题; 2025-02-19 16:27:25 +08:00
yangws 06a2697ec2 Merge pull request 'fix:修改rootid;' (#239) from yws_dev into main
Reviewed-on: #239
2025-02-19 16:25:48 +08:00
小杨 fd43dde733 fix:修改rootid; 2025-02-19 16:25:22 +08:00
朱浩 0960599c73 Merge remote-tracking branch 'origin/main' 2025-02-19 10:35:22 +08:00
朱浩 a5579d4091 版本升级 2025-02-19 10:35:11 +08:00
zouyf d5c17eb17f Merge pull request 'zouyf_dev' (#238) from zouyf_dev into main
Reviewed-on: #238
2025-02-19 10:31:40 +08:00
“zouyf” f5c9cdc9de Merge branch 'main' into zouyf_dev 2025-02-19 10:27:22 +08:00
“zouyf” b5f43f1a37 去掉无自主试题的提示 2025-02-19 10:27:04 +08:00
zhangxuelin df906c52f6 Merge pull request 'zxl' (#237) from zxl into main
Reviewed-on: #237
2025-02-18 17:04:57 +08:00
zhangxuelin 7a64625567 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2025-02-18 17:04:22 +08:00
zhangxuelin f033155cc1 修改音频上传 2025-02-18 17:04:01 +08:00
朱浩 b3b1dde262 Merge remote-tracking branch 'origin/main' 2025-02-17 09:37:19 +08:00
朱浩 cbb3971c9b 版本升级 2025-02-17 09:37:10 +08:00
zhengdegang 38227cc282 Merge pull request 'zdg_dev' (#236) from zdg_dev into main
Reviewed-on: #236
2025-02-14 16:36:32 +08:00
zdg 433161ef13 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2025-02-14 16:35:37 +08:00
zdg 0b2ed540b8 修复
1.上课视频无法控制
2.ppt导入图片远程上传异常
2025-02-14 16:35:28 +08:00
zhangxuelin 0af53f82f0 Merge pull request '新增学校管理展示判断' (#235) from zxl into main
Reviewed-on: #235
2025-02-13 14:33:47 +08:00
zhangxuelin 38df362a86 新增学校管理展示判断 2025-02-13 14:32:35 +08:00
朱浩 0beae0b035 打字机效率变更 2025-02-13 14:25:18 +08:00
朱浩 159cb75ca9 Merge remote-tracking branch 'origin/main' 2025-02-11 16:41:09 +08:00
朱浩 c69bc91185 去除32位打包兼容 2025-02-11 16:41:02 +08:00
朱浩 66bc555445 思维导图插件,酉阳版本升级 2025-02-11 16:40:16 +08:00
zhengdegang 5b10c4b5d5 Merge pull request 'zdg_dev' (#234) from zdg_dev into main
Reviewed-on: #234
2025-02-11 14:31:17 +08:00
zdg 3032e2fb3a ppt导入-解析过程中增加关闭功能 2025-02-11 14:30:22 +08:00
朱浩 35d8bdf13f 思维导图插件 2025-02-10 17:14:25 +08:00
zdg 6f3ffc45cf Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2025-02-10 16:05:56 +08:00
zdg 89307e5d71 修复onse 课件重复打开 2025-02-10 16:05:41 +08:00
zouyf cf80e50b62 Merge pull request 'zouyf_dev' (#233) from zouyf_dev into main
Reviewed-on: #233
2025-02-10 15:17:40 +08:00
“zouyf” 4ffe428523 Merge branch 'main' into zouyf_dev 2025-02-10 15:08:58 +08:00
“zouyf” 6d624e67d8 1 2025-02-10 15:08:32 +08:00
朱浩 28be505dc1 BUG修复 2025-02-10 10:55:55 +08:00
朱浩 b31e975efd Merge remote-tracking branch 'origin/main' 2025-01-21 14:23:33 +08:00
yangws 8d85ad6ab6 Merge pull request 'fix:默认图片问题;' (#232) from yws_dev into main
Reviewed-on: #232
2025-01-21 14:23:21 +08:00
小杨 3c0e7777f8 fix:默认图片问题; 2025-01-21 14:22:56 +08:00
zhengdegang a73a409776 Merge pull request 'zdg_dev' (#231) from zdg_dev into main
Reviewed-on: #231
2025-01-21 14:16:10 +08:00
zdg b6d1e03201 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2025-01-21 14:15:25 +08:00
zdg 8d8b8d223c ppt上传 2025-01-21 14:15:15 +08:00
朱浩 083fdba962 Merge remote-tracking branch 'origin/main' 2025-01-21 14:01:09 +08:00
朱浩 681b5f7923 思维导图 2025-01-21 13:11:29 +08:00
朱浩 fabffc2363 新增base64图片直接导出 2025-01-21 12:49:41 +08:00
朱浩 57d0885df7 思维导图插件图标 2025-01-21 12:49:18 +08:00
朱浩 45f03977b3 更新图标 2025-01-21 12:48:55 +08:00
zhengdegang f47f305dc9 Merge pull request 'zdg_dev' (#230) from zdg_dev into main
Reviewed-on: #230
2025-01-21 12:35:32 +08:00
zdg 95fcd2445e Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
# Conflicts:
#	src/renderer/src/AixPPTist/src/hooks/useImport.ts
#	src/renderer/src/views/model/index.vue
2025-01-21 12:32:48 +08:00
zdg 4af2b5fc3a 优化pptx识别
母版加载等
2025-01-21 12:24:24 +08:00
“zouyf” 92170da77d 1 2025-01-20 17:28:01 +08:00
“zouyf” 24b2d08617 Merge branch 'main' into zouyf_dev 2025-01-20 16:11:04 +08:00