Commit Graph

669 Commits

Author SHA1 Message Date
lyc 0ec8ec7480 路由冲突 2024-11-11 17:28:49 +08:00
lyc 5a1b95ea5d Merge pull request 'lyc-dev' (#22) from lyc-dev into main 2024-11-11 17:28:10 +08:00
baigl 2c1e9923c5 Merge pull request 'baigl' (#21) from baigl into main
Reviewed-on: #21
2024-11-11 17:27:09 +08:00
白了个白 2f58722206 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-11 17:26:12 +08:00
白了个白 317dc9f184 1 2024-11-11 17:25:55 +08:00
lyc c3ef8d881e 模板 2024-11-11 17:16:06 +08:00
baigl 3f81e36dd9 Merge pull request 'baigl' (#20) from baigl into main
Reviewed-on: #20
2024-11-11 15:07:29 +08:00
白了个白 ecc74e4666 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-11 15:06:57 +08:00
白了个白 0cc3d970d1 作业设计:课程切换数据覆盖bug修复 2024-11-11 15:06:40 +08:00
baigl 3c4c035703 Merge pull request 'baigl' (#19) from baigl into main
Reviewed-on: #19
2024-11-11 10:19:10 +08:00
白了个白 a0bfb5be70 作业设计:课程选择太快增加防抖 2024-11-11 10:13:41 +08:00
白了个白 f53d7f104c Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-11 10:03:48 +08:00
zhangxuelin 225982ec0c Merge pull request 'zxl' (#18) from zxl into main
Reviewed-on: #18
2024-11-08 17:24:13 +08:00
白了个白 cbd706fed1 习题查询:加上分页传参 2024-11-08 15:38:13 +08:00
zhangxuelin e07d01f0a1 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-11-08 14:47:02 +08:00
zhangxuelin 5c60a30a8a 重新认证 2024-11-08 14:46:43 +08:00
baigl d7857d9f45 Merge pull request 'baigl' (#17) from baigl into main
Reviewed-on: #17
2024-11-08 09:55:56 +08:00
白了个白 f4f2ebb0cf Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-08 09:55:15 +08:00
白了个白 e002066da6 作业设计:题源同步2.0 web版 2024-11-08 09:54:57 +08:00
lyc 756d7fdaa1 模板 2024-11-07 14:14:46 +08:00
baigl 8bc50b3ab4 Merge pull request 'baigl' (#16) from baigl into main
Reviewed-on: #16
2024-11-07 09:46:27 +08:00
白了个白 6e3959328b Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-07 09:44:55 +08:00
白了个白 3c32f5d823 作业批改:逻辑与界面更改 2024-11-07 09:44:28 +08:00
lyc d05e50218d 模板 2024-11-06 17:33:32 +08:00
zhangxuelin dbb0f44b1c Merge pull request 'zxl' (#15) from zxl into main
Reviewed-on: #15
2024-11-06 17:31:41 +08:00
zhangxuelin 45b93b8980 首页展示学校 2024-11-06 17:30:31 +08:00
zhangxuelin 79f38ad18f no message 2024-11-06 17:06:17 +08:00
zhangxuelin 652c46c33b Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
# Conflicts:
#	src/renderer/src/assets/iconfont/iconfont.css
#	src/renderer/src/assets/iconfont/iconfont.js
#	src/renderer/src/assets/iconfont/iconfont.json
#	src/renderer/src/assets/iconfont/iconfont.ttf
#	src/renderer/src/assets/iconfont/iconfont.woff
#	src/renderer/src/assets/iconfont/iconfont.woff2
#	src/renderer/src/router/index.js
2024-11-06 17:04:39 +08:00
zhangxuelin dd8c48f3ae 学校加入 注册 登录注册 加入学校审批 2024-11-06 16:55:40 +08:00
白了个白 625f82880f 1 2024-11-06 11:24:53 +08:00
lyc 71e6b74dd4 调整路由 2024-11-05 00:39:06 +08:00
朱浩 3b2fee6731 版本升级 2024-11-04 16:58:36 +08:00
lyc 2ca3d89d1c 模板 2024-11-04 15:45:11 +08:00
lyc 7d1fd46c46 Merge pull request 'lyc-dev' (#14) from lyc-dev into main 2024-11-04 15:44:41 +08:00
lyc 9d3e11f336 Merge branch 'main' into lyc-dev 2024-11-01 16:51:51 +08:00
lyc b63eb6631d 模板 2024-11-01 16:51:26 +08:00
lyc a75502415c 更新图标 2024-10-31 14:40:48 +08:00
lyc b7e8798552 Merge pull request 'lyc-dev' (#13) from lyc-dev into main 2024-10-31 14:40:14 +08:00
yangws 27198aabfa Merge pull request 'fix:学科学段联动;' (#12) from yangws_ws into main
Reviewed-on: #12
2024-10-31 14:27:00 +08:00
小杨 e44909f747 fix:学科学段联动; 2024-10-31 14:26:35 +08:00
lyc 8bc0ab460c 教学工作台面包屑 2024-10-31 14:05:24 +08:00
zhangxuelin bbf85c4337 注册 2024-10-30 17:25:04 +08:00
yangws da1390a0df Merge pull request 'add:创建班级;' (#11) from yangws_ws into main
Reviewed-on: #11
2024-10-30 15:55:21 +08:00
小杨 1c463ed58b add:创建班级; 2024-10-30 15:54:48 +08:00
zhangxuelin 9167751c6c Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
# Conflicts:
#	src/renderer/src/layout/components/Aside.vue
2024-10-30 15:08:25 +08:00
zhangxuelin 7319c396c4 新增加入学校 学校认证 2024-10-30 15:06:37 +08:00
lyc 32ab4dbbfb Merge pull request '更新图标' (#10) from lyc-dev into main 2024-10-30 10:54:01 +08:00
lyc 9d742a1e21 更新图标 2024-10-30 10:54:44 +08:00
yangws ed45284e20 Merge pull request 'fix:个人中心修改;' (#9) from yangws_ws into main
Reviewed-on: #9
2024-10-30 10:52:10 +08:00
小杨 7a18c1927a fix:个人中心修改; 2024-10-30 10:50:30 +08:00