Commit Graph

1408 Commits

Author SHA1 Message Date
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
白了个白 2887528e9e 作业批改ui调整 2024-09-27 14:48:52 +08:00
baigl 34900832ba Merge pull request 'baigl' (#281) from baigl into main
Reviewed-on: #281
2024-09-27 12:52:57 +08:00
白了个白 2e1fe84bcd 作业批改--学生未提交,老师批阅后批阅数未更新的bug修复 2024-09-27 12:49:10 +08:00
白了个白 2b074df0b5 1 2024-09-27 11:21:56 +08:00
白了个白 065e215a81 工作台-作业批改界面更改 2024-09-27 11:20:48 +08:00
白了个白 c78c166044 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-27 11:09:13 +08:00
白了个白 aa6a996808 新增作业批改窗口页面 2024-09-27 11:04:52 +08:00
朱浩 0511256094 Merge branch 'main' into zhuhao_dev 2024-09-27 11:01:16 +08:00
lyc 2a75aef245 2024-09-27 11:01:03 +08:00
lyc bd82605109 Merge pull request '丑' (#280) from lyc-dev into main 2024-09-27 11:01:00 +08:00
朱浩 e2e8cae690 背景色 2024-09-27 11:00:03 +08:00
lyc 1edef92586 Merge pull request '工作台-edit' (#279) from lyc-dev into main 2024-09-27 10:32:06 +08:00
lyc d330b4cd55 工作台-edit 2024-09-27 10:32:00 +08:00
朱浩 db2218b1c5 Merge pull request 'zhuhao_dev' (#278) from zhuhao_dev into main
Reviewed-on: #278
2024-09-27 10:13:44 +08:00
朱浩 926f45f232 Merge branch 'main' into zhuhao_dev 2024-09-27 10:13:02 +08:00
朱浩 5c0cc9a91c 版本提升 2024-09-27 10:12:49 +08:00