小杨
|
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 |
白了个白
|
40d83c4cb3
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-10-19 17:14:35 +08:00 |
|
小杨
|
6b63235084
|
fix：修改字段名称以及统一逻辑；
|
2024-10-19 17:14:21 +08:00 |
|
白了个白
|
8ba6e15020
|
作业管理相关修改
|
2024-10-19 17:14:09 +08:00 |
|
朱浩
|
bddcf2d4ff
|
BUG修复
|
2024-10-19 17:01:05 +08:00 |
 lyc
|
8f91be9a4b
|
Merge pull request '默认全屏' (#338) from lyc-dev into main
|
2024-10-19 16:59:35 +08:00 |
|
lyc
|
75384c8057
|
默认全屏
|
2024-10-19 17:00:09 +08:00 |
|
朱浩
|
bed3ef96a7
|
Merge branch 'main' into zhuhao_dev
|
2024-10-19 16:59:30 +08:00 |
|
qinqing
|
f5497aa856
|
Merge pull request 'qinqing_dev' (#337) from qinqing_dev into main
Reviewed-on: #337
|
2024-10-19 16:59:09 +08:00 |
|
qinqing
|
47329aea75
|
Merge branch 'main' into qinqing_dev
|
2024-10-19 16:58:44 +08:00 |
|
qinqing
|
52275e1de6
|
全连接百度ocr识别
|
2024-10-19 16:58:04 +08:00 |
|
朱浩
|
6fe5ee5703
|
Merge branch 'main' into zhuhao_dev
# Conflicts:
# src/renderer/src/views/classTask/classTaskAssign.vue
# src/renderer/src/views/classTask/teachClassTask.vue
|
2024-10-19 16:42:36 +08:00 |
|
qinqing
|
8dba05c0d4
|
Merge pull request 'qinqing_dev' (#336) from qinqing_dev into main
Reviewed-on: #336
|
2024-10-19 16:31:45 +08:00 |
|
qinqing
|
b4fefdd0cf
|
文字识别全路径，屏蔽评论批注
|
2024-10-19 16:29:11 +08:00 |
|
lyc
|
e4114bf1b4
|
考试分析-题目详情-增加灰色背景
|
2024-10-19 16:12:38 +08:00 |
|
lyc
|
95f94f0c3e
|
Merge pull request '考试分析-题目详情-增加灰色背景' (#335) from lyc-dev into main
|
2024-10-19 16:12:19 +08:00 |
|
lyc
|
4dbb5d2224
|
考试分析-题目详情增加关闭按钮
|
2024-10-19 15:59:20 +08:00 |
|
lyc
|
3430ad75ca
|
Merge pull request '考试分析-题目详情增加关闭按钮' (#334) from lyc-dev into main
|
2024-10-19 15:59:08 +08:00 |
|
baigl
|
388fc2b2b4
|
Merge pull request 'baigl' (#333) from baigl into main
Reviewed-on: #333
|
2024-10-19 15:07:35 +08:00 |
|
白了个白
|
1a671d7dd2
|
作业批改：session缓存出现莫名缓存数据bug修改
|
2024-10-19 15:04:51 +08:00 |
|
白了个白
|
0d21b1de53
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-10-19 14:38:29 +08:00 |
|
“zouyf”
|
0a2d3f54b7
|
Merge branch 'main' into zouyf_dev
|
2024-10-19 14:20:34 +08:00 |
|
“zouyf”
|
45c2e35a66
|
[作业布置] - 修正[课堂展示]中[问题输入框]的保存
|
2024-10-19 14:19:46 +08:00 |
|
朱浩
|
68de31c569
|
Merge branch 'main' into zhuhao_dev
|
2024-10-18 17:12:22 +08:00 |
|
朱浩
|
45485c04fc
|
BUG修复
|
2024-10-18 17:11:30 +08:00 |
 zhengdegang
|
e8763793a7
|
Merge pull request 'zdg' (#332) from zdg into main
Reviewed-on: #332
|
2024-10-18 17:08:45 +08:00 |
zdg
|
a3b940f138
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-10-18 17:06:14 +08:00 |
|
zdg
|
548442f278
|
作业推送注释掉im消息发送
|
2024-10-18 17:06:08 +08:00 |
|
朱浩
|
e02f67e3e5
|
Merge pull request 'zhuhao_dev' (#331) from zhuhao_dev into main
Reviewed-on: #331
|
2024-10-18 16:34:01 +08:00 |
|
朱浩
|
6de43cbab3
|
Merge branch 'main' into zhuhao_dev
|
2024-10-18 16:32:42 +08:00 |
|
朱浩
|
9552e75f18
|
解决ppt生成失败的问题
|
2024-10-18 16:31:57 +08:00 |
|
zdg
|
d7f17c253d
|
im 日志
|
2024-10-18 16:09:55 +08:00 |
|
zdg
|
ea6c56a401
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-10-18 16:09:24 +08:00 |
|
白了个白
|
2bcf780b7b
|
1
|
2024-10-18 10:16:25 +08:00 |
|
baigl
|
83c377fd9e
|
Merge pull request 'baigl' (#330) from baigl into main
Reviewed-on: #330
|
2024-10-18 10:13:12 +08:00 |
|
白了个白
|
a8c823030b
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-10-18 10:11:30 +08:00 |