zdg
|
86154148c6
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
# Conflicts:
# src/renderer/src/views/prepare/container/class-start.vue
|
2024-12-09 13:52:24 +08:00 |
|
zdg
|
44092a21bf
|
ppt上课
|
2024-12-09 13:51:00 +08:00 |
 lyc
|
93fa916084
|
Merge branch 'main' into lyc-dev
|
2024-12-09 10:56:20 +08:00 |
|
lyc
|
24d6d5887f
|
pptlist edit
|
2024-12-09 10:56:04 +08:00 |
 朱浩
|
222b0f54f8
|
Merge remote-tracking branch 'origin/main'
|
2024-12-09 10:51:25 +08:00 |
|
朱浩
|
e0a56b37ef
|
改名AIPPT
|
2024-12-09 10:51:07 +08:00 |
白了个白
|
464f39dac8
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
|
2024-12-09 10:16:42 +08:00 |
|
白了个白
|
8e72b50c68
|
ppts：图片样式 裁剪逻辑样式修改
|
2024-12-09 10:16:17 +08:00 |
|
lyc
|
cb5445f9a9
|
Merge branch 'main' into lyc-dev
|
2024-12-06 16:40:03 +08:00 |
|
lyc
|
560e6f0e70
|
插入素材-pptlist
|
2024-12-06 16:39:47 +08:00 |
|
白了个白
|
da1c80406f
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
|
2024-12-06 15:29:35 +08:00 |
|
白了个白
|
e3199b43de
|
1
|
2024-12-06 15:26:22 +08:00 |
|
朱浩
|
a78497b263
|
Merge remote-tracking branch 'origin/main'
|
2024-12-06 14:21:19 +08:00 |
|
朱浩
|
65670af54f
|
s生成PPT
|
2024-12-06 14:21:05 +08:00 |
|
zdg
|
209ab7fafc
|
弹窗进度条
|
2024-12-06 14:15:01 +08:00 |
|
朱浩
|
87dcd9d5c3
|
Merge remote-tracking branch 'origin/main'
|
2024-12-05 15:47:38 +08:00 |
 “zouyf”
|
35c088c25a
|
Merge branch 'main' into zouyf_dev
|
2024-12-05 14:37:13 +08:00 |
|
“zouyf”
|
028eb0f752
|
[考试分析] - 增加分页及优化题型获取
|
2024-12-05 14:36:50 +08:00 |
|
zdg
|
b28abdff50
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
|
2024-12-05 14:21:43 +08:00 |
|
zdg
|
b428260703
|
类型异常
|
2024-12-05 14:21:36 +08:00 |
|
lyc
|
b5f824ceea
|
Merge pull request 'edit' (#88) from lyc-dev into main
|
2024-12-05 10:36:59 +08:00 |
|
lyc
|
d3b3e3bcb5
|
edit
|
2024-12-05 10:36:34 +08:00 |
|
zdg
|
53f26d96d4
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
|
2024-12-05 09:44:51 +08:00 |
|
zdg
|
7d7b50fa3e
|
类型定义
|
2024-12-05 09:44:45 +08:00 |
|
白了个白
|
5fe9359d64
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
|
2024-12-04 17:30:30 +08:00 |
|
白了个白
|
be9d33fcd3
|
pptist： canvasTool 里面 新增插入试题
|
2024-12-04 17:30:01 +08:00 |
|
lyc
|
09e3264ee7
|
Merge pull request 'edit' (#85) from lyc-dev into main
|
2024-12-04 17:16:34 +08:00 |
|
lyc
|
7845d9bb1a
|
edit
|
2024-12-04 17:15:20 +08:00 |
|
zdg
|
d542064ee3
|
ppt生成课堂备课
|
2024-12-04 17:08:51 +08:00 |
|
朱浩
|
9803c09c43
|
s生成PPT
|
2024-12-04 17:04:20 +08:00 |
|
zdg
|
0e5d84fcd2
|
ppt生产
|
2024-12-04 16:41:38 +08:00 |
|
朱浩
|
7811bbfe3e
|
s生成PPT
|
2024-12-04 16:28:52 +08:00 |
|
zdg
|
91ceb712bf
|
异常修复
|
2024-12-04 15:45:45 +08:00 |
|
zdg
|
a192640899
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
|
2024-12-04 15:42:38 +08:00 |
|
zdg
|
08a16929f7
|
还原本地测试代码
|
2024-12-04 15:32:56 +08:00 |
|
lyc
|
42e8149443
|
Merge pull request 'lyc-dev' (#81) from lyc-dev into main
|
2024-12-04 15:14:22 +08:00 |
|
lyc
|
8b429a4174
|
edit
|
2024-12-04 15:13:53 +08:00 |
|
白了个白
|
23795f2419
|
Merge branch 'yws_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
|
2024-12-04 15:09:05 +08:00 |
|
白了个白
|
ea204de407
|
1
|
2024-12-04 15:05:48 +08:00 |
|
白了个白
|
a31b8d7376
|
pptist：canvastool 新增 插入习题按钮
|
2024-12-04 14:58:47 +08:00 |
小杨
|
8d03c927b9
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev
|
2024-12-04 14:58:02 +08:00 |
|
小杨
|
edabc0336f
|
add：新增pptlist活动列表;
|
2024-12-04 14:57:56 +08:00 |
|
白了个白
|
df474db4a5
|
1
|
2024-12-04 14:38:28 +08:00 |
|
白了个白
|
328e623db7
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
|
2024-12-04 14:36:53 +08:00 |
|
白了个白
|
8ad041e963
|
1
|
2024-12-04 14:34:25 +08:00 |
|
zdg
|
3b851887ca
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
|
2024-12-04 14:33:30 +08:00 |
|
zdg
|
e6333e49f0
|
更新ppt
|
2024-12-04 14:33:08 +08:00 |
 cys
|
59bc2fba86
|
Merge branch 'cys_dev'
|
2024-12-04 10:27:45 +08:00 |
|
lyc
|
3ad4391e10
|
edit 模板
|
2024-12-03 10:11:51 +08:00 |
|
“zouyf”
|
7b59d78ce3
|
1
|
2024-12-02 17:30:24 +08:00 |