Commit Graph

1492 Commits

Author SHA1 Message Date
小杨 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
yangws 00b58644b1 Merge pull request 'fix:修改格式;' (#402) from yangws into main
Reviewed-on: #402
2024-11-12 14:48:52 +08:00
小杨 6de59fabfa fix:修改格式; 2024-11-12 14:48:14 +08:00
yangws 28a2f95903 Merge pull request 'fix:修改格式传值;' (#401) from yangws into main
Reviewed-on: #401
2024-11-12 11:04:31 +08:00
小杨 78dce6dc6a fix:修改格式传值; 2024-11-12 11:04:04 +08:00
yangws a79add8625 Merge pull request 'yangws' (#400) from yangws into main
Reviewed-on: #400
2024-11-12 10:45:15 +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
朱浩 169d6d7c31 Merge pull request 'zhuhao_dev' (#399) from zhuhao_dev into main
Reviewed-on: #399
2024-11-12 10:36:30 +08:00
朱浩 a75f880b30 添加回调 2024-11-12 10:35:45 +08:00
朱浩 e31904ed9f Merge branch 'main' into zhuhao_dev
# Conflicts:
#	package.json
2024-11-12 09:59:52 +08:00
朱浩 2d75ae6cb8 版本管理 2024-11-12 09:59:17 +08:00
yangws f0fcbed61e Merge pull request 'add:章节节点添加;' (#398) from yangws into main
Reviewed-on: #398
2024-11-12 09:50:00 +08:00
小杨 0a080bd1f0 add:章节节点添加; 2024-11-12 09:47:05 +08:00
zouyf a4a839931d Merge pull request 'zouyf_dev' (#397) from zouyf_dev into main
Reviewed-on: #397
2024-11-11 16:58:11 +08:00
“zouyf” 1844af01da 1 2024-11-11 16:56:56 +08:00
“zouyf” 163764cf1c Merge branch 'main' into zouyf_dev 2024-11-11 16:54:10 +08:00
“zouyf” 7273f7f835 限制题目上线 2024-11-11 16:53:56 +08:00
lyc 28ba027407 Merge pull request '打包' (#395) from lyc-dev into main 2024-11-11 16:21:50 +08:00
lyc b35daeb3c7 打包 2024-11-11 16:15:15 +08:00
baigl a7ac61e32f Merge pull request 'baigl' (#394) from baigl into main
Reviewed-on: #394
2024-11-11 15:04:18 +08:00
白了个白 f58a38dceb 1 2024-11-11 15:03:17 +08:00
“zouyf” cb910068e0 正常查询10条 2024-11-11 14:49:05 +08:00
“zouyf” 01ee2c8c85 Merge branch 'baigl' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-11-11 13:43:41 +08:00
“zouyf” 768b3e7abf Revert "1"
This reverts commit f504cee74b.
2024-11-11 13:43:35 +08:00
“zouyf” f504cee74b 1 2024-11-11 13:43:09 +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