Compare commits

..

700 Commits
1.2.0 ... main

Author SHA1 Message Date
zouyf a4a839931d Merge pull request 'zouyf_dev' (#397) from zouyf_dev into main
Reviewed-on: #397
2024-11-11 16:58:11 +08:00
“zouyf” 1844af01da 1 2024-11-11 16:56:56 +08:00
“zouyf” 163764cf1c Merge branch 'main' into zouyf_dev 2024-11-11 16:54:10 +08:00
“zouyf” 7273f7f835 限制题目上线 2024-11-11 16:53:56 +08:00
lyc 28ba027407 Merge pull request '打包' (#395) from lyc-dev into main 2024-11-11 16:21:50 +08:00
lyc b35daeb3c7 打包 2024-11-11 16:15:15 +08:00
baigl a7ac61e32f Merge pull request 'baigl' (#394) from baigl into main
Reviewed-on: #394
2024-11-11 15:04:18 +08:00
白了个白 f58a38dceb 1 2024-11-11 15:03:17 +08:00
“zouyf” cb910068e0 正常查询10条 2024-11-11 14:49:05 +08:00
“zouyf” 01ee2c8c85 Merge branch 'baigl' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-11-11 13:43:41 +08:00
“zouyf” 768b3e7abf Revert "1"
This reverts commit f504cee74b.
2024-11-11 13:43:35 +08:00
“zouyf” f504cee74b 1 2024-11-11 13:43:09 +08:00
白了个白 6c66c97e33 1 2024-11-11 12:53:16 +08:00
白了个白 2929997d17 作业设计:课程选择过快请求添加防抖 2024-11-11 10:02:23 +08:00
zouyf 96c074d396 [作业设计] - 下拉刷新试题 2024-11-09 16:50:28 +08:00
zouyf 15633f065f 1 2024-11-09 14:30:26 +08:00
zouyf 9d45b72771 Merge branch 'baigl' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zouyf_dev 2024-11-09 12:22:55 +08:00
白了个白 f5c42958f4 1 2024-11-08 17:25:36 +08:00
白了个白 3b8e36454a 1 2024-11-08 17:22:42 +08:00
白了个白 dd64e4e085 习题查询:加上分页传参 2024-11-08 15:39:05 +08:00
“zouyf” 7740346b49 Merge branch 'main' into zouyf_dev 2024-11-08 15:08:17 +08:00
baigl dfd56d6f52 Merge pull request 'baigl' (#393) from baigl into main
Reviewed-on: #393
2024-11-08 09:58:36 +08:00
白了个白 ea3e416f8f Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-11-08 09:56:47 +08:00
白了个白 5e948d9b95 作业设计:习题来源同步web端的菁优网 2024-11-08 09:51:17 +08:00
“zouyf” a75e4bcc52 Merge branch 'baigl' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zouyf_dev 2024-11-06 16:00:37 +08:00
白了个白 201b10a91e 工作台作业:逻辑更改 2024-11-06 09:56:43 +08:00
白了个白 a918aa18e9 作业批改列表:逻辑代码优化 2024-11-05 17:28:16 +08:00
“zouyf” 6c87321900 Merge branch 'baigl' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zouyf_dev 2024-11-05 14:04:35 +08:00
白了个白 1cc0bf965e 1 2024-11-05 11:15:06 +08:00
白了个白 2407e66e66 作业批改:已批改日期更改 2024-11-05 11:12:14 +08:00
zhengdegang 09914eb8f9 Merge pull request '修复bug' (#392) from zdg into main
Reviewed-on: #392
2024-11-04 21:55:00 +08:00
zdg f1cdb7b400 修复bug 2024-11-04 21:53:37 +08:00
白了个白 033c0a3b19 作业批阅:待继续完善 2024-11-04 17:31:30 +08:00
zhengdegang d4f58d8a05 Merge pull request 'zdg' (#391) from zdg into main
Reviewed-on: #391
2024-11-04 16:30:25 +08:00
zdg a4647ff828 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-11-04 16:29:43 +08:00
zdg 7e18f2e9d9 ppt上课-资源更新 2024-11-04 16:29:34 +08:00
白了个白 b07a4e07b9 作业批改:需求更新,界面调整 2024-11-04 15:36:00 +08:00
白了个白 4be888e39e Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-11-04 11:27:32 +08:00
白了个白 e1c8ab42d9 作业批改:需求变更修改 2024-11-04 11:25:58 +08:00
zhengdegang e79d554987 Merge pull request '优化ppt上课' (#390) from zdg into main
Reviewed-on: #390
2024-11-04 09:41:37 +08:00
zdg fbacb32940 优化ppt上课 2024-11-04 09:40:16 +08:00
zhengdegang 7d20a7ee50 Merge pull request 'zdg' (#389) from zdg into main
Reviewed-on: #389
2024-11-01 12:55:07 +08:00
zdg e494c303f0 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-11-01 12:54:12 +08:00
zdg 0fcaf3f3e7 ppt 上课优化 2024-11-01 12:54:01 +08:00
zouyf 91f43987f7 Merge pull request 'zouyf_dev' (#388) from zouyf_dev into main
Reviewed-on: #388
2024-11-01 11:22:40 +08:00
“zouyf” 9ab2c17b3e Merge branch 'main' into zouyf_dev 2024-11-01 11:22:03 +08:00
“zouyf” 21dfced02e [考试分析] - 优化获取真题 2024-11-01 11:21:40 +08:00
zhengdegang c3d6c2a57b Merge pull request 'zdg' (#387) from zdg into main
Reviewed-on: #387
2024-10-31 20:17:23 +08:00
zdg 674f98a53a Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-10-31 20:16:03 +08:00
zdg d4a02e85ce 自动关闭-屏蔽该功能 2024-10-31 20:15:45 +08:00
lyc 4fbd4d8f0f Merge pull request '默认用户头像' (#386) from lyc-dev into main 2024-10-31 16:54:44 +08:00
lyc 4578bbca58 默认用户头像 2024-10-31 16:55:19 +08:00
yangws 8cffee606a Merge pull request 'fix:知识点分数修改;' (#385) from yangws into main
Reviewed-on: #385
2024-10-31 16:37:26 +08:00
小杨 9e24b6111d fix:知识点分数修改; 2024-10-31 16:37:02 +08:00
yangws 0433febf06 Merge pull request 'fix:知识点得分率计算;' (#384) from yangws into main
Reviewed-on: #384
2024-10-31 16:02:13 +08:00
小杨 6370086c85 fix:知识点得分率计算; 2024-10-31 16:01:50 +08:00
zhengdegang 7da598b30e Merge pull request 'zdg' (#383) from zdg into main
Reviewed-on: #383
2024-10-31 15:07:49 +08:00
zdg eafdb718b6 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-10-31 15:07:16 +08:00
zdg d44516226e 上课修改 2024-10-31 15:07:04 +08:00
yangws 4afa20808c Merge pull request 'fix:知识点分数计算;' (#382) from yangws into main
Reviewed-on: #382
2024-10-31 14:08:52 +08:00
小杨 a0327ad556 fix:知识点分数计算; 2024-10-31 14:08:20 +08:00
baigl ada6659666 Merge pull request 'baigl' (#381) from baigl into main
Reviewed-on: #381
2024-10-31 13:51:22 +08:00
白了个白 d65eb565e5 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-10-31 13:49:44 +08:00
zouyf 678f43e548 Merge pull request 'zouyf_dev' (#380) from zouyf_dev into main
Reviewed-on: #380
2024-10-31 12:36:31 +08:00
“zouyf” 8f4845a37c [逐题讲解] - 兼容填空自建题 2024-10-31 12:33:16 +08:00
白了个白 2db7d3e872 作业批改 2024-10-30 17:06:57 +08:00
“zouyf” 4c10409e07 Merge branch 'main' into zouyf_dev 2024-10-30 15:33:24 +08:00
zhengdegang 4418d1ae27 Merge pull request 'zdg' (#379) from zdg into main
Reviewed-on: #379
2024-10-30 13:55:37 +08:00
zdg fc7868afa6 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-10-30 13:54:28 +08:00
zdg 1b3d226412 点赞-颜色恢复 2024-10-30 13:54:18 +08:00
zhengdegang fb5daf221f Merge pull request '点赞颜色统一 apt' (#378) from zdg into main
Reviewed-on: #378
2024-10-30 10:37:18 +08:00
zdg eca5f8f815 点赞颜色统一 apt 2024-10-30 10:36:18 +08:00
“zouyf” d845377879 Merge branch 'main' into zouyf_dev 2024-10-29 16:29:02 +08:00
“zouyf” 90d37e725b [作业批改] - 学生答题提交 2024-10-29 16:28:37 +08:00
yangws adc4f99636 Merge pull request 'fix:新增学生的得分以及修改得分率;' (#377) from yangws into main
Reviewed-on: #377
2024-10-29 14:13:33 +08:00
小杨 531a62ad64 fix:新增学生的得分以及修改得分率; 2024-10-29 14:12:59 +08:00
lyc 6ca1fb0883 Merge pull request '更新打包' (#376) from lyc-dev into main 2024-10-28 21:04:49 +08:00
lyc f836085c68 更新打包 2024-10-28 21:04:13 +08:00
zouyf cf49fbf23f Merge pull request '[推送作业] - 优化作业说明' (#375) from zouyf_dev into main
Reviewed-on: #375
2024-10-28 18:09:42 +08:00
zouyf f3d90b7d95 [推送作业] - 优化作业说明 2024-10-28 18:08:15 +08:00
yangws 06cb96c7bc Merge pull request 'fix:地址修改;' (#374) from yangws into main
Reviewed-on: #374
2024-10-28 17:14:47 +08:00
小杨 8784c0cfe3 fix:地址修改; 2024-10-28 17:14:14 +08:00
yangws 9e13e3dfb5 Merge pull request 'fix:作业统计相关问题以及优化;' (#373) from yangws into main
Reviewed-on: #373
2024-10-28 17:12:52 +08:00
小杨 c8aae6f408 fix:作业统计相关问题以及优化; 2024-10-28 17:12:32 +08:00
baigl 13f7398d79 Merge pull request 'baigl' (#372) from baigl into main
Reviewed-on: #372
2024-10-28 14:15:11 +08:00
白了个白 6ef29f2b5a Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-10-28 14:14:20 +08:00
白了个白 5cf7d737d6 批阅:习题学生答案背景颜色修改-对绿错红 2024-10-28 14:13:56 +08:00
baigl 346b07e47a Merge pull request '作业批阅:习题训练类型 新增客观题自动批阅逻辑更改' (#371) from baigl into main
Reviewed-on: #371
2024-10-28 10:50:14 +08:00
白了个白 743d8e05d3 作业批阅:习题训练类型 新增客观题自动批阅逻辑更改 2024-10-28 10:48:51 +08:00
yangws 7c9b2755f2 Merge pull request 'fix:价值透析数据修改;' (#370) from yangws into main
Reviewed-on: #370
2024-10-25 16:41:15 +08:00
小杨 25acd398ff fix:价值透析数据修改; 2024-10-25 16:40:53 +08:00
yangws fe078e7ce5 Merge pull request 'fix:价值透析数据修改;' (#369) from yangws into main
Reviewed-on: #369
2024-10-25 16:37:28 +08:00
小杨 eaaba2b5e8 fix:价值透析数据修改; 2024-10-25 16:37:06 +08:00
zhengdegang 4816a4565b Merge pull request 'zdg' (#368) from zdg into main
Reviewed-on: #368
2024-10-25 15:29:56 +08:00
zdg 8b55ebffa5 ppt点赞优化 2024-10-25 15:28:54 +08:00
zdg 9674c68d11 修复-侧边工具 2024-10-25 15:05:25 +08:00
朱浩 906559134e Merge pull request '版本管理' (#367) from zhuhao_dev into main
Reviewed-on: #367
2024-10-25 14:35:33 +08:00
朱浩 ed3559f34f 版本管理 2024-10-25 14:34:53 +08:00
yangws f224f8b048 Merge pull request 'fix:第三方资源图片预览修改;' (#366) from yangws into main
Reviewed-on: #366
2024-10-25 13:56:58 +08:00
小杨 5790e87a85 fix:第三方资源图片预览修改; 2024-10-25 13:56:34 +08:00
yangws 4b6a7918a9 Merge pull request 'add:表格自动批阅;' (#365) from yangws into main
Reviewed-on: #365
2024-10-25 10:53:15 +08:00
小杨 7e71af0cb7 add:表格自动批阅; 2024-10-25 10:52:42 +08:00
zouyf bdc508a0fa Merge pull request 'zouyf_dev' (#364) from zouyf_dev into main
Reviewed-on: #364
2024-10-25 10:23:59 +08:00
“zouyf” fab449cc96 Merge branch 'main' into zouyf_dev 2024-10-25 10:21:33 +08:00
“zouyf” 5879f3d5e8 [作业批改] - 逐题字体修改 2024-10-25 10:20:48 +08:00
朱浩 4d20a27177 Merge pull request 'zhuhao_dev' (#363) from zhuhao_dev into main
Reviewed-on: #363
2024-10-24 17:04:45 +08:00
朱浩 302c82503a Merge branch 'main' into zhuhao_dev 2024-10-24 17:03:31 +08:00
朱浩 afd1a1dcf9 版本管理 2024-10-24 17:03:18 +08:00
zhengdegang 9c1cd2a2fc Merge pull request 'zdg' (#362) from zdg into main
Reviewed-on: #362
2024-10-24 17:03:03 +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 812e799e2a Merge pull request 'zouyf_dev' (#361) from zouyf_dev into main
Reviewed-on: #361
2024-10-24 14:49:33 +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
yangws a731dff62c Merge pull request 'fix:url地址更改;' (#360) from yangws into main
Reviewed-on: #360
2024-10-24 14:38:02 +08:00
小杨 dac36e611d fix:url地址更改; 2024-10-24 14:37:38 +08:00
yangws b574464a1e Merge pull request 'add:用时分析改为柱状图;' (#359) from yangws into main
Reviewed-on: #359
2024-10-24 14:37:04 +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
yangws 14340e211d Merge pull request 'yangws' (#357) from yangws into main
Reviewed-on: #357
2024-10-23 15:50:44 +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
lyc e457ac9baf Merge pull request '调整ppt上课 作业查询' (#356) from lyc-dev into main 2024-10-23 10:43:25 +08:00
baigl 7b2ad4ce64 Merge pull request 'baigl' (#355) from baigl into main
Reviewed-on: #355
2024-10-22 17:31:41 +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
yangws 6467203c26 Merge pull request 'yangws' (#354) from yangws into main
Reviewed-on: #354
2024-10-22 16:59:52 +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 2f726bccfb Merge pull request 'zouyf_dev' (#353) from zouyf_dev into main
Reviewed-on: #353
2024-10-22 16:54:40 +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
baigl 08ed5c9f2f Merge pull request 'baigl' (#352) from baigl into main
Reviewed-on: #352
2024-10-22 16:16:43 +08:00
白了个白 35a00e2aca 作业批阅:最小化再次打开会刷新的逻辑修改 2024-10-22 16:04:03 +08:00
“zouyf” ab127958f9 Merge branch 'main' into zouyf_dev 2024-10-22 14:54:57 +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 bcc9a66df6 Merge pull request 'zouyf_dev' (#350) from zouyf_dev into main
Reviewed-on: #350
2024-10-21 16:46:40 +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
yangws 6c1bb40826 Merge pull request 'fix:获取学生id;' (#349) from yangws into main
Reviewed-on: #349
2024-10-20 17:46:51 +08:00
小杨 ea861dd2ea fix:获取学生id; 2024-10-20 17:45:42 +08:00
lyc ff2e05fb6b Merge pull request 'edit' (#348) from lyc-dev into main 2024-10-20 17:08:22 +08:00
lyc b7425da4da edit 2024-10-20 17:08:57 +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
yangws 54d4896e18 Merge pull request 'fix:判断没有学生回答题目的情况;' (#346) from yangws into main
Reviewed-on: #346
2024-10-20 15:25:37 +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
yangws 5ff18bf4aa Merge pull request 'yangws' (#344) from yangws into main
Reviewed-on: #344
2024-10-20 01:36:42 +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
朱浩 cf05038c0d Merge pull request 'zhuhao_dev' (#343) from zhuhao_dev into main
Reviewed-on: #343
2024-10-19 18:02:44 +08:00
朱浩 a72177d02e Merge branch 'main' into zhuhao_dev 2024-10-19 18:02:09 +08:00
朱浩 39f46a1709 生成PPT后自动打开 2024-10-19 18:01:52 +08:00
朱浩 d03e6e2fbc Merge pull request 'zhuhao_dev' (#342) from zhuhao_dev into main
Reviewed-on: #342
2024-10-19 17:34:04 +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 7b4e6d0b10 Merge pull request 'qinqing_dev' (#340) from qinqing_dev into main
Reviewed-on: #340
2024-10-19 17:20:26 +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
baigl d58dff8731 Merge pull request 'baigl' (#339) from baigl into main
Reviewed-on: #339
2024-10-19 17:15:41 +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 f5497aa856 Merge pull request 'qinqing_dev' (#337) from qinqing_dev into main
Reviewed-on: #337
2024-10-19 16:59:09 +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 95f94f0c3e Merge pull request '考试分析-题目详情-增加灰色背景' (#335) from lyc-dev into main 2024-10-19 16:12:19 +08:00
lyc 4dbb5d2224 考试分析-题目详情增加关闭按钮 2024-10-19 15:59:20 +08:00
lyc 3430ad75ca Merge pull request '考试分析-题目详情增加关闭按钮' (#334) from lyc-dev into main 2024-10-19 15:59:08 +08:00
baigl 388fc2b2b4 Merge pull request 'baigl' (#333) from baigl into main
Reviewed-on: #333
2024-10-19 15:07:35 +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
zhengdegang e8763793a7 Merge pull request 'zdg' (#332) from zdg into main
Reviewed-on: #332
2024-10-18 17:08:45 +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
朱浩 e02f67e3e5 Merge pull request 'zhuhao_dev' (#331) from zhuhao_dev into main
Reviewed-on: #331
2024-10-18 16:34:01 +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
baigl 83c377fd9e Merge pull request 'baigl' (#330) from baigl into main
Reviewed-on: #330
2024-10-18 10:13:12 +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
yangws a83cbc2ba2 Merge pull request 'fix:判断图表为0的时候的情况;' (#329) from yangws into main
Reviewed-on: #329
2024-10-18 09:34:55 +08:00
小杨 a521010392 fix:判断图表为0的时候的情况; 2024-10-18 09:34:28 +08:00
白了个白 b132bb5813 作业布置、作业设计跳转优化 2024-10-17 17:25:21 +08:00
baigl 09575b9896 Merge pull request 'baigl' (#328) from baigl into main
Reviewed-on: #328
2024-10-17 13:52:20 +08:00
白了个白 436cde508c Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-10-17 13:51:28 +08:00
白了个白 0e42ce08e1 1 2024-10-17 13:50:21 +08:00
baigl be4f9d2499 Merge pull request 'baigl' (#327) from baigl into main
Reviewed-on: #327
2024-10-17 11:29:35 +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
yangws 16761d3fc8 Merge pull request 'fix:柱状图展示修改;' (#326) from yangws into main
Reviewed-on: #326
2024-10-17 10:45:32 +08:00
小杨 03b5eccab0 fix:柱状图展示修改; 2024-10-17 10:44:55 +08:00
baigl add2a3e621 Merge pull request 'baigl' (#325) from baigl into main
Reviewed-on: #325
2024-10-17 10:44:08 +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
朱浩 ae433b7520 Merge pull request 'zhuhao_dev' (#324) from zhuhao_dev into main
Reviewed-on: #324
2024-10-16 14:32:50 +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
zhengdegang 206a81eeee Merge pull request 'zdg' (#323) from zdg into main
Reviewed-on: #323
2024-10-16 12:13:01 +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
zouyf 4d9ae0ab90 Merge pull request 'zouyf_dev' (#322) from zouyf_dev into main
Reviewed-on: #322
2024-10-16 09:39:23 +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
yangws 1a447b30fb Merge pull request 'fix:作业批阅柱状图改为百分比显示;' (#321) from yangws into main
Reviewed-on: #321
2024-10-15 16:36:21 +08:00
小杨 1c9a3762ef fix:作业批阅柱状图改为百分比显示; 2024-10-15 16:34:31 +08:00
lyc ea88aa959d Merge pull request 'lyc-dev' (#320) from lyc-dev into main 2024-10-15 16:30:12 +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
朱浩 7fa76e0f7e Merge branch 'main' into zhuhao_dev
# Conflicts:
#	src/renderer/src/views/classManage/reserv-item-apt.vue
#	src/renderer/src/views/prepare/container/kj-list-item.vue
2024-10-15 15:40:08 +08:00
zhengdegang 540229cd9b Merge pull request 'apt ppt 上下课、继续上课' (#319) from zdg into main
Reviewed-on: #319
2024-10-15 15:35:12 +08:00
zdg 2115d2c76a apt ppt 上下课、继续上课 2024-10-15 15:33:07 +08:00
yangws d068d4e71a Merge pull request 'fix: 作业批阅展示修改;' (#318) from yangws into main
Reviewed-on: #318
2024-10-15 15:25:10 +08:00
小杨 1ef4615587 fix: 作业批阅展示修改; 2024-10-15 15:24:06 +08:00
baigl a853214741 Merge pull request 'baigl' (#317) from baigl into main
Reviewed-on: #317
2024-10-15 15:09:25 +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
朱浩 b3e75e799e Merge branch 'main' into zhuhao_dev 2024-10-15 09:23:04 +08:00
白了个白 b0415ecafa 作业布置:新增 框架梳理 列表详情预览 2024-10-14 17:26:49 +08:00
qinqing 1724419848 Merge pull request 'qinqing_dev' (#316) from qinqing_dev into main
Reviewed-on: #316
2024-10-14 17:18:38 +08:00
qinqing 37652cd803 Merge branch 'main' into qinqing_dev 2024-10-14 17:17:55 +08:00
qinqing 506f95060b 优化PDF插件工具栏 2024-10-14 17:17:04 +08:00
qinqing d68e4fef0b Merge pull request '修改默认展示判定逻辑' (#315) from qinqing_dev into main
Reviewed-on: #315
2024-10-14 16:25:37 +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 14c4ede80e Merge pull request '删除 hooks、useGetClassWork.js' (#314) from lyc-dev into main 2024-10-14 15:11:49 +08:00
lyc bf642ddc79 删除 hooks、useGetClassWork.js 2024-10-14 15:12:05 +08:00
白了个白 ed035f94ed 作业布置:列表排序修改 2024-10-14 11:22:37 +08:00
baigl 35af866a53 Merge pull request '作业布置:推送多个班级的学生bug修复' (#313) from baigl into main
Reviewed-on: #313
2024-10-14 10:59:55 +08:00
白了个白 58988313b7 作业布置:推送多个班级的学生bug修复 2024-10-14 10:57:02 +08:00
朱浩 81cd69beb9 暂时取消APT的上课判断 2024-10-11 17:31:12 +08:00
朱浩 0bb03dad5e 暂时取消APT的上课判断 2024-10-11 16:40:07 +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
baigl 3fb3af9cae Merge pull request 'baigl' (#311) from baigl into main
Reviewed-on: #311
2024-10-11 16:33:56 +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 ee4088ad75 Merge pull request 'zouyf_dev' (#310) from zouyf_dev into main
Reviewed-on: #310
2024-10-11 16:31:18 +08:00
“zouyf” 082a824adf Merge branch 'main' into zouyf_dev 2024-10-11 16:30:20 +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 5b1986afaf Merge pull request 'zouyf_dev' (#309) from zouyf_dev into main
Reviewed-on: #309
2024-10-11 16:05:36 +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
朱浩 155631a3e3 Merge pull request 'zhuhao_dev' (#308) from zhuhao_dev into main
Reviewed-on: #308
2024-10-11 15:01:02 +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
baigl 233d065f9c Merge pull request 'baigl' (#305) from baigl into main
Reviewed-on: #305
2024-10-10 15:53:17 +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 ad541fd929 Merge pull request 'zouyf_dev' (#304) from zouyf_dev into main
Reviewed-on: #304
2024-10-10 15:37:11 +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 05286236b7 Merge branch 'main' into lyc-dev 2024-10-10 15:07:04 +08:00
lyc 039dfe2e09 替换apt图标 2024-10-10 15:06:52 +08:00
lyc 0cd00809ed Merge pull request 'lyc-dev' (#303) from lyc-dev into main 2024-10-10 15:06:46 +08:00
白了个白 e7f439dd0c 1 2024-10-10 14:00:29 +08:00
lyc 95965aa4b5 edit 2024-10-10 10:57:19 +08:00
lyc ad5025f6aa Merge pull request 'edit' (#302) from lyc-dev into main 2024-10-10 10:56:58 +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 615be3302c Merge pull request '修复一些问题' (#301) from lyc-dev into main 2024-10-09 16:55:13 +08:00
lyc 3921c1a425 冲突 2024-10-09 16:55:30 +08:00
lyc 34da5fb432 修复一些问题 2024-10-09 16:52:47 +08:00
zouyf 9c21458c57 Merge pull request '[教学实践] - 作业中增加作业设计及单任务编辑' (#300) from zouyf_dev into main
Reviewed-on: #300
2024-10-09 16:19:26 +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
lyc 8bddb166a3 Merge pull request '登录-清除缓存的数据' (#299) from lyc-dev into main 2024-10-09 11:28:54 +08:00
白了个白 4b3c511af1 1 2024-10-09 10:18:29 +08:00
lyc 22c377cd57 结束上课 2024-10-09 09:38:58 +08:00
lyc 8a17273605 Merge pull request '结束上课' (#298) from lyc-dev into main 2024-10-09 09:38:43 +08:00
zhengdegang b13dae5b92 Merge pull request 'zdg' (#297) from zdg into main
Reviewed-on: #297
2024-10-09 09:31:41 +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 5e247006c5 Merge pull request '去掉返回' (#296) from lyc-dev into main 2024-10-08 14:01:24 +08:00
lyc f2387c709a 去掉返回 2024-10-08 14:01:39 +08:00
lyc 03f98c8beb Merge pull request '去掉返回' (#295) from lyc-dev into main 2024-10-08 11:23:41 +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
zhengdegang 9b5a2ec88d Merge pull request 'zdg' (#294) from zdg into main
Reviewed-on: #294
2024-09-29 15:36:27 +08:00
zdg 32b0cdafc6 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-29 15:35:35 +08:00
zdg 17e3ee62df 修复二维码异常 2024-09-29 15:35:25 +08:00
zhengdegang 1f43e70175 Merge pull request 'zdg' (#293) from zdg into main
Reviewed-on: #293
2024-09-29 15:15:03 +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 3992cc814a Merge pull request '文字描述' (#292) from lyc-dev into main 2024-09-29 11:10:27 +08:00
lyc 19e385ec24 文字描述 2024-09-29 11:10:28 +08:00
baigl bac959c0bb Merge pull request 'baigl' (#291) from baigl into main
Reviewed-on: #291
2024-09-29 09:32:36 +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
zhengdegang 28b189e965 Merge pull request 'zdg' (#290) from zdg into main
Reviewed-on: #290
2024-09-27 16:55:38 +08:00
zdg 8ea28d2635 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-27 16:54:37 +08:00
zdg 352bb9be97 还原二维码 2024-09-27 16:54:29 +08:00
zhengdegang 7c8e10628b Merge pull request '增加刷新二维码' (#289) from zdg into main
Reviewed-on: #289
2024-09-27 16:41:50 +08:00
zdg 0ea299c317 增加刷新二维码 2024-09-27 16:41:19 +08:00
zouyf 5fa328fd93 Merge pull request 'zouyf_dev' (#288) from zouyf_dev into main
Reviewed-on: #288
2024-09-27 16:30:52 +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
zhengdegang 3caa561610 Merge pull request 'zdg' (#286) from zdg into main
Reviewed-on: #286
2024-09-27 15:54:54 +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
朱浩 716c1dd0a9 Merge pull request 'zhuhao_dev' (#285) from zhuhao_dev into main
Reviewed-on: #285
2024-09-27 15:15:28 +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
yangws 988c6160bb Merge pull request 'fix : 样式问题;' (#284) from yangws into main
Reviewed-on: #284
2024-09-27 15:08:23 +08:00
小杨 0119a92501 fix : 样式问题; 2024-09-27 15:07:58 +08:00
yangws e1dfc0f8b4 Merge pull request 'fix:新建分组前清空操作;' (#283) from yangws into main
Reviewed-on: #283
2024-09-27 15:06:30 +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
baigl 042f8e5907 Merge pull request 'baigl' (#282) from baigl into main
Reviewed-on: #282
2024-09-27 14:50:22 +08:00
“zouyf” 2ca4117561 1 2024-09-27 14:50:18 +08:00
白了个白 db20978575 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-27 14:49:21 +08:00
白了个白 2887528e9e 作业批改ui调整 2024-09-27 14:48:52 +08:00
baigl 34900832ba Merge pull request 'baigl' (#281) from baigl into main
Reviewed-on: #281
2024-09-27 12:52:57 +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
lyc bd82605109 Merge pull request '丑' (#280) from lyc-dev into main 2024-09-27 11:01:00 +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
朱浩 db2218b1c5 Merge pull request 'zhuhao_dev' (#278) from zhuhao_dev into main
Reviewed-on: #278
2024-09-27 10:13:44 +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
zhengdegang 1152859479 Merge pull request 'zdg' (#277) from zdg into main
Reviewed-on: #277
2024-09-27 09:29:44 +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 0d5e9755cb Merge pull request 'qinqing_dev' (#276) from qinqing_dev into main
Reviewed-on: #276
2024-09-26 17:26:22 +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 773a795707 Merge pull request 'lyc-dev' (#275) from lyc-dev into main 2024-09-26 16:39:19 +08:00
lyc 3b84a340aa 上课里面的章节,教材edit 2024-09-26 16:38:29 +08:00
zouyf b1b4d8e9e1 Merge pull request 'zouyf_dev' (#274) from zouyf_dev into main
Reviewed-on: #274
2024-09-26 16:26:07 +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 9b33b7d6e6 Merge pull request 'zouyf_dev' (#272) from zouyf_dev into main
Reviewed-on: #272
2024-09-26 14:13:56 +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 bf7258f005 Merge pull request 'lyc-dev' (#271) from lyc-dev into main 2024-09-25 16:13:59 +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
朱浩 49f87a4709 Merge pull request 'zhuhao_dev' (#270) from zhuhao_dev into main
Reviewed-on: #270
2024-09-25 15:28:33 +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 213eacb689 Merge pull request '重新登陆手机号获取' (#269) from lyc-dev into main 2024-09-25 14:28:42 +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 30bcc7bfc1 Merge pull request 'qinqing_dev' (#268) from qinqing_dev into main
Reviewed-on: #268
2024-09-25 13:47:09 +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 38d3e6a906 Merge pull request 'lyc-dev' (#267) from lyc-dev into main 2024-09-25 11:25:30 +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
baigl 93a5ffef20 Merge pull request 'baigl' (#266) from baigl into main
Reviewed-on: #266
2024-09-25 10:11:03 +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 4e478f487a Merge pull request 'zouyf_dev' (#265) from zouyf_dev into main
Reviewed-on: #265
2024-09-25 09:52:30 +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 5660d8d167 Merge pull request 'lyc-dev' (#264) from lyc-dev into main 2024-09-25 09:42:53 +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
“zouyf” b6d9082e1b Merge branch 'main' into zouyf_dev 2024-09-24 16:54:09 +08:00
baigl 918504570f Merge pull request 'baigl' (#261) from baigl into main
Reviewed-on: #261
2024-09-24 16:34:37 +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
“zouyf” c957961a0b Merge branch 'main' into zouyf_dev 2024-09-24 16:24:22 +08:00
朱浩 09159ae2d8 Merge pull request 'zhuhao_dev' (#260) from zhuhao_dev into main
Reviewed-on: #260
2024-09-24 16:23:23 +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
朱浩 da20aecfc6 更名文枢课堂 2024-09-24 16:20:20 +08:00
朱浩 d46a86e303 更名文枢课堂 2024-09-24 16:20:06 +08:00
“zouyf” 26576ad086 Merge branch 'main' into zouyf_dev 2024-09-24 15:54:42 +08:00
qinqing 32baef766f Merge pull request 'qinqing_dev' (#259) from qinqing_dev into main
Reviewed-on: #259
2024-09-24 15:37:39 +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
yangws 0e832a4a32 Merge pull request 'fix:2.0.4bug修改;' (#250) from yangws into main
Reviewed-on: #250
2024-09-24 13:57:31 +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
yangws 4596ce4911 Merge remote-tracking branch 'origin/main' into yangws 2024-09-23 17:30:05 +08:00
zhengdegang 83e985e0d6 Merge pull request 'zdg' (#257) from zdg into main
Reviewed-on: #257
2024-09-23 17:28:43 +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 fa6f61e3b3 Merge pull request 'lyc-dev' (#256) from lyc-dev into main 2024-09-23 17:24:35 +08:00
lyc bfa7cc4cd9 Merge branch 'main' into lyc-dev 2024-09-23 17:22:56 +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 47390723a7 Merge pull request '跳转修改' (#255) from lyc-dev into main 2024-09-23 16:50:23 +08:00
lyc 713a592bcf 跳转修改 2024-09-23 16:49:48 +08:00
yangws d1ae68d184 Merge remote-tracking branch 'origin/main' into yangws 2024-09-23 16:24:05 +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
zhengdegang 776e77a88c Merge pull request 'zdg' (#253) from zdg into main
Reviewed-on: #253
2024-09-23 11:06:14 +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
lyc 8b9cc3f1ee Merge pull request '推出 提示正在上课' (#252) from lyc-dev into main 2024-09-23 10:38:18 +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 a5ad6c2250 Merge pull request 'edit' (#251) from lyc-dev into main 2024-09-23 09:58:48 +08:00
lyc 60e31f4b43 edit 2024-09-23 09:58:47 +08:00
yangws e36ede941c Merge remote-tracking branch 'origin/main' into yangws 2024-09-23 09:32:35 +08:00
“zouyf” d1ab430a6c Merge branch 'main' into zouyf_dev 2024-09-23 09:26:44 +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
yangws 87a50c397f fix:2.0.4bug修改; 2024-09-23 09:20:19 +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
朱浩 56976c6642 Merge branch 'main' into zhuhao_dev 2024-09-22 16:48:16 +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 c2b54714ac Merge pull request '跳转增加bookid' (#248) from lyc-dev into main 2024-09-22 16:41:45 +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
朱浩 dfe28eb037 打包联通文枢课堂 2024-09-22 14:36:25 +08:00
朱浩 03e61c8440 Merge pull request '打包联通文枢课堂' (#247) from zhuhao_dev into main
Reviewed-on: #247
2024-09-22 14:28:29 +08:00
朱浩 79b9a0726a 打包联通文枢课堂 2024-09-22 14:27:48 +08:00
朱浩 0ccde18f00 Merge pull request 'zhuhao_dev' (#246) from zhuhao_dev into main
Reviewed-on: #246
2024-09-22 14:02:32 +08:00
朱浩 274c80ad0a Merge branch 'main' into zhuhao_dev 2024-09-22 14:02:02 +08:00
yangws 923006eab1 Merge pull request 'fix:2.0.4bug修改;' (#245) from yangws into main
Reviewed-on: #245
2024-09-22 12:52:53 +08:00
yangws a64ba24742 fix:2.0.4bug修改; 2024-09-22 12:51:58 +08:00
lyc df1f8737bd Merge pull request '点击章节 存储章节id (临时)' (#244) from lyc-dev into main 2024-09-22 12:34:16 +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 92667a7d25 Merge pull request '注册账号-班级修改为可选' (#243) from lyc-dev into main 2024-09-22 10:38:38 +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 9ff824e082 Merge pull request '修改工具拖动' (#242) from zdg into main
Reviewed-on: #242
2024-09-20 16:27:54 +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
朱浩 049768c8b6 Merge pull request 'BUG修复' (#240) from zhuhao_dev into main
Reviewed-on: #240
2024-09-20 15:29:56 +08:00
朱浩 ac599a2c39 BUG修复 2024-09-20 15:29:21 +08:00
lyc 00871797bf edit 2024-09-20 15:24:23 +08:00
lyc fa7a44472b Merge pull request 'edit' (#239) from lyc-dev into main 2024-09-20 15:24:19 +08:00
lyc 85529ad81f Merge pull request 'edit' (#238) from lyc-dev into main 2024-09-20 15:20:27 +08:00
lyc f9a87143aa edit 2024-09-20 15:19:33 +08:00
zhengdegang 17ef183741 Merge pull request 'zdg' (#237) from zdg into main
Reviewed-on: #237
2024-09-20 15:17:16 +08:00
zdg d5833f6f03 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-20 15:16:43 +08:00
zdg c93eeeb308 修复异常 2024-09-20 15:16:34 +08:00
zhengdegang 0d48111e50 Merge pull request '解决 值为null问题' (#236) from zdg into main
Reviewed-on: #236
2024-09-20 15:06:33 +08:00
zdg ca57e72e9c 解决 值为null问题 2024-09-20 15:04:14 +08:00
zhengdegang 928a1401db Merge pull request 'zdg' (#235) from zdg into main
Reviewed-on: #235
2024-09-20 14:57:41 +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 d4cfedf883 Merge pull request 'lyc-dev' (#234) from lyc-dev into main 2024-09-20 14:43:21 +08:00
lyc b5fd1f2a9d edit 2024-09-20 14:42:58 +08:00
lyc c6477d5ca9 edit 2024-09-20 14:34:22 +08:00
lyc 27ec047981 edit 教材选择 2024-09-20 14:30:36 +08:00
zhengdegang 7da4defed4 Merge pull request 'zdg' (#233) from zdg into main
Reviewed-on: #233
2024-09-20 13:54:51 +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
朱浩 a75f151b19 Merge pull request 'BUG修复' (#231) from zhuhao_dev into main
Reviewed-on: #231
2024-09-20 09:22:02 +08:00
朱浩 2531c25d7c BUG修复 2024-09-20 09:21:31 +08:00
朱浩 9e5527d822 Merge pull request 'zhuhao_dev' (#230) from zhuhao_dev into main
Reviewed-on: #230
2024-09-20 09:19:10 +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
baigl bd7f6f765f Merge pull request 'baigl' (#229) from baigl into main
Reviewed-on: #229
2024-09-19 16:58:13 +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
zhengdegang 93a061ca78 Merge pull request 'zdg' (#228) from zdg into main
Reviewed-on: #228
2024-09-19 16:37:45 +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
baigl a082b437b7 Merge pull request 'baigl' (#224) from baigl into main
Reviewed-on: #224
2024-09-19 15:32:32 +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
“zouyf” 7f9afedef9 Merge branch 'main' into zouyf_dev
# Conflicts:
#	src/renderer/src/components/set-homework/index.vue
2024-09-19 14:05:16 +08:00
zhengdegang aa35621b59 Merge pull request 'zdg' (#222) from zdg into main
Reviewed-on: #222
2024-09-19 12:03:47 +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
baigl 89ae43a458 Merge pull request 'baigl' (#221) from baigl into main
Reviewed-on: #221
2024-09-19 11:30:20 +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
“zouyf” 7dcfd487fc Merge branch 'main' into zouyf_dev
# Conflicts:
#	src/renderer/src/components/set-homework/index.vue
2024-09-19 11:11:51 +08:00
baigl b06ad0f411 Merge pull request 'baigl' (#220) from baigl into main
Reviewed-on: #220
2024-09-19 10:58:42 +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
zhengdegang 675613bbee Merge pull request 'zdg' (#218) from zdg into main
Reviewed-on: #218
2024-09-18 15:01:31 +08:00
zdg 9188df0d94 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-18 15:00:30 +08:00
zdg 4e8560b033 解决二维码不出现的问题 2024-09-18 15:00:17 +08:00
“zouyf” 4e835cac82 Merge branch 'main' into zouyf_dev 2024-09-18 14:57:46 +08:00
朱浩 7303128334 Merge branch 'main' into zhuhao_dev 2024-09-18 14:14:35 +08:00
yangws d047e85d03 Merge pull request 'fix: 个人中心任选学科报错问题;' (#217) from yangws into main
Reviewed-on: #217
2024-09-18 14:05:31 +08:00
yangws acd66c11fa fix: 个人中心任选学科报错问题; 2024-09-18 14:04:58 +08:00
朱浩 f90e2548c6 Merge branch 'main' into zhuhao_dev 2024-09-18 13:56:53 +08:00
yangws c32bd6eef4 Merge pull request 'fix: 解决资源库报错的问题;' (#216) from yangws into main
Reviewed-on: #216
2024-09-18 13:56:28 +08:00
yangws 3b9877e788 fix: 解决资源库报错的问题; 2024-09-18 13:55:30 +08:00
朱浩 fb48984e7f APT上课 2024-09-18 11:29:39 +08:00
lyc aaa2aef3ca move-file 2024-09-18 11:13:32 +08:00
lyc 5cfd5747a1 Merge pull request 'move-file' (#215) from lyc-dev into main 2024-09-18 11:13:31 +08:00
lyc 04263cd519 Merge pull request '预约课程-时间限制修改' (#214) from lyc-dev into main 2024-09-18 10:53:27 +08:00
lyc aee945f90f 预约课程-时间限制修改 2024-09-18 10:53:22 +08:00
白了个白 bae24601ef Merge branch 'zouyf_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-18 10:24:55 +08:00
白了个白 980e4d66e8 作业设计 2024-09-18 10:23:13 +08:00
lyc 7439c9759a Merge pull request '布置作业-截止时间默认当前时间' (#213) from lyc-dev into main 2024-09-18 09:42:58 +08:00
lyc ddd53943b8 布置作业-截止时间默认当前时间 2024-09-18 09:42:35 +08:00
ekooo 70ba70df45 [作业设计] - 增加页面 2024-09-17 19:56:32 +08:00
baigl 7ae8547d41 Merge pull request '作业批改 loading Bug修复' (#212) from baigl into main
Reviewed-on: #212
2024-09-14 17:38:44 +08:00
zhengdegang c5c28b4bf5 Merge pull request 'zdg' (#211) from zdg into main
Reviewed-on: #211
2024-09-14 17:34:21 +08:00
zdg 67d7395c47 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
#	src/renderer/src/views/desktop/container/work-trend.vue
2024-09-14 17:32:04 +08:00
白了个白 46adf4c058 作业批改 loading Bug修复 2024-09-14 17:00:14 +08:00
zdg f615efbd88 Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-14 16:39:38 +08:00
zdg 741e7336f3 上课 2024-09-14 16:39:31 +08:00
朱浩 a67f801356 Merge pull request 'zhuhao_dev' (#210) from zhuhao_dev into main
Reviewed-on: #210
2024-09-14 16:01:51 +08:00
朱浩 1c89217fbf Merge branch 'main' into zhuhao_dev 2024-09-14 16:01:08 +08:00
朱浩 3a20f453c6 APT上课 2024-09-14 16:00:45 +08:00
朱浩 dfa5c7d99b APT上课 2024-09-14 15:59:40 +08:00
lyc e144fbe36a Merge pull request 'lyc-dev' (#209) from lyc-dev into main 2024-09-14 15:13:05 +08:00
lyc b279d36c89 edit 2024-09-14 15:12:36 +08:00
lyc 8013b1c2cc edit 2024-09-14 14:59:35 +08:00
baigl 610aac6985 Merge pull request 'baigl' (#208) from baigl into main
Reviewed-on: #208
2024-09-14 14:22:36 +08:00
白了个白 6c85654608 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-14 14:22:02 +08:00
白了个白 a5b6cd3516 1 2024-09-14 14:18:13 +08:00
lyc 01718f573b Merge pull request '警告' (#207) from lyc-dev into main 2024-09-14 13:44:42 +08:00
lyc ec9c673b5a 警告 2024-09-14 13:44:35 +08:00
白了个白 578fc9feba 1 2024-09-14 10:23:45 +08:00
白了个白 f49cba5e36 作业管理:放开作业设计弹窗、作业布置的外部链接跳转;批阅界面需求变更调整; 2024-09-14 10:14:40 +08:00
lyc a92176174a Merge pull request '作业查询' (#206) from lyc-dev into main 2024-09-13 17:19:55 +08:00
lyc 8063783284 作业查询 2024-09-13 17:19:17 +08:00
lyc eadc6f1440 Merge pull request '工作台、资源库调整' (#205) from lyc-dev into main 2024-09-13 17:07:48 +08:00
lyc 8753951796 工作台、资源库调整 2024-09-13 17:03:30 +08:00
白了个白 490add5467 工作台右侧工作动态的作业, 新增可点击并弹框批改 2024-09-13 16:27:09 +08:00
白了个白 634ae460f3 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-13 15:32:58 +08:00
白了个白 1cc7007852 作业分离后 接口传参修改 2024-09-13 14:02:05 +08:00
朱浩 502cf13168 Merge branch 'main' into zhuhao_dev 2024-09-13 09:53:55 +08:00
朱浩 a4fa5be295 文件上传修改 2024-09-13 09:30:36 +08:00
yangws e907a1c07a Merge pull request 'fix: 解决资源库报错的问题;' (#204) from yangws into main
Reviewed-on: #204
2024-09-12 16:53:15 +08:00
yangws 1afaed082a fix: 解决资源库报错的问题; 2024-09-12 16:52:47 +08:00
lyc 69362a6153 Merge pull request 'lyc-dev' (#203) from lyc-dev into main 2024-09-12 16:03:56 +08:00
lyc 1da3ca0ee0 Merge branch 'main' into lyc-dev 2024-09-12 16:03:42 +08:00
lyc d4a6f74cfc 首页调整 2024-09-12 16:03:21 +08:00
zouyf f57c67aab2 Merge pull request 'zouyf_dev' (#202) from zouyf_dev into main
Reviewed-on: #202
2024-09-12 15:58:59 +08:00
“zouyf” 63ad74c77f Merge branch 'main' into zouyf_dev 2024-09-12 15:58:28 +08:00
“zouyf” d171117f03 tmp 2024-09-12 15:58:12 +08:00
lyc 0426b85d3f Merge pull request '工作台' (#201) from lyc-dev into main 2024-09-12 15:42:55 +08:00
lyc 17b8ce1dda 工作台 2024-09-12 15:42:43 +08:00
zhangxuelin 0fa3c84f5e 修改注册bug 2024-09-12 11:09:51 +08:00
zhangxuelin 490536654a Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-12 10:51:38 +08:00
zhangxuelin 2efb870a16 添加注册提示 2024-09-12 10:51:12 +08:00
yangws 5778a8955d Merge pull request 'fix: 提示教材没有时选择教材;' (#200) from yangws into main
Reviewed-on: #200
2024-09-12 09:48:40 +08:00
朱浩 e4e23e7508 Merge pull request '排序问题处理' (#199) from zhuhao_dev into main
Reviewed-on: #199
2024-09-12 09:48:14 +08:00
yangws 6a33ea8023 fix: 提示教材没有时选择教材; 2024-09-12 09:47:46 +08:00
朱浩 bc0579fa32 排序问题处理 2024-09-12 09:47:35 +08:00
yangws 3357cf8a78 Merge pull request 'fix: 样式修改,以及第三方资源名称不对应的情况;' (#198) from yangws into main
Reviewed-on: #198
2024-09-12 09:31:57 +08:00
yangws 3fdf500366 fix: 样式修改,以及第三方资源名称不对应的情况; 2024-09-12 09:30:44 +08:00
zhengdegang e985417675 Merge pull request 'zdg' (#197) from zdg into main
Reviewed-on: #197
2024-09-11 20:06:20 +08:00
zdg 1978d1bac1 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-11 20:05:30 +08:00
zdg b9014b950a 密码找回 2024-09-11 20:05:18 +08:00
lyc 03ecbb1d50 Merge pull request 'ai助手-拖动' (#196) from lyc-dev into main 2024-09-11 16:51:56 +08:00
lyc ec3b978185 ai助手-拖动 2024-09-11 16:50:47 +08:00
zdg 3632beebfa Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-11 16:17:16 +08:00
zdg f0e87338fb 注册优化,修复 2024-09-11 16:17:05 +08:00
lyc 54266f8a37 Merge pull request '图片' (#195) from lyc-dev into main 2024-09-11 16:05:04 +08:00
lyc 82bed1be03 图片 2024-09-11 16:04:36 +08:00
lyc 8a74f17266 Merge pull request '头部展示学科' (#194) from lyc-dev into main 2024-09-11 15:42:39 +08:00
lyc 40c6e1303b 头部展示学科 2024-09-11 15:39:54 +08:00
yangws ee196b6eb8 Merge pull request 'fix:解决个人中心班级限制问题;' (#193) from yangws into main
Reviewed-on: #193
2024-09-11 14:43:25 +08:00
yangws 6c60cd4442 fix:解决个人中心班级限制问题; 2024-09-11 14:42:48 +08:00
baigl 471d73a224 Merge pull request '作业批阅:新增空列表展示与loading加载效果' (#192) from baigl into main
Reviewed-on: #192
2024-09-11 14:30:31 +08:00
白了个白 d7761883f2 作业批阅:新增空列表展示与loading加载效果 2024-09-11 14:22:05 +08:00
baigl d4b1e547de Merge pull request 'baigl' (#191) from baigl into main
Reviewed-on: #191
2024-09-11 11:29:52 +08:00
白了个白 b34182eb39 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-11 11:28:03 +08:00
白了个白 300093cf74 作业批改优化:新增时间筛选接口 界面调整 2024-09-11 11:25:41 +08:00
yangws aaf03eb60d Merge pull request 'fix:样式问题;' (#190) from yangws into main
Reviewed-on: #190
2024-09-11 09:49:07 +08:00
yangws 08075746c0 fix:样式问题; 2024-09-11 09:48:27 +08:00
yangws 8ec93353bc Merge pull request 'fix:修改添加的班级;' (#189) from yangws into main
Reviewed-on: #189
2024-09-10 17:56:33 +08:00
yangws 68df866db5 fix:修改添加的班级; 2024-09-10 17:55:48 +08:00
516 changed files with 148184 additions and 3417 deletions

View File

@ -15,3 +15,5 @@ VITE_APP_UPLOAD_API = 'https://file.ysaix.com:7868/prod-api'
VITE_APP_RES_FILE_PATH = 'https://file.ysaix.com:7868/src/assets/textbook/booktxt/'
VITE_APP_BUILD_BASE_PATH = 'https://file.ysaix.com:7868/'
VITE_SHOW_DEV_TOOLS = 'true'

19
.env.old Normal file
View File

@ -0,0 +1,19 @@
# 页面标题
VITE_APP_TITLE = AIX智慧课堂
# 生产环境配置
VITE_APP_ENV = 'production'
# AIx融合数字管理系统/生产环境
VITE_APP_BASE_API = 'https://prev.ysaix.com:7868/prod-api'
VITE_APP_DOMAIN = 'prev.ysaix.com'
VITE_APP_UPLOAD_API = 'https://prev.ysaix.com:7868/prod-api'
# 是否在打包时开启压缩,支持 gzip 和 brotli
VITE_BUILD_COMPRESS = gzip
VITE_APP_RES_FILE_PATH = 'https://prev.ysaix.com:7868/src/assets/textbook/booktxt/'
VITE_APP_BUILD_BASE_PATH = 'https://prev.ysaix.com:7868/'

View File

@ -1,5 +1,5 @@
# 页面标题
VITE_APP_TITLE = AIx数字平台
VITE_APP_TITLE = 文枢课堂
# 生产环境配置
VITE_APP_ENV = 'production'
@ -17,3 +17,5 @@ VITE_BUILD_COMPRESS = gzip
VITE_APP_RES_FILE_PATH = 'https://prev.ysaix.com:7868/src/assets/textbook/booktxt/'
VITE_APP_BUILD_BASE_PATH = 'https://prev.ysaix.com:7868/'
VITE_SHOW_DEV_TOOLS = 'false'

54
electron-builder-old.yml Normal file
View File

@ -0,0 +1,54 @@
appId: com.electron.app
productName: AIx
directories:
output: dist
buildResources: build
win:
executableName: AIx
icon: resources/logo2.ico
files:
- '!**/.vscode/*'
- '!src/*'
- '!electron.vite.config.{js,ts,mjs,cjs}'
- '!{.eslintignore,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,dev-app-update.yml,CHANGELOG.md,README.md}'
- '!{.env,.env.*,.npmrc,pnpm-lock.yaml}'
asarUnpack:
- resources/**
nsis:
oneClick: false
allowToChangeInstallationDirectory: true
artifactName: ${name}-${version}-setup.${ext}
shortcutName: ${productName}
uninstallDisplayName: ${productName}
createDesktopShortcut: always
mac:
entitlementsInherit: build/entitlements.mac.plist
extendInfo:
- NSCameraUsageDescription: Application requests access to the device's camera.
- NSMicrophoneUsageDescription: Application requests access to the device's microphone.
- NSDocumentsFolderUsageDescription: Application requests access to the user's Documents folder.
- NSDownloadsFolderUsageDescription: Application requests access to the user's Downloads folder.
notarize: false
dmg:
artifactName: ${name}-${version}.${ext}
linux:
target:
- AppImage
- snap
- deb
maintainer: electronjs.org
category: Utility
appImage:
artifactName: ${name}-${version}.${ext}
npmRebuild: false
publish:
provider: generic
url: https://prev.ysaix.com:7868/src/assets/smarttalk/
electronDownload:
mirror: https://npmmirror.com/mirrors/electron/
# 额外依赖打包到输出目录
extraFiles:
- from: ./node_modules/im_electron_sdk/lib/
to: ./resources
filter:
- '**/*'

View File

@ -1,10 +1,10 @@
appId: com.electron.app
productName: AIx
productName: 文枢课堂
directories:
output: dist
buildResources: build
win:
executableName: AIx
executableName: 文枢课堂
icon: resources/logo2.ico
files:
- '!**/.vscode/*'

View File

@ -16,7 +16,7 @@ win:
nsis:
oneClick: false
allowToChangeInstallationDirectory: true
artifactName: ${name}-${version}-setup.${ext}
artifactName: ${name}-${version}-test.${ext}
shortcutName: ${productName}
uninstallDisplayName: ${productName}
createDesktopShortcut: always

View File

@ -3,7 +3,14 @@ import path from 'path'
import { defineConfig, externalizeDepsPlugin } from 'electron-vite'
import vue from '@vitejs/plugin-vue'
import WindiCSS from "vite-plugin-windicss"
/*import electron from 'vite-plugin-electron'
plugins: [electron({
main: {
builderOptions: {
asar: false
}
}
})],*/
export default defineConfig({
main: {
plugins: [externalizeDepsPlugin()]
@ -29,7 +36,18 @@ export default defineConfig({
// target: 'http://192.168.2.52:7863',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api/, '')
}
},
'/baidubce': {
target: 'https://aip.baidubce.com',
ws: true,
changeOrigin: true,
rewrite: (p) => p.replace(/^\/baidubce/, '')
},
'/parth': {
target: 'https://zwapi.xfyun.cn', // 第三方API的地址
changeOrigin: true, // 改变请求的起源
rewrite: (path) => path.replace(/^\/parth/, '') // 重写路径
},
},
},
plugins: [vue(), WindiCSS()],

View File

@ -1,9 +1,9 @@
{
"name": "aix-win",
"version": "1.2.0",
"description": "An Electron application with Vue",
"version": "2.1.28",
"description": "",
"main": "./out/main/index.js",
"author": "example.com",
"author": "上海交大重庆人工智能研究院",
"homepage": "https://electron-vite.org",
"scripts": {
"format": "prettier --write .",
@ -16,7 +16,8 @@
"build:dev": "npm run build && electron-builder --win --config ./electron-builder-test.yml",
"build:test": "electron-vite build --mode test && electron-builder --win --config ./electron-builder.yml",
"build:prod": "electron-vite build --mode production && electron-builder --win --config ./electron-builder-prod.yml",
"build:mac": "npm run build && electron-builder --mac",
"build:lt": "electron-vite build --mode lt && electron-builder --win --config ./electron-builder-lt.yml",
"build:mac": "electron-vite build --mode production && electron-builder --mac --config ./electron-builder-prod.yml",
"build:linux": "npm run build && electron-builder --linux"
},
"dependencies": {
@ -25,10 +26,19 @@
"@electron/remote": "^2.1.2",
"@element-plus/icons-vue": "^2.3.1",
"@vitejs/plugin-vue-jsx": "^4.0.0",
"@antv/x6": "^2.18.1",
"@antv/x6-plugin-clipboard": "^2.1.6",
"@antv/x6-plugin-dnd": "^2.1.1",
"@antv/x6-plugin-export": "^2.1.6",
"@antv/x6-plugin-keyboard": "^2.2.3",
"@antv/x6-plugin-selection": "^2.2.2",
"@antv/x6-plugin-snapline": "^2.1.7",
"@antv/x6-plugin-transform": "^2.1.8",
"@vue-office/docx": "^1.6.2",
"@vue-office/excel": "^1.7.11",
"@vue-office/pdf": "^2.0.2",
"@vueuse/core": "^10.11.0",
"circular-json": "^0.5.9",
"cropperjs": "^1.6.2",
"crypto-js": "^4.2.0",
"echarts": "^5.5.1",
@ -37,20 +47,26 @@
"electron-store": "8.0.0",
"electron-updater": "^6.1.7",
"element-china-area-data": "^6.1.0",
"element-plus": "^2.7.6",
"element-plus": "^2.8.0",
"fabric": "^5.3.0",
"im_electron_sdk": "^8.0.5904",
"js-cookie": "^3.0.5",
"jsencrypt": "^3.3.2",
"jsondiffpatch": "0.6.0",
"lodash": "^4.17.21",
"node-addon-api": "^8.1.0",
"pdfjs-dist": "4.4.168",
"pinia": "^2.1.7",
"pinia-plugin-persistedstate": "^3.2.1",
"spark-md5": "^3.0.2",
"vite-plugin-electron": "^0.28.8",
"vue-qr": "^4.0.9",
"vue-router": "^4.4.0",
"xgplayer": "^3.0.19",
"xlsx": "^0.18.5"
"xlsx": "^0.18.5",
"less": "^4.2.0",
"less-loader": "^7.3.0",
"whiteboard_lyc": "^0.1.3"
},
"devDependencies": {
"@electron-toolkit/eslint-config": "^1.0.2",

View File

@ -224,7 +224,7 @@ export default async function ({ app, shell, BrowserWindow, ipcMain }) {
formData.append(key, uploadData[key])
}
}
formData.append('fileFlag', '教案')
formData.append('fileFlag', '课件')
uploadFileByFS({
url: uploadUrl,
path,
@ -243,6 +243,81 @@ export default async function ({ app, shell, BrowserWindow, ipcMain }) {
})
})
/*创建新的ppt文件*/
ipcMain.on('creat-ai-file-default', (e, { name, url, uploadData, cookie }) => {
createFolder('tempFile').then(async () => {
let lastname = decodeURIComponent(url);
name = lastname.substring(lastname.lastIndexOf("/")+1)
let path = appTempFilePath + name.replace(/[\\/:*?"<>|]/, '')
let {type,item} = await downloadFiles(url,name)
if (type==="成功") {
let fileType = 'application/vnd.openxmlformats-officedocument.presentationml.presentation'
let formData = new FormData()
for (let key in uploadData) {
if (Object.prototype.hasOwnProperty.call(uploadData, key)) {
// 检查是否是对象自身的属性
formData.append(key, uploadData[key])
}
}
formData.append('fileFlag', '课件')
uploadFileByFS({
url: uploadUrl,
path,
name,
cookie,
fileType,
formData,
success: (response) => {
e.reply('creat-ai-file-default-reply', response.data)
console.log('File uploaded successfully:', response.data)
},
error: (err) => {
console.error('Error uploading file:', err)
}
})
}else {
e.reply('creat-ai-file-default-reply', type)
}
})
})
function downloadFiles(url,fileName) {
console.log(url,fileName)
return new Promise((resolve, reject)=>{
const browserWindow = BrowserWindow.getFocusedWindow()
const id = manager.download({
window: browserWindow,
url: url,
saveAsFilename: fileName,
directory: appTempFilePath,
callbacks: {
onDownloadStarted: async ({ id, item, webContents }) => {
// Do something with the download id
},
onDownloadProgress: async ({ id, item, percentCompleted }) => {
// console.log(percentCompleted)
},
onDownloadCompleted: async ({ id, item }) => {
console.log('完成')
resolve({type:"成功",item})
},
onDownloadCancelled: async () => {
console.log("取消")
reject({type:"取消了下载"})
},
onDownloadInterrupted: async () => {
console.log('中断')
reject({type:"下载被中断"})
},
onError: (err, data) => {
console.log(err.toString())
reject({type:"下载出错",err})
}
}
})
})
}
//获取应用文件目录
ipcMain.on('get-root-file-path', (e) => {
e.reply('get-root-file-path-reply', appRootFilePath)

View File

@ -21,6 +21,27 @@ File({ app, shell, BrowserWindow, ipcMain })
process.env['ELECTRON_DISABLE_SECURITY_WARNINGS'] = 'true'
let mainWindow, loginWindow
const additionalData = {myKey:'ys_axi_smarttalk'}
const gotTheLock = app.requestSingleInstanceLock(additionalData)
if(!gotTheLock){
app.quit()
}else{
app.on('second-instance',(event,commandLine,workingDirectory,additionalData)=>{
//输入从第二个实例中接收到的数据
console.log(additionalData)
//有人试图运行第二个实例,我们应该关注我们的窗口
if(mainWindow){
if(mainWindow.isMinimized()) mainWindow.restore()
mainWindow.focus()
}
if(loginWindow){
if(loginWindow.isMinimized()) loginWindow.restore()
loginWindow.focus()
}
})
}
//登录窗口
function createLoginWindow() {
if (loginWindow) return
@ -52,8 +73,7 @@ function createLoginWindow() {
loginWindow.loadFile(join(__dirname, '../renderer/index.html'), { hash: 'login' })
updateInit(loginWindow)
}
// loginWindow.webContents.openDevTools()
if (import.meta.env.VITE_SHOW_DEV_TOOLS === 'true') loginWindow.webContents.openDevTools()
loginWindow.once('ready-to-show', () => {
loginWindow.show()
})
@ -67,9 +87,10 @@ function createLoginWindow() {
//主窗口
function createMainWindow() {
mainWindow = new BrowserWindow({
width: 1200,
width: 1350,
minWidth: 1200,
height: 700,
minHeight: 700,
show: false,
frame: false, // 无边框
autoHideMenuBar: true,
@ -97,19 +118,26 @@ function createMainWindow() {
}, 1000)
// app.quit() // 主窗口关闭-结束所有进程
})
mainWindow.on('resize', () => {
const { width, height } = mainWindow.getBounds();
mainWindow.webContents.send('minWinResize', { width, height });
});
mainWindow.webContents.setWindowOpenHandler((details) => {
shell.openExternal(details.url)
return { action: 'deny' }
})
mainWindow.webContents.openDevTools()
if (import.meta.env.VITE_SHOW_DEV_TOOLS === 'true') mainWindow.webContents.openDevTools()
if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
mainWindow.loadURL(process.env['ELECTRON_RENDERER_URL'])
} else {
mainWindow.loadFile(join(__dirname, '../renderer/index.html'))
}
// mainWindow.setAlwaysOnTop(true, "screen-saver") // 将窗口设置为顶层窗口
// mainWindow.setVisibleOnAllWorkspaces(true) // 如果窗口在所有工作区都可见
mainWindow.maximize();
// 第三步: 开启remote服务
remote.enable(mainWindow.webContents)
}
@ -133,7 +161,7 @@ async function createLinkWin(data) {
contextIsolation: true
}
})
linkWin[data.key].type = 'link' // 唯一标识
linkWin[data.key].type = 'link'+data.key // 唯一标识
let cookieDetails = { ...data.cookieData }
await linkWin[data.key].webContents.session.cookies
@ -142,11 +170,12 @@ async function createLinkWin(data) {
.catch((error) => {})
data.fullPath = data.fullPath.replaceAll('//', '/')
if (data.fullPath.indexOf('?') !== -1) {
data.fullPath += '&urlSource=smarttalk'
data.fullPath += '&urlSource=smarttalk&t' + Date.now()
}else {
data.fullPath += '?urlSource=smarttalk'
data.fullPath += '?urlSource=smarttalk&t' + Date.now()
}
linkWin[data.key].loadURL(data.fullPath)
if (import.meta.env.VITE_SHOW_DEV_TOOLS === 'true') linkWin[data.key].webContents.openDevTools()
linkWin[data.key].once('ready-to-show', () => {
linkWin[data.key].show()
@ -243,15 +272,17 @@ app.on('window-all-closed', () => {
function handleAll() {
const chatInstance = chat.initialize() // im-chat 实例
// 新窗口创建-监听
ipcMain.on('new-window', (e, data) => {
ipcMain.handle('new-window', (e, data) => {
const { id, type } = data
const win = BrowserWindow.fromId(id)
win.type = type // 绑定独立标识
remote.enable(win.webContents) // 开启远程服务
chatInstance.enable(win.webContents) // 开启im-chat
console.log(`主进程 [${type}]: 窗口注册-远程代理-完毕(${Date.now()})`)
})
// 用于监听-状态管理变化-同步所有窗口
ipcMain.handle('pinia-state-change', (e, storeName, jsonStr) => {
for(const curWin of BrowserWindow.getAllWindows()){
const id = curWin.webContents.id
const bool = id !== e.sender.id && !curWin.isDestroyed()
@ -297,4 +328,4 @@ function appWatchError() {
app.on('child-process-gone', async (event, details) => {
console.error(`APP-ERROR:child-process-gone; event: ${JSON.stringify(event)}; details:${JSON.stringify(details)}`)
})
}
}

View File

@ -13,10 +13,19 @@ const defaultData = {
showBoardAll: false, // 全屏画板-是否显示
isPdfWin: false, // pdf窗口是否打开
isToolWin: false, // 工具窗口是否打开
isTaskWin: false, // 批改窗口是否打开
curSubjectNode: {
data: {}, // 当前教材节点 (包含当前教材 单元)
querySearch: {} // 查询资源所需参数
}
},
subject: { // 不走同步 Pinia
bookList: null, // 教材列表
curBook: null, // 当前选中的教材
curNode: null, // 当前选中的节点
defaultExpandedKeys: [], //展开的节点
subjectTree: [] // "树结构" 章节
},
env: {}, // 不走同步 Pinia - 变量
curr: {} // 不走同步 Pinia - 当前信息
},
local: { // 本地(永久localStorage)
},

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

View File

@ -0,0 +1,177 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,3 @@
àRCopyright 1990-2009 Adobe Systems Incorporated.
All rights reserved.
See ./LICENSEáCNS2-H

View File

@ -0,0 +1,3 @@
àRCopyright 1990-2009 Adobe Systems Incorporated.
All rights reserved.
See ./LICENSEá ETen-B5-H` ^

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,4 @@
àRCopyright 1990-2009 Adobe Systems Incorporated.
All rights reserved.
See ./LICENSE!!<21>º]aX!!]`<60>21<32>> <09>p <0B>z<EFBFBD>$]<06>"Rd<E2809A>-Uƒ7<C692>*4„%<25>+ „Z „{<7B>/%…<<3C>9K…b<E280A6>1]†.<2E>" ‰`]‡,<2C>"]ˆ
<EFBFBD>"]ˆh<CB86>"]‰F<E280B0>"]Š$<24>"]<02>"]`<60>"]Œ><3E>"]<5D><1C>"]<5D>z<EFBFBD>"]ŽX<C5BD>"]<5D>6<EFBFBD>"]<5D><14>"]<5D>r<EFBFBD>"]P<E28098>"].<2E>"]“ <0C>"]“j<E2809C>"]”H<E2809D>"]•&<26>"]<04>"]b<E28093>"]—@<40>"]˜<1E>"]˜|<7C>"]™Z<E284A2>"]š8<C5A1>"]<16>"]t<E280BA>"]œR<C593>"]<5D>0<EFBFBD>"]ž<0E>"]žl<C5BE>"]ŸJ<C5B8>"] (<28>"]¡<06>"]¡d<C2A1>"]¢B<C2A2>"]£ <20>"X£~<7E>']¤W<C2A4>"]¥5<C2A5>"]¦<13>"]¦q<C2A6>"]§O<C2A7>"]¨-<2D>"]© <0B>"]©i<C2A9>"]ªG<C2AA>"]«%<25>"]¬<03>"]¬a<C2AC>"]­?<3F>"]®<1D>"]®{<7B>"]¯Y<C2AF>"]°7<C2B0>"]±<15>"]±s<C2B1>"]²Q<C2B2>"]³/<2F>"]´ <0A>"]´k<C2B4>"]µI<C2B5>"]¶'<27>"]·<05>"]·c<C2B7>"]¸A<C2B8>"]¹<1F>"]¹}<7D>"]º[<5B>"]»9

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More