zdg
|
11968879d8
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
# Conflicts:
# src/renderer/src/AixPPTist/src/views/Editor/EditorHeader/index.vue
|
2024-12-24 11:33:49 +08:00 |
|
zdg
|
db86299523
|
ppt缩略图生成
|
2024-12-24 11:32:52 +08:00 |
|
zdg
|
c152a3d3ee
|
aippt生成-缩略图
|
2024-12-24 11:24:53 +08:00 |
 lyc
|
9c8872579f
|
Merge pull request 'edit 框架设计' (#173) from lyc-dev into main
|
2024-12-24 10:21:42 +08:00 |
|
lyc
|
4f32927b49
|
edit 框架设计
|
2024-12-24 10:21:13 +08:00 |
 zhangxuelin
|
e132f3927b
|
Merge pull request 'zxl' (#172) from zxl into main
Reviewed-on: #172
|
2024-12-24 10:07:31 +08:00 |
 朱浩
|
c290c170d3
|
报错后及时回转loading按钮
|
2024-12-24 10:01:34 +08:00 |
|
朱浩
|
3867a9603f
|
报错后及时回转loading按钮
|
2024-12-24 09:58:31 +08:00 |
|
zhangxuelin
|
f732520d8d
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
|
2024-12-24 09:51:31 +08:00 |
|
lyc
|
01fbb9d05c
|
Merge pull request 'lyc-dev' (#171) from lyc-dev into main
|
2024-12-23 17:02:30 +08:00 |
|
lyc
|
1334becb54
|
Merge branch 'main' into lyc-dev
|
2024-12-23 17:01:53 +08:00 |
|
lyc
|
c95508ed59
|
edit 模板
|
2024-12-23 17:01:40 +08:00 |
|
zhangxuelin
|
cf540d73df
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
|
2024-12-23 15:26:47 +08:00 |
 baigl
|
35bf246975
|
Merge pull request 'baigl' (#170) from baigl into main
Reviewed-on: #170
|
2024-12-23 14:04:52 +08:00 |
白了个白
|
e3c4706880
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
|
2024-12-23 14:02:24 +08:00 |
|
白了个白
|
c507331fb5
|
作业设计：作业类型 tag颜色样式修改
|
2024-12-23 14:01:04 +08:00 |
|
lyc
|
abd7be0698
|
Merge pull request '模板edit' (#169) from lyc-dev into main
|
2024-12-23 10:45:55 +08:00 |
|
lyc
|
92e8aa64d7
|
模板edit
|
2024-12-23 10:45:27 +08:00 |
|
zhangxuelin
|
83d3cd5df8
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
|
2024-12-23 09:41:19 +08:00 |
|
朱浩
|
b1407706a8
|
永川个性化打包
|
2024-12-22 12:15:01 +08:00 |
|
朱浩
|
996b4006a2
|
永川个性化打包
|
2024-12-22 11:46:10 +08:00 |
|
朱浩
|
4531533382
|
大模型顺序问题修改
|
2024-12-21 21:42:07 +08:00 |
|
朱浩
|
a601a9f8dd
|
Merge remote-tracking branch 'origin/main'
|
2024-12-21 21:40:07 +08:00 |
 zhengdegang
|
086836e016
|
Merge pull request '1.pptList 实验室功能' (#168) from zdg_dev into main
Reviewed-on: #168
|
2024-12-21 12:17:04 +08:00 |
|
zdg
|
acb0231304
|
1.pptList 实验室功能
2.pplList 批量更新缩略图
|
2024-12-21 12:15:58 +08:00 |
|
baigl
|
94e23c3d69
|
Merge pull request 'baigl' (#167) from baigl into main
Reviewed-on: #167
|
2024-12-20 17:19:17 +08:00 |
|
白了个白
|
ea5ed4b6ac
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
|
2024-12-20 17:18:32 +08:00 |
|
白了个白
|
6b45fa61dd
|
1
|
2024-12-20 17:17:35 +08:00 |
|
白了个白
|
7aa75794dc
|
科学实验：批改优化
|
2024-12-20 17:16:57 +08:00 |
|
朱浩
|
a2c2c4eec7
|
Merge remote-tracking branch 'origin/main'
|
2024-12-20 17:14:40 +08:00 |
 CYS
|
4095390f45
|
Merge pull request '插入素材' (#166) from cys_dev into main
Reviewed-on: #166
|
2024-12-20 17:12:50 +08:00 |
|
cys
|
d75af2636d
|
插入素材
|
2024-12-20 17:12:07 +08:00 |
|
朱浩
|
1983dafbba
|
Merge remote-tracking branch 'origin/main'
|
2024-12-20 16:52:18 +08:00 |
|
朱浩
|
6c7284383a
|
宫格图片插件
|
2024-12-20 16:52:02 +08:00 |
|
白了个白
|
f7a3aa6e53
|
科学实验：学科写死
|
2024-12-20 16:37:08 +08:00 |
|
baigl
|
28f79f7ab0
|
Merge pull request 'baigl' (#165) from baigl into main
Reviewed-on: #165
|
2024-12-20 16:07:29 +08:00 |
|
白了个白
|
1488d7cc03
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
|
2024-12-20 16:06:55 +08:00 |
|
白了个白
|
045b44b833
|
1
|
2024-12-20 16:06:41 +08:00 |
|
baigl
|
b47a3bb63a
|
Merge pull request 'baigl' (#164) from baigl into main
Reviewed-on: #164
|
2024-12-20 16:02:49 +08:00 |
|
白了个白
|
5e954bab0b
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
|
2024-12-20 16:02:07 +08:00 |
|
白了个白
|
7322056dad
|
1
|
2024-12-20 16:01:46 +08:00 |
|
zhengdegang
|
18370129df
|
Merge pull request 'zdg_dev' (#163) from zdg_dev into main
Reviewed-on: #163
|
2024-12-20 16:00:48 +08:00 |
|
zdg
|
0bf94af5a3
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
|
2024-12-20 16:00:14 +08:00 |
|
zdg
|
7b042fd001
|
ppt上课 工具栏
|
2024-12-20 16:00:09 +08:00 |
|
CYS
|
3bf381f5c5
|
Merge pull request '插入素材' (#162) from cys_dev into main
Reviewed-on: #162
|
2024-12-20 15:57:22 +08:00 |
|
cys
|
fb67b16258
|
插入素材
|
2024-12-20 15:52:22 +08:00 |
|
baigl
|
016e87277b
|
Merge pull request 'baigl' (#161) from baigl into main
Reviewed-on: #161
|
2024-12-20 15:45:01 +08:00 |
|
白了个白
|
502c772b46
|
1
|
2024-12-20 15:42:19 +08:00 |
|
白了个白
|
57cd8ea45a
|
1
|
2024-12-20 15:24:27 +08:00 |
|
白了个白
|
8bbd01e2b2
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
|
2024-12-20 15:24:02 +08:00 |