Commit Graph

235 Commits

Author SHA1 Message Date
白了个白 7c304650ad Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-02 15:35:13 +08:00
lyc 1a267e5696 Merge pull request 'lyc-dev' (#76) from lyc-dev into main 2024-12-02 14:25:30 +08:00
lyc cd6ca2e4e7 最大最小化icon 2024-12-02 14:24:02 +08:00
白了个白 40053c6c79 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-02 10:19:30 +08:00
zdg 482cab5cd3 ppt 优化 2024-11-28 16:15:25 +08:00
zdg 0d68e6efa7 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-11-28 09:33:48 +08:00
zdg a9443035c2 ppt文件转入数据 2024-11-27 17:58:25 +08:00
lyc 7b4e54cb16 edit 2024-11-27 17:31:54 +08:00
白了个白 eb428eaddf Merge branch 'zouyf_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-27 16:58:39 +08:00
“zouyf” e30e3fd42d Merge branch 'main' into zouyf_dev 2024-11-27 16:58:18 +08:00
“zouyf” 81f704b2a5 1 2024-11-27 15:48:22 +08:00
lyc 58e80d590e Merge pull request 'edit' (#74) from lyc-dev into main 2024-11-27 14:38:49 +08:00
lyc 8a1c5d7186 edit 2024-11-27 14:38:22 +08:00
zdg 7c3f3ea8fb Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-11-27 14:21:00 +08:00
zdg f2b1a097bb 更新ppt-排序 2024-11-27 14:20:52 +08:00
朱浩 a6e6f450c5 s生成PPT 2024-11-27 14:19:24 +08:00
白了个白 944dff1b00 1 2024-11-27 14:15:00 +08:00
zdg c555de5fe5 修复pptx 2024-11-27 14:09:32 +08:00
zdg a10d3b078b Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-11-27 13:45:57 +08:00
zdg c1bba6e443 pptist 基础功能 2024-11-27 13:45:48 +08:00
lyc 231a7b6dce Merge pull request 'edit' (#72) from lyc-dev into main 2024-11-27 12:02:35 +08:00
lyc 310d9d3a2b edit 2024-11-27 12:02:14 +08:00
lyc fae380f9c6 Merge pull request 'edit' (#71) from lyc-dev into main 2024-11-27 11:21:39 +08:00
lyc a68fb21203 edit 2024-11-27 11:21:18 +08:00
朱浩 2c6ccd893b s生成PPT 2024-11-27 11:03:35 +08:00
朱浩 540e5f0179 Merge remote-tracking branch 'origin/main' 2024-11-27 10:59:44 +08:00
朱浩 8a8f90ce16 s生成PPT 2024-11-27 10:58:29 +08:00
朱浩 050f87a84a s生成PPT 2024-11-27 10:58:00 +08:00
小杨 5b49eef8e8 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev 2024-11-27 10:51:50 +08:00
小杨 1060929532 fix:修改个人中心默认修改; 2024-11-27 10:51:43 +08:00
白了个白 222f558807 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-27 10:41:03 +08:00
白了个白 ef5dfc8ed1 习题筛选修改 2024-11-27 10:39:21 +08:00
小杨 7a6f57a9b7 fix:个人中心修改学科问题; 2024-11-27 10:29:39 +08:00
白了个白 48571086c3 1 2024-11-27 10:12:39 +08:00
白了个白 b967c684d6 1 2024-11-27 10:11:35 +08:00
白了个白 84e8acdef7 Merge branch 'zouyf_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-27 10:03:38 +08:00
白了个白 d8c4556393 1 2024-11-27 10:01:53 +08:00
“zouyf” 2d9518804e Merge branch 'main' into zouyf_dev
# Conflicts:
#	src/renderer/src/views/profile/userInfo.vue
2024-11-26 17:09:05 +08:00
“zouyf” e405eb041b 更新章节下知识点 2024-11-26 17:06:46 +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
小杨 1882fd0dae fix:修改个人中心修改学科的时候不生效的问题; 2024-11-26 10:36:41 +08:00
小杨 e1caa441cb add:新增第三方资源筛选; 2024-11-26 09:35:25 +08:00
“zouyf” 09e6bec69f 优化菁优网api接口 2024-11-25 17:23:31 +08:00
“zouyf” d26af6446a 试题编辑-回显知识点 2024-11-25 15:19:15 +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
白了个白 42f24041db Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-25 11:11:20 +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