zhuhao
/
AIx_Smarttalk_WS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity
702 Commits 10 Branches 3 Tags 32 MiB
Commit Graph

539 Commits

Author SHA1 Message Date
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
小杨 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
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
lyc eaa14b1666 Merge branch 'main' into lyc-dev 2024-12-12 17:14:55 +08:00
lyc 99c26145d8 edit 2024-12-12 17:14:39 +08:00
zdg e7990dc175 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-12 17:02:31 +08:00
zdg 31de0da3c5 优化 2024-12-12 17:02:22 +08:00
朱浩 82548ce937 Merge remote-tracking branch 'origin/main' 2024-12-12 16:55:19 +08:00
朱浩 aa3be39721 研学相关权限问题 2024-12-12 16:55:08 +08:00
白了个白 ea2a8ebfda Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-12 16:44:36 +08:00
白了个白 308465adb4 ppts： 64转file 提取到utils image中 2024-12-12 16:44:03 +08:00
小杨 7861727e92 fix：修改pptlist活动的bug； 2024-12-12 16:39:01 +08:00
zdg 80b66ffb28 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-12 16:38:44 +08:00
zhangxuelin c7ebc6de65 1 2024-12-12 16:37:51 +08:00
zhangxuelin b906a1e688 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-12 16:37:22 +08:00
白了个白 363b284b7c 1 2024-12-12 16:34:47 +08:00
zdg 75b5884210 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-12 16:24:53 +08:00
zdg 03f160464c ppt上课 2024-12-12 16:24:47 +08:00
白了个白 fb3ffd5dda Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-12 16:23:51 +08:00
白了个白 5771533039 ppts: 插入试题 图片路径存储修改 2024-12-12 16:23:28 +08:00
zhangxuelin 75ea11e171 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-12 16:15:55 +08:00
zhangxuelin 851a39897b 修改作业弹窗 2024-12-12 16:15:16 +08:00
zhangxuelin 69bfc68b28 Merge pull request '作业弹窗' (#121) from zxl into main 
Reviewed-on: #121
 2024-12-12 16:12:53 +08:00
zhangxuelin 590b318757 作业弹窗 2024-12-12 16:12:32 +08:00
CYS 4421ee7fea Merge pull request '政治课标dataset_id修改' (#120) from cys_dev into main 
Reviewed-on: #120
 2024-12-12 16:05:55 +08:00
cys 19ef95447c 1 2024-12-12 16:04:43 +08:00
白了个白 892b4ee3b0 教程分析：pdf页面展示修改 2024-12-12 15:26:14 +08:00
zdg 5e04a4c2c2 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-12 12:21:53 +08:00
zdg ca93eb72ac 更新消息 2024-12-12 12:21:47 +08:00
小杨 78cc5edd39 fix：修改pptlist添加活动的bug； 2024-12-12 11:26:26 +08:00
朱浩 9f4e232d6f Merge remote-tracking branch 'origin/main' 2024-12-12 11:20:12 +08:00
朱浩 afc9fe89d1 解决按钮层级问题 2024-12-12 11:19:38 +08:00
朱浩 894ed269ce 解决生产无法关闭PPTIST页面问题 2024-12-12 11:17:12 +08:00
zdg b15fa29ffa Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-12 11:02:22 +08:00
zhangxuelin 64d2dbcabb Merge pull request '点赞疑问' (#117) from zxl into main 
Reviewed-on: #117
 2024-12-12 10:58:09 +08:00
zhangxuelin f4cb3a8916 点赞疑问 2024-12-12 10:57:48 +08:00
小杨 e522fc8ee5 清除debugger; 2024-12-12 10:53:15 +08:00
小杨 bbed835ffe fix：修改ppt添加活动的bug； 2024-12-12 10:52:10 +08:00
zdg 9ef4812acb Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-12 10:31:00 +08:00
zhangxuelin 979621b515 点赞和疑问 2024-12-12 10:28:32 +08:00
zdg d313f901a3 去掉注释 2024-12-11 17:32:11 +08:00
zdg 8990ffdc58 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-11 17:17:01 +08:00
zdg 13b1a895a4 上课 socket 2024-12-11 17:16:55 +08:00
朱浩 9c7aeb1a27 Merge remote-tracking branch 'origin/main' 2024-12-11 17:11:22 +08:00
lyc dad772713f edit 2024-12-11 17:04:12 +08:00
朱浩 a9faeea3fd Merge remote-tracking branch 'origin/main' 2024-12-11 17:03:04 +08:00
朱浩 02ab1ffa8e 霞客 2024-12-11 16:42:46 +08:00
朱浩 10e76add35 霞客 2024-12-11 16:35:52 +08:00
lyc c1325db9e7 Merge pull request 'edit 模板' (#112) from lyc-dev into main 2024-12-11 15:07:56 +08:00
lyc cbc12a3d43 edit 模板 2024-12-11 15:07:25 +08:00
白了个白 c8dd19382e 作业管理：作业名称为空保存判断 2024-12-11 14:51:07 +08:00
zhangxuelin e4afb26e4e Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-11 13:50:50 +08:00
zhangxuelin d60d8822a6 修改动画不能展示问题 2024-12-11 13:50:25 +08:00
朱浩 90137bc3a2 Merge remote-tracking branch 'origin/main' 2024-12-11 13:37:07 +08:00
朱浩 82c61a3fa7 大模型首页 2024-12-11 13:36:49 +08:00
朱浩 48d631a17c 大模型首页 2024-12-11 11:11:47 +08:00
zhangxuelin 432c1ff71d pptist点赞组件 2024-12-11 11:02:22 +08:00
朱浩 7f595c09a9 大模型首页 2024-12-11 10:33:18 +08:00
朱浩 c8e10d4fe1 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	src/renderer/src/components/file-image/index.vue
#	src/renderer/src/views/model/index.vue
 2024-12-11 10:31:29 +08:00
朱浩 f916660156 大模型首页 2024-12-11 10:28:55 +08:00
zdg bb0aa82e82 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-11 10:06:30 +08:00
zdg 8ed13a3146 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 
# Conflicts:
#	src/renderer/src/AixPPTist/src/api/index.ts
#	src/renderer/src/views/prepare/index.vue
 2024-12-11 10:06:23 +08:00
zhangxuelin bace41e12e Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-11 09:58:08 +08:00
zhangxuelin 04e204928d 添加ppt 视频url替换 2024-12-11 09:57:39 +08:00
zdg 9e5609fbdd ppt上课 2024-12-11 09:44:52 +08:00
lyc a1a4e11de7 add icon 2024-12-11 09:40:51 +08:00
lyc 7e9ac2bf74 Merge branch 'main' into lyc-dev 2024-12-10 15:43:14 +08:00
lyc 013669dd35 edit 模板 2024-12-10 15:42:59 +08:00
小杨 c159d6be1a fix:清除debugger; 2024-12-10 15:38:19 +08:00
小杨 e7c6ab9e8d Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev 2024-12-10 15:34:51 +08:00
小杨 85d06f306a fix：ppt活动添加; 2024-12-10 15:34:46 +08:00
朱浩 656a58693f Merge remote-tracking branch 'origin/main' 2024-12-10 14:20:08 +08:00
“zouyf” 9603406a0b 1 2024-12-10 11:09:32 +08:00
“zouyf” 10a7e73c64 Merge branch 'main' into zouyf_dev 2024-12-10 10:59:48 +08:00
“zouyf” 2c238b5706 1 2024-12-10 10:54:21 +08:00
“zouyf” b47feb4a3a 1 2024-12-10 10:46:22 +08:00
朱浩 772b196b31 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	src/renderer/src/views/prepare/index.vue
 2024-12-10 10:44:04 +08:00
zhangxuelin 80ac4a6e1c Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-10 10:40:21 +08:00
朱浩 757edb0f67 改名AIPPT 2024-12-10 10:40:08 +08:00
“zouyf” c79911cc99 Merge branch 'main' into zouyf_dev 2024-12-10 10:40:07 +08:00
zhangxuelin 1987783fda 添加作业弹窗 2024-12-10 10:40:00 +08:00
“zouyf” 755cfc615a 试题分页查询回顶部 2024-12-10 10:39:39 +08:00
白了个白 122487cf8b ppts习题插入：个人题库 习题截图放到ppts里面转换 2024-12-10 10:24:30 +08:00
“zouyf” 2e81c706b1 Merge branch 'main' into zouyf_dev 2024-12-10 10:13:00 +08:00
“zouyf” 2360d95f1c pptList试题转图片优化 2024-12-10 10:12:47 +08:00
zdg 4f68ae27b3 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-10 10:09:00 +08:00
zdg 38c041465e ppt上课 2024-12-10 10:08:53 +08:00
zhangxuelin f035cf87ea Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 
# Conflicts:
#	src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue
 2024-12-10 09:43:43 +08:00
zhangxuelin e56eb059be 替换上传图片 视频url为线上url 2024-12-10 09:41:59 +08:00
小杨 23e59531ea Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev 2024-12-09 17:25:30 +08:00
小杨 9e021edc67 fix：添加活动； 2024-12-09 17:25:25 +08:00
“zouyf” d90b7c695a 1 2024-12-09 17:14:37 +08:00
“zouyf” d07dd4455c 1 2024-12-09 16:50:00 +08:00
“zouyf” 23c397e18a Merge branch 'main' into zouyf_dev 2024-12-09 15:01:43 +08:00
“zouyf” 78858111bb pptList样式修改 2024-12-09 15:01:25 +08:00
zdg 97962d591f 删除无效代码 2024-12-09 13:54:44 +08:00
zdg 86154148c6 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 
# Conflicts:
#	src/renderer/src/views/prepare/container/class-start.vue
 2024-12-09 13:52:24 +08:00
zdg 44092a21bf ppt上课 2024-12-09 13:51:00 +08:00
“zouyf” 728ce16c8b Merge branch 'main' into zouyf_dev 2024-12-09 13:46:32 +08:00
小杨 5b1d921378 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev 2024-12-09 11:16:48 +08:00
lyc 93fa916084 Merge branch 'main' into lyc-dev 2024-12-09 10:56:20 +08:00
lyc 24d6d5887f pptlist edit 2024-12-09 10:56:04 +08:00
朱浩 222b0f54f8 Merge remote-tracking branch 'origin/main' 2024-12-09 10:51:25 +08:00
朱浩 e0a56b37ef 改名AIPPT 2024-12-09 10:51:07 +08:00