 “zouyf”
|
4b935b9110
|
1
|
2024-12-25 17:30:42 +08:00 |
|
“zouyf”
|
96e01ae711
|
Merge branch 'main' into zouyf_dev
|
2024-12-25 17:04:50 +08:00 |
|
“zouyf”
|
d8c4876119
|
[科学实验] - 更新作业学段学科回显
|
2024-12-25 17:04:29 +08:00 |
 zhangxuelin
|
ae839825d4
|
Merge pull request 'zxl' (#180) from zxl into main
Reviewed-on: #180
|
2024-12-25 16:56:38 +08:00 |
|
zhangxuelin
|
ef670dee99
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
|
2024-12-25 16:55:47 +08:00 |
 朱浩
|
c81f393715
|
宫格插件
|
2024-12-25 14:38:29 +08:00 |
|
zhangxuelin
|
06bb6284c4
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
|
2024-12-25 13:39:31 +08:00 |
|
朱浩
|
b5caa7ba80
|
Merge remote-tracking branch 'origin/main'
|
2024-12-25 12:04:41 +08:00 |
|
朱浩
|
53ff508635
|
宫格插件
|
2024-12-25 12:04:27 +08:00 |
|
“zouyf”
|
d9a0f2f8c3
|
1
|
2024-12-25 11:20:18 +08:00 |
|
“zouyf”
|
89cba04b8c
|
Merge branch 'main' into zouyf_dev
# Conflicts:
# src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue
|
2024-12-25 11:02:19 +08:00 |
|
zouyf
|
9cce9c224c
|
Merge pull request '[作业批改] - 替换自动批改完成' (#179) from zouyf_tmp into main
Reviewed-on: #179
|
2024-12-25 10:42:58 +08:00 |
|
“zouyf”
|
171dc72ee7
|
[作业批改] - 替换自动批改完成
|
2024-12-25 10:33:20 +08:00 |
|
zhangxuelin
|
c2750e3da6
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
|
2024-12-25 10:27:02 +08:00 |
|
zhangxuelin
|
5550ca570c
|
no message
|
2024-12-25 10:25:07 +08:00 |
|
“zouyf”
|
dd0160865b
|
Merge branch 'main' into zouyf_dev
|
2024-12-25 10:09:57 +08:00 |
|
“zouyf”
|
ff0dd3600c
|
1
|
2024-12-25 10:06:03 +08:00 |
 lyc
|
62a419356c
|
Merge pull request 'edit' (#178) from lyc-dev into main
|
2024-12-24 17:32:25 +08:00 |
|
lyc
|
4b2d13db8e
|
edit
|
2024-12-24 17:31:56 +08:00 |
|
zhangxuelin
|
ab9bad467a
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
# Conflicts:
# src/renderer/src/AixPPTist/src/views/Editor/EditorHeader/index.vue
|
2024-12-24 16:08:48 +08:00 |
 zhengdegang
|
f63bb69919
|
Merge pull request 'zdg_dev' (#177) from zdg_dev into main
Reviewed-on: #177
|
2024-12-24 16:08:38 +08:00 |
zdg
|
b3ffa9bdaa
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
|
2024-12-24 16:07:00 +08:00 |
|
zdg
|
5510021566
|
上课允许不选班级开课
|
2024-12-24 16:06:53 +08:00 |
|
lyc
|
89e0b2f97c
|
Merge pull request 'edit 框架设计' (#176) from lyc-dev into main
|
2024-12-24 14:48:25 +08:00 |
|
lyc
|
406e581182
|
edit 框架设计
|
2024-12-24 14:47:58 +08:00 |
|
lyc
|
ea0e1c91cf
|
Merge pull request 'lyc-dev' (#175) from lyc-dev into main
|
2024-12-24 14:38:20 +08:00 |
|
lyc
|
d4dce61555
|
Merge branch 'main' into lyc-dev
|
2024-12-24 14:37:06 +08:00 |
|
lyc
|
d6d5d13232
|
pptList 插入素材 增加loading
|
2024-12-24 14:32:59 +08:00 |
|
zhengdegang
|
33e38f8992
|
Merge pull request 'zdg_dev' (#174) from zdg_dev into main
Reviewed-on: #174
|
2024-12-24 12:05:02 +08:00 |
|
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 |
|
zhangxuelin
|
a366d5d4d6
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
|
2024-12-24 11:24:01 +08:00 |
|
zhangxuelin
|
e0ec22c3ac
|
替换照片改为线上url
|
2024-12-24 11:23:52 +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 |
|
“zouyf”
|
63b8a0d5c6
|
Merge branch 'main' into zouyf_dev
|
2024-12-23 15:28:49 +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 |