 lyc
|
50aff2f158
|
Merge pull request 'add icon' (#106) from lyc-dev into main
|
2024-12-11 09:41:16 +08:00 |
|
lyc
|
a1a4e11de7
|
add icon
|
2024-12-11 09:40:51 +08:00 |
|
lyc
|
20fe5be502
|
Merge pull request 'lyc-dev' (#105) from lyc-dev into main
|
2024-12-10 15:44:00 +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 |
 yangws
|
3ca20cd327
|
Merge pull request 'fix:清除debugger;' (#104) from yws_dev into main
Reviewed-on: #104
|
2024-12-10 15:38:42 +08:00 |
小杨
|
c159d6be1a
|
fix:清除debugger;
|
2024-12-10 15:38:19 +08:00 |
|
yangws
|
cc44a86437
|
Merge pull request 'yws_dev' (#103) from yws_dev into main
Reviewed-on: #103
|
2024-12-10 15:35:20 +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
|
34cfcf5a6f
|
Merge pull request 'zouyf_dev' (#102) from zouyf_dev into main
Reviewed-on: #102
|
2024-12-10 11:10:55 +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
|
91e9867b68
|
Merge pull request 'zxl' (#101) from zxl into main
Reviewed-on: #101
|
2024-12-10 10:41:08 +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 |
 baigl
|
fa776d2a8c
|
Merge pull request 'baigl' (#100) from baigl into main
Reviewed-on: #100
|
2024-12-10 10:26:52 +08:00 |
白了个白
|
122487cf8b
|
ppts习题插入：个人题库 习题截图放到ppts里面转换
|
2024-12-10 10:24:30 +08:00 |
|
白了个白
|
b7f11c5338
|
Merge branch 'zouyf_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
|
2024-12-10 10:19:06 +08:00 |
|
白了个白
|
c78233a2f4
|
1
|
2024-12-10 10:16:07 +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 |
zdg
|
4f68ae27b3
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
|
2024-12-10 10:09:00 +08:00 |
|
zdg
|
38c041465e
|
ppt上课
|
2024-12-10 10:08:53 +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 |
|
yangws
|
ffd6d6fab9
|
Merge pull request 'yws_dev' (#99) from yws_dev into main
Reviewed-on: #99
|
2024-12-09 17:26:08 +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
|
238f08d9ac
|
Merge pull request 'zouyf_dev' (#98) from zouyf_dev into main
Reviewed-on: #98
|
2024-12-09 17:16:42 +08:00 |
|
“zouyf”
|
d90b7c695a
|
1
|
2024-12-09 17:14:37 +08:00 |
|
“zouyf”
|
f936e726c0
|
Merge branch 'main' into zouyf_dev
|
2024-12-09 16:50:12 +08:00 |
|
“zouyf”
|
d07dd4455c
|
1
|
2024-12-09 16:50:00 +08:00 |
|
zouyf
|
b319aeb4b2
|
Merge pull request 'zouyf_dev' (#97) from zouyf_dev into main
Reviewed-on: #97
|
2024-12-09 15:03:29 +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 |
 zhengdegang
|
3c6ac1f77d
|
Merge pull request 'zdg_dev' (#96) from zdg_dev into main
Reviewed-on: #96
|
2024-12-09 14:07:40 +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
|
f2637c7b15
|
Merge pull request 'lyc-dev' (#95) from lyc-dev into main
|
2024-12-09 10:56:53 +08:00 |