 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 |
|
白了个白
|
cc2606d507
|
1
|
2024-10-18 10:11:10 +08:00 |
 yangws
|
a83cbc2ba2
|
Merge pull request 'fix:判断图表为0的时候的情况；' (#329) from yangws into main
Reviewed-on: #329
|
2024-10-18 09:34:55 +08:00 |
小杨
|
a521010392
|
fix:判断图表为0的时候的情况；
|
2024-10-18 09:34:28 +08:00 |
|
白了个白
|
b132bb5813
|
作业布置、作业设计跳转优化
|
2024-10-17 17:25:21 +08:00 |
|
baigl
|
09575b9896
|
Merge pull request 'baigl' (#328) from baigl into main
Reviewed-on: #328
|
2024-10-17 13:52:20 +08:00 |
|
白了个白
|
436cde508c
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-10-17 13:51:28 +08:00 |
|
白了个白
|
0e42ce08e1
|
1
|
2024-10-17 13:50:21 +08:00 |
|
baigl
|
be4f9d2499
|
Merge pull request 'baigl' (#327) from baigl into main
Reviewed-on: #327
|
2024-10-17 11:29:35 +08:00 |
|
白了个白
|
6a8b0f82e8
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-10-17 11:28:49 +08:00 |
|
白了个白
|
d290be9320
|
主页、作业批改 进行结束 时间逻辑修改
|
2024-10-17 11:28:25 +08:00 |
|
朱浩
|
670c457a9f
|
解决ppt生成失败的问题
|
2024-10-17 11:18:35 +08:00 |
|
yangws
|
16761d3fc8
|
Merge pull request 'fix：柱状图展示修改；' (#326) from yangws into main
Reviewed-on: #326
|
2024-10-17 10:45:32 +08:00 |
|
小杨
|
03b5eccab0
|
fix：柱状图展示修改；
|
2024-10-17 10:44:55 +08:00 |
|
baigl
|
add2a3e621
|
Merge pull request 'baigl' (#325) from baigl into main
Reviewed-on: #325
|
2024-10-17 10:44:08 +08:00 |
|
白了个白
|
f18d0c0e5e
|
1
|
2024-10-17 10:42:10 +08:00 |
|
白了个白
|
e57e643f67
|
教学实践：作业类型ui更改
|
2024-10-17 10:34:29 +08:00 |
|
朱浩
|
39aa3b157d
|
解决教材课标切换名字问题
|
2024-10-17 10:25:55 +08:00 |
|
白了个白
|
1a9f98e6c9
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-10-17 10:23:37 +08:00 |
|
白了个白
|
e53731ac3f
|
主页：作业设计、作业布置外链改为pc端
|
2024-10-17 10:20:16 +08:00 |
|
白了个白
|
a1002a1f40
|
作业布置：列表逻辑改为usegetHomework里面，新增历史记录查看，新增历史记录的批阅详情查看
|
2024-10-17 10:19:22 +08:00 |
|
zdg
|
6be26f19cd
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-10-17 09:58:37 +08:00 |
|
zdg
|
d40873d198
|
ppt上课发送多次
|
2024-10-17 09:55:42 +08:00 |