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

996 Commits

Author SHA1 Message Date
朱浩 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
白了个白 e7f439dd0c 1 2024-10-10 14:00:29 +08:00
lyc 95965aa4b5 edit 2024-10-10 10:57:19 +08:00
朱浩 4b2f2aa73a Merge branch 'main' into zhuhao_dev 2024-10-10 10:12:57 +08:00
朱浩 71bd199f4a 打开调试窗口 2024-10-10 10:12:38 +08:00
白了个白 f0313653e6 作业布置：新增推送、批量推送 2024-10-10 09:53:45 +08:00
lyc 3921c1a425 冲突 2024-10-09 16:55:30 +08:00
lyc 34da5fb432 修复一些问题 2024-10-09 16:52:47 +08:00
“zouyf” 1a20fcc835 [教学实践] - 作业中增加作业设计及单任务编辑 2024-10-09 16:17:31 +08:00
白了个白 68388b9c86 作业布置：新增课堂展示编辑 2024-10-09 15:14:42 +08:00
白了个白 7a878fc5b0 作业布置：新增常规作业编辑 2024-10-09 14:20:30 +08:00
白了个白 aea10a5bba 作业布置：列表新增 框架梳理编辑 2024-10-09 13:56:18 +08:00
lyc a1c5236c8f 登录-清除缓存的数据 2024-10-09 11:29:18 +08:00
白了个白 4b3c511af1 1 2024-10-09 10:18:29 +08:00
lyc 22c377cd57 结束上课 2024-10-09 09:38:58 +08:00
zdg a7743ba249 优化 2024-10-09 09:30:42 +08:00
zdg 3038223a7f 修复bug 2024-10-09 09:28:52 +08:00
白了个白 acd1cb3485 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-10-09 09:25:26 +08:00
lyc f2387c709a 去掉返回 2024-10-08 14:01:39 +08:00
lyc b085d96c0e 去掉返回 2024-10-08 11:23:16 +08:00
白了个白 2e27d3e7fb 1 2024-09-29 16:11:33 +08:00
白了个白 cc26ea4780 作业布置，模版编辑 2024-09-29 15:36:43 +08:00
zdg 17e3ee62df 修复二维码异常 2024-09-29 15:35:25 +08:00
zdg 0973128e0e Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-29 15:14:13 +08:00
zdg 61493a7f4e 二维码登录 2024-09-29 15:13:27 +08:00
lyc 19e385ec24 文字描述 2024-09-29 11:10:28 +08:00
白了个白 e72710f027 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-29 09:31:36 +08:00
白了个白 9a74630e56 批阅窗口添加防连点 2024-09-29 09:31:16 +08:00
zdg 352bb9be97 还原二维码 2024-09-27 16:54:29 +08:00
zdg 0ea299c317 增加刷新二维码 2024-09-27 16:41:19 +08:00
“zouyf” eab46ec7f4 Merge branch 'main' into zouyf_dev 2024-09-27 16:17:08 +08:00
“zouyf” 81dd59f564 [作业批改] - 由原来班级查询变更为用户id查询作业 2024-09-27 16:16:55 +08:00
lyc 7c36255508 Merge pull request '教学大模型' (#287) from lyc-dev into main 2024-09-27 15:55:45 +08:00
lyc 310d1aee59 教学大模型 2024-09-27 15:55:50 +08:00
zdg ada2e63060 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 
# Conflicts:
#	src/main/index.js
 2024-09-27 15:53:42 +08:00
zdg eaf9d508d4 apt上课-无需登录 2024-09-27 15:52:07 +08:00
“zouyf” cb15855fc1 Merge branch 'main' into zouyf_dev 2024-09-27 15:11:57 +08:00
朱浩 76f053d8c8 Merge branch 'main' into zhuhao_dev 2024-09-27 15:11:45 +08:00
小杨 0119a92501 fix : 样式问题； 2024-09-27 15:07:58 +08:00
小杨 31f9ec61ea fix：新建分组前清空操作; 2024-09-27 15:05:49 +08:00
“zouyf” 7b3f00ba67 Merge branch 'main' into zouyf_dev 
# Conflicts:
#	src/renderer/src/views/classTask/teachClassTask.vue
 2024-09-27 14:52:51 +08:00
“zouyf” 2ca4117561 1 2024-09-27 14:50:18 +08:00
白了个白 2887528e9e 作业批改ui调整 2024-09-27 14:48:52 +08:00
白了个白 2e1fe84bcd 作业批改--学生未提交，老师批阅后批阅数未更新的bug修复 2024-09-27 12:49:10 +08:00
白了个白 2b074df0b5 1 2024-09-27 11:21:56 +08:00
白了个白 065e215a81 工作台-作业批改界面更改 2024-09-27 11:20:48 +08:00
白了个白 c78c166044 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-27 11:09:13 +08:00
白了个白 aa6a996808 新增作业批改窗口页面 2024-09-27 11:04:52 +08:00
朱浩 0511256094 Merge branch 'main' into zhuhao_dev 2024-09-27 11:01:16 +08:00
lyc 2a75aef245 丑 2024-09-27 11:01:03 +08:00
朱浩 e2e8cae690 背景色 2024-09-27 11:00:03 +08:00
lyc 1edef92586 Merge pull request '工作台-edit' (#279) from lyc-dev into main 2024-09-27 10:32:06 +08:00
lyc d330b4cd55 工作台-edit 2024-09-27 10:32:00 +08:00
朱浩 926f45f232 Merge branch 'main' into zhuhao_dev 2024-09-27 10:13:02 +08:00
朱浩 5c0cc9a91c 版本提升 2024-09-27 10:12:49 +08:00
zdg 68cf2bae1f 屏蔽注释打印 2024-09-27 09:27:51 +08:00
zdg 785b70d888 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-27 09:16:55 +08:00
zdg cae110c686 去掉打印 2024-09-27 09:16:42 +08:00
qinqing 8eff515fd8 从main分支合并，解决冲突 2024-09-26 17:25:24 +08:00
qinqing cf38097739 优化PDF插件几课标教材分析逻辑优化 2024-09-26 17:18:55 +08:00
lyc 21215150bb Merge branch 'main' into lyc-dev 2024-09-26 16:39:20 +08:00
lyc 3b84a340aa 上课里面的章节，教材edit 2024-09-26 16:38:29 +08:00
“zouyf” c3bd7b31ee Merge branch 'main' into zouyf_dev 2024-09-26 16:25:28 +08:00
“zouyf” def2bd32da [作业概况] - 增加点击调用 2024-09-26 16:25:09 +08:00
lyc 2ec9941a20 Merge pull request '教材切换-edit' (#273) from lyc-dev into main 2024-09-26 16:08:56 +08:00
lyc 8a60ce4ef9 教材切换-edit 2024-09-26 16:08:55 +08:00
“zouyf” 8a0b73d07b Merge branch 'main' into zouyf_dev 2024-09-26 14:10:43 +08:00
“zouyf” 4066992aa2 [作业批改] - 优化 2024-09-26 14:10:27 +08:00
zouyf 23b9ab3801 1 2024-09-25 21:04:04 +08:00
“zouyf” a2a263a35a 1 2024-09-25 17:34:31 +08:00
lyc 14e87351c5 Merge branch 'main' into lyc-dev 2024-09-25 16:13:47 +08:00
lyc eb78a80131 工作台-edit 2024-09-25 16:12:55 +08:00
zhangxuelin 40e660f44a Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-25 16:09:11 +08:00
朱浩 4efc8108e5 Merge branch 'main' into zhuhao_dev 2024-09-25 15:28:02 +08:00
朱浩 9d18bb2cdf PDF插件上线 2024-09-25 15:27:41 +08:00
zhangxuelin a0e0388df8 修改密码验证 2024-09-25 14:30:54 +08:00
lyc 773d0c1957 重新登陆手机号获取 2024-09-25 14:28:38 +08:00
朱浩 7a978ddf55 Merge branch 'main' into zhuhao_dev 2024-09-25 13:47:37 +08:00
qinqing e7a36ddfba Merge branch 'main' into qinqing_dev 2024-09-25 13:46:13 +08:00
qinqing c517fa14af 课标分析，教材分析 2024-09-25 13:45:10 +08:00
朱浩 dcbd288a0a Merge branch 'main' into zhuhao_dev 2024-09-25 11:26:26 +08:00
lyc a24da0f6a6 Merge branch 'main' into lyc-dev 2024-09-25 11:24:38 +08:00
lyc bb486e2bd2 教材切换 edit 2024-09-25 11:24:23 +08:00
白了个白 5089ecce3d 作业批改：查询排序更改 2024-09-25 11:22:52 +08:00
朱浩 b884700a62 Merge branch 'main' into zhuhao_dev 2024-09-25 11:10:54 +08:00
朱浩 4816a7c5c8 #817 V2.0.7 教学实践-开始上课逻辑 2024-09-25 11:10:31 +08:00
qinqing 443ecf0ecf Merge branch 'main' into qinqing_dev 2024-09-25 10:11:36 +08:00
白了个白 d247d22288 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-25 10:10:29 +08:00
白了个白 a3084e0546 1 2024-09-25 10:10:06 +08:00
白了个白 551bd62ae3 1 2024-09-25 10:09:09 +08:00
qinqing b7adda1510 Merge branch 'main' into qinqing_dev 2024-09-25 10:06:57 +08:00
qinqing a3e6aca890 PDF阅读器样式层级更新 2024-09-25 10:05:28 +08:00
“zouyf” 2a4b0281c2 Merge branch 'main' into zouyf_dev 2024-09-25 09:51:35 +08:00
“zouyf” b76a589672 增加菁优网样式 2024-09-25 09:51:09 +08:00
lyc 7845d0e0a1 跳转修改 2024-09-25 09:42:58 +08:00
lyc 40089a2cd0 Merge branch 'main' into lyc-dev 2024-09-24 17:37:03 +08:00
lyc 9329da9ddf 章节切换 edit 2024-09-24 17:36:43 +08:00
qinqing f7262effc3 Merge pull request 'qinqing_dev' (#263) from qinqing_dev into main 
Reviewed-on: #263
 2024-09-24 17:27:07 +08:00
qinqing 8fd5edf141 Merge branch 'main' into qinqing_dev 2024-09-24 17:25:36 +08:00
qinqing ff441c6579 Merge branch 'qinqing_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into qinqing_dev 2024-09-24 17:23:52 +08:00
qinqing cf331b9c63 课标分析切换教材 2024-09-24 17:23:34 +08:00
白了个白 0fc08f647f Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-24 16:33:19 +08:00
白了个白 d4a20347db 1 2024-09-24 16:29:28 +08:00
白了个白 2a95f08bb2 作业布置 2024-09-24 16:27:49 +08:00
白了个白 a33ff1abea 作业批改--orderby导致无数据 bug修复 2024-09-24 16:24:31 +08:00
朱浩 d3a3acdedc 解决冲突 2024-09-24 16:22:41 +08:00
朱浩 1a678afb89 Merge branch 'main' into zhuhao_dev 2024-09-24 16:21:06 +08:00
朱浩 d46a86e303 更名文枢课堂 2024-09-24 16:20:06 +08:00
qinqing 65f959c492 Merge pull request 'main' (#258) from main into qinqing_dev 
Reviewed-on: #258
 2024-09-24 15:36:42 +08:00
qinqing 4d7b69c8c2 课标分析 2024-09-24 15:35:36 +08:00
小杨 c1d6cb7767 fix: 解除注释的部分； 2024-09-24 13:55:37 +08:00
白了个白 458596547e 作业设计-习题训练 添加知识点 2024-09-24 13:52:52 +08:00
朱浩 53ce42cc59 Merge branch 'main' into zhuhao_dev 2024-09-24 11:03:58 +08:00
朱浩 0d71dee801 更名文枢课堂 2024-09-24 11:03:40 +08:00
白了个白 5f8ea627d0 作业设计-课堂展示 2024-09-24 11:02:04 +08:00
白了个白 820a4e04f7 作业设计-常规作业 2024-09-24 10:14:23 +08:00
白了个白 2e2e29808f 作业批改-ui样式调整 2024-09-24 09:31:14 +08:00
白了个白 f346285528 作业设计--常规作业 2024-09-23 17:33:35 +08:00
zdg 20ca8f71d6 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-23 17:27:42 +08:00
zdg c9292af67b 优化-下课和stroe监听相关bug 2024-09-23 17:26:44 +08:00
lyc 852b92e1f3 首页跳转 2024-09-23 17:22:43 +08:00
qinqing 56a44740b6 合并代码 2024-09-23 17:12:44 +08:00
qinqing f00fa243c1 调用切换课本 2024-09-23 17:08:35 +08:00
qinqing 82e02f472b 添加课标分析入口 2024-09-23 17:08:02 +08:00
qinqing 3e532c1afd 隐藏工具栏 2024-09-23 17:07:06 +08:00
lyc 713a592bcf 跳转修改 2024-09-23 16:49:48 +08:00
白了个白 54a24ed077 作业设计：框架梳理 2024-09-23 15:33:00 +08:00
lyc 3dc36cbc34 Merge pull request '生成图片地址修改' (#254) from lyc-dev into main 2024-09-23 13:01:46 +08:00
lyc 781829373a 生成图片地址修改 2024-09-23 13:01:13 +08:00
朱浩 1be00156a8 去除console 2024-09-23 11:07:59 +08:00
朱浩 dafe13a1a7 Merge branch 'main' into zhuhao_dev 2024-09-23 11:07:47 +08:00
zdg 7145658d13 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-23 11:05:20 +08:00
zdg 372371e2f0 解决下课异常 2024-09-23 11:05:14 +08:00
lyc 2f49d42418 推出 提示正在上课 2024-09-23 10:38:21 +08:00
朱浩 3b4f463883 BUG修复 2024-09-23 10:31:47 +08:00
zdg a05cf19e74 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-23 10:14:31 +08:00
白了个白 6b24749db9 作业设计：习题训练添加 2024-09-23 10:04:40 +08:00
朱浩 9a5581cea3 Merge branch 'main' into zhuhao_dev 2024-09-23 10:01:45 +08:00
lyc 60e31f4b43 edit 2024-09-23 09:58:47 +08:00
白了个白 e59071c16b Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-23 09:21:13 +08:00
白了个白 e70d6b0539 unitid 保存 2024-09-23 09:15:39 +08:00
白了个白 96098c899f 作业设计 2024-09-23 09:14:13 +08:00
朱浩 6b9949dfae BUG修复 2024-09-22 16:55:00 +08:00
朱浩 27c7033522 Merge pull request 'yangws' (#249) from yangws into main 
Reviewed-on: #249
 2024-09-22 16:47:12 +08:00
朱浩 4c66cc90c0 BUG修复 2024-09-22 16:46:37 +08:00
lyc cafea2d719 跳转增加bookid 2024-09-22 16:41:49 +08:00
yangws d5afede36c fix:2.0.4bug修改; 2024-09-22 16:28:10 +08:00
朱浩 79b9a0726a 打包联通文枢课堂 2024-09-22 14:27:48 +08:00
朱浩 274c80ad0a Merge branch 'main' into zhuhao_dev 2024-09-22 14:02:02 +08:00
yangws a64ba24742 fix:2.0.4bug修改; 2024-09-22 12:51:58 +08:00
lyc 19a3b948c5 点击章节 存储章节id （临时） 2024-09-22 12:34:15 +08:00
朱浩 622cdfe0fe BUG修复 #811,V2.0.3 APT设计-添加活动，与当前选择的章节不一致 2024-09-22 11:14:19 +08:00
朱浩 78b795bf4f BUG修复 #801,V2.0.3 教学实践-作业，红框部分去掉 2024-09-22 10:53:23 +08:00
lyc 71f7e4e5a1 注册账号-班级修改为可选 2024-09-22 10:38:31 +08:00
zdg 6935bec1e4 测试 2024-09-21 12:05:46 +08:00
qinqing 2532dc5fc2 解决冲突 2024-09-20 16:58:25 +08:00
朱浩 3cced30959 Merge branch 'main' into zhuhao_dev 2024-09-20 16:56:44 +08:00
朱浩 ef9fe838a3 BUG修复 2024-09-20 16:56:26 +08:00
qinqing f67380b2c9 PDF插件 2024-09-20 16:52:59 +08:00
zhangxuelin 8975784ce0 修改工具拖动 2024-09-20 16:27:12 +08:00
lyc e586755b75 Merge pull request 'edit' (#241) from lyc-dev into main 2024-09-20 15:38:39 +08:00
lyc ef771f4e0b edit 2024-09-20 15:38:37 +08:00
朱浩 ac599a2c39 BUG修复 2024-09-20 15:29:21 +08:00
lyc 00871797bf edit 2024-09-20 15:24:23 +08:00
lyc f9a87143aa edit 2024-09-20 15:19:33 +08:00
zdg c93eeeb308 修复异常 2024-09-20 15:16:34 +08:00
zdg ca57e72e9c 解决 值为null问题 2024-09-20 15:04:14 +08:00
zdg e0d3a6da6a Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-20 14:56:54 +08:00
zdg 1a9b426ec3 修复-上课 提示 2024-09-20 14:56:48 +08:00
lyc c6477d5ca9 edit 2024-09-20 14:34:22 +08:00
lyc 27ec047981 edit 教材选择 2024-09-20 14:30:36 +08:00
zdg 51cb1989a1 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-20 13:53:53 +08:00
zdg 4ab4d5dff2 恢复修改 2024-09-20 13:53:42 +08:00
lyc 80d6e1c59c Merge pull request 'edit' (#232) from lyc-dev into main 2024-09-20 13:41:22 +08:00
lyc 75c6777933 edit 2024-09-20 13:41:18 +08:00
朱浩 2531c25d7c BUG修复 2024-09-20 09:21:31 +08:00
朱浩 e002ef5f7d Merge branch 'main' into zhuhao_dev 2024-09-20 09:18:30 +08:00
朱浩 2ca637072d BUG修复 2024-09-20 09:18:12 +08:00
白了个白 ef6c3d2a2b Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-19 16:57:03 +08:00
白了个白 9ea05568e1 作业批改：同步web端164逻辑修改 2024-09-19 16:56:15 +08:00
zdg c5075af2fc 已上课 2024-09-19 16:37:07 +08:00
zdg 7da60f0815 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-19 16:35:43 +08:00
zdg 02a25db5e2 修复 2024-09-19 16:35:36 +08:00
yangws 59de30b6b2 Merge pull request 'fix: 解决空数据的判断;' (#227) from yangws into main 
Reviewed-on: #227
 2024-09-19 16:03:39 +08:00
yangws 746cb150c4 fix: 解决空数据的判断; 2024-09-19 16:02:56 +08:00
lyc 893be27671 切换学科 2024-09-19 16:02:42 +08:00
lyc b0b429c7aa Merge pull request '切换学科' (#226) from lyc-dev into main 2024-09-19 16:02:41 +08:00
lyc dbfa1a4037 Merge pull request '路由title' (#225) from lyc-dev into main 2024-09-19 15:55:19 +08:00
lyc ce8b2e6ab0 路由title 2024-09-19 15:55:19 +08:00
白了个白 9eb6d991c1 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-19 15:31:45 +08:00
白了个白 0cbb513a60 作业批改：常规作业ui修改 2024-09-19 15:29:52 +08:00
lyc be765b21b6 Merge pull request 'lyc-dev' (#223) from lyc-dev into main 2024-09-19 15:15:26 +08:00
lyc 34c1c66b31 edit 教材 2024-09-19 15:15:16 +08:00
lyc 5f06657b09 教学实践 2024-09-19 14:58:54 +08:00
白了个白 3ec25f07b4 作业批改：接口传参未传状态值bug修改 2024-09-19 14:25:33 +08:00
zdg 49de9ee9c2 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-19 12:02:51 +08:00
zdg 0ef5ef424f bug修复，以及代码优化 2024-09-19 12:02:31 +08:00
白了个白 9d7aad1946 Merge branch 'zouyf_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-19 11:28:45 +08:00
lyc db2be260a7 教材edit 2024-09-19 11:25:01 +08:00
白了个白 129f875469 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-19 10:54:31 +08:00
白了个白 2c6da76cf7 作业设计跳转web端逻辑修改 2024-09-19 10:52:33 +08:00
ekooo 499e428138 Merge branch 'main' into zouyf_dev 
# Conflicts:
#	src/renderer/src/components/set-homework/index.vue
 2024-09-18 20:02:53 +08:00
朱浩 81f873bcc3 Merge branch 'main' into zhuhao_dev 2024-09-18 17:31:14 +08:00
lyc c58322ca0b Merge pull request '作业查询修改' (#219) from lyc-dev into main 2024-09-18 16:11:59 +08:00
lyc 08dad41e4d 作业查询修改 2024-09-18 16:11:54 +08:00