 朱浩
|
ae433b7520
|
Merge pull request 'zhuhao_dev' (#324) from zhuhao_dev into main
Reviewed-on: #324
|
2024-10-16 14:32:50 +08:00 |
|
朱浩
|
16b574a167
|
Merge branch 'main' into zhuhao_dev
# Conflicts:
# src/renderer/src/views/prepare/index.vue
|
2024-10-16 14:31:55 +08:00 |
|
朱浩
|
8a90da5b64
|
接入AI生成PPT的功能
|
2024-10-16 14:29:43 +08:00 |
白了个白
|
2b25924213
|
作业推送：row改为rows组件模式
|
2024-10-16 14:20:46 +08:00 |
|
白了个白
|
f3d59ca8ee
|
教学实践：作业-推送布置修改；作业设计外链改为pc端作业设计
|
2024-10-16 14:19:30 +08:00 |
|
白了个白
|
6163fb06f9
|
公共组件：布置推送作业，row改为批量rows逻辑；截止日期默认为当前时间3小时之后
|
2024-10-16 14:16:48 +08:00 |
 zhengdegang
|
206a81eeee
|
Merge pull request 'zdg' (#323) from zdg into main
Reviewed-on: #323
|
2024-10-16 12:13:01 +08:00 |
zdg
|
b68e5c449b
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-10-16 12:12:06 +08:00 |
|
zdg
|
bf7c9839c7
|
ppt作业布置-加上课堂id
|
2024-10-16 12:12:00 +08:00 |
|
朱浩
|
d1f3abcc72
|
#882 V2.1.5 教学实录只记录已结束课程，添加继续上课逻辑
|
2024-10-16 10:58:42 +08:00 |
|
zdg
|
781a62c137
|
测试
|
2024-10-16 10:58:09 +08:00 |
 zouyf
|
4d9ae0ab90
|
Merge pull request 'zouyf_dev' (#322) from zouyf_dev into main
Reviewed-on: #322
|
2024-10-16 09:39:23 +08:00 |
|
朱浩
|
d39d96f733
|
Merge branch 'main' into zhuhao_dev
|
2024-10-16 09:33:29 +08:00 |
|
“zouyf”
|
26c388f31c
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk
|
2024-10-16 09:23:28 +08:00 |
|
“zouyf”
|
d9ddb1982b
|
[作业批改] - 重新优化常规作业逻辑
|
2024-10-16 09:22:18 +08:00 |
|
朱浩
|
3942f894b0
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk
|
2024-10-15 18:40:07 +08:00 |
|
朱浩
|
ec8f7b5727
|
无法上课PPT的问题解决
|
2024-10-15 18:39:50 +08:00 |
|
朱浩
|
fe9e0c1fe2
|
删除沉余代码
|
2024-10-15 17:47:32 +08:00 |
 yangws
|
1a447b30fb
|
Merge pull request 'fix：作业批阅柱状图改为百分比显示；' (#321) from yangws into main
Reviewed-on: #321
|
2024-10-15 16:36:21 +08:00 |
小杨
|
1c9a3762ef
|
fix：作业批阅柱状图改为百分比显示；
|
2024-10-15 16:34:31 +08:00 |
 lyc
|
ea88aa959d
|
Merge pull request 'lyc-dev' (#320) from lyc-dev into main
|
2024-10-15 16:30:12 +08:00 |
|
lyc
|
d534340f88
|
Merge branch 'main' into lyc-dev
|
2024-10-15 16:30:17 +08:00 |
|
lyc
|
ad2c37be82
|
ai-ppt
|
2024-10-15 16:30:07 +08:00 |
|
朱浩
|
7fa76e0f7e
|
Merge branch 'main' into zhuhao_dev
# Conflicts:
# src/renderer/src/views/classManage/reserv-item-apt.vue
# src/renderer/src/views/prepare/container/kj-list-item.vue
|
2024-10-15 15:40:08 +08:00 |
|
zhengdegang
|
540229cd9b
|
Merge pull request 'apt ppt 上下课、继续上课' (#319) from zdg into main
Reviewed-on: #319
|
2024-10-15 15:35:12 +08:00 |
|
zdg
|
2115d2c76a
|
apt ppt 上下课、继续上课
|
2024-10-15 15:33:07 +08:00 |
|
yangws
|
d068d4e71a
|
Merge pull request 'fix: 作业批阅展示修改；' (#318) from yangws into main
Reviewed-on: #318
|
2024-10-15 15:25:10 +08:00 |
|
小杨
|
1ef4615587
|
fix: 作业批阅展示修改；
|
2024-10-15 15:24:06 +08:00 |
 baigl
|
a853214741
|
Merge pull request 'baigl' (#317) from baigl into main
Reviewed-on: #317
|
2024-10-15 15:09:25 +08:00 |
|
白了个白
|
7d71cbd398
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-10-15 15:07:54 +08:00 |
|
白了个白
|
2f3b2e8c8f
|
1
|
2024-10-15 11:27:03 +08:00 |
|
白了个白
|
5b818d2dd8
|
作业布置：新增 常规作业 列表详情预览
|
2024-10-15 11:08:23 +08:00 |
|
朱浩
|
b3e75e799e
|
Merge branch 'main' into zhuhao_dev
|
2024-10-15 09:23:04 +08:00 |
|
白了个白
|
b0415ecafa
|
作业布置：新增 框架梳理 列表详情预览
|
2024-10-14 17:26:49 +08:00 |
 qinqing
|
1724419848
|
Merge pull request 'qinqing_dev' (#316) from qinqing_dev into main
Reviewed-on: #316
|
2024-10-14 17:18:38 +08:00 |
|
qinqing
|
37652cd803
|
Merge branch 'main' into qinqing_dev
|
2024-10-14 17:17:55 +08:00 |
|
qinqing
|
506f95060b
|
优化PDF插件工具栏
|
2024-10-14 17:17:04 +08:00 |
|
qinqing
|
d68e4fef0b
|
Merge pull request '修改默认展示判定逻辑' (#315) from qinqing_dev into main
Reviewed-on: #315
|
2024-10-14 16:25:37 +08:00 |
|
qinqing
|
fcc0af04cb
|
Merge branch 'main' into qinqing_dev
|
2024-10-14 16:25:00 +08:00 |
|
qinqing
|
944d94a202
|
修改默认展示判定逻辑
|
2024-10-14 16:24:00 +08:00 |
|
白了个白
|
c3787eef0f
|
作业布置：列表编辑，ui显示null标题修复
|
2024-10-14 15:55:54 +08:00 |
|
lyc
|
14c4ede80e
|
Merge pull request '删除 hooks、useGetClassWork.js' (#314) from lyc-dev into main
|
2024-10-14 15:11:49 +08:00 |
|
lyc
|
bf642ddc79
|
删除 hooks、useGetClassWork.js
|
2024-10-14 15:12:05 +08:00 |
|
白了个白
|
ed035f94ed
|
作业布置：列表排序修改
|
2024-10-14 11:22:37 +08:00 |
|
baigl
|
35af866a53
|
Merge pull request '作业布置：推送多个班级的学生bug修复' (#313) from baigl into main
Reviewed-on: #313
|
2024-10-14 10:59:55 +08:00 |
|
白了个白
|
58988313b7
|
作业布置：推送多个班级的学生bug修复
|
2024-10-14 10:57:02 +08:00 |
|
朱浩
|
81cd69beb9
|
暂时取消APT的上课判断
|
2024-10-11 17:31:12 +08:00 |
|
朱浩
|
0bb03dad5e
|
暂时取消APT的上课判断
|
2024-10-11 16:40:07 +08:00 |
|
qinqing
|
eca1a927c0
|
Merge pull request 'qinqing_dev' (#312) from qinqing_dev into main
Reviewed-on: #312
|
2024-10-11 16:39:10 +08:00 |
|
qinqing
|
7cab923fa4
|
合并代码
|
2024-10-11 16:35:42 +08:00 |