Commit Graph

254 Commits

Author SHA1 Message Date
朱浩 050f87a84a s生成PPT 2024-11-27 10:58:00 +08:00
lyc b0d3876e05 Merge pull request 'lyc-dev' (#67) from lyc-dev into main 2024-11-26 16:09:15 +08:00
lyc eb197db4fd 框架设计-edit 2024-11-26 16:07:13 +08:00
lyc 5808798b95 模板修改 2024-11-26 14:55:14 +08:00
lyc 393587848f 模板修改 2024-11-26 14:52:52 +08:00
yangws 57fb6b9c75 Merge pull request 'fix:修改个人中心修改学科的时候不生效的问题;' (#66) from yws_dev into main
Reviewed-on: #66
2024-11-26 10:37:10 +08:00
小杨 1882fd0dae fix:修改个人中心修改学科的时候不生效的问题; 2024-11-26 10:36:41 +08:00
yangws 7f2cacffac Merge pull request 'add:新增第三方资源筛选;' (#65) from yws_dev into main
Reviewed-on: #65
2024-11-26 09:35:59 +08:00
小杨 e1caa441cb add:新增第三方资源筛选; 2024-11-26 09:35:25 +08:00
zouyf ca3f2658a7 Merge pull request '1' (#64) from zouyf_dev into main
Reviewed-on: #64
2024-11-25 11:19:34 +08:00
“zouyf” cd1fc036a2 1 2024-11-25 11:18:45 +08:00
zouyf 727299aac9 Merge pull request 'zouyf_dev' (#63) from zouyf_dev into main
Reviewed-on: #63
2024-11-25 11:07:13 +08:00
lyc 27b0457eef Merge pull request 'edit' (#62) from lyc-dev into main 2024-11-25 11:00:42 +08:00
lyc 34e74c5ec6 edit 2024-11-25 10:59:56 +08:00
“zouyf” 208f5d496f Merge branch 'main' into zouyf_dev 2024-11-25 10:59:40 +08:00
“zouyf” 122fb41690 [习题上传] - 章节下增加对应知识点数据 2024-11-25 10:59:27 +08:00
朱浩 eb4a58b306 Merge remote-tracking branch 'origin/main' 2024-11-25 10:54:33 +08:00
朱浩 a313a0e8b0 BUG修复 2024-11-25 10:54:16 +08:00
“zouyf” 630a7b4c50 1 2024-11-22 16:57:19 +08:00
zhengdegang 01dc5dc643 Merge pull request 'zdg_dev' (#61) from zdg_dev into main
Reviewed-on: #61
2024-11-22 15:57:35 +08:00
zdg 349bdbd181 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
# Conflicts:
#	src/renderer/index.html
#	src/renderer/src/views/model/index.vue
2024-11-22 15:55:44 +08:00
zdg 8707b54420 pptList 功能二开 2024-11-22 15:18:42 +08:00
朱浩 f08b5a8bee Merge remote-tracking branch 'origin/main' 2024-11-22 11:07:11 +08:00
朱浩 e2255544da BUG修复 2024-11-22 11:06:57 +08:00
zouyf 748a3c4b86 Merge pull request '增加根据用户id查询' (#60) from zouyf_dev into main
Reviewed-on: #60
2024-11-22 11:03:50 +08:00
“zouyf” c4c1115abb 增加根据用户id查询 2024-11-22 11:03:19 +08:00
zouyf eefc4d75f8 Merge pull request 'zouyf_dev' (#59) from zouyf_dev into main
Reviewed-on: #59
2024-11-22 10:50:57 +08:00
“zouyf” db99dbf0d8 Merge branch 'main' into zouyf_dev 2024-11-22 10:49:05 +08:00
“zouyf” 3b6878ece5 更新下划线格式化 2024-11-22 10:48:37 +08:00
朱浩 cbc6f21100 没有教材-的datasetid 2024-11-22 10:47:44 +08:00
朱浩 cefc29df6a 版本更新 2024-11-22 09:58:50 +08:00
朱浩 cb3485f10f Merge remote-tracking branch 'origin/main' 2024-11-22 09:58:09 +08:00
朱浩 cbb6a10c1d 窗口初始化最大化 2024-11-22 09:58:01 +08:00
zouyf 95c93f19ee Merge pull request 'zouyf_dev' (#58) from zouyf_dev into main
Reviewed-on: #58
2024-11-22 09:54:36 +08:00
“zouyf” dcd1a3bb05 1 2024-11-22 09:54:05 +08:00
“zouyf” 5ac33bd1ca 1 2024-11-22 09:53:15 +08:00
yangws dc36821366 Merge pull request 'fix:新增图标;' (#57) from yws_dev into main
Reviewed-on: #57
2024-11-22 09:52:48 +08:00
小杨 2641845ce0 fix:新增图标; 2024-11-22 09:52:21 +08:00
朱浩 e1a12ff0e0 个别文字说明修改 2024-11-22 09:48:43 +08:00
“zouyf” bd50a7cdf0 Merge branch 'main' into zouyf_dev 2024-11-22 09:42:15 +08:00
“zouyf” 94e609164a 替换菁优网填空标识 2024-11-22 09:41:58 +08:00
朱浩 4fbd77c40c Merge remote-tracking branch 'origin/main' 2024-11-22 09:34:38 +08:00
baigl dfe1a23327 Merge pull request 'baigl' (#56) from baigl into main
Reviewed-on: #56
2024-11-22 09:34:23 +08:00
白了个白 437bff2cdd Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-22 09:33:32 +08:00
白了个白 6a6d932852 作业管理 2024-11-22 09:33:04 +08:00
朱浩 d3b5493810 Merge remote-tracking branch 'origin/main' 2024-11-22 09:18:02 +08:00
白了个白 2fd17df429 1 2024-11-21 17:35:52 +08:00
lyc fbf906f390 Merge pull request 'lyc-dev' (#55) from lyc-dev into main 2024-11-21 17:34:05 +08:00
lyc 663ecb962c model/index.vue 冲突 解决 2024-11-21 17:33:36 +08:00
朱浩 398de60dcd 关闭自动同步文件,超过150M文件不允许加入课程 2024-11-21 17:32:47 +08:00