zhuhao
/
AIx_Smarttalk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 26 Wiki Activity
1,472 Commits 9 Branches 26 Tags 40 MiB
Commit Graph

1000 Commits

Author SHA1 Message Date
朱浩 302c82503a Merge branch 'main' into zhuhao_dev 2024-10-24 17:03:31 +08:00
zdg dc39486620 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-10-24 17:02:21 +08:00
zdg 62881bc052 修复部分ppt上课无效 2024-10-24 17:02:11 +08:00
“zouyf” b5b6272141 Merge branch 'main' into zouyf_dev 2024-10-24 14:45:07 +08:00
“zouyf” 027d0ebe07 [ppt上课] - 增加作业回答消息检测 2024-10-24 14:44:53 +08:00
小杨 dac36e611d fix:url地址更改; 2024-10-24 14:37:38 +08:00
小杨 eba6727dc0 add：用时分析改为柱状图; 2024-10-24 14:36:35 +08:00
朱浩 521247f817 Merge branch 'main' into zhuhao_dev 2024-10-23 17:45:37 +08:00
lyc 8a759479bd Merge pull request 'ppt 上课 推送玩作业 打开作业批改弹窗' (#358) from lyc-dev into main 2024-10-23 16:08:53 +08:00
lyc e891259413 ppt 上课 推送玩作业 打开作业批改弹窗 2024-10-23 16:09:18 +08:00
小杨 24ce28f2e2 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into yangws 2024-10-23 15:50:17 +08:00
小杨 0de7a7356e add:作业批阅客观题自动评分； 2024-10-23 15:50:03 +08:00
lyc 0b4019957f 调整ppt上课 作业查询 2024-10-23 10:43:57 +08:00
白了个白 758081d9e5 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-10-22 17:30:00 +08:00
白了个白 a7a84b3738 常规作业改为主题作业，课堂展示改为创作展示 暂不修改 2024-10-22 17:27:02 +08:00
小杨 49b4ba1f02 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into yangws 2024-10-22 16:59:28 +08:00
小杨 2c2c5b32e9 fix:修改作业批阅样式; 2024-10-22 16:59:23 +08:00
“zouyf” 6112cc8a92 1 2024-10-22 16:50:42 +08:00
“zouyf” d05388cb05 Merge branch 'main' into zouyf_dev 2024-10-22 16:46:45 +08:00
“zouyf” cca640e945 [逐题讲评] - 增加右侧试题显示 2024-10-22 16:45:55 +08:00
白了个白 35a00e2aca 作业批阅：最小化再次打开会刷新的逻辑修改 2024-10-22 16:04:03 +08:00
“zouyf” ef75fb7570 试题格式化样式优化 2024-10-22 14:47:49 +08:00
白了个白 e3ce510322 常规作业改为主题作业，课堂展示改为创作展示 2024-10-22 14:39:48 +08:00
朱浩 79cb126728 Merge branch 'main' into zhuhao_dev 2024-10-21 17:21:41 +08:00
朱浩 810a734fa5 上课APT错误修复，去除课程预约 2024-10-21 17:21:12 +08:00
“zouyf” 0f425d9277 [作业布置] - 增加试题详情查看弹框 2024-10-21 16:41:13 +08:00
“zouyf” 8c36d59b19 Merge branch 'main' into zouyf_dev 2024-10-21 16:34:55 +08:00
“zouyf” a229e9933e [考试分析] - 优化试题详情弹框 2024-10-21 16:34:39 +08:00
朱浩 b43422f389 生成PPT秘钥更新 2024-10-21 10:41:43 +08:00
小杨 ea861dd2ea fix：获取学生id； 2024-10-20 17:45:42 +08:00
zouyf b0075b86ba Merge pull request 'zouyf_dev' (#347) from zouyf_dev into main 
Reviewed-on: #347
 2024-10-20 15:28:42 +08:00
小杨 3042e874e4 fix：判断没有学生回答题目的情况； 2024-10-20 15:23:48 +08:00
zouyf 92f23a35f9 Merge branch 'main' into zouyf_dev 2024-10-20 15:04:33 +08:00
zouyf 64e91dffbe 1 2024-10-20 15:03:30 +08:00
qinqing 80c38152d2 Merge pull request '屏蔽ocr识别' (#345) from qinqing_dev into main 
Reviewed-on: #345
 2024-10-20 12:11:50 +08:00
qinqing 0cefb94721 屏蔽ocr识别 2024-10-20 12:08:37 +08:00
小杨 688f200d43 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into yangws 2024-10-20 01:35:50 +08:00
小杨 46d5078cac fix：训练报告整体修改； 2024-10-20 01:35:45 +08:00
朱浩 39f46a1709 生成PPT后自动打开 2024-10-19 18:01:52 +08:00
朱浩 770a847e91 默认窗口最大化 2024-10-19 17:33:11 +08:00
朱浩 6f35ad8a1a Merge branch 'main' into zhuhao_dev 
# Conflicts:
#	src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
 2024-10-19 17:21:34 +08:00
zouyf 4e7b9f0a82 Merge pull request 'zouyf_dev' (#341) from zouyf_dev into main 
Reviewed-on: #341
 2024-10-19 17:20:42 +08:00
qinqing 04d2e47882 Merge branch 'main' into qinqing_dev 2024-10-19 17:20:02 +08:00
“zouyf” 17e8e43ad4 Merge branch 'main' into zouyf_dev 
# Conflicts:
#	src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
 2024-10-19 17:19:09 +08:00
qinqing ea2de75415 百度OCR识别 2024-10-19 17:18:52 +08:00
“zouyf” 38b17333ab 页面优化 2024-10-19 17:17:16 +08:00
白了个白 40d83c4cb3 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-10-19 17:14:35 +08:00
小杨 6b63235084 fix：修改字段名称以及统一逻辑； 2024-10-19 17:14:21 +08:00
白了个白 8ba6e15020 作业管理相关修改 2024-10-19 17:14:09 +08:00
朱浩 bddcf2d4ff BUG修复 2024-10-19 17:01:05 +08:00
lyc 8f91be9a4b Merge pull request '默认全屏' (#338) from lyc-dev into main 2024-10-19 16:59:35 +08:00
lyc 75384c8057 默认全屏 2024-10-19 17:00:09 +08:00
朱浩 bed3ef96a7 Merge branch 'main' into zhuhao_dev 2024-10-19 16:59:30 +08:00
qinqing 47329aea75 Merge branch 'main' into qinqing_dev 2024-10-19 16:58:44 +08:00
qinqing 52275e1de6 全连接百度ocr识别 2024-10-19 16:58:04 +08:00
朱浩 6fe5ee5703 Merge branch 'main' into zhuhao_dev 
# Conflicts:
#	src/renderer/src/views/classTask/classTaskAssign.vue
#	src/renderer/src/views/classTask/teachClassTask.vue
 2024-10-19 16:42:36 +08:00
qinqing 8dba05c0d4 Merge pull request 'qinqing_dev' (#336) from qinqing_dev into main 
Reviewed-on: #336
 2024-10-19 16:31:45 +08:00
qinqing b4fefdd0cf 文字识别全路径，屏蔽评论批注 2024-10-19 16:29:11 +08:00
lyc e4114bf1b4 考试分析-题目详情-增加灰色背景 2024-10-19 16:12:38 +08:00
lyc 4dbb5d2224 考试分析-题目详情增加关闭按钮 2024-10-19 15:59:20 +08:00
白了个白 1a671d7dd2 作业批改：session缓存出现莫名缓存数据bug修改 2024-10-19 15:04:51 +08:00
白了个白 0d21b1de53 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-10-19 14:38:29 +08:00
“zouyf” 0a2d3f54b7 Merge branch 'main' into zouyf_dev 2024-10-19 14:20:34 +08:00
“zouyf” 45c2e35a66 [作业布置] - 修正[课堂展示]中[问题输入框]的保存 2024-10-19 14:19:46 +08:00
朱浩 68de31c569 Merge branch 'main' into zhuhao_dev 2024-10-18 17:12:22 +08:00
朱浩 45485c04fc BUG修复 2024-10-18 17:11:30 +08:00
zdg a3b940f138 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-10-18 17:06:14 +08:00
zdg 548442f278 作业推送注释掉im消息发送 2024-10-18 17:06:08 +08:00
朱浩 6de43cbab3 Merge branch 'main' into zhuhao_dev 2024-10-18 16:32:42 +08:00
朱浩 9552e75f18 解决ppt生成失败的问题 2024-10-18 16:31:57 +08:00
zdg d7f17c253d im 日志 2024-10-18 16:09:55 +08:00
zdg ea6c56a401 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-10-18 16:09:24 +08:00
白了个白 2bcf780b7b 1 2024-10-18 10:16:25 +08:00
白了个白 a8c823030b Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-10-18 10:11:30 +08:00
白了个白 cc2606d507 1 2024-10-18 10:11:10 +08:00
小杨 a521010392 fix:判断图表为0的时候的情况； 2024-10-18 09:34:28 +08:00
白了个白 b132bb5813 作业布置、作业设计跳转优化 2024-10-17 17:25:21 +08:00
白了个白 0e42ce08e1 1 2024-10-17 13:50:21 +08:00
白了个白 6a8b0f82e8 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-10-17 11:28:49 +08:00
白了个白 d290be9320 主页、作业批改 进行结束 时间逻辑修改 2024-10-17 11:28:25 +08:00
朱浩 670c457a9f 解决ppt生成失败的问题 2024-10-17 11:18:35 +08:00
小杨 03b5eccab0 fix：柱状图展示修改； 2024-10-17 10:44:55 +08:00
白了个白 f18d0c0e5e 1 2024-10-17 10:42:10 +08:00
白了个白 e57e643f67 教学实践：作业类型ui更改 2024-10-17 10:34:29 +08:00
朱浩 39aa3b157d 解决教材课标切换名字问题 2024-10-17 10:25:55 +08:00
白了个白 1a9f98e6c9 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-10-17 10:23:37 +08:00
白了个白 e53731ac3f 主页：作业设计、作业布置外链改为pc端 2024-10-17 10:20:16 +08:00
白了个白 a1002a1f40 作业布置：列表逻辑改为usegetHomework里面，新增历史记录查看，新增历史记录的批阅详情查看 2024-10-17 10:19:22 +08:00
zdg 6be26f19cd Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-10-17 09:58:37 +08:00
zdg d40873d198 ppt上课发送多次 2024-10-17 09:55:42 +08:00
白了个白 7c539614fd 教学实践：作业编辑外链改为pc版 2024-10-16 16:11:07 +08:00
朱浩 16b574a167 Merge branch 'main' into zhuhao_dev 
# Conflicts:
#	src/renderer/src/views/prepare/index.vue
 2024-10-16 14:31:55 +08:00
朱浩 8a90da5b64 接入AI生成PPT的功能 2024-10-16 14:29:43 +08:00
白了个白 2b25924213 作业推送：row改为rows组件模式 2024-10-16 14:20:46 +08:00
白了个白 f3d59ca8ee 教学实践：作业-推送布置修改；作业设计外链改为pc端作业设计 2024-10-16 14:19:30 +08:00
白了个白 6163fb06f9 公共组件：布置推送作业，row改为批量rows逻辑；截止日期默认为当前时间3小时之后 2024-10-16 14:16:48 +08:00
zdg b68e5c449b Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-10-16 12:12:06 +08:00
zdg bf7c9839c7 ppt作业布置-加上课堂id 2024-10-16 12:12:00 +08:00
朱浩 d1f3abcc72 #882 V2.1.5 教学实录只记录已结束课程，添加继续上课逻辑 2024-10-16 10:58:42 +08:00
zdg 781a62c137 测试 2024-10-16 10:58:09 +08:00
朱浩 d39d96f733 Merge branch 'main' into zhuhao_dev 2024-10-16 09:33:29 +08:00
“zouyf” 26c388f31c Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk 2024-10-16 09:23:28 +08:00
“zouyf” d9ddb1982b [作业批改] - 重新优化常规作业逻辑 2024-10-16 09:22:18 +08:00
朱浩 3942f894b0 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk 2024-10-15 18:40:07 +08:00
朱浩 ec8f7b5727 无法上课PPT的问题解决 2024-10-15 18:39:50 +08:00
朱浩 fe9e0c1fe2 删除沉余代码 2024-10-15 17:47:32 +08:00
小杨 1c9a3762ef fix：作业批阅柱状图改为百分比显示； 2024-10-15 16:34:31 +08:00
lyc d534340f88 Merge branch 'main' into lyc-dev 2024-10-15 16:30:17 +08:00
lyc ad2c37be82 ai-ppt 2024-10-15 16:30:07 +08:00
zdg 2115d2c76a apt ppt 上下课、继续上课 2024-10-15 15:33:07 +08:00
小杨 1ef4615587 fix: 作业批阅展示修改； 2024-10-15 15:24:06 +08:00
白了个白 7d71cbd398 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-10-15 15:07:54 +08:00
白了个白 2f3b2e8c8f 1 2024-10-15 11:27:03 +08:00
白了个白 5b818d2dd8 作业布置：新增 常规作业 列表详情预览 2024-10-15 11:08:23 +08:00
白了个白 b0415ecafa 作业布置：新增 框架梳理 列表详情预览 2024-10-14 17:26:49 +08:00
qinqing 506f95060b 优化PDF插件工具栏 2024-10-14 17:17:04 +08:00
qinqing fcc0af04cb Merge branch 'main' into qinqing_dev 2024-10-14 16:25:00 +08:00
qinqing 944d94a202 修改默认展示判定逻辑 2024-10-14 16:24:00 +08:00
白了个白 c3787eef0f 作业布置：列表编辑，ui显示null标题修复 2024-10-14 15:55:54 +08:00
lyc bf642ddc79 删除 hooks、useGetClassWork.js 2024-10-14 15:12:05 +08:00
白了个白 ed035f94ed 作业布置：列表排序修改 2024-10-14 11:22:37 +08:00
白了个白 58988313b7 作业布置：推送多个班级的学生bug修复 2024-10-14 10:57:02 +08:00
qinqing eca1a927c0 Merge pull request 'qinqing_dev' (#312) from qinqing_dev into main 
Reviewed-on: #312
 2024-10-11 16:39:10 +08:00
qinqing 7cab923fa4 合并代码 2024-10-11 16:35:42 +08:00
白了个白 96ef7da95a Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-10-11 16:32:17 +08:00
“zouyf” b35cba4e31 1 2024-10-11 16:30:07 +08:00
白了个白 2ad1904802 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-10-11 16:28:04 +08:00
白了个白 8ff117ab53 作业批改：页面缓存读取bug修复 2024-10-11 16:27:39 +08:00
qinqing 6911a92ecb 新增打开新课件，优化PDF插件查看器 2024-10-11 16:22:26 +08:00
“zouyf” df46413c1c Merge branch 'main' into zouyf_dev 2024-10-11 16:04:12 +08:00
“zouyf” cd5abd864d [考试分析] - 优化非绑定菁优网章节不显示试题 2024-10-11 16:03:56 +08:00
朱浩 f209bc673f Merge branch 'main' into zhuhao_dev 2024-10-11 15:00:23 +08:00
朱浩 acc20b79f1 #895 V2.1.5 【教学实践】“APT”“PPT”现在创建后是先生成文档，再点击进入，应该改成创建后直接默认打开进入编辑页面 2024-10-11 14:59:23 +08:00
朱浩 b4dca57828 #909 V2.1.5 平台版本号应该在平台内展示出来。方便查阅是否为最新版本 2024-10-11 14:51:46 +08:00
朱浩 3c064ebffd #924 V2.1.5 PPT上课，点击上课之后，默认打开当前课程PPT 2024-10-11 14:41:36 +08:00
朱浩 07fa4c9790 修改资源为活动，去除窗口和互动 2024-10-11 13:42:03 +08:00
朱浩 e253a6c9dc #876 教学实践，上课时检查未结束课程逻辑 2024-10-10 17:42:48 +08:00
“zouyf” f6f804a09e 1 2024-10-10 17:32:13 +08:00
zouyf 89097eab31 Merge pull request 'zouyf_dev' (#307) from zouyf_dev into main 
Reviewed-on: #307
 2024-10-10 16:03:06 +08:00
lyc ef18d4adf4 Merge pull request 'lyc-dev' (#306) from lyc-dev into main 2024-10-10 16:01:01 +08:00
lyc bff59d699f edit 2024-10-10 16:01:22 +08:00
lyc 7d457782cc edit 2024-10-10 16:00:13 +08:00
“zouyf” d0947da293 Merge branch 'main' into zouyf_dev 2024-10-10 15:58:45 +08:00
“zouyf” fd734ab645 客观题不许修改分数 2024-10-10 15:54:38 +08:00
白了个白 8b7858615e Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-10-10 15:46:33 +08:00
白了个白 8dafce9d86 批阅列表ui更改 2024-10-10 15:44:08 +08:00
“zouyf” 6038ae3bd6 Merge branch 'main' into zouyf_dev 2024-10-10 15:28:59 +08:00
“zouyf” 93abc4905c [作业批改] - 逐题分析显示优化 2024-10-10 15:28:46 +08:00
白了个白 ccf8f2c8fb 作业批改：ui修改 2024-10-10 15:17:49 +08:00
lyc 039dfe2e09 替换apt图标 2024-10-10 15:06:52 +08:00