 朱浩
|
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
|
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 |
|
baigl
|
3fb3af9cae
|
Merge pull request 'baigl' (#311) from baigl into main
Reviewed-on: #311
|
2024-10-11 16:33:56 +08:00 |
|
白了个白
|
96ef7da95a
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-10-11 16:32:17 +08:00 |
 zouyf
|
ee4088ad75
|
Merge pull request 'zouyf_dev' (#310) from zouyf_dev into main
Reviewed-on: #310
|
2024-10-11 16:31:18 +08:00 |
|
“zouyf”
|
082a824adf
|
Merge branch 'main' into zouyf_dev
|
2024-10-11 16:30:20 +08:00 |
|
“zouyf”
|
b35cba4e31
|
1
|
2024-10-11 16:30:07 +08:00 |
|
白了个白
|
2ad1904802
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-10-11 16:28:04 +08:00 |
|
白了个白
|
8ff117ab53
|
作业批改：页面缓存读取bug修复
|
2024-10-11 16:27:39 +08:00 |
|
qinqing
|
6911a92ecb
|
新增打开新课件，优化PDF插件查看器
|
2024-10-11 16:22:26 +08:00 |
|
zouyf
|
5b1986afaf
|
Merge pull request 'zouyf_dev' (#309) from zouyf_dev into main
Reviewed-on: #309
|
2024-10-11 16:05:36 +08:00 |
|
“zouyf”
|
df46413c1c
|
Merge branch 'main' into zouyf_dev
|
2024-10-11 16:04:12 +08:00 |
|
“zouyf”
|
cd5abd864d
|
[考试分析] - 优化非绑定菁优网章节不显示试题
|
2024-10-11 16:03:56 +08:00 |
|
朱浩
|
155631a3e3
|
Merge pull request 'zhuhao_dev' (#308) from zhuhao_dev into main
Reviewed-on: #308
|
2024-10-11 15:01:02 +08:00 |
|
朱浩
|
f209bc673f
|
Merge branch 'main' into zhuhao_dev
|
2024-10-11 15:00:23 +08:00 |
|
朱浩
|
acc20b79f1
|
#895 V2.1.5 【教学实践】“APT”“PPT”现在创建后是先生成文档，再点击进入，应该改成创建后直接默认打开进入编辑页面
|
2024-10-11 14:59:23 +08:00 |
|
朱浩
|
b4dca57828
|
#909 V2.1.5 平台版本号应该在平台内展示出来。方便查阅是否为最新版本
|
2024-10-11 14:51:46 +08:00 |
|
朱浩
|
3c064ebffd
|
#924 V2.1.5 PPT上课，点击上课之后，默认打开当前课程PPT
|
2024-10-11 14:41:36 +08:00 |
|
朱浩
|
07fa4c9790
|
修改资源为活动，去除窗口和互动
|
2024-10-11 13:42:03 +08:00 |
|
朱浩
|
e253a6c9dc
|
#876 教学实践，上课时检查未结束课程逻辑
|
2024-10-10 17:42:48 +08:00 |
|
“zouyf”
|
f6f804a09e
|
1
|
2024-10-10 17:32:13 +08:00 |
|
zouyf
|
89097eab31
|
Merge pull request 'zouyf_dev' (#307) from zouyf_dev into main
Reviewed-on: #307
|
2024-10-10 16:03:06 +08:00 |
|
lyc
|
ef18d4adf4
|
Merge pull request 'lyc-dev' (#306) from lyc-dev into main
|
2024-10-10 16:01:01 +08:00 |
|
lyc
|
bff59d699f
|
edit
|
2024-10-10 16:01:22 +08:00 |
|
lyc
|
7d457782cc
|
edit
|
2024-10-10 16:00:13 +08:00 |
|
“zouyf”
|
d0947da293
|
Merge branch 'main' into zouyf_dev
|
2024-10-10 15:58:45 +08:00 |