zhuhao
/
AIx_Smarttalk_WS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity
831 Commits 10 Branches 6 Tags 33 MiB
Commit Graph

640 Commits

Author SHA1 Message Date
zhangxuelin ab9bad467a Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 
# Conflicts:
#	src/renderer/src/AixPPTist/src/views/Editor/EditorHeader/index.vue
 2024-12-24 16:08:48 +08:00
zdg b3ffa9bdaa Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-24 16:07:00 +08:00
zdg 5510021566 上课允许不选班级开课 2024-12-24 16:06:53 +08:00
lyc 406e581182 edit 框架设计 2024-12-24 14:47:58 +08:00
lyc d4dce61555 Merge branch 'main' into lyc-dev 2024-12-24 14:37:06 +08:00
lyc d6d5d13232 pptList 插入素材 增加loading 2024-12-24 14:32:59 +08:00
zdg 11968879d8 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 
# Conflicts:
#	src/renderer/src/AixPPTist/src/views/Editor/EditorHeader/index.vue
 2024-12-24 11:33:49 +08:00
zdg db86299523 ppt缩略图生成 2024-12-24 11:32:52 +08:00
zdg c152a3d3ee aippt生成-缩略图 2024-12-24 11:24:53 +08:00
zhangxuelin a366d5d4d6 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-24 11:24:01 +08:00
zhangxuelin e0ec22c3ac 替换照片改为线上url 2024-12-24 11:23:52 +08:00
lyc 9c8872579f Merge pull request 'edit 框架设计' (#173) from lyc-dev into main 2024-12-24 10:21:42 +08:00
lyc 4f32927b49 edit 框架设计 2024-12-24 10:21:13 +08:00
zhangxuelin e132f3927b Merge pull request 'zxl' (#172) from zxl into main 
Reviewed-on: #172
 2024-12-24 10:07:31 +08:00
朱浩 c290c170d3 报错后及时回转loading按钮 2024-12-24 10:01:34 +08:00
朱浩 3867a9603f 报错后及时回转loading按钮 2024-12-24 09:58:31 +08:00
zhangxuelin f732520d8d Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-24 09:51:31 +08:00
lyc 1334becb54 Merge branch 'main' into lyc-dev 2024-12-23 17:01:53 +08:00
lyc c95508ed59 edit 模板 2024-12-23 17:01:40 +08:00
“zouyf” 63b8a0d5c6 Merge branch 'main' into zouyf_dev 2024-12-23 15:28:49 +08:00
zhangxuelin cf540d73df Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-23 15:26:47 +08:00
白了个白 e3c4706880 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-23 14:02:24 +08:00
白了个白 c507331fb5 作业设计：作业类型 tag颜色样式修改 2024-12-23 14:01:04 +08:00
lyc 92e8aa64d7 模板edit 2024-12-23 10:45:27 +08:00
“zouyf” f6b08169b6 Merge branch 'main' into zouyf_dev 2024-12-23 10:11:48 +08:00
zhangxuelin 83d3cd5df8 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-23 09:41:19 +08:00
朱浩 b1407706a8 永川个性化打包 2024-12-22 12:15:01 +08:00
朱浩 996b4006a2 永川个性化打包 2024-12-22 11:46:10 +08:00
朱浩 4531533382 大模型顺序问题修改 2024-12-21 21:42:07 +08:00
朱浩 a601a9f8dd Merge remote-tracking branch 'origin/main' 2024-12-21 21:40:07 +08:00
zdg acb0231304 1.pptList 实验室功能 
2.pplList 批量更新缩略图
 2024-12-21 12:15:58 +08:00
白了个白 ea5ed4b6ac Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-20 17:18:32 +08:00
白了个白 6b45fa61dd 1 2024-12-20 17:17:35 +08:00
白了个白 7aa75794dc 科学实验：批改优化 2024-12-20 17:16:57 +08:00
朱浩 a2c2c4eec7 Merge remote-tracking branch 'origin/main' 2024-12-20 17:14:40 +08:00
CYS 4095390f45 Merge pull request '插入素材' (#166) from cys_dev into main 
Reviewed-on: #166
 2024-12-20 17:12:50 +08:00
cys d75af2636d 插入素材 2024-12-20 17:12:07 +08:00
朱浩 1983dafbba Merge remote-tracking branch 'origin/main' 2024-12-20 16:52:18 +08:00
朱浩 6c7284383a 宫格图片插件 2024-12-20 16:52:02 +08:00
白了个白 f7a3aa6e53 科学实验：学科写死 2024-12-20 16:37:08 +08:00
白了个白 045b44b833 1 2024-12-20 16:06:41 +08:00
白了个白 5e954bab0b Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-20 16:02:07 +08:00
白了个白 7322056dad 1 2024-12-20 16:01:46 +08:00
zdg 0bf94af5a3 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-20 16:00:14 +08:00
zdg 7b042fd001 ppt上课 工具栏 2024-12-20 16:00:09 +08:00
CYS 3bf381f5c5 Merge pull request '插入素材' (#162) from cys_dev into main 
Reviewed-on: #162
 2024-12-20 15:57:22 +08:00
cys fb67b16258 插入素材 2024-12-20 15:52:22 +08:00
白了个白 502c772b46 1 2024-12-20 15:42:19 +08:00
白了个白 57cd8ea45a 1 2024-12-20 15:24:27 +08:00
白了个白 8bbd01e2b2 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-20 15:24:02 +08:00
白了个白 622a71253f 作业设计：科学实验 2024-12-20 15:23:34 +08:00
“zouyf” af60c5cc17 Merge branch 'baigl' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zouyf_dev 2024-12-20 14:49:02 +08:00
“zouyf” da8d6c4b32 更新菁优网参数 2024-12-20 14:44:59 +08:00
“zouyf” 73d4ee03ba Merge branch 'main' into zouyf_dev 2024-12-20 14:08:27 +08:00
“zouyf” 8863e05a1a Merge branch 'main' into zouyf_dev 2024-12-20 11:18:03 +08:00
朱浩 795c4d82c7 Merge remote-tracking branch 'origin/main' 2024-12-20 11:18:00 +08:00
朱浩 8e0b9f72d5 宫格图片插件 2024-12-20 11:16:44 +08:00
白了个白 4ad59a8b4e Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-20 11:15:32 +08:00
白了个白 3de2ddb094 作业设计：新增 科学实验作业类型 2024-12-20 11:13:37 +08:00
zouyf 6dbd140f80 Merge pull request '[作业批改] - 增加科学实验的批改(同常规作业)' (#159) from zouyf_tmp into main 
Reviewed-on: #159
 2024-12-20 11:06:37 +08:00
“zouyf” 7bca2fdc2d [作业批改] - 增加科学实验的批改(同常规作业) 2024-12-20 11:05:22 +08:00
lyc 54be3cad4f 隐藏教学工作台 2024-12-20 10:56:55 +08:00
“zouyf” debd5e1942 Merge branch 'main' into zouyf_dev 2024-12-20 10:27:19 +08:00
“zouyf” 3a6c7dfa47 暂屏蔽-[校本题库, 智能推荐, AI设计作业] 2024-12-20 10:25:30 +08:00
zdg e5667fac2d Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-20 09:44:02 +08:00
zdg f9bb7ed672 去掉 无用代码 2024-12-20 09:43:56 +08:00
朱浩 0ab34e7aa3 退出登录问题 2024-12-20 09:42:28 +08:00
朱浩 7751692061 新增宫格查看插件 2024-12-20 09:39:20 +08:00
朱浩 c69ae97a48 Merge remote-tracking branch 'origin/main' 2024-12-19 18:42:54 +08:00
朱浩 051dbdf4a2 新增宫格查看插件 2024-12-19 18:42:35 +08:00
zdg bc195e1f51 pplist 2024-12-19 17:33:19 +08:00
lyc 4b393ecec9 add:添加实验室; 2024-12-19 17:26:53 +08:00
lyc f708e2f741 Merge branch 'main' into lyc-dev 2024-12-19 16:55:52 +08:00
lyc 94276db542 edit 2024-12-19 16:55:37 +08:00
zdg dfc10aebbe pptlist公屏上课 2024-12-19 16:48:43 +08:00
“zouyf” c8b8c21875 Merge branch 'main' into zouyf_dev 2024-12-19 15:51:19 +08:00
“zouyf” c8729a7008 [试题上传] - 兼容优化菁优网题型 2024-12-19 15:51:06 +08:00
zdg ff6fab0bcc Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-19 11:14:19 +08:00
zdg 45abab7a41 公屏上课 2024-12-19 11:14:14 +08:00
朱浩 6128f267e1 Merge remote-tracking branch 'origin/main' 2024-12-19 11:07:27 +08:00
朱浩 e0a406c497 新增宫格查看插件 2024-12-19 11:07:12 +08:00
lyc cebf864b82 Merge pull request '模板修改' (#151) from lyc-dev into main 2024-12-18 17:31:44 +08:00
lyc 0ed69394ef 模板修改 2024-12-18 17:31:10 +08:00
lyc 0b6039f9d8 Merge pull request '白板按钮图标不显示' (#150) from lyc-dev into main 2024-12-18 17:17:15 +08:00
lyc 627c70d0e1 白板按钮图标不显示 2024-12-18 17:16:23 +08:00
zhangxuelin 64272467a2 ppist里面不显示导入 2024-12-18 16:08:19 +08:00
zdg 38a50d18bf 注释 2024-12-18 16:00:31 +08:00
zdg 6fa0aa6e5f Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-18 15:59:51 +08:00
zdg b0fca4ad9b ppt上课-全屏演讲者 
点赞修复
 2024-12-18 15:59:45 +08:00
lyc 28561b5016 Merge branch 'main' into lyc-dev 2024-12-18 11:17:25 +08:00
lyc 2e2ebbd47f 模板新增 模型选择 2024-12-18 11:17:09 +08:00
“zouyf” 2bdac6e2ea Merge branch 'main' into zouyf_dev 2024-12-18 10:31:46 +08:00
“zouyf” 058509b29c 1 2024-12-18 10:31:20 +08:00
白了个白 90ac7a49c7 1 2024-12-18 09:53:39 +08:00
白了个白 75ddbf6f26 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-18 09:52:08 +08:00
白了个白 de9235751f 作业管理：习题上传后，返回进入 个人题库界面 2024-12-18 09:51:44 +08:00
zdg 94fa1a2457 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-17 17:35:57 +08:00
zdg abce344d42 ppt 动画 2024-12-17 17:35:48 +08:00
zdg 0d38a12094 ppt 2024-12-17 17:34:47 +08:00
白了个白 dfd53637be 作业管理：习题上传页面加上返回 2024-12-17 17:20:53 +08:00
白了个白 c01a29bf3f 习题上传：扫描识别url修改 2024-12-17 17:20:30 +08:00
zhangxuelin 2d0be935bf Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-17 10:26:51 +08:00
zhangxuelin d6dfe966c0 pptist 比例修改 2024-12-17 10:26:41 +08:00
zdg cf7f985020 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-16 17:49:09 +08:00
zdg 5d6c946e08 更新 2024-12-16 17:49:04 +08:00
“zouyf” 9a2a55c62b 1 2024-12-16 17:30:00 +08:00
“zouyf” 19efe185c5 Merge branch 'main' into zouyf_dev 2024-12-16 17:14:22 +08:00
“zouyf” 78ecf6ea55 [查询试题] - 单元查询优化 2024-12-16 17:13:56 +08:00
小杨 122c5341e9 fix:修复头像问题； 2024-12-16 17:06:01 +08:00
朱浩 c2a4f2c708 Merge remote-tracking branch 'origin/main' 2024-12-16 16:46:22 +08:00
小杨 e080e39e1c Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev 2024-12-16 16:40:43 +08:00
小杨 25f09cb4e0 fix：头像类型修改； 2024-12-16 16:40:33 +08:00
朱浩 3b67c34ccb Merge remote-tracking branch 'origin/main' 2024-12-16 16:20:53 +08:00
朱浩 187c222fe5 大模型页面补全 2024-12-16 16:20:30 +08:00
lyc a255b1af71 Merge pull request 'edit 模板' (#142) from lyc-dev into main 2024-12-16 16:18:02 +08:00
lyc 546c8ad72f edit 模板 2024-12-16 16:17:32 +08:00
zhengdegang e58cb334e4 Merge pull request 'ppt -优化活动列表' (#141) from zdg_dev into main 
Reviewed-on: #141
 2024-12-16 15:03:14 +08:00
zdg c298e1c0a2 ppt -优化活动列表 2024-12-16 15:01:07 +08:00
朱浩 ed8051d0e0 Merge remote-tracking branch 'origin/main' 2024-12-16 14:24:16 +08:00
朱浩 628055fb58 大模型页面补全 2024-12-16 14:24:00 +08:00
zdg a973d296fe 更新ppt活动 2024-12-16 12:18:19 +08:00
zhangxuelin 79839458f0 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-16 10:19:14 +08:00
zhangxuelin d018a28200 添加注册验证码倒计时 2024-12-16 10:19:04 +08:00
zdg 9ad959dfb7 ppt上课 拖动更新排序 动画播放等 2024-12-16 10:15:08 +08:00
lyc 0b9fce21f3 Merge pull request 'edit' (#137) from lyc-dev into main 2024-12-16 10:06:40 +08:00
lyc 37d0592dcc edit 2024-12-16 10:06:14 +08:00
小杨 6eda37c8c9 fix：修改监听活动的方式； 2024-12-16 09:55:48 +08:00
lyc 88869e9a8a Merge branch 'main' into lyc-dev 2024-12-16 09:50:30 +08:00
lyc 08db70a3f2 edit 2024-12-16 09:50:17 +08:00
小杨 ec3d728896 fix:修改头像是取消头像消失的问题； 2024-12-13 14:01:13 +08:00
小杨 43e9c9f44e fix：ppt活动类型判断; 2024-12-13 13:47:56 +08:00
小杨 243561dfd8 fix：头像问题； 2024-12-13 13:45:06 +08:00
zdg 29888b0674 ppt播放 已经翻页异常情况 2024-12-13 13:17:18 +08:00
zdg 645f9ab120 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-13 13:16:31 +08:00
朱浩 74767b44df Merge remote-tracking branch 'origin/main' 2024-12-13 13:01:34 +08:00
朱浩 ef4ec36bbe 大模型页面补全 2024-12-13 13:00:02 +08:00
zdg c4a15e9c53 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-13 12:46:51 +08:00
小杨 a34883abbb Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev 2024-12-13 11:18:48 +08:00
小杨 8f8016cb0b fix：添加默认头像以及pptlist的bug； 2024-12-13 11:18:33 +08:00
lyc a3079a87d0 edit 模板 2024-12-13 10:58:01 +08:00
lyc e43573bae2 Merge pull request 'edit' (#129) from lyc-dev into main 2024-12-13 10:34:04 +08:00
lyc 83d885bcbe 查询模板增加user 2024-12-13 10:33:35 +08:00
lyc b5669a97f1 模板查询增加user 2024-12-13 10:28:42 +08:00
“zouyf” cccf109499 Merge branch 'main' into zouyf_dev 2024-12-13 10:12:14 +08:00
“zouyf” 4a0e9b0b84 批改作业 2024-12-13 10:11:33 +08:00
lyc be2afadd43 edit 2024-12-13 10:10:36 +08:00
朱浩 a62dde1b93 Merge remote-tracking branch 'origin/main' 2024-12-13 10:06:23 +08:00
lyc b4864bc109 Merge pull request 'lyc-dev' (#128) from lyc-dev into main 2024-12-13 09:47:56 +08:00
lyc a379176496 edti 插入素材 2024-12-13 09:47:15 +08:00
zdg e8ecc27441 全屏 2024-12-12 17:33:39 +08:00