Commit Graph

969 Commits

Author SHA1 Message Date
朱浩 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
小杨 de8e058197 fix:清除测试数据; 2024-11-21 09:33:49 +08:00
小杨 9418998ec5 fix:样式提交; 2024-11-20 17:07:00 +08:00
小杨 64d9e9c18b fix:样式调整; 2024-11-20 17:05:12 +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
小杨 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
小杨 fb4908ee1d add:新增实验室; 2024-11-20 15:04:39 +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
zdg 6303b442a4 发送短信 2024-11-19 11:15:29 +08:00
小杨 09df401cf1 fix:切换第三方资源格式; 2024-11-18 17:16:43 +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
白了个白 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” 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
“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
小杨 6de59fabfa fix:修改格式; 2024-11-12 14:48:14 +08:00
小杨 78dce6dc6a fix:修改格式传值; 2024-11-12 11:04:04 +08:00
小杨 83212f4ec0 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into yangws
# Conflicts:
#	src/renderer/src/views/prepare/components/treeLog.vue
2024-11-12 10:44:36 +08:00
小杨 24706b8912 fix:不修改原本树结构; 2024-11-12 10:42:39 +08:00
朱浩 a75f880b30 添加回调 2024-11-12 10:35:45 +08:00
小杨 0a080bd1f0 add:章节节点添加; 2024-11-12 09:47:05 +08:00
“zouyf” 1844af01da 1 2024-11-11 16:56:56 +08:00
“zouyf” 7273f7f835 限制题目上线 2024-11-11 16:53:56 +08:00
白了个白 f58a38dceb 1 2024-11-11 15:03:17 +08:00
“zouyf” cb910068e0 正常查询10条 2024-11-11 14:49:05 +08:00
白了个白 6c66c97e33 1 2024-11-11 12:53:16 +08:00
白了个白 2929997d17 作业设计:课程选择过快请求添加防抖 2024-11-11 10:02:23 +08:00
zouyf 96c074d396 [作业设计] - 下拉刷新试题 2024-11-09 16:50:28 +08:00
zouyf 15633f065f 1 2024-11-09 14:30:26 +08:00
白了个白 f5c42958f4 1 2024-11-08 17:25:36 +08:00
白了个白 3b8e36454a 1 2024-11-08 17:22:42 +08:00
白了个白 dd64e4e085 习题查询:加上分页传参 2024-11-08 15:39:05 +08:00
白了个白 ea3e416f8f Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-11-08 09:56:47 +08:00
白了个白 5e948d9b95 作业设计:习题来源同步web端的菁优网 2024-11-08 09:51:17 +08:00