小杨
|
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 |
|
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 |
 baigl
|
045bc5e198
|
Merge pull request 'baigl' (#94) from baigl into main
Reviewed-on: #94
|
2024-12-09 10:17:51 +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
|
97f55ca333
|
Merge pull request 'lyc-dev' (#93) from lyc-dev into main
|
2024-12-06 16:40:40 +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 |
|
baigl
|
4010411c9f
|
Merge pull request 'baigl' (#92) from baigl into main
Reviewed-on: #92
|
2024-12-06 15:30:38 +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 |
|
zhengdegang
|
e5be55f12e
|
Merge pull request '弹窗进度条' (#91) from zdg_dev into main
Reviewed-on: #91
|
2024-12-06 14:15:42 +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
|
1f96b9b09e
|
Merge pull request 'zouyf_dev' (#90) from zouyf_dev into main
Reviewed-on: #90
|
2024-12-05 14:55:32 +08:00 |
|
小杨
|
0e18d74bb9
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev
|
2024-12-05 14:47:27 +08:00 |
|
小杨
|
399c4b5461
|
add:添加活动页面;
|
2024-12-05 14:47:23 +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 |
|
zhengdegang
|
9a68661fb0
|
Merge pull request 'zdg_dev' (#89) from zdg_dev into main
Reviewed-on: #89
|
2024-12-05 14:22:13 +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 |
|
zhengdegang
|
dcabb80757
|
Merge pull request 'zdg_dev' (#87) from zdg_dev into main
Reviewed-on: #87
|
2024-12-05 09:47:15 +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 |