Commit Graph

930 Commits

Author SHA1 Message Date
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
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
“zouyf” 28294d0a25 [科学实验] - 更改学段学科选择方式 2025-01-20 16:10:51 +08:00
朱浩 f5779a82fd Merge branch 'main' into lyc-dev 2025-01-20 14:59:42 +08:00
朱浩 91e9468f41 Merge remote-tracking branch 'origin/main' 2025-01-20 14:58:41 +08:00
朱浩 16100d1ffa 去除省份地址包 2025-01-20 14:56:47 +08:00
yangws a368925887 Merge pull request 'fix:默认头像问题;' (#228) from yws_dev into main
Reviewed-on: #228
2025-01-20 14:27:22 +08:00
小杨 9d29238017 fix:默认头像问题; 2025-01-20 14:26:50 +08:00
朱浩 2c90e96c5f 去除省份地址包 2025-01-20 10:14:05 +08:00
朱浩 90aafaba10 去除IM包 2025-01-20 09:56:29 +08:00
lyc 57af105c90 edit 2025-01-20 09:49:02 +08:00
朱浩 1d68bc6534 yy版本 2025-01-17 14:50:47 +08:00
朱浩 088eac287b Merge remote-tracking branch 'origin/main' 2025-01-17 11:11:38 +08:00
朱浩 934f561dee yy版本 2025-01-17 11:08:35 +08:00
朱浩 1326c5dd02 微调 2025-01-17 10:36:57 +08:00
lyc 797ac57441 Merge branch 'main' into lyc-dev 2025-01-17 09:57:50 +08:00
lyc c7d9bb087c edit 2025-01-17 09:57:35 +08:00
“zouyf” c56b434b4b Merge branch 'main' into zouyf_dev 2025-01-16 15:22:07 +08:00
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
“zouyf” 58c5a99dd2 Merge branch 'main' into zouyf_dev 2025-01-16 10:45:08 +08:00
朱浩 9c2c31e4b7 打印数据屏蔽 2025-01-15 16:43:12 +08:00
朱浩 121cff7c2b 打印数据屏蔽 2025-01-15 16:43:00 +08:00
朱浩 2ad1ae4946 打印数据屏蔽 2025-01-15 16:42:10 +08:00