Commit Graph

819 Commits

Author SHA1 Message Date
朱浩 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