Commit Graph

1469 Commits

Author SHA1 Message Date
朱浩 5e2a2d90fc 永川登录页面新增 2024-12-05 10:51:39 +08:00
yangws 2cecbc14fd Merge pull request 'yangws' (#418) from yangws into main
Reviewed-on: #418
2024-11-22 09:27:44 +08:00
小杨 8d8ff06c5e Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into yangws 2024-11-22 09:27:13 +08:00
小杨 0a3ab2eff5 fix:固定学科; 2024-11-22 09:27:02 +08:00
yangws 21a4f4cfac Merge pull request 'fix:实验室样式修改;' (#417) from yangws into main
Reviewed-on: #417
2024-11-21 17:42:24 +08:00
小杨 16f696bd4f fix:实验室样式修改; 2024-11-21 17:41:54 +08:00
朱浩 19494eb9e7 Merge pull request 'zhuhao_dev' (#416) from zhuhao_dev into main
Reviewed-on: #416
2024-11-21 17:40:04 +08:00
朱浩 4820405ca4 Merge branch 'main' into zhuhao_dev 2024-11-21 17:20:46 +08:00
朱浩 36f3018269 关闭自动同步文件,超过150M文件不允许加入课程 2024-11-21 17:20:10 +08:00
yangws b5a5381e5b Merge pull request 'fix:清除测试数据;' (#415) from yangws into main
Reviewed-on: #415
2024-11-21 09:34:19 +08:00
小杨 de8e058197 fix:清除测试数据; 2024-11-21 09:33:49 +08:00
yangws 35d07291d3 Merge pull request 'yangws' (#414) from yangws into main
Reviewed-on: #414
2024-11-20 17:07:22 +08:00
小杨 9418998ec5 fix:样式提交; 2024-11-20 17:07:00 +08:00
小杨 64d9e9c18b fix:样式调整; 2024-11-20 17:05:12 +08:00
yangws 28d6d2d705 Merge pull request 'fix:修改样式;' (#413) from yangws into main
Reviewed-on: #413
2024-11-20 17:03:06 +08:00
小杨 4ba1039ea9 fix:修改样式; 2024-11-20 17:00:04 +08:00
朱浩 1417919f74 Merge branch 'main' into zhuhao_dev 2024-11-20 15:58:31 +08:00
yangws c691612bff Merge pull request 'fix:获取所有的教材;' (#412) from yangws into main
Reviewed-on: #412
2024-11-20 15:58:11 +08:00
小杨 baa1fa7483 fix:获取所有的教材; 2024-11-20 15:57:50 +08:00
朱浩 0f211628c5 Merge branch 'main' into zhuhao_dev 2024-11-20 15:47:13 +08:00
yangws 9afd5f417d Merge pull request 'add:新增实验室;' (#411) from yangws into main
Reviewed-on: #411
2024-11-20 15:05:06 +08:00
小杨 fb4908ee1d add:新增实验室; 2024-11-20 15:04:39 +08:00
yangws fc181559e2 Merge pull request 'add:科学实验室;' (#410) from yangws into main
Reviewed-on: #410
2024-11-19 15:58:40 +08:00
小杨 24f2d0ef4b add:科学实验室; 2024-11-19 15:58:08 +08:00
朱浩 eba83889b0 Merge branch 'main' into zhuhao_dev 2024-11-19 15:25:39 +08:00
zhengdegang bd485409e3 Merge pull request '发送短信' (#409) from zdg into main
Reviewed-on: #409
2024-11-19 11:17:04 +08:00
zdg 6303b442a4 发送短信 2024-11-19 11:15:29 +08:00
yangws 5a92b6dedf Merge pull request 'fix:切换第三方资源格式;' (#408) from yangws into main
Reviewed-on: #408
2024-11-18 17:17:25 +08:00
小杨 09df401cf1 fix:切换第三方资源格式; 2024-11-18 17:16:43 +08:00
zouyf 6b5164048c Merge pull request 'zouyf_dev' (#407) from zouyf_dev into main
Reviewed-on: #407
2024-11-13 15:45:01 +08:00
“zouyf” 1f2eb722f1 1 2024-11-13 15:43:09 +08:00
“zouyf” b973fd685c 优化滚动条 2024-11-13 14:08:28 +08:00
朱浩 966a64faa3 bug修复 2024-11-13 11:22:28 +08:00
朱浩 f899729db0 Merge pull request '三方资源加入备课' (#406) from zhuhao_dev into main
Reviewed-on: #406
2024-11-13 11:08:51 +08:00
朱浩 249e1c047c 三方资源加入备课 2024-11-13 11:07:50 +08:00
baigl c9bfd41fc7 Merge pull request 'baigl' (#405) from baigl into main
Reviewed-on: #405
2024-11-12 16:47:48 +08:00
白了个白 51a8df474a Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-11-12 16:46:51 +08:00
白了个白 fbbd84df93 作业批改页:已交未交选择背景颜色缺失修复 2024-11-12 16:45:56 +08:00
朱浩 5cc93bb093 Merge pull request 'zhuhao_dev' (#404) from zhuhao_dev into main
Reviewed-on: #404
2024-11-12 15:53:26 +08:00
朱浩 eefa9aff63 三方资源加入备课 2024-11-12 15:50:38 +08:00
朱浩 3ef73885e1 三方资源加入备课 2024-11-12 15:47:24 +08:00
zouyf bc63691645 Merge pull request 'zouyf_dev' (#403) from zouyf_dev into main
Reviewed-on: #403
2024-11-12 15:45:31 +08:00
“zouyf” fa54546f5e 1 2024-11-12 15:43:47 +08:00
朱浩 d50327bc17 去除测试 2024-11-12 15:34:14 +08:00
“zouyf” f20ddc1c58 Merge branch 'main' into zouyf_dev 2024-11-12 15:29:13 +08:00
“zouyf” 7c1c4e9b7d 1 2024-11-12 15:26:46 +08:00
白了个白 78eb65d532 Merge branch 'zouyf_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-11-12 15:01:18 +08:00
“zouyf” f2dbf12f3c [作业布置] - 更改为分页查询 2024-11-12 15:01:00 +08:00
朱浩 77921f7e61 Merge branch 'main' into zhuhao_dev 2024-11-12 14:49:26 +08:00
朱浩 ac1cad8fd0 添加回调 2024-11-12 14:49:16 +08:00