Commit Graph

1281 Commits

Author SHA1 Message Date
小杨 24ce28f2e2 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into yangws 2024-10-23 15:50:17 +08:00
小杨 0de7a7356e add:作业批阅客观题自动评分; 2024-10-23 15:50:03 +08:00
lyc e457ac9baf Merge pull request '调整ppt上课 作业查询' (#356) from lyc-dev into main 2024-10-23 10:43:25 +08:00
lyc 0b4019957f 调整ppt上课 作业查询 2024-10-23 10:43:57 +08:00
baigl 7b2ad4ce64 Merge pull request 'baigl' (#355) from baigl into main
Reviewed-on: #355
2024-10-22 17:31:41 +08:00
白了个白 758081d9e5 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-10-22 17:30:00 +08:00
白了个白 a7a84b3738 常规作业改为主题作业,课堂展示改为创作展示 暂不修改 2024-10-22 17:27:02 +08:00
yangws 6467203c26 Merge pull request 'yangws' (#354) from yangws into main
Reviewed-on: #354
2024-10-22 16:59:52 +08:00
小杨 49b4ba1f02 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into yangws 2024-10-22 16:59:28 +08:00
小杨 2c2c5b32e9 fix:修改作业批阅样式; 2024-10-22 16:59:23 +08:00
zouyf 2f726bccfb Merge pull request 'zouyf_dev' (#353) from zouyf_dev into main
Reviewed-on: #353
2024-10-22 16:54:40 +08:00
“zouyf” 6112cc8a92 1 2024-10-22 16:50:42 +08:00
“zouyf” d05388cb05 Merge branch 'main' into zouyf_dev 2024-10-22 16:46:45 +08:00
“zouyf” cca640e945 [逐题讲评] - 增加右侧试题显示 2024-10-22 16:45:55 +08:00
baigl 08ed5c9f2f Merge pull request 'baigl' (#352) from baigl into main
Reviewed-on: #352
2024-10-22 16:16:43 +08:00
白了个白 35a00e2aca 作业批阅:最小化再次打开会刷新的逻辑修改 2024-10-22 16:04:03 +08:00
“zouyf” ab127958f9 Merge branch 'main' into zouyf_dev 2024-10-22 14:54:57 +08:00
“zouyf” ef75fb7570 试题格式化样式优化 2024-10-22 14:47:49 +08:00
白了个白 e3ce510322 常规作业改为主题作业,课堂展示改为创作展示 2024-10-22 14:39:48 +08:00
zouyf bcc9a66df6 Merge pull request 'zouyf_dev' (#350) from zouyf_dev into main
Reviewed-on: #350
2024-10-21 16:46:40 +08:00
“zouyf” 0f425d9277 [作业布置] - 增加试题详情查看弹框 2024-10-21 16:41:13 +08:00
“zouyf” 8c36d59b19 Merge branch 'main' into zouyf_dev 2024-10-21 16:34:55 +08:00
“zouyf” a229e9933e [考试分析] - 优化试题详情弹框 2024-10-21 16:34:39 +08:00
yangws 6c1bb40826 Merge pull request 'fix:获取学生id;' (#349) from yangws into main
Reviewed-on: #349
2024-10-20 17:46:51 +08:00
小杨 ea861dd2ea fix:获取学生id; 2024-10-20 17:45:42 +08:00
lyc ff2e05fb6b Merge pull request 'edit' (#348) from lyc-dev into main 2024-10-20 17:08:22 +08:00
lyc b7425da4da edit 2024-10-20 17:08:57 +08:00
zouyf b0075b86ba Merge pull request 'zouyf_dev' (#347) from zouyf_dev into main
Reviewed-on: #347
2024-10-20 15:28:42 +08:00
yangws 54d4896e18 Merge pull request 'fix:判断没有学生回答题目的情况;' (#346) from yangws into main
Reviewed-on: #346
2024-10-20 15:25:37 +08:00
小杨 3042e874e4 fix:判断没有学生回答题目的情况; 2024-10-20 15:23:48 +08:00
zouyf 92f23a35f9 Merge branch 'main' into zouyf_dev 2024-10-20 15:04:33 +08:00
zouyf 64e91dffbe 1 2024-10-20 15:03:30 +08:00
qinqing 80c38152d2 Merge pull request '屏蔽ocr识别' (#345) from qinqing_dev into main
Reviewed-on: #345
2024-10-20 12:11:50 +08:00
qinqing 0cefb94721 屏蔽ocr识别 2024-10-20 12:08:37 +08:00
yangws 5ff18bf4aa Merge pull request 'yangws' (#344) from yangws into main
Reviewed-on: #344
2024-10-20 01:36:42 +08:00
小杨 688f200d43 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into yangws 2024-10-20 01:35:50 +08:00
小杨 46d5078cac fix:训练报告整体修改; 2024-10-20 01:35:45 +08:00
朱浩 cf05038c0d Merge pull request 'zhuhao_dev' (#343) from zhuhao_dev into main
Reviewed-on: #343
2024-10-19 18:02:44 +08:00
朱浩 a72177d02e Merge branch 'main' into zhuhao_dev 2024-10-19 18:02:09 +08:00
朱浩 39f46a1709 生成PPT后自动打开 2024-10-19 18:01:52 +08:00
朱浩 d03e6e2fbc Merge pull request 'zhuhao_dev' (#342) from zhuhao_dev into main
Reviewed-on: #342
2024-10-19 17:34:04 +08:00
朱浩 770a847e91 默认窗口最大化 2024-10-19 17:33:11 +08:00
朱浩 6f35ad8a1a Merge branch 'main' into zhuhao_dev
# Conflicts:
#	src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
2024-10-19 17:21:34 +08:00
zouyf 4e7b9f0a82 Merge pull request 'zouyf_dev' (#341) from zouyf_dev into main
Reviewed-on: #341
2024-10-19 17:20:42 +08:00
qinqing 7b4e6d0b10 Merge pull request 'qinqing_dev' (#340) from qinqing_dev into main
Reviewed-on: #340
2024-10-19 17:20:26 +08:00
qinqing 04d2e47882 Merge branch 'main' into qinqing_dev 2024-10-19 17:20:02 +08:00
“zouyf” 17e8e43ad4 Merge branch 'main' into zouyf_dev
# Conflicts:
#	src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
2024-10-19 17:19:09 +08:00
qinqing ea2de75415 百度OCR识别 2024-10-19 17:18:52 +08:00
“zouyf” 38b17333ab 页面优化 2024-10-19 17:17:16 +08:00
baigl d58dff8731 Merge pull request 'baigl' (#339) from baigl into main
Reviewed-on: #339
2024-10-19 17:15:41 +08:00