 lyc
|
3921c1a425
|
冲突
|
2024-10-09 16:55:30 +08:00 |
|
lyc
|
34da5fb432
|
修复一些问题
|
2024-10-09 16:52:47 +08:00 |
 zouyf
|
9c21458c57
|
Merge pull request '[教学实践] - 作业中增加作业设计及单任务编辑' (#300) from zouyf_dev into main
Reviewed-on: #300
|
2024-10-09 16:19:26 +08:00 |
|
“zouyf”
|
1a20fcc835
|
[教学实践] - 作业中增加作业设计及单任务编辑
|
2024-10-09 16:17:31 +08:00 |
|
lyc
|
a1c5236c8f
|
登录-清除缓存的数据
|
2024-10-09 11:29:18 +08:00 |
|
lyc
|
8bddb166a3
|
Merge pull request '登录-清除缓存的数据' (#299) from lyc-dev into main
|
2024-10-09 11:28:54 +08:00 |
|
lyc
|
22c377cd57
|
结束上课
|
2024-10-09 09:38:58 +08:00 |
|
lyc
|
8a17273605
|
Merge pull request '结束上课' (#298) from lyc-dev into main
|
2024-10-09 09:38:43 +08:00 |
 zhengdegang
|
b13dae5b92
|
Merge pull request 'zdg' (#297) from zdg into main
Reviewed-on: #297
|
2024-10-09 09:31:41 +08:00 |
zdg
|
a7743ba249
|
优化
|
2024-10-09 09:30:42 +08:00 |
|
zdg
|
3038223a7f
|
修复bug
|
2024-10-09 09:28:52 +08:00 |
|
lyc
|
5e247006c5
|
Merge pull request '去掉返回' (#296) from lyc-dev into main
|
2024-10-08 14:01:24 +08:00 |
|
lyc
|
f2387c709a
|
去掉返回
|
2024-10-08 14:01:39 +08:00 |
|
lyc
|
03f98c8beb
|
Merge pull request '去掉返回' (#295) from lyc-dev into main
|
2024-10-08 11:23:41 +08:00 |
|
lyc
|
b085d96c0e
|
去掉返回
|
2024-10-08 11:23:16 +08:00 |
|
zhengdegang
|
9b5a2ec88d
|
Merge pull request 'zdg' (#294) from zdg into main
Reviewed-on: #294
|
2024-09-29 15:36:27 +08:00 |
|
zdg
|
32b0cdafc6
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-29 15:35:35 +08:00 |
|
zdg
|
17e3ee62df
|
修复二维码异常
|
2024-09-29 15:35:25 +08:00 |
|
zhengdegang
|
1f43e70175
|
Merge pull request 'zdg' (#293) from zdg into main
Reviewed-on: #293
|
2024-09-29 15:15:03 +08:00 |
|
zdg
|
0973128e0e
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-29 15:14:13 +08:00 |
|
zdg
|
61493a7f4e
|
二维码登录
|
2024-09-29 15:13:27 +08:00 |
|
lyc
|
3992cc814a
|
Merge pull request '文字描述' (#292) from lyc-dev into main
|
2024-09-29 11:10:27 +08:00 |
|
lyc
|
19e385ec24
|
文字描述
|
2024-09-29 11:10:28 +08:00 |
 baigl
|
bac959c0bb
|
Merge pull request 'baigl' (#291) from baigl into main
Reviewed-on: #291
|
2024-09-29 09:32:36 +08:00 |
白了个白
|
e72710f027
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-09-29 09:31:36 +08:00 |
|
白了个白
|
9a74630e56
|
批阅窗口添加防连点
|
2024-09-29 09:31:16 +08:00 |
|
zhengdegang
|
28b189e965
|
Merge pull request 'zdg' (#290) from zdg into main
Reviewed-on: #290
|
2024-09-27 16:55:38 +08:00 |
|
zdg
|
8ea28d2635
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-27 16:54:37 +08:00 |
|
zdg
|
352bb9be97
|
还原二维码
|
2024-09-27 16:54:29 +08:00 |
|
zhengdegang
|
7c8e10628b
|
Merge pull request '增加刷新二维码' (#289) from zdg into main
Reviewed-on: #289
|
2024-09-27 16:41:50 +08:00 |
|
zdg
|
0ea299c317
|
增加刷新二维码
|
2024-09-27 16:41:19 +08:00 |
|
zouyf
|
5fa328fd93
|
Merge pull request 'zouyf_dev' (#288) from zouyf_dev into main
Reviewed-on: #288
|
2024-09-27 16:30:52 +08:00 |
|
“zouyf”
|
eab46ec7f4
|
Merge branch 'main' into zouyf_dev
|
2024-09-27 16:17:08 +08:00 |
|
“zouyf”
|
81dd59f564
|
[作业批改] - 由原来班级查询变更为用户id查询作业
|
2024-09-27 16:16:55 +08:00 |
|
lyc
|
7c36255508
|
Merge pull request '教学大模型' (#287) from lyc-dev into main
|
2024-09-27 15:55:45 +08:00 |
|
lyc
|
310d1aee59
|
教学大模型
|
2024-09-27 15:55:50 +08:00 |
|
zhengdegang
|
3caa561610
|
Merge pull request 'zdg' (#286) from zdg into main
Reviewed-on: #286
|
2024-09-27 15:54:54 +08:00 |
|
zdg
|
ada2e63060
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
# src/main/index.js
|
2024-09-27 15:53:42 +08:00 |
|
zdg
|
eaf9d508d4
|
apt上课-无需登录
|
2024-09-27 15:52:07 +08:00 |
 朱浩
|
716c1dd0a9
|
Merge pull request 'zhuhao_dev' (#285) from zhuhao_dev into main
Reviewed-on: #285
|
2024-09-27 15:15:28 +08:00 |
|
“zouyf”
|
cb15855fc1
|
Merge branch 'main' into zouyf_dev
|
2024-09-27 15:11:57 +08:00 |
|
朱浩
|
76f053d8c8
|
Merge branch 'main' into zhuhao_dev
|
2024-09-27 15:11:45 +08:00 |
 yangws
|
988c6160bb
|
Merge pull request 'fix : 样式问题；' (#284) from yangws into main
Reviewed-on: #284
|
2024-09-27 15:08:23 +08:00 |
小杨
|
0119a92501
|
fix : 样式问题；
|
2024-09-27 15:07:58 +08:00 |
|
yangws
|
e1dfc0f8b4
|
Merge pull request 'fix：新建分组前清空操作;' (#283) from yangws into main
Reviewed-on: #283
|
2024-09-27 15:06:30 +08:00 |
|
小杨
|
31f9ec61ea
|
fix：新建分组前清空操作;
|
2024-09-27 15:05:49 +08:00 |
|
“zouyf”
|
7b3f00ba67
|
Merge branch 'main' into zouyf_dev
# Conflicts:
# src/renderer/src/views/classTask/teachClassTask.vue
|
2024-09-27 14:52:51 +08:00 |
|
baigl
|
042f8e5907
|
Merge pull request 'baigl' (#282) from baigl into main
Reviewed-on: #282
|
2024-09-27 14:50:22 +08:00 |
|
“zouyf”
|
2ca4117561
|
1
|
2024-09-27 14:50:18 +08:00 |
|
白了个白
|
db20978575
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-09-27 14:49:21 +08:00 |