Commit Graph

884 Commits

Author SHA1 Message Date
朱浩 a75f151b19 Merge pull request 'BUG修复' (#231) from zhuhao_dev into main
Reviewed-on: #231
2024-09-20 09:22:02 +08:00
朱浩 2531c25d7c BUG修复 2024-09-20 09:21:31 +08:00
朱浩 9e5527d822 Merge pull request 'zhuhao_dev' (#230) from zhuhao_dev into main
Reviewed-on: #230
2024-09-20 09:19:10 +08:00
朱浩 e002ef5f7d Merge branch 'main' into zhuhao_dev 2024-09-20 09:18:30 +08:00
朱浩 2ca637072d BUG修复 2024-09-20 09:18:12 +08:00
baigl bd7f6f765f Merge pull request 'baigl' (#229) from baigl into main
Reviewed-on: #229
2024-09-19 16:58:13 +08:00
白了个白 ef6c3d2a2b Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-19 16:57:03 +08:00
白了个白 9ea05568e1 作业批改:同步web端164逻辑修改 2024-09-19 16:56:15 +08:00
zhengdegang 93a061ca78 Merge pull request 'zdg' (#228) from zdg into main
Reviewed-on: #228
2024-09-19 16:37:45 +08:00
zdg c5075af2fc 已上课 2024-09-19 16:37:07 +08:00
zdg 7da60f0815 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-19 16:35:43 +08:00
zdg 02a25db5e2 修复 2024-09-19 16:35:36 +08:00
yangws 59de30b6b2 Merge pull request 'fix: 解决空数据的判断;' (#227) from yangws into main
Reviewed-on: #227
2024-09-19 16:03:39 +08:00
yangws 746cb150c4 fix: 解决空数据的判断; 2024-09-19 16:02:56 +08:00
lyc 893be27671 切换学科 2024-09-19 16:02:42 +08:00
lyc b0b429c7aa Merge pull request '切换学科' (#226) from lyc-dev into main 2024-09-19 16:02:41 +08:00
lyc dbfa1a4037 Merge pull request '路由title' (#225) from lyc-dev into main 2024-09-19 15:55:19 +08:00
lyc ce8b2e6ab0 路由title 2024-09-19 15:55:19 +08:00
baigl a082b437b7 Merge pull request 'baigl' (#224) from baigl into main
Reviewed-on: #224
2024-09-19 15:32:32 +08:00
白了个白 9eb6d991c1 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-19 15:31:45 +08:00
白了个白 0cbb513a60 作业批改:常规作业ui修改 2024-09-19 15:29:52 +08:00
lyc be765b21b6 Merge pull request 'lyc-dev' (#223) from lyc-dev into main 2024-09-19 15:15:26 +08:00
lyc 34c1c66b31 edit 教材 2024-09-19 15:15:16 +08:00
lyc 5f06657b09 教学实践 2024-09-19 14:58:54 +08:00
白了个白 3ec25f07b4 作业批改:接口传参未传状态值bug修改 2024-09-19 14:25:33 +08:00
zhengdegang aa35621b59 Merge pull request 'zdg' (#222) from zdg into main
Reviewed-on: #222
2024-09-19 12:03:47 +08:00
zdg 49de9ee9c2 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-19 12:02:51 +08:00
zdg 0ef5ef424f bug修复,以及代码优化 2024-09-19 12:02:31 +08:00
baigl 89ae43a458 Merge pull request 'baigl' (#221) from baigl into main
Reviewed-on: #221
2024-09-19 11:30:20 +08:00
白了个白 9d7aad1946 Merge branch 'zouyf_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-19 11:28:45 +08:00
lyc db2be260a7 教材edit 2024-09-19 11:25:01 +08:00
baigl b06ad0f411 Merge pull request 'baigl' (#220) from baigl into main
Reviewed-on: #220
2024-09-19 10:58:42 +08:00
白了个白 129f875469 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-19 10:54:31 +08:00
白了个白 2c6da76cf7 作业设计跳转web端逻辑修改 2024-09-19 10:52:33 +08:00
ekooo 499e428138 Merge branch 'main' into zouyf_dev
# Conflicts:
#	src/renderer/src/components/set-homework/index.vue
2024-09-18 20:02:53 +08:00
朱浩 81f873bcc3 Merge branch 'main' into zhuhao_dev 2024-09-18 17:31:14 +08:00
lyc c58322ca0b Merge pull request '作业查询修改' (#219) from lyc-dev into main 2024-09-18 16:11:59 +08:00
lyc 08dad41e4d 作业查询修改 2024-09-18 16:11:54 +08:00
zhengdegang 675613bbee Merge pull request 'zdg' (#218) from zdg into main
Reviewed-on: #218
2024-09-18 15:01:31 +08:00
zdg 9188df0d94 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-18 15:00:30 +08:00
zdg 4e8560b033 解决二维码不出现的问题 2024-09-18 15:00:17 +08:00
“zouyf” 4e835cac82 Merge branch 'main' into zouyf_dev 2024-09-18 14:57:46 +08:00
朱浩 7303128334 Merge branch 'main' into zhuhao_dev 2024-09-18 14:14:35 +08:00
yangws d047e85d03 Merge pull request 'fix: 个人中心任选学科报错问题;' (#217) from yangws into main
Reviewed-on: #217
2024-09-18 14:05:31 +08:00
yangws acd66c11fa fix: 个人中心任选学科报错问题; 2024-09-18 14:04:58 +08:00
朱浩 f90e2548c6 Merge branch 'main' into zhuhao_dev 2024-09-18 13:56:53 +08:00
yangws c32bd6eef4 Merge pull request 'fix: 解决资源库报错的问题;' (#216) from yangws into main
Reviewed-on: #216
2024-09-18 13:56:28 +08:00
yangws 3b9877e788 fix: 解决资源库报错的问题; 2024-09-18 13:55:30 +08:00
朱浩 fb48984e7f APT上课 2024-09-18 11:29:39 +08:00
lyc aaa2aef3ca move-file 2024-09-18 11:13:32 +08:00