 lyc
|
a1a4e11de7
|
add icon
|
2024-12-11 09:40:51 +08:00 |
|
lyc
|
7e9ac2bf74
|
Merge branch 'main' into lyc-dev
|
2024-12-10 15:43:14 +08:00 |
|
lyc
|
013669dd35
|
edit 模板
|
2024-12-10 15:42:59 +08:00 |
小杨
|
c159d6be1a
|
fix:清除debugger;
|
2024-12-10 15:38:19 +08:00 |
|
小杨
|
e7c6ab9e8d
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev
|
2024-12-10 15:34:51 +08:00 |
|
小杨
|
85d06f306a
|
fix：ppt活动添加;
|
2024-12-10 15:34:46 +08:00 |
 朱浩
|
656a58693f
|
Merge remote-tracking branch 'origin/main'
|
2024-12-10 14:20:08 +08:00 |
 “zouyf”
|
9603406a0b
|
1
|
2024-12-10 11:09:32 +08:00 |
|
“zouyf”
|
10a7e73c64
|
Merge branch 'main' into zouyf_dev
|
2024-12-10 10:59:48 +08:00 |
|
“zouyf”
|
2c238b5706
|
1
|
2024-12-10 10:54:21 +08:00 |
|
“zouyf”
|
b47feb4a3a
|
1
|
2024-12-10 10:46:22 +08:00 |
|
朱浩
|
772b196b31
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# src/renderer/src/views/prepare/index.vue
|
2024-12-10 10:44:04 +08:00 |
 zhangxuelin
|
80ac4a6e1c
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
|
2024-12-10 10:40:21 +08:00 |
|
朱浩
|
757edb0f67
|
改名AIPPT
|
2024-12-10 10:40:08 +08:00 |
|
“zouyf”
|
c79911cc99
|
Merge branch 'main' into zouyf_dev
|
2024-12-10 10:40:07 +08:00 |
|
zhangxuelin
|
1987783fda
|
添加作业弹窗
|
2024-12-10 10:40:00 +08:00 |
|
“zouyf”
|
755cfc615a
|
试题分页查询回顶部
|
2024-12-10 10:39:39 +08:00 |
白了个白
|
122487cf8b
|
ppts习题插入：个人题库 习题截图放到ppts里面转换
|
2024-12-10 10:24:30 +08:00 |
|
“zouyf”
|
2e81c706b1
|
Merge branch 'main' into zouyf_dev
|
2024-12-10 10:13:00 +08:00 |
|
“zouyf”
|
2360d95f1c
|
pptList试题转图片优化
|
2024-12-10 10:12:47 +08:00 |
|
zhangxuelin
|
f035cf87ea
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
# Conflicts:
# src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue
|
2024-12-10 09:43:43 +08:00 |
|
zhangxuelin
|
e56eb059be
|
替换上传图片 视频url为线上url
|
2024-12-10 09:41:59 +08:00 |
|
小杨
|
23e59531ea
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev
|
2024-12-09 17:25:30 +08:00 |
|
小杨
|
9e021edc67
|
fix：添加活动；
|
2024-12-09 17:25:25 +08:00 |
|
“zouyf”
|
d90b7c695a
|
1
|
2024-12-09 17:14:37 +08:00 |
|
“zouyf”
|
d07dd4455c
|
1
|
2024-12-09 16:50:00 +08:00 |
|
“zouyf”
|
23c397e18a
|
Merge branch 'main' into zouyf_dev
|
2024-12-09 15:01:43 +08:00 |
|
“zouyf”
|
78858111bb
|
pptList样式修改
|
2024-12-09 15:01:25 +08:00 |
zdg
|
97962d591f
|
删除无效代码
|
2024-12-09 13:54:44 +08:00 |
|
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 |
|
“zouyf”
|
728ce16c8b
|
Merge branch 'main' into zouyf_dev
|
2024-12-09 13:46:32 +08:00 |
|
小杨
|
5b1d921378
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev
|
2024-12-09 11:16:48 +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 |
|
小杨
|
0aa09e9d9a
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev
|
2024-12-09 09:30:08 +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 |
|
“zouyf”
|
bbe2281781
|
Merge branch 'baigl' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zouyf_dev
|
2024-12-06 15:32:02 +08:00 |
|
“zouyf”
|
66881b0025
|
Merge branch 'main' into zouyf_dev
|
2024-12-06 15:30:41 +08:00 |
|
“zouyf”
|
e43c9fd038
|
1
|
2024-12-06 15:30:09 +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 |