Compare commits

..

727 Commits

Author SHA1 Message Date
朱浩 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
朱浩 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
朱浩 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
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
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
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
朱浩 add564c4ed Merge pull request 'zhuhao_dev' (#188) from zhuhao_dev into main
Reviewed-on: #188
2024-09-10 17:22:22 +08:00
朱浩 77e76fcf7d 版本升级2.0 2024-09-10 17:21:49 +08:00
朱浩 0268f1af36 Merge branch 'main' into zhuhao_dev 2024-09-10 17:17:38 +08:00
朱浩 278dfd4d93 章节排序 2024-09-10 17:17:10 +08:00
lyc db6ebbdbaf Merge pull request 'lyc-dev' (#187) from lyc-dev into main 2024-09-10 17:10:04 +08:00
lyc e2017c3553 冲突-file-preview 2024-09-10 17:09:50 +08:00
lyc 0be3d131e2 聊天机器人 2024-09-10 17:07:00 +08:00
yangws 8ec738de46 Merge pull request 'add:新增加入班级;' (#185) from yangws into main
Reviewed-on: #185
2024-09-10 16:50:30 +08:00
yangws 076a510109 add:新增加入班级; 2024-09-10 16:49:11 +08:00
zhangxuelin ee9e5d1326 Merge pull request 'zdg' (#184) from zdg into main
Reviewed-on: #184
2024-09-10 16:16:44 +08:00
zhangxuelin 7ed7b2efd2 添加跳转apt页面 2024-09-10 15:21:46 +08:00
zhangxuelin eaf2d82ead Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-10 15:06:39 +08:00
朱浩 786c6816ec Merge pull request 'zhuhao_dev' (#183) from zhuhao_dev into main
Reviewed-on: #183
2024-09-10 15:04:51 +08:00
朱浩 1b504a1653 Merge branch 'main' into zhuhao_dev 2024-09-10 15:04:18 +08:00
朱浩 85c61ca802 APT入口开发 2024-09-10 15:03:42 +08:00
zhangxuelin 7da1d97939 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-10 14:57:19 +08:00
baigl 3603c4e0f2 Merge pull request 'baigl' (#182) from baigl into main
Reviewed-on: #182
2024-09-10 14:11:05 +08:00
白了个白 cb1c3c23fe Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-10 14:10:10 +08:00
白了个白 de1dee7380 题目转义判断 2024-09-10 14:09:50 +08:00
zhangxuelin 151cdbb1a1 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
#	electron.vite.config.mjs
2024-09-10 14:07:04 +08:00
朱浩 a2c962e94d Merge pull request 'zhuhao_dev' (#181) from zhuhao_dev into main
Reviewed-on: #181
2024-09-10 14:03:35 +08:00
朱浩 9cad353d36 Merge branch 'main' into zhuhao_dev 2024-09-10 14:02:51 +08:00
朱浩 53f43019e9 APT入口开发 2024-09-10 14:01:58 +08:00
baigl 4996af57c7 Merge pull request 'baigl' (#180) from baigl into main
Reviewed-on: #180
2024-09-10 13:51:02 +08:00
白了个白 7a4cc9eb64 1 2024-09-10 13:49:46 +08:00
白了个白 fd6aa2a56a Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-10 13:43:04 +08:00
zdg ad2e6b92db Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-10 12:18:48 +08:00
白了个白 6be4b3526e 作业批改:优化轮询机制 2024-09-10 11:30:45 +08:00
zhangxuelin bbe4037a71 注册账号 2024-09-10 10:37:32 +08:00
白了个白 0b6b0c318d 作业批改:报告迁入 2024-09-10 09:52:10 +08:00
zouyf d896209948 Merge pull request '[考试分析] - 修改路由' (#179) from zouyf_dev into main
Reviewed-on: #179
2024-09-10 09:43:13 +08:00
“zouyf” c618ec04c7 [考试分析] - 修改路由 2024-09-10 09:41:28 +08:00
zhangxuelin c79e7966ee 注册 2024-09-09 18:14:57 +08:00
lyc 3a1cf6224a chart 2024-09-09 17:57:08 +08:00
白了个白 2d89ef8de3 作业批改:概况 2024-09-09 17:53:55 +08:00
白了个白 44002ae78d 作业批改路径修改 2024-09-09 17:28:25 +08:00
白了个白 0e88eb8226 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-09 17:17:51 +08:00
白了个白 5bda6cfad2 批阅优化 2024-09-09 17:14:57 +08:00
朱浩 280313e638 Merge remote-tracking branch 'origin/main' 2024-09-09 16:54:19 +08:00
朱浩 ed7a8a124e 文件预览 2024-09-09 16:54:04 +08:00
zouyf 4b71008bee Merge pull request 'zouyf_dev' (#178) from zouyf_dev into main
Reviewed-on: #178
2024-09-09 16:47:27 +08:00
“zouyf” aab477999e Merge branch 'main' into zouyf_dev 2024-09-09 16:44:40 +08:00
“zouyf” d1b7101ba5 [考试分析] - 优化显示解析 2024-09-09 16:44:24 +08:00
白了个白 7cb84ffe37 作业批阅:附件预览 2024-09-09 15:50:55 +08:00
lyc 47f3202444 Merge pull request 'lyc-dev' (#177) from lyc-dev into main 2024-09-09 09:51:28 +08:00
lyc 3cd8c51aae Merge branch 'main' into lyc-dev 2024-09-09 09:51:06 +08:00
lyc be187e1a2d header路由报错 2024-09-09 09:48:28 +08:00
白了个白 0c506a09f2 Merge branch 'baigl' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-09 09:28:57 +08:00
白了个白 04ac5dc8b5 作业批阅 2024-09-09 07:04:21 +08:00
zhangxuelin aca464fddd Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-09 01:15:19 +08:00
zhangxuelin 25d026bd13 新增注册页面 2024-09-09 01:14:26 +08:00
lyc 119e07bcea 新增工作台 2024-09-07 18:18:56 +08:00
“zouyf” 555960b8bd Merge branch 'main' into zouyf_dev 2024-09-07 18:08:15 +08:00
“zouyf” d709753534 [考试分析] - 添加 2024-09-07 18:07:32 +08:00
朱浩 78ac6e5ca6 解决版本问题 2024-09-06 15:38:50 +08:00
朱浩 acc29b02e4 解决版本问题 2024-09-06 15:33:25 +08:00
zhengdegang 12da4ac2c0 Merge pull request 'zdg' (#176) from zdg into main
Reviewed-on: #176
2024-09-05 16:32:57 +08:00
zdg 5ecba3fb62 默认群没清除,导致没有创建群 2024-09-05 16:28:15 +08:00
zdg f5f33eaa63 im日志级别 Debbug 2024-09-05 16:18:34 +08:00
zhengdegang 090bc5997c Merge pull request 'zdg' (#175) from zdg into main
Reviewed-on: #175
2024-09-05 01:31:11 +08:00
zdg 1c69d10263 修复-- bug 工具在桌面和pdf切换 2024-09-05 01:30:24 +08:00
zdg b794d55cd7 注释掉 2024-09-05 01:05:29 +08:00
zdg 28b5a131fd Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-05 01:03:25 +08:00
zdg e740cb0c7e Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-05 01:02:47 +08:00
zdg 3a83a31970 修复数据状态-生产环境 无法监听问题 2024-09-05 01:02:42 +08:00
zhangxuelin 30f7b9d5b3 Merge pull request '修复bug-画笔' (#174) from zdg into main
Reviewed-on: #174
2024-09-04 21:12:24 +08:00
zhangxuelin 37810586b7 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-04 21:09:45 +08:00
zhangxuelin e31858a3fe 修改pdf画笔bug 2024-09-04 21:06:21 +08:00
zdg 3a6b78bc76 修复bug-画笔 2024-09-04 20:43:47 +08:00
zhengdegang 10a1342b95 Merge pull request '修复 bug' (#173) from zdg into main
Reviewed-on: #173
2024-09-04 19:51:06 +08:00
zdg 70e99e69ba 修复 bug 2024-09-04 19:50:23 +08:00
lyc 3171c0b3f9 Merge pull request 'lyc-dev' (#172) from lyc-dev into main 2024-09-04 16:29:09 +08:00
lyc 33e84ca006 资源推送 2024-09-04 16:28:36 +08:00
lyc 28a815169d Merge branch 'main' into lyc-dev 2024-09-04 13:46:36 +08:00
zhengdegang eace8b56d8 Merge pull request 'zdg' (#171) from zdg into main
Reviewed-on: #171
2024-09-03 18:11:46 +08:00
zdg e03e385dbc Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-03 18:03:30 +08:00
zdg 2aaa15230a 恢复 im 注释 2024-09-03 18:03:25 +08:00
zdg 7894214859 修复bug: #678 #652 #648 2024-09-03 18:02:46 +08:00
朱浩 fe41a63b2d Merge pull request 'zhuhao_dev' (#170) from zhuhao_dev into main
Reviewed-on: #170
2024-09-03 16:39:57 +08:00
朱浩 cdf12cf213 区分生产和测试版本,测试版会直接显示测试版文字 2024-09-03 16:37:39 +08:00
yangws 7bb8d2afeb Merge pull request 'fix:看不了学生信息;' (#169) from yangws into main
Reviewed-on: #169
2024-09-03 16:33:03 +08:00
yangws cfac2086e6 fix:看不了学生信息; 2024-09-03 16:31:40 +08:00
朱浩 59ca00d6d1 Merge branch 'main' into zhuhao_dev
# Conflicts:
#	package.json
2024-09-03 16:15:07 +08:00
zdg b6504e114f 桌面,底部导航 多个窗口 2024-09-03 16:01:40 +08:00
lyc 931ed531ab Merge branch 'main' into lyc-dev 2024-09-03 14:12:00 +08:00
zhengdegang 5433e47d0b Merge pull request '修复bug-数据共享' (#168) from zdg into main
Reviewed-on: #168
2024-09-03 13:19:35 +08:00
zdg eb3778dde2 修复bug-数据共享 2024-09-03 13:18:40 +08:00
lyc a6bda302af Merge branch 'main' into lyc-dev 2024-09-03 10:41:57 +08:00
zhengdegang 411ef757e2 Merge pull request 'zdg' (#167) from zdg into main
Reviewed-on: #167
2024-09-02 22:23:07 +08:00
zdg 0201385e75 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-02 22:22:14 +08:00
zdg ea9af1440e 数据库共享:结合 pinia + electron-store
关闭开发 本地文件日志,只有生产有日志文件记录
2024-09-02 22:22:03 +08:00
zdg b4c2751e8c 注释代码放开 2024-09-02 18:35:16 +08:00
yangws c5257b760a Merge pull request 'fix:隐藏掉班级中心所有的操作按钮;' (#166) from yangws into main
Reviewed-on: #166
2024-09-02 16:58:33 +08:00
yangws 22239090ea fix:隐藏掉班级中心所有的操作按钮; 2024-09-02 16:57:54 +08:00
zdg 1d808950b5 优化bug 2024-09-02 16:33:25 +08:00
zhengdegang cb0d60b93e Merge pull request 'zdg' (#165) from zdg into main
Reviewed-on: #165
2024-09-02 13:53:21 +08:00
zdg d65af70a34 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-02 13:51:36 +08:00
zdg 3f4e9c35b0 崩溃等,日志文件配置 2024-09-02 13:51:25 +08:00
zhengdegang a133c322f3 Merge pull request 'zdg' (#164) from zdg into main
Reviewed-on: #164
2024-09-02 11:15:52 +08:00
zdg b5d41050ae 数据共享-修改成 session local
永久和临时
2024-09-02 11:14:47 +08:00
朱浩 0e5ca5eff2 Merge branch 'main' into zhuhao_dev 2024-08-31 14:13:56 +08:00
lyc eb481e265b 获取教材-单元、章节调整 2024-08-30 18:28:27 +08:00
zdg fa77c6cc6b 版本 2024-08-30 17:29:15 +08:00
lyc ff97a2bef6 Merge pull request 'lyc-dev' (#163) from lyc-dev into main 2024-08-30 14:29:52 +08:00
lyc 05c567d1cd console 2024-08-30 14:28:55 +08:00
lyc 1a6abfaa50 预约课程-时间限制 2024-08-30 14:15:15 +08:00
zhengdegang 2ae200cc9e Merge pull request 'zdg' (#162) from zdg into main
Reviewed-on: #162
2024-08-30 13:46:48 +08:00
zdg 177df96d69 更新-logo 2024-08-30 13:45:01 +08:00
zdg 571bfc98f7 bug: 335 优化动画 2024-08-30 13:35:25 +08:00
yangws b249df2dff Merge pull request 'fix:修改老师创建查看自己小组的权限;' (#161) from yangws into main
Reviewed-on: #161
2024-08-30 09:33:01 +08:00
yangws 1871e7e565 fix:修改老师创建查看自己小组的权限; 2024-08-30 09:32:22 +08:00
lyc bb56c3fdab Merge pull request 'lyc-dev' (#160) from lyc-dev into main 2024-08-29 16:50:05 +08:00
lyc df8f4fcf92 Merge branch 'main' into lyc-dev 2024-08-29 16:48:39 +08:00
lyc d6b4ae011d 预约课程-默认时间-时间限制 2024-08-29 16:45:17 +08:00
yangws bf7f740aaf Merge pull request 'fix:无数据时处理;' (#159) from yangws into main
Reviewed-on: #159
2024-08-28 14:07:56 +08:00
yangws e6a0859f87 fix:无数据时处理; 2024-08-28 14:07:14 +08:00
zhengdegang 3d8dc4320d Merge pull request '更新作业推送' (#158) from zdg into main
Reviewed-on: #158
2024-08-27 11:38:46 +08:00
zdg 1518d9c3ae 更新作业推送 2024-08-27 11:36:30 +08:00
lyc 23878f5843 Merge pull request '教学研究室-打开教材分析' (#157) from lyc-dev into main 2024-08-26 14:39:56 +08:00
lyc 144da0ace9 教学研究室-打开教材分析 2024-08-26 14:34:35 +08:00
zhengdegang 46098aa733 Merge pull request 'zdg' (#156) from zdg into main
Reviewed-on: #156
2024-08-26 11:50:11 +08:00
zdg 13e755bb9a Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-26 11:48:41 +08:00
zdg b5ce949172 恢复 2024-08-26 11:48:18 +08:00
zdg d033c217d6 数据共享配置 渲染器和主进程 2024-08-26 11:47:10 +08:00
yangws edfdf8b9ad Merge pull request 'fix:年级不允许切换;' (#155) from yangws into main
Reviewed-on: #155
2024-08-26 09:31:02 +08:00
yangws 59be0c07d1 fix:年级不允许切换; 2024-08-26 09:30:26 +08:00
朱浩 e985c2e7af Merge branch 'main' into zhuhao_dev 2024-08-23 12:01:51 +08:00
朱浩 0ea628d174 二期:打包IM 2024-08-23 12:01:43 +08:00
朱浩 d4982d47c7 二期:打包IM 2024-08-23 12:01:21 +08:00
yangws 0ad99e9ac2 Merge pull request 'feat:修改固定住自己所选的学科学段;' (#154) from yangws into main
Reviewed-on: #154
2024-08-23 11:28:52 +08:00
yangws be222a2ba6 feat:修改固定住自己所选的学科学段; 2024-08-23 11:28:26 +08:00
lyc b922219602 Merge pull request 'lyc-dev' (#153) from lyc-dev into main 2024-08-23 11:22:52 +08:00
lyc 386c4e09c6 冲突 2024-08-23 11:21:57 +08:00
zhengdegang b738ade9a4 Merge pull request 'zdg' (#152) from zdg into main
Reviewed-on: #152
2024-08-23 10:45:00 +08:00
zdg 6f6d56b37b Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-23 10:43:57 +08:00
zdg c1f81a8e5c 更新 点赞,疑惑 2024-08-23 10:43:44 +08:00
lyc d003ecf8ce Merge branch 'main' into lyc-dev 2024-08-23 09:56:28 +08:00
lyc 146784bf26 增加一个预览文件 2024-08-23 09:56:14 +08:00
yangws 88e63f376c Merge pull request 'add:新增第三方对接素材;' (#151) from yangws into main
Reviewed-on: #151
2024-08-23 09:45:04 +08:00
yangws 99ee438fd7 add:新增第三方对接素材; 2024-08-23 09:44:03 +08:00
lyc 2279bbb904 布置作业修改 2024-08-22 10:43:05 +08:00
lyc b0d969546a Merge branch 'main' into lyc-dev 2024-08-22 09:43:10 +08:00
lyc 8ec96996c6 增加预览pdf 2024-08-22 09:42:55 +08:00
zhengdegang 968b5d3e43 Merge pull request 'zdg' (#150) from zdg into main
Reviewed-on: #150
2024-08-22 09:29:49 +08:00
zdg c0fd0ae9d3 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-22 09:28:17 +08:00
zdg 86cd50b8a3 im-点赞 疑惑 作业布置 2024-08-22 09:14:21 +08:00
zhengdegang 9240c055f4 Merge pull request 'zdg' (#149) from zdg into main
Reviewed-on: #149
2024-08-21 09:21:06 +08:00
zdg 6d77d54bc1 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-21 09:18:15 +08:00
zdg c57f21461a 点赞动画优化 2024-08-21 09:18:00 +08:00
lyc d669b6ee42 Merge pull request '教材选择不区分上下册' (#148) from lyc-dev into main 2024-08-20 17:11:00 +08:00
lyc 13598615c7 教材选择不区分上下册 2024-08-20 14:24:18 +08:00
zdg a80a3b006c Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-20 14:21:29 +08:00
zdg a2e72b855b 优化 2024-08-20 14:21:25 +08:00
zhangxuelin 1e0ff00503 1 2024-08-20 10:22:42 +08:00
zhangxuelin d30b4a230a Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-20 10:22:05 +08:00
zhangxuelin b8ea091bb5 最小化pdf 2024-08-20 10:22:02 +08:00
zdg 04a03b0c43 配置到公共环境,所有环境都使用 2024-08-20 09:54:24 +08:00
zdg f7ad8d4c71 Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-19 17:15:09 +08:00
朱浩 f38a14bc0b Merge branch 'zdg' into zhuhao_dev
# Conflicts:
#	package.json
#	src/renderer/src/plugins/shareStore.js
2024-08-19 17:00:42 +08:00
朱浩 f98fa5a3f3 二期:打包IM 2024-08-19 16:30:57 +08:00
zdg 6fb7369ce5 配置im 打包 2024-08-19 14:37:18 +08:00
zdg 49c4c7245a 打包chat-im 2024-08-19 14:21:42 +08:00
朱浩 5f6839058a 二期:打包IM 2024-08-19 14:18:39 +08:00
朱浩 0ff0cd42bc 二期:修改自动同步检测逻辑 2024-08-16 18:10:20 +08:00
朱浩 6dfb2d4a8a Merge branch 'main' into zhuhao_dev 2024-08-16 17:41:01 +08:00
zhengdegang 4fd47d2f2f Merge pull request 'zdg' (#147) from zdg into main
Reviewed-on: #147
2024-08-16 17:35:43 +08:00
zhangxuelin 44bec9fab4 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-16 17:33:41 +08:00
zhangxuelin 56483a9a49 shareStore状态优化 2024-08-16 17:33:27 +08:00
zhengdegang 4f6c7f157c Merge pull request 'zdg' (#146) from zdg into main
Reviewed-on: #146
2024-08-16 17:08:11 +08:00
zdg 631fcf38f7 恢复 2024-08-16 17:07:06 +08:00
zdg cf477398c9 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-16 16:43:06 +08:00
zdg e3e704d95d 修复 2024-08-16 16:41:05 +08:00
yangws f8eece2ff6 Merge pull request 'fix:课件改为线上的;' (#145) from yangws into main
Reviewed-on: #145
2024-08-16 14:34:40 +08:00
yangws 7fc7135d73 fix:课件改为线上的; 2024-08-16 14:33:46 +08:00
朱浩 88177d610e Merge branch 'main' into zhuhao_dev 2024-08-16 13:42:55 +08:00
zhengdegang 6bc2579c2e Merge pull request 'zdg' (#144) from zdg into main
Reviewed-on: #144
2024-08-16 13:42:39 +08:00
朱浩 57b7d3d601 二期:修改自动同步检测逻辑 2024-08-16 13:42:19 +08:00
zdg 75caf13d8b im-chat 2024-08-16 13:41:33 +08:00
zdg 7fb98309fb Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-16 10:15:31 +08:00
zdg a3b7248977 Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-16 10:15:17 +08:00
zdg 6ae7c2c4b7 优化im 2024-08-16 10:15:12 +08:00
朱浩 c19631eb89 Merge pull request '二期:保存用户不成功的问题' (#143) from zhuhao_dev into main
Reviewed-on: #143
2024-08-16 09:11:50 +08:00
朱浩 b8896bf53d 二期:保存用户不成功的问题 2024-08-16 09:11:10 +08:00
朱浩 6f5eee4289 Merge pull request 'zhuhao_dev' (#142) from zhuhao_dev into main
Reviewed-on: #142
2024-08-16 09:07:02 +08:00
朱浩 aec8e9a21f Merge remote-tracking branch 'origin/main' 2024-08-16 09:05:13 +08:00
朱浩 de909adccb 二期:修复图片加载失败无法点击的问题 2024-08-15 16:23:07 +08:00
yangws f7b00b1ccd Merge pull request 'fix:个人信息宽度调整;' (#141) from yangws into main
Reviewed-on: #141
2024-08-15 15:59:41 +08:00
yangws c94563fd43 fix:个人信息宽度调整; 2024-08-15 15:58:58 +08:00
lyc c1a34c61c9 Merge pull request 'lyc-dev' (#140) from lyc-dev into main 2024-08-15 15:16:07 +08:00
lyc a68b2a2805 Merge branch 'main' into lyc-dev 2024-08-15 15:15:40 +08:00
lyc 0d1a96b202 窗口minwidth 2024-08-15 15:15:22 +08:00
yangws 71fe8a0a8f Merge pull request 'fix:上传存图片路径之前取的缓存接口getUserProfile(),并且去掉前缀dev-api保证图片回显;' (#139) from yangws into main
Reviewed-on: #139
2024-08-15 15:11:43 +08:00
yangws b8f95eb20f fix:上传存图片路径之前取的缓存接口getUserProfile(),并且去掉前缀dev-api保证图片回显; 2024-08-15 15:10:42 +08:00
lyc 5328607ce1 Merge pull request '禁用双击最大化' (#138) from lyc-dev into main 2024-08-15 14:57:29 +08:00
lyc a17be49850 禁用双击最大化 2024-08-15 14:57:08 +08:00
yangws 2a4dac58ac Merge pull request 'fix:上传存图片路径之前取的缓存接口getUserProfile(),并且去掉前缀dev-api保证图片回显;' (#137) from yangws into main
Reviewed-on: #137
2024-08-15 14:11:32 +08:00
yangws 0fe264054c fix:上传存图片路径之前取的缓存接口getUserProfile(),并且去掉前缀dev-api保证图片回显; 2024-08-15 14:10:29 +08:00
lyc f632bab6b3 Merge pull request 'lyc-dev' (#136) from lyc-dev into main 2024-08-15 13:58:17 +08:00
lyc ae52510c7c Merge branch 'main' into lyc-dev 2024-08-15 13:57:36 +08:00
lyc 86d5f33119 登录 修改 2024-08-15 13:57:23 +08:00
zhangxuelin 2ed62802ce Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-15 11:21:48 +08:00
zhangxuelin 2ee5e24e6f 课程预约显示 bug修改 2024-08-15 11:18:33 +08:00
lyc cf3129ed66 Merge pull request 'lyc-dev' (#135) from lyc-dev into main 2024-08-15 10:32:15 +08:00
lyc 97e035398c Merge branch 'main' into lyc-dev 2024-08-15 10:31:34 +08:00
lyc 6e8c96ce2e 布置作业默认日期修改 2024-08-15 10:31:11 +08:00
zhangxuelin 3448a029c6 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-15 10:25:29 +08:00
lyc decfb09eb4 Merge pull request 'lyc-dev' (#134) from lyc-dev into main
Reviewed-on: #134
2024-08-15 09:59:07 +08:00
zhangxuelin 1dce3f6f70 窗口修改 2024-08-15 09:57:46 +08:00
lyc 2a84455f05 教材封面baseUrl 2024-08-15 09:55:37 +08:00
zhangxuelin d9ae544022 Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
#	src/renderer/src/utils/tool.js
2024-08-14 17:50:16 +08:00
zhangxuelin b520858f3f Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
#	src/renderer/src/utils/tool.js
#	src/renderer/src/views/prepare/index.vue
#	src/renderer/src/views/tool/components/side.vue
2024-08-14 17:48:32 +08:00
zdg 758a4b09c9 提交 2024-08-14 17:47:42 +08:00
lyc ba9b381b69 Merge branch 'main' into lyc-dev 2024-08-14 17:27:34 +08:00
zdg 716c16928e Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-14 17:23:39 +08:00
zdg 0da2b25586 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
#	src/renderer/src/utils/tool.js
#	src/renderer/src/views/prepare/index.vue
#	src/renderer/src/views/tool/components/side.vue
#	src/renderer/src/views/tool/sphere.vue
2024-08-14 17:23:32 +08:00
朱浩 6616ac640e Merge pull request 'zhuhao_dev' (#133) from zhuhao_dev into main
Reviewed-on: #133
2024-08-14 17:22:19 +08:00
朱浩 f3619817f9 Merge branch 'main' into zhuhao_dev 2024-08-14 17:21:38 +08:00
zdg bb1d5da104 保存-群id 2024-08-14 16:53:40 +08:00
zdg 69f54a217b Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
#	src/main/index.js
#	src/renderer/src/views/tool/sphere.vue
2024-08-14 16:42:59 +08:00
lyc 4754ed641c 上课-作业 修改 2024-08-14 16:40:43 +08:00
yangws c64fbe49e9 Merge pull request 'fix:上传存图片路径;' (#132) from yangws into main
Reviewed-on: #132
2024-08-14 16:32:23 +08:00
yangws 3c2dbb722a fix:上传存图片路径; 2024-08-14 16:31:30 +08:00
zdg 1c67ce1b8f im通信 2024-08-14 16:31:08 +08:00
yangws acbd36ca88 Merge pull request 'yangws' (#131) from yangws into main
Reviewed-on: #131
2024-08-14 15:58:42 +08:00
yangws 1e52abc170 fix:新加个人中心修改学段; 2024-08-14 15:58:06 +08:00
yangws 1a1f20d175 Merge remote-tracking branch 'origin/main' into yangws 2024-08-14 15:57:20 +08:00
朱浩 1aded1d50a 二期:修复中文目录无法打开文件的问题 2024-08-14 15:45:27 +08:00
lyc 94ae78bffc Merge branch 'main' into lyc-dev 2024-08-14 14:57:17 +08:00
lyc c72d103082 查询作业修改 2024-08-14 14:57:00 +08:00
lyc 22f35a6638 Merge pull request 'lyc-dev' (#130) from lyc-dev into main 2024-08-14 14:08:52 +08:00
lyc bf783cf940 作业 2024-08-14 14:07:53 +08:00
lyc b255e48be5 冲突 2024-08-14 14:06:02 +08:00
lyc 41b0660559 打开外部链接 url 增加参数 2024-08-14 14:03:06 +08:00
朱浩 0964cc0965 Merge pull request 'zhuhao_dev' (#129) from zhuhao_dev into main
Reviewed-on: #129
2024-08-14 11:00:45 +08:00
朱浩 219e4abdc0 Merge branch 'main' into zhuhao_dev 2024-08-14 11:00:13 +08:00
朱浩 c3709bf0c7 二期:BUG修复 2024-08-14 11:00:01 +08:00
朱浩 e6a06a67b8 Merge pull request 'zhuhao_dev' (#128) from zhuhao_dev into main
Reviewed-on: #128
2024-08-14 10:00:47 +08:00
朱浩 ea4afb409f Merge branch 'main' into zhuhao_dev
# Conflicts:
#	src/renderer/src/views/prepare/index.vue
2024-08-14 10:00:16 +08:00
朱浩 79055dc1c2 二期:BUG修复 2024-08-14 09:58:14 +08:00
yangws e3a04c0add Merge pull request 'fix:修改个人中心宽度,预约课件删除及时回应;' (#127) from yangws into main
Reviewed-on: #127
2024-08-14 09:56:10 +08:00
yangws f6bf811ee5 Merge remote-tracking branch 'origin/main' into yangws 2024-08-14 09:54:34 +08:00
朱浩 3b872f371f Merge branch 'main' into zhuhao_dev 2024-08-13 17:43:49 +08:00
朱浩 7fc04faad1 二期:BUG修复 2024-08-13 17:43:34 +08:00
lyc d18c47994a Merge pull request '作业' (#126) from lyc-dev into main 2024-08-13 17:39:38 +08:00
lyc 7b804f9e62 作业 2024-08-13 17:39:23 +08:00
yangws 62367c13d3 fix:修改个人中心宽度,预约课件删除及时回应; 2024-08-13 17:33:04 +08:00
朱浩 8f50174595 二期:BUG修复 2024-08-13 16:46:47 +08:00
lyc bc9c6a3c89 Merge pull request 'lyc-dev' (#125) from lyc-dev into main 2024-08-13 16:23:03 +08:00
lyc e2d9b61fbe 作业 2024-08-13 16:22:35 +08:00
lyc bc5a6e961d 作业布置 2024-08-13 16:14:41 +08:00
lyc 2b5acf272d Merge branch 'main' into lyc-dev 2024-08-13 15:39:06 +08:00
lyc 9dda6b934c 作业-布置 2024-08-13 15:38:56 +08:00
zhangxuelin 799dbed676 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
#	src/main/index.js
#	src/renderer/src/plugins/shareStore.js
#	src/renderer/src/views/prepare/index.vue
#	src/renderer/src/views/tool/sphere.vue
2024-08-13 15:30:38 +08:00
yangws 3b52f9acc4 Merge pull request 'fix:去掉defineProps,以及修改备课-课标研读,高考研读,教学大模型链接不能同时跳转的bug;' (#124) from yangws into main
Reviewed-on: #124
2024-08-13 15:16:09 +08:00
lyc a1e00ba716 Merge branch 'main' into lyc-dev 2024-08-13 15:15:37 +08:00
lyc acc4d7c81e icon 2024-08-13 15:15:03 +08:00
zhangxuelin f80e7dee2a 代码优化 2024-08-13 15:14:26 +08:00
yangws 1f9788498a fix:去掉defineProps,以及修改备课-课标研读,高考研读,教学大模型链接不能同时跳转的bug; 2024-08-13 15:12:55 +08:00
白了个白 9ab62f180e Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-08-13 13:53:19 +08:00
yangws f60fdbafa0 Merge pull request 'fix🐛资源-平台资源和校本资源里别人上传的文件不应该可以编辑名称;' (#123) from yangws into main
Reviewed-on: #123
2024-08-13 11:32:10 +08:00
yangws 776be8eaac fix🐛资源-平台资源和校本资源里别人上传的文件不应该可以编辑名称; 2024-08-13 11:31:39 +08:00
朱浩 67320f897e Merge pull request 'zhuhao_dev' (#122) from zhuhao_dev into main
Reviewed-on: #122
2024-08-13 11:28:27 +08:00
朱浩 2cdc33d706 Merge branch 'main' into zhuhao_dev 2024-08-13 11:27:56 +08:00
朱浩 f334adfda9 二期:BUG修复 2024-08-13 11:27:42 +08:00
朱浩 fe26d348fc 二期:版本升级自动下载进度提示问题 2024-08-13 11:11:29 +08:00
yangws 444daa3cec Merge pull request 'fix🐛资源-平台资源和校本资源里别人上传的文件不应该可以编辑名称;' (#121) from yangws into main
Reviewed-on: #121
2024-08-13 11:06:53 +08:00
yangws c7d2eba5bb fix🐛资源-平台资源和校本资源里别人上传的文件不应该可以编辑名称; 2024-08-13 11:06:09 +08:00
zhangxuelin 2bf82dc294 Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
#	src/renderer/src/views/tool/sphere.vue
2024-08-13 09:11:31 +08:00
zhangxuelin cc5c823071 1 2024-08-13 09:09:49 +08:00
zdg 8df3871f7d Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
#	src/renderer/src/components/pdf/index.vue
#	src/renderer/src/views/classBegins/index.vue
2024-08-13 09:09:08 +08:00
zdg 0ffa45313b 优化-数据状态共享
im-chat
2024-08-13 09:07:28 +08:00
lyc c4e82017e5 Merge pull request '作业' (#120) from lyc-dev into main 2024-08-12 16:55:21 +08:00
lyc d4fc68c902 作业 2024-08-12 16:55:05 +08:00
朱浩 732e4c9a64 Merge branch 'main' into zhuhao_dev 2024-08-12 16:53:44 +08:00
yangws 6c717ea345 Merge pull request 'fix:修改更改科目主页课程不能更新的问题;' (#119) from yangws into main
Reviewed-on: #119
2024-08-12 16:53:29 +08:00
yangws c4c4bca54a fix:修改更改科目主页课程不能更新的问题; 2024-08-12 16:52:41 +08:00
朱浩 e89ffd4416 二期:版本切换 2024-08-12 16:51:10 +08:00
lyc cc1faa7f88 Merge pull request '作业' (#118) from lyc-dev into main 2024-08-12 15:56:46 +08:00
lyc 0b67ca30f8 作业 2024-08-12 15:55:50 +08:00
zhangxuelin 7d3007bbf2 Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-12 13:40:07 +08:00
zhangxuelin bf99c4dd00 bug修改 2024-08-12 13:40:03 +08:00
朱浩 d690a4ae70 Merge pull request '二期:预约开发' (#117) from zhuhao_dev into main
Reviewed-on: #117
2024-08-12 09:43:00 +08:00
朱浩 974aaf3522 二期:预约开发 2024-08-12 09:41:01 +08:00
lyc 524eedc451 Merge pull request 'edit' (#116) from lyc-dev into main 2024-08-12 09:38:59 +08:00
lyc 9d38f715a1 edit 2024-08-12 09:38:39 +08:00
朱浩 b4c9db619e Merge pull request '二期:预约开发' (#115) from zhuhao_dev into main
Reviewed-on: #115
2024-08-09 17:42:56 +08:00
朱浩 7cf3487bfb 二期:预约开发 2024-08-09 17:42:19 +08:00
朱浩 74275ac327 Merge pull request 'zhuhao_dev' (#114) from zhuhao_dev into main
Reviewed-on: #114
2024-08-09 17:27:14 +08:00
朱浩 c29a3d7a77 二期:预约开发 2024-08-09 17:26:04 +08:00
朱浩 b8325d336b Merge branch 'main' into zhuhao_dev
# Conflicts:
#	src/renderer/src/views/prepare/index.vue
#	src/renderer/src/views/tool/sphere.vue
2024-08-09 17:25:23 +08:00
朱浩 c2876ff983 二期:预约开发 2024-08-09 17:20:55 +08:00
zhengdegang 6035803db1 Merge pull request 'zdg' (#113) from zdg into main
Reviewed-on: #113
2024-08-09 17:20:15 +08:00
zdg f9de8514ed Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-09 17:19:19 +08:00
zdg cc8ea2b043 点赞组件 2024-08-09 17:19:00 +08:00
lyc 9e0e2a41f2 Merge pull request 'lyc-dev' (#112) from lyc-dev into main 2024-08-09 17:17:43 +08:00
lyc 3fcd0cdb21 Merge branch 'main' into lyc-dev 2024-08-09 17:09:59 +08:00
lyc 815b2b15cb Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk 2024-08-09 17:09:54 +08:00
lyc eb17167feb 作业 2024-08-09 17:09:15 +08:00
朱浩 ae500c94ce 二期:预约开发 2024-08-09 15:06:13 +08:00
lyc 258a99bc36 上课作业 2024-08-09 09:43:14 +08:00
朱浩 e5845a6714 二期:预约列表开发 2024-08-08 17:44:03 +08:00
朱浩 1c1ec2be71 Merge branch 'main' into zhuhao_dev
# Conflicts:
#	src/renderer/src/views/prepare/index.vue
2024-08-08 17:41:08 +08:00
朱浩 572bdb5fec 二期:预约列表开发 2024-08-08 17:39:06 +08:00
朱浩 7974aeabe4 二期:预约列表开发 2024-08-08 17:38:45 +08:00
zhangxuelin c11b9765e6 Merge pull request 'zdg' (#111) from zdg into main
Reviewed-on: #111
2024-08-08 17:37:41 +08:00
lyc 0e34b6a1e9 Merge pull request 'lyc-dev' (#110) from lyc-dev into main 2024-08-08 17:03:47 +08:00
lyc b10be40ddc 作业 2024-08-08 17:03:18 +08:00
zhangxuelin 964e99c186 不打开工具栏不允许操作数据 2024-08-08 17:02:18 +08:00
zhangxuelin e1e9f171e0 读取本地pdf文件 2024-08-08 16:50:21 +08:00
zhangxuelin a8f9c828d7 更改地址 2024-08-08 14:27:22 +08:00
朱浩 c56039270c Merge pull request 'zhuhao_dev' (#109) from zhuhao_dev into main
Reviewed-on: #109
2024-08-08 14:05:48 +08:00
朱浩 32c64d073b 二期:解决无法同时打开多个的问题 2024-08-08 14:04:00 +08:00
lyc 1498b9bc9f Merge branch 'main' into lyc-dev 2024-08-08 11:22:59 +08:00
lyc 9a8d0e61d5 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk 2024-08-08 11:22:54 +08:00
lyc d4b24f8d71 Merge branch 'main' into lyc-dev 2024-08-08 11:22:17 +08:00
lyc ccf4211f44 上课作业 2024-08-08 11:22:05 +08:00
朱浩 aaa75df73b Merge branch 'main' into zhuhao_dev 2024-08-08 10:41:20 +08:00
lyc 6ddd172bb9 Merge pull request '取消课件文件限制' (#108) from lyc-dev into main 2024-08-08 10:32:25 +08:00
lyc 00d23f4b31 取消课件文件限制 2024-08-08 10:32:02 +08:00
朱浩 54d9f6d782 Merge branch 'main' into zhuhao_dev 2024-08-07 17:44:50 +08:00
朱浩 5db876ebfa 二期:解决新建文件失败问题 2024-08-07 17:44:36 +08:00
zhengdegang 6b1ec46360 Merge pull request 'zdg' (#107) from zdg into main
Reviewed-on: #107
2024-08-07 17:38:37 +08:00
zdg 8fc1339419 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-07 17:37:57 +08:00
zdg 0c8af75e2a 更新样式-工具 2024-08-07 17:36:56 +08:00
zhengdegang b8f2eb24e2 Merge pull request 'zdg' (#106) from zdg into main
Reviewed-on: #106
2024-08-07 17:06:15 +08:00
zdg 618618f736 工具-下课 2024-08-07 17:04:32 +08:00
zdg 43afd575de 下课 2024-08-07 16:52:46 +08:00
zhengdegang 8c2362ff4f Merge pull request 'zdg' (#105) from zdg into main
Reviewed-on: #105
2024-08-07 16:11:12 +08:00
zhangxuelin 4687d62b90 1 2024-08-07 16:10:34 +08:00
zhangxuelin 2a78cb40dc 重复打开课本 2024-08-07 16:08:54 +08:00
zdg d12b5bb29f Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
#	src/renderer/src/views/prepare/index.vue
2024-08-07 16:04:44 +08:00
zdg 5430cb8c50 Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-07 16:02:54 +08:00
zdg 6f890843ab 重复开始上课 2024-08-07 16:02:36 +08:00
朱浩 bd2024eed2 Merge pull request 'zhuhao_dev' (#104) from zhuhao_dev into main
Reviewed-on: #104
2024-08-07 15:51:11 +08:00
朱浩 9f510187c0 二期:教材打开开发 2024-08-07 15:49:37 +08:00
zhangxuelin dca4eaae91 1 2024-08-07 15:36:07 +08:00
zhangxuelin d64122775a Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
#	src/renderer/src/components/pdf/index.vue
#	src/renderer/src/views/classBegins/index.vue
#	src/renderer/src/views/tool/sphere.vue
2024-08-07 15:31:59 +08:00
zhangxuelin 29ad68e5ab pdf功能设置 2024-08-07 15:19:58 +08:00
zdg 4e2512ed77 优化 2024-08-07 15:14:34 +08:00
zdg c9d377aa74 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-07 12:26:30 +08:00
zdg 7221a203e9 Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
#	src/renderer/src/views/tool/sphere.vue
2024-08-07 12:26:19 +08:00
朱浩 3bcb0a2ef3 Merge branch 'main' into zhuhao_dev 2024-08-07 11:13:07 +08:00
朱浩 9018abb673 二期:预约课程修改 2024-08-07 11:12:51 +08:00
朱浩 a55a662ce9 二期:文件大小改为500M 2024-08-07 11:12:38 +08:00
朱浩 528e7876a9 二期:延长本地同步自动计时速率 2024-08-07 11:12:18 +08:00
朱浩 82456a7f96 二期:打包生产配置添加 2024-08-07 11:11:55 +08:00
zdg 7dfa51f5dc 侧边工具栏 2024-08-07 10:34:34 +08:00
lyc 74b0cf5fdb Merge pull request 'login 修改' (#103) from lyc-dev into main 2024-08-07 10:32:02 +08:00
lyc df7658a17d login 修改 2024-08-07 10:31:08 +08:00
zhangxuelin db496ee154 窗口根据控制 2024-08-07 09:23:07 +08:00
lyc 8a9fa83c04 Merge pull request '登录修改' (#102) from lyc-dev into main 2024-08-06 15:02:59 +08:00
lyc 9a6f37528c 登录修改 2024-08-06 15:02:40 +08:00
zhangxuelin a6fff59601 Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-06 14:07:07 +08:00
zhangxuelin 2a670c1447 添加画布接口 2024-08-06 14:07:02 +08:00
zhengdegang d64b469ac8 Merge pull request 'zdg' (#101) from zdg into main
Reviewed-on: #101
2024-08-05 17:49:43 +08:00
zdg 19901d802f 状态管理-多窗口共享 2024-08-05 17:46:48 +08:00
zdg 22a92ee84b Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-05 17:11:19 +08:00
zdg 8d558c47f5 多窗口状态共享 2024-08-05 17:10:57 +08:00
lyc 9ab5f65409 Merge pull request 'lyc-dev' (#100) from lyc-dev into main 2024-08-05 17:05:16 +08:00
lyc 95e9fc528a 教材默认图标 2024-08-05 17:03:13 +08:00
lyc e38235fd6b Merge pull request '作业修改' (#99) from lyc-dev into main 2024-08-05 16:25:19 +08:00
lyc 26c46e33c7 Merge branch 'main' into lyc-dev 2024-08-05 16:24:58 +08:00
lyc ce274237dc 作业修改 2024-08-05 16:24:46 +08:00
lyc d46d312b37 Merge pull request 'login' (#98) from lyc-dev into main 2024-08-05 09:49:25 +08:00
lyc fb84977321 login 2024-08-05 09:48:48 +08:00
zhangxuelin 1d4cad94c1 Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-05 09:47:38 +08:00
zhangxuelin da78c7e1e8 更改画板 2024-08-05 09:47:33 +08:00
朱浩 2ef129d5c1 Merge pull request '二期:软件名称修改' (#97) from zhuhao_dev into main
Reviewed-on: #97
2024-08-02 17:13:44 +08:00
朱浩 6b8c6c8c7f 二期:软件名称修改 2024-08-02 17:12:45 +08:00
zhengdegang fa5e132c2d Merge pull request 'zdg' (#96) from zdg into main
Reviewed-on: #96
2024-08-02 16:09:31 +08:00
zdg 99c6fe85d4 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-02 16:07:35 +08:00
zdg 05074f3145 优化-工具类拖动折叠
清除所有画布内容
2024-08-02 16:06:07 +08:00
lyc 34b35d8beb Merge pull request '选择学生checkbox 大小修改' (#95) from lyc-dev into main 2024-08-02 15:33:40 +08:00
lyc 921ce6ecb0 选择学生checkbox 大小修改 2024-08-02 15:08:36 +08:00
lyc 1be862a0f2 Merge pull request 'lyc-dev' (#94) from lyc-dev into main 2024-08-02 14:50:58 +08:00
lyc 9ef553f8eb 作业 冲突 2024-08-02 14:49:48 +08:00
lyc e53eab0c31 作业删除 2024-08-02 14:30:27 +08:00
朱浩 1a51af93f6 Merge pull request '二期:样式修改' (#93) from zhuhao_dev into main
Reviewed-on: #93
2024-08-02 14:18:51 +08:00
朱浩 ae4f7d3b49 二期:样式修改 2024-08-02 14:18:11 +08:00
lyc 0ba717de6e 删除作业 2024-08-02 10:32:09 +08:00
lyc 6e29229e95 冲突 作业 2024-08-02 10:03:24 +08:00
lyc df84893509 布置作业 2024-08-02 10:01:05 +08:00
zhengdegang f32dd848cc Merge pull request 'zdg' (#92) from zdg into main
Reviewed-on: #92
2024-08-02 09:23:13 +08:00
zdg bb02f92bb2 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-02 09:22:18 +08:00
zdg dbf6b665a8 工具栏-拖动 折叠 2024-08-02 09:21:57 +08:00
朱浩 43d75f94dd Merge pull request 'zhuhao_dev' (#91) from zhuhao_dev into main
Reviewed-on: #91
2024-08-01 17:47:51 +08:00
朱浩 62a5339d04 二期:首页样式修改 2024-08-01 17:46:56 +08:00
朱浩 191ead45cb Merge branch 'main' into zhuhao_dev 2024-08-01 14:33:52 +08:00
朱浩 cac9490256 二期:首页样式修改 2024-08-01 14:33:40 +08:00
lyc d46b01cca2 Merge pull request 'lyc-dev' (#90) from lyc-dev into main 2024-08-01 11:27:38 +08:00
lyc 57aa718711 修复先进入备课报错 2024-08-01 11:26:50 +08:00
lyc 0d41a5a62f 冲突 2024-08-01 11:14:07 +08:00
lyc 510258361f 作业 2024-08-01 11:12:58 +08:00
zdg ee53207d31 关闭打印 2024-08-01 10:45:47 +08:00
zdg 24c2540436 工具栏-橡皮擦 2024-08-01 10:44:52 +08:00
zdg e788174a3a Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-07-31 17:22:08 +08:00
zdg 89ef820366 橡皮擦 2024-07-31 17:22:03 +08:00
朱浩 4248fd4504 Merge pull request 'zhuhao_dev' (#89) from zhuhao_dev into main
Reviewed-on: #89
2024-07-31 16:47:27 +08:00
朱浩 241b0d3f24 Merge branch 'main' into zhuhao_dev 2024-07-31 16:46:58 +08:00
朱浩 ede8dfd533 二期:bug修复 2024-07-31 16:46:37 +08:00
朱浩 8f54d17439 Merge pull request 'zhuhao_dev' (#88) from zhuhao_dev into main
Reviewed-on: #88
2024-07-31 16:05:53 +08:00
朱浩 15f6b5dcbd 二期:首页开发 2024-07-31 16:04:49 +08:00
zdg b4e7867922 测试 2024-07-31 11:23:37 +08:00
zdg ba64ff931b 插件重新整理 2024-07-31 10:04:12 +08:00
朱浩 955d3a6d7d Merge branch 'main' into zhuhao_dev 2024-07-31 09:25:57 +08:00
朱浩 b7f45bbd33 二期:添加配置 2024-07-31 09:25:44 +08:00
yangws 8f3925f57a Merge pull request 'fix:主页页面;' (#87) from yangws into main
Reviewed-on: #87
2024-07-31 09:21:38 +08:00
yangws 370396e2b8 fix:主页页面; 2024-07-31 09:20:30 +08:00
lyc 0eb047b3f2 Merge branch 'main' into lyc-dev 2024-07-30 17:03:14 +08:00
lyc 9f5115f4a3 Merge pull request 'lyc-dev' (#86) from lyc-dev into main 2024-07-30 17:03:01 +08:00
lyc 12332348b0 备课模块---查询作业列表 2024-07-30 17:02:23 +08:00
yangws 51943f0595 Merge pull request 'yangws' (#85) from yangws into main
Reviewed-on: #85
2024-07-30 16:12:09 +08:00
yangws 9edc6d6e2b fix:学生列表高度问题; 2024-07-30 16:11:38 +08:00
yangws 2a9b39f5e9 Merge pull request 'fix:修改头像上传;' (#84) from yangws into main
Reviewed-on: #84
2024-07-30 16:02:39 +08:00
yangws 04eca3435e Merge remote-tracking branch 'origin/main' into yangws 2024-07-30 16:02:09 +08:00
yangws 1e79807a4b fix:修改头像上传; 2024-07-30 16:02:01 +08:00
yangws 594f380785 Merge pull request 'fix:修改添加班级的问题;' (#83) from yangws into main
Reviewed-on: #83
2024-07-30 10:17:26 +08:00
yangws 817ea8790e fix:修改添加班级的问题; 2024-07-30 10:16:46 +08:00
zhengdegang b317471e66 Merge pull request 'zdg' (#82) from zdg into main
Reviewed-on: #82
2024-07-30 10:07:28 +08:00
zdg f35c6a97b7 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-07-30 10:05:35 +08:00
zdg 45770d15c1 优化生产环境静态文件加载 2024-07-30 10:04:49 +08:00
zdg 604a20b9b0 生产环境-文件获取 2024-07-30 10:00:48 +08:00
lyc d5165fa3b0 Merge branch 'main' into lyc-dev 2024-07-30 09:44:31 +08:00
lyc b65cd95558 新增打开作业反馈 2024-07-30 09:44:09 +08:00
lyc d6c302fc04 Merge pull request '退出' (#81) from lyc-dev into main 2024-07-29 16:06:41 +08:00
lyc 277a5ec873 退出 2024-07-29 16:05:52 +08:00
lyc 77c1ca7d50 Merge pull request 'lyc-dev' (#80) from lyc-dev into main 2024-07-29 14:13:12 +08:00
lyc 2565f86260 login cookie 2024-07-29 14:12:39 +08:00
zdg b2b95db8fb 本地测试 2024-07-29 10:18:15 +08:00
zhangxuelin d7ecb2d547 1 2024-07-29 10:10:39 +08:00
lyc 1f0b02ea61 Merge branch 'main' into lyc-dev 2024-07-29 09:22:21 +08:00
lyc 71a380f9e0 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk 2024-07-29 09:22:12 +08:00
朱浩 f057320625 Merge pull request '二期:BUG修复' (#79) from zhuhao_dev into main
Reviewed-on: #79
2024-07-27 00:26:44 +08:00
朱浩 2f4d48a8c0 二期:BUG修复 2024-07-27 00:25:46 +08:00
zhengdegang 529197c9dc Merge pull request 'zdg' (#78) from zdg into main
Reviewed-on: #78
2024-07-26 22:16:51 +08:00
zdg 5ac36dd569 bug修复 2024-07-26 22:15:12 +08:00
zdg 8b7e64765b Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-07-26 19:20:25 +08:00
zdg 4d17465c24 Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-07-26 19:20:20 +08:00
zhangxuelin 3097491df2 1 2024-07-26 17:43:35 +08:00
朱浩 3ad5871505 Merge pull request 'zhuhao_dev' (#77) from zhuhao_dev into main
Reviewed-on: #77
2024-07-26 17:36:49 +08:00
朱浩 71aff5d1f8 Merge branch 'main' into zhuhao_dev 2024-07-26 17:36:16 +08:00
朱浩 14428f2706 二期:BUG修复 2024-07-26 17:36:04 +08:00
lyc e3016b5aff Merge branch 'main' into lyc-dev 2024-07-26 17:24:07 +08:00
lyc 1da1db8378 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk 2024-07-26 17:23:58 +08:00
zdg dd577385af Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-07-26 17:04:14 +08:00
yangws fb607c6f83 Merge pull request 'fix:高度自适应问题;' (#76) from yangws into main
Reviewed-on: #76
2024-07-26 16:01:25 +08:00
yangws 52dfb52161 fix:高度自适应问题; 2024-07-26 16:00:59 +08:00
lyc ef77069329 Merge branch 'main' into lyc-dev 2024-07-26 15:43:44 +08:00
lyc 0cfc352c5a Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk 2024-07-26 15:43:38 +08:00
lyc 9fa06cfabb 1 2024-07-26 15:43:25 +08:00
朱浩 7d4f9bdbf9 Merge pull request 'zhuhao_dev' (#75) from zhuhao_dev into main
Reviewed-on: #75
2024-07-26 15:39:44 +08:00
朱浩 67bc54765c Merge branch 'main' into zhuhao_dev
# Conflicts:
#	src/renderer/src/views/classManage/index.vue
2024-07-26 15:39:00 +08:00
yangws 0d53cabbed Merge pull request 'fix:修改字体颜色;' (#74) from yangws into main
Reviewed-on: #74
2024-07-26 15:38:39 +08:00
yangws e6a08c857a fix:修改字体颜色; 2024-07-26 15:38:13 +08:00
yangws 4e6e11ac2c Merge pull request 'fix:修改路由以及用户信息的问题;' (#73) from yangws into main
Reviewed-on: #73
2024-07-26 15:36:20 +08:00
yangws a857912c83 fix:修改路由以及用户信息的问题; 2024-07-26 15:35:45 +08:00
zhangxuelin 0d2fe7655f 设置pdf 比例 2024-07-26 15:32:43 +08:00
朱浩 51c8c79b17 Merge branch 'main' into zhuhao_dev 2024-07-26 15:31:17 +08:00
朱浩 53e34dc515 二期:BUG修复 2024-07-26 15:22:58 +08:00
lyc 18be8cc96a Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk 2024-07-26 14:42:00 +08:00
lyc f6e5511e94 ico 2024-07-26 14:41:46 +08:00
zhangxuelin b3bf366134 Merge pull request 'zdg' (#72) from zdg into main
Reviewed-on: #72
2024-07-26 14:39:17 +08:00
zhangxuelin 705dbf3832 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
#	src/renderer/src/views/resource/index.vue
2024-07-26 14:37:32 +08:00
朱浩 03ce0df516 Merge branch 'main' into zhuhao_dev 2024-07-26 14:35:11 +08:00
yangws ccf16176c6 Merge pull request 'fix:修改路由以及用户信息的问题;' (#71) from yangws into main
Reviewed-on: #71
2024-07-26 14:34:56 +08:00
zhangxuelin ca61976291 Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-07-26 14:34:39 +08:00
zhangxuelin af6236a751 设置pdf宽高 2024-07-26 14:34:35 +08:00
yangws 828abbbcb7 fix:修改路由以及用户信息的问题; 2024-07-26 14:34:16 +08:00
zdg 6c6c08abf6 优化 2024-07-26 14:26:00 +08:00
lyc 7b87b5a6e3 Merge pull request '配置文件' (#70) from lyc-dev into main 2024-07-26 14:15:49 +08:00
lyc 80ee3c0f11 配置文件 2024-07-26 14:15:33 +08:00
lyc f2ff4ac7d6 Merge pull request 'edit' (#69) from lyc-dev into main 2024-07-26 14:12:53 +08:00
lyc 479131ef21 edit 2024-07-26 14:12:40 +08:00
朱浩 c25978d30e Merge branch 'main' into zhuhao_dev 2024-07-26 14:03:27 +08:00
zhangxuelin 1004567103 pdf展示 2024-07-26 13:57:04 +08:00
lyc b85bb9b9cc Merge pull request 'lyc-dev' (#68) from lyc-dev into main 2024-07-26 13:28:01 +08:00
lyc 3ae303322a Merge branch 'main' into lyc-dev 2024-07-26 13:27:05 +08:00
lyc df68c47cd3 资源只能删除自己的 2024-07-26 13:26:51 +08:00
zdg beca8c21b6 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-07-26 12:52:22 +08:00
zdg e6a854b1a2 Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
#	src/main/index.js
#	src/renderer/src/assets/iconfont/iconfont.css
#	src/renderer/src/assets/iconfont/iconfont.ttf
#	src/renderer/src/assets/iconfont/iconfont.woff
#	src/renderer/src/assets/iconfont/iconfont.woff2
#	src/renderer/src/views/resource/index.vue
2024-07-26 12:52:05 +08:00
zdg d50d4722aa 工具栏悬浮 2024-07-26 12:48:03 +08:00
yangws e6431c6ac6 Merge pull request 'add:班级管理;' (#67) from yangws into main
Reviewed-on: #67
2024-07-26 12:11:12 +08:00
yangws d2f57fd18e add:班级管理; 2024-07-26 12:09:31 +08:00
zhangxuelin 81fa22690e 图标css 2024-07-26 11:18:30 +08:00
zhangxuelin 22a678940d Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-07-26 11:13:54 +08:00
lyc 03bcade299 Merge pull request 'lyc-dev' (#66) from lyc-dev into main 2024-07-26 11:06:46 +08:00
lyc 8c7468ef7f Merge branch 'main' into lyc-dev 2024-07-26 11:06:32 +08:00
lyc 7e3978d532 图标 2024-07-26 11:06:06 +08:00
zhangxuelin 925db8b743 1 2024-07-26 10:57:05 +08:00
zhangxuelin baa41d00eb Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
#	package.json
#	src/main/index.js
#	src/renderer/src/assets/iconfont/iconfont.css
#	src/renderer/src/assets/iconfont/iconfont.js
#	src/renderer/src/assets/iconfont/iconfont.json
#	src/renderer/src/assets/iconfont/iconfont.svg
#	src/renderer/src/assets/iconfont/iconfont.ttf
#	src/renderer/src/assets/iconfont/iconfont.woff
#	src/renderer/src/assets/iconfont/iconfont.woff2
#	src/renderer/src/views/resource/index.vue
2024-07-26 10:51:46 +08:00
lyc 01d972f18e Merge pull request '图标' (#65) from lyc-dev into main 2024-07-26 10:43:51 +08:00
lyc c0c3324d9d 图标 2024-07-26 10:43:46 +08:00
zhangxuelin 4e2ac7c92e pdf的展示 翻页 及数据回显 2024-07-26 10:26:34 +08:00
lyc daaddfaaf2 Merge pull request 'lyc-dev' (#64) from lyc-dev into main 2024-07-26 09:44:11 +08:00
lyc 5fea7e094d 资源-上传修改 2024-07-26 09:43:59 +08:00
朱浩 9f9a611f89 二期:BUG修复 2024-07-26 09:11:55 +08:00
lyc e221bedb81 Merge branch 'main' into lyc-dev 2024-07-25 16:45:36 +08:00
lyc 0ec1a7327a 更新 2024-07-25 16:45:17 +08:00
zdg fe21b676a8 Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
#	src/renderer/src/assets/iconfont/iconfont.css
#	src/renderer/src/assets/iconfont/iconfont.js
#	src/renderer/src/assets/iconfont/iconfont.json
#	src/renderer/src/assets/iconfont/iconfont.svg
#	src/renderer/src/assets/iconfont/iconfont.ttf
#	src/renderer/src/assets/iconfont/iconfont.woff
#	src/renderer/src/assets/iconfont/iconfont.woff2
2024-07-25 13:31:28 +08:00
zdg d2a2510e09 electron 代理 2024-07-25 13:24:31 +08:00
lyc ed9f3d4189 Merge pull request '教学模型跳转' (#63) from lyc-dev into main 2024-07-25 10:52:39 +08:00
lyc af20ff4931 教学模型跳转 2024-07-25 10:52:29 +08:00
朱浩 1b45ab4579 Merge branch 'main' into zhuhao_dev 2024-07-25 10:09:17 +08:00
朱浩 0a641fee06 二期:路由修改 2024-07-25 10:09:03 +08:00
lyc 08c365b0ed Merge pull request '资源模块-新建权限' (#62) from lyc-dev into main 2024-07-25 10:08:17 +08:00
lyc 212d5be4d4 资源模块-新建权限 2024-07-25 10:07:59 +08:00
朱浩 e032d8514e 二期:切换备课时,从新获取列表 2024-07-25 09:35:01 +08:00
朱浩 415a4c17c1 Merge pull request 'zhuhao_dev' (#61) from zhuhao_dev into main
Reviewed-on: #61
2024-07-25 09:20:57 +08:00
朱浩 88e306e8a2 Merge branch 'main' into zhuhao_dev 2024-07-25 09:19:56 +08:00
朱浩 e5c55cefda 二期:文件上传图标修复 2024-07-25 09:19:43 +08:00
lyc 78e666d6c1 Merge pull request 'lyc-dev' (#60) from lyc-dev into main 2024-07-25 09:15:03 +08:00
lyc 580ab2ee5b Merge branch 'main' into lyc-dev 2024-07-25 09:14:35 +08:00
lyc cda6e3e2c4 edit 2024-07-25 09:12:52 +08:00
zhangxuelin fd7686af9a Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
#	package.json
2024-07-24 16:22:00 +08:00
zhangxuelin ae86b1aa60 新增pdf界面 2024-07-24 16:21:12 +08:00
zdg 79d36ea6ba 画板-画笔 2024-07-24 16:20:35 +08:00
lyc 75595562db Merge pull request 'lyc-dev' (#59) from lyc-dev into main 2024-07-24 15:27:57 +08:00
lyc ea5a069f85 Merge branch 'main' into lyc-dev 2024-07-24 15:24:03 +08:00
lyc bf9e7c96ff 平台资源管理员 2024-07-24 15:23:26 +08:00
朱浩 d0bf9c0768 Merge pull request 'zhuhao_dev' (#58) from zhuhao_dev into main
Reviewed-on: #58
2024-07-24 14:49:32 +08:00
朱浩 eff5688e42 Merge branch 'main' into zhuhao_dev 2024-07-24 14:48:36 +08:00
朱浩 4e9c93da15 二期:头像相关问题修复 2024-07-24 14:48:18 +08:00
lyc e6da6ef65f 打开外部链接 2024-07-24 14:03:59 +08:00
zdg 666c4becd2 画笔 Fabric 2024-07-23 17:20:36 +08:00
lyc a618032d25 Merge branch 'main' into lyc-dev 2024-07-23 16:04:16 +08:00
朱浩 a25be335e6 Merge pull request 'zhuhao_dev' (#57) from zhuhao_dev into main
Reviewed-on: #57
2024-07-23 16:02:27 +08:00
朱浩 62248dfafa Merge branch 'main' into zhuhao_dev
# Conflicts:
#	src/renderer/src/views/prepare/index.vue
2024-07-23 16:01:53 +08:00
朱浩 2926b4bd63 二期:自动同步功能开发 2024-07-23 15:59:52 +08:00
lyc ac5cafe1e8 Merge branch 'main' into lyc-dev 2024-07-23 14:33:18 +08:00
lyc 0086ce4236 open win cookie 2024-07-23 14:33:07 +08:00
朱浩 af941a22b7 Merge pull request '二期:自动同步功能开发' (#56) from zhuhao_dev into main
Reviewed-on: #56
2024-07-23 14:32:01 +08:00
朱浩 4dc180a26f 二期:自动同步功能开发 2024-07-23 14:31:33 +08:00
lyc 3487cabc02 Merge pull request 'lyc-dev' (#55) from lyc-dev into main 2024-07-23 14:08:22 +08:00
lyc 5712e77a29 openwindow 2024-07-23 14:08:00 +08:00
朱浩 7106d75964 Merge pull request '二期:自动同步功能开发' (#54) from zhuhao_dev into main
Reviewed-on: #54
2024-07-23 14:07:13 +08:00
朱浩 4c635e9fe3 二期:自动同步功能开发 2024-07-23 14:06:42 +08:00
lyc 4a5fb04362 Merge branch 'main' into lyc-dev 2024-07-23 13:46:32 +08:00
lyc d91f08d398 布置作业 2024-07-23 13:46:09 +08:00
朱浩 5afa31b8c3 Merge pull request 'zhuhao_dev' (#53) from zhuhao_dev into main
Reviewed-on: #53
2024-07-23 13:45:27 +08:00
朱浩 c8f1047124 Merge branch 'main' into zhuhao_dev
# Conflicts:
#	src/renderer/src/views/prepare/index.vue
2024-07-23 13:44:44 +08:00
朱浩 e1fc883870 二期:自动同步功能开发 2024-07-23 13:43:41 +08:00
lyc c81b74b9de Merge pull request 'lyc-dev' (#52) from lyc-dev into main 2024-07-23 10:23:45 +08:00
lyc 2fbc3e272b Merge branch 'main' into lyc-dev 2024-07-23 10:23:34 +08:00
lyc 125962b859 备课-增加头部布局 2024-07-23 10:23:18 +08:00
zdg 7782de699f Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk
# Conflicts:
#	src/main/index.js
2024-07-22 16:35:54 +08:00
zdg df87aafca4 悬浮球 2024-07-22 16:30:35 +08:00
lyc 5f05ad8bea Merge pull request '打开新网页窗口' (#51) from lyc-dev into main 2024-07-22 16:25:13 +08:00
lyc 3dc478e724 打开新网页窗口 2024-07-22 16:24:32 +08:00
lyc d72d0ae956 Merge pull request '登录窗口/主窗口调整' (#50) from lyc-dev into main 2024-07-22 15:11:06 +08:00
lyc cefb6ae5a7 登录窗口/主窗口调整 2024-07-22 15:10:28 +08:00
lyc 7b09c8ec81 Merge pull request 'window-tools' (#49) from lyc-dev into main 2024-07-22 11:25:26 +08:00
lyc de1e0c5a2e window-tools 2024-07-22 11:24:36 +08:00
baigl 954f43d8b3 vscode 行尾爆红eslintrc 关闭 2024-07-19 14:31:54 +08:00
555 changed files with 236518 additions and 1141 deletions

View File

@ -7,7 +7,10 @@ VITE_APP_ENV = 'development'
# AIx融合数字管理系统/开发环境
VITE_APP_BASE_API = '/dev-api'
VITE_APP_UPLOAD_API = 'http://192.168.2.52:7863'
VITE_APP_DOMAIN = 'file.ysaix.com'
VITE_APP_UPLOAD_API = 'https://file.ysaix.com:7868/prod-api'
#VITE_APP_UPLOAD_API = 'http://192.168.2.52:7863'
VITE_APP_RES_FILE_PATH = 'https://file.ysaix.com:7868/src/assets/textbook/booktxt/'

19
.env.lt Normal file
View File

@ -0,0 +1,19 @@
# 页面标题
VITE_APP_TITLE = 文枢课堂
# 生产环境配置
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,17 +1,19 @@
# 页面标题
VITE_APP_TITLE = AIx数字平台
VITE_APP_TITLE = AIX智慧课堂
# 生产环境配置
VITE_APP_ENV = 'production'
# AIx融合数字管理系统/生产环境
VITE_APP_BASE_API = 'https://file.ysaix.com:7868/prod-api'
VITE_APP_BASE_API = 'https://prev.ysaix.com:7868/prod-api'
VITE_APP_UPLOAD_API = 'https://file.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://file.ysaix.com:7868/src/assets/textbook/booktxt/'
VITE_APP_RES_FILE_PATH = 'https://prev.ysaix.com:7868/src/assets/textbook/booktxt/'
VITE_APP_BUILD_BASE_PATH = 'https://file.ysaix.com:7868/'
VITE_APP_BUILD_BASE_PATH = 'https://prev.ysaix.com:7868/'

19
.env.test Normal file
View File

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

View File

@ -10,6 +10,7 @@ module.exports = {
],
rules: {
'vue/require-default-prop': 'off',
'vue/multi-word-component-names': 'off'
'vue/multi-word-component-names': 'off',
'prettier/prettier': 'off'
}
}

View File

@ -1,3 +1,3 @@
provider: generic
url: https://example.com/auto-updates
url: http://localhost:3000/
updaterCacheDirName: electron-app-updater

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

@ -0,0 +1,54 @@
appId: com.electron.app
productName: 文枢课堂
directories:
output: dist
buildResources: build
win:
executableName: 文枢课堂
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:
- '**/*'

54
electron-builder-prod.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:
- '**/*'

53
electron-builder-test.yml Normal file
View File

@ -0,0 +1,53 @@
appId: com.electron.app
productName: AIx
directories:
buildResources: build
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/**
win:
executableName: AIx
icon: resources/logo2.ico
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: http://localhost:3000
electronDownload:
mirror: https://npmmirror.com/mirrors/electron/
# 额外依赖打包到输出目录
extraFiles:
- from: ./node_modules/im_electron_sdk/lib/
to: ./resources
filter:
- '**/*'

View File

@ -12,7 +12,8 @@ asarUnpack:
- resources/**
win:
executableName: AIx
nsis:
icon: resources/logo2.ico
nsis:
oneClick: false
allowToChangeInstallationDirectory: true
artifactName: ${name}-${version}-setup.${ext}
@ -41,6 +42,12 @@ appImage:
npmRebuild: false
publish:
provider: generic
url: https://example.com/auto-updates
url: https://file.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

@ -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()]
@ -17,21 +24,19 @@ export default defineConfig({
// '@': resolve('./src/renderer/src'),
// '@': path.resolve(__dirname, 'src/renderer/src'),
'@': path.join(__dirname, './src/renderer/src'),
'@root': path.join(__dirname, '.'),
}
},
server: {
proxy: {
'/dev-api': {
// target: 'http://27.128.240.72:7865',
target: 'http://192.168.2.52:7863',
target: 'http://27.128.240.72:7865',
// target: 'http://36.134.181.164:7863',
// target: 'http://192.168.2.52:7863',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api/, '')
},
'/profile': {
target: 'http://192.168.2.52:7863',
ws: true,
changeOrigin: true
},
}
},
},
plugins: [vue(), WindiCSS()],

View File

@ -4,7 +4,8 @@
"paths": {
"@/*":[
"src/renderer/src/*"
]
],
"@root/*":["./*"]
}
},
"exclude": [

View File

@ -1,7 +1,7 @@
{
"name": "electron-app",
"version": "1.0.0",
"description": "An Electron application with Vue",
"name": "aix-win",
"version": "2.0.6",
"description": "",
"main": "./out/main/index.js",
"author": "example.com",
"homepage": "https://electron-vite.org",
@ -13,25 +13,49 @@
"build": "electron-vite build",
"postinstall": "electron-builder install-app-deps",
"build:unpack": "npm run build && electron-builder --dir",
"build:win": "npm run build && electron-builder --win",
"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:lt": "electron-vite build --mode lt && electron-builder --win --config ./electron-builder-lt.yml",
"build:mac": "npm run build && electron-builder --mac",
"build:linux": "npm run build && electron-builder --linux"
},
"dependencies": {
"@electron-toolkit/preload": "^3.0.1",
"@electron-toolkit/utils": "^3.0.0",
"@electron/remote": "^2.1.2",
"@element-plus/icons-vue": "^2.3.1",
"@vitejs/plugin-vue-jsx": "^4.0.0",
"@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",
"electron-dl-manager": "^3.0.0",
"electron-log": "^5.1.7",
"electron-store": "8.0.0",
"electron-updater": "^6.1.7",
"element-china-area-data": "^6.1.0",
"element-plus": "^2.7.6",
"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",
"vue-cropper": "^1.0.3",
"vue-router": "^4.4.0"
"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"
},
"devDependencies": {
"@electron-toolkit/eslint-config": "^1.0.2",

BIN
resources/logo.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 57 KiB

BIN
resources/logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

BIN
resources/logo2.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

BIN
resources/logo3.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB

20
src/main/chat.js Normal file
View File

@ -0,0 +1,20 @@
/**
* @description 腾讯云-即时通讯-sdkID
*/
// import { ipcMain } from 'electron'
// const TimMain = require('im_electron_sdk/dist/main')
import TimMain from 'im_electron_sdk/dist/main'
// import {TIMErrCode} from 'im_electron_sdk/dist/enumbers'
const sdkappidDef = 1600034736 // 可以去腾讯云即时通信IM控制台申请
// 初始化
function init(sdkappid = sdkappidDef) {
return new TimMain({sdkappid})
}
export function initialize(){
// ipcMain.handle('im-chat:init', (event, sdkappid) => {
// return init(sdkappid)
// })
return init()
}
export default { initialize, init }

View File

@ -1,16 +1,116 @@
import CryptoJS from 'crypto-js'
import SparkMD5 from 'spark-md5'
const fs = require('fs')
const path = require('path')
import { ElectronDownloadManager } from 'electron-dl-manager'
import { dialog } from 'electron'
import axios from 'axios'
const uploadUrl = import.meta.env.VITE_APP_UPLOAD_API + '/smarttalk/file/upload'
const asyncUploadUrl = import.meta.env.VITE_APP_UPLOAD_API + '/smarttalk/file/asyncUpload'
const manager = new ElectronDownloadManager()
export default async function ({ app, shell, BrowserWindow, ipcMain }) {
const userDataPath = app.getPath('userData')
const appRootFilePath = userDataPath + '\\selfFile\\'
const appTempFilePath = userDataPath + '\\tempFile\\'
let Spark = new SparkMD5.ArrayBuffer()
ipcMain.on('upload-file-change', (e, { id, fileNewName, cookie, fileType }) => {
let filePath = appRootFilePath + fileNewName
//执行更新,上传文件
let formData = new FormData()
formData.append('id', id)
uploadFileByFS({
url: asyncUploadUrl,
path: filePath,
name: fileNewName,
cookie,
fileType,
formData,
success: (response) => {
e.reply('upload-file-change-success' + fileNewName, {
data: response.data,
md5: formData.md5
})
},
error: (err) => {
console.error('Error uploading file:', err)
}
})
})
/*监听文件改变,如果有改变则返回触发*/
ipcMain.on('listen-file-change', (e, { id, fileNewName, md5, cookie, fileType }) => {
let filePath = appRootFilePath + fileNewName
let uploadId = null
let isOn = false
let lastMTime = fs.statSync(filePath).mtime.getTime()
console.log(lastMTime)
setInterval(() => {
getFileMsg(filePath).then((msg) => {
if (msg !== lastMTime) {
lastMTime = msg
if (uploadId) {
clearTimeout(uploadId)
}
if (isOn === false) {
console.log(fileNewName)
e.reply('listen-file-change-on' + fileNewName)
isOn = true
}
//倒数十秒提交更改,十秒之内有继续修改则重置倒数
uploadId = setTimeout(() => {
console.log(223)
//执行更新,上传文件
let formData = new FormData()
formData.append('id', id)
uploadFileByFS({
url: asyncUploadUrl,
path: filePath,
name: fileNewName,
cookie,
fileType,
formData,
success: (response) => {
e.reply('listen-file-change-success' + fileNewName, {
data: response.data,
md5: formData.md5
})
clearTimeout(uploadId)
isOn = false
},
error: (err) => {
console.error('Error uploading file:', err)
}
})
}, 5000)
}
})
}, 1000)
})
function getFileMsg(path) {
return new Promise((resolve, reject) => {
const stats = fs.statSync(path)
return resolve(stats.mtime.getTime())
})
}
function getFileMD5(path) {
return new Promise((resolve, reject) => {
fs.readFile(path, (err, dataFile) => {
if (err) {
reject(err)
return console.error(err)
}
Spark.append(dataFile)
let md5 = Spark.end()
resolve(md5)
})
})
}
/*
* 判断是否有本地文件
* */
ipcMain.on('is-have-local-file', (e, fileNewName) => {
let filePath = appRootFilePath + fileNewName
fs.access(filePath, fs.constants.F_OK, (err) => {
@ -21,14 +121,44 @@ export default async function ({ app, shell, BrowserWindow, ipcMain }) {
e.reply('is-have-local-file-reply' + fileNewName, true)
})
})
/*
* 判断是需要同步本地文件
* */
ipcMain.on('is-async-local-file', (e, { fileNewName, lastModifyTime, md5 }) => {
let filePath = appRootFilePath + fileNewName
fs.access(filePath, fs.constants.F_OK, (err) => {
if (err) {
e.reply('is-async-local-file-reply' + fileNewName, { isAsync: true, type: 'down' })
return
}
getFileMsg(filePath).then((msg) => {
let time = new Date(lastModifyTime).getTime();
msg = parseInt(msg/1000)*1000;
if (msg == time) {
e.reply('is-async-local-file-reply' + fileNewName, { isAsync: false, type: '' })
} else {
const stats = fs.statSync(filePath)
//如果线上时间大于线下时间,就需要从线上下载,否则则需要上传
if (time > stats.mtime.getTime()) {
e.reply('is-async-local-file-reply' + fileNewName, { isAsync: true, type: 'down' })
} else if (time < stats.mtime.getTime()) {
e.reply('is-async-local-file-reply' + fileNewName, { isAsync: true, type: 'upload' })
}
}
})
})
})
//默认浏览器打开url
ipcMain.on('open-url-browser', (e, url) => {
shell.openPath(url)
})
//使用默认应用打开本地文件
ipcMain.on('open-path-app', (e, destination) => {
let path = appRootFilePath + destination
shell.openExternal(path).catch((error) => {
shell.openPath(path).catch((error) => {
console.log(error)
})
})
@ -40,65 +170,75 @@ export default async function ({ app, shell, BrowserWindow, ipcMain }) {
})
})
//复制文件
//导出文件
ipcMain.on('export-file-default', (e, list) => {
exportFile(list, (res) => {
e.reply('export-file-default-reply', res)
})
})
function getFileMD5(file) {
return new Promise((resolve, reject) => {
const fileReader = new FileReader()
fileReader.onload = (e) => {
const buffer = e.target.result
let md5 = CryptoJS.MD5(buffer).toString()
resolve(md5)
function uploadFileByFS({ url, path, name, cookie, fileType, formData, success, error }) {
fs.readFile(path, (err, data) => {
if (err) {
return console.error(err)
}
fileReader.readAsArrayBuffer(file)
// 配置上传的请求
const config = {
headers: {
'Content-Type': 'multipart/form-data', // 或者其他适合上传文件的Content-Type
Authorization: 'Bearer ' + cookie
}
}
Spark.append(data)
let md5 = Spark.end()
// 使用axios上传文件
let file = new File([data], name, {
type: fileType
})
const stats = fs.statSync(path)
formData.append('file', file)
formData.append('md5', md5)
formData.append('lastModifyTime', stats.mtime.toLocaleString())
axios
.post(url, formData, config)
.then((response) => {
success(response)
})
.catch((errorMsg) => {
error(errorMsg)
})
})
}
/*创建新的ppt文件*/
ipcMain.on('creat-file-default', (e, { name, uploadData, cookie }) => {
createFolder('tempFile').then(() => {
let path = appTempFilePath + name
let path = appTempFilePath + name.replace(/[\\/:*?"<>|]/, '')
console.log(path)
fs.writeFileSync(path, '', 'utf-8')
// 读取文件
fs.readFile(path, (err, data) => {
if (err) {
return console.error(err)
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])
}
// 配置上传的请求
const config = {
headers: {
'Content-Type': 'multipart/form-data', // 或者其他适合上传文件的Content-Type
Authorization: 'Bearer ' + cookie
}
}
formData.append('fileFlag', '课件')
uploadFileByFS({
url: uploadUrl,
path,
name,
cookie,
fileType,
formData,
success: (response) => {
e.reply('creat-file-default-reply', response.data)
console.log('File uploaded successfully:', response.data)
},
error: (err) => {
console.error('Error uploading file:', err)
}
let md5 = CryptoJS.MD5(data).toString()
let formData = new FormData()
// 使用axios上传文件
let file = new File([data], name, {
type: 'application/vnd.openxmlformats-officedocument.presentationml.presentation'
})
formData.append('file', file)
formData.append('md5',md5)
for (let key in uploadData) {
if (uploadData.hasOwnProperty(key)) { // 检查是否是对象自身的属性
formData.append(key,uploadData[key])
}
}
formData.append("fileFlag","教案")
axios
.post(uploadUrl, formData, config)
.then((response) => {
e.reply('creat-file-default-reply', response.data)
console.log('File uploaded successfully:', response.data)
})
.catch((error) => {
console.error('Error uploading file:', error)
})
})
})
})
@ -110,37 +250,43 @@ export default async function ({ app, shell, BrowserWindow, ipcMain }) {
//下载文件
ipcMain.on('download-file-default', (e, { url, fileName }) => {
createFolder('selfFile').then(async () => {
const browserWindow = BrowserWindow.fromId(e.sender.id)
const id = await manager.download({
window: browserWindow,
url: url,
saveAsFilename: fileName,
directory: appRootFilePath,
callbacks: {
onDownloadStarted: async ({ id, item, webContents }) => {
// Do something with the download id
},
onDownloadProgress: async ({ id, item, percentCompleted }) => {},
onDownloadCompleted: async ({ id, item }) => {
console.log('完成')
e.reply('download-file-default' + fileName, true)
},
onDownloadCancelled: async () => {
console.log('取消')
e.reply('download-file-default' + fileName, false)
},
onDownloadInterrupted: async () => {
console.log('中断')
e.reply('download-file-default' + fileName, false)
},
onError: (err, data) => {
console.log(err.toString())
e.reply('download-file-default' + fileName, false)
createFolder('selfFile')
.then(async () => {
const browserWindow = BrowserWindow.getFocusedWindow()
const id = await manager.download({
window: browserWindow,
url: url,
saveAsFilename: fileName,
directory: appRootFilePath,
callbacks: {
onDownloadStarted: async ({ id, item, webContents }) => {
// Do something with the download id
},
onDownloadProgress: async ({ id, item, percentCompleted }) => {
e.reply('download-file-default-prog' + fileName, percentCompleted)
},
onDownloadCompleted: async ({ id, item }) => {
console.log('完成')
e.reply('download-file-default' + fileName, true)
},
onDownloadCancelled: async () => {
console.log('取消')
e.reply('download-file-default' + fileName, false)
},
onDownloadInterrupted: async () => {
console.log('中断')
e.reply('download-file-default' + fileName, false)
},
onError: (err, data) => {
console.log(err.toString())
e.reply('download-file-default' + fileName, false)
}
}
}
})
})
.catch((error) => {
e.reply('download-file-default' + fileName, false)
})
})
})
/**...
@ -191,6 +337,7 @@ export default async function ({ app, shell, BrowserWindow, ipcMain }) {
})
})
/*导出文件*/
function exportFile(list, callback) {
let win = BrowserWindow.getFocusedWindow()
//通过扩展名识别文件类型
@ -220,10 +367,12 @@ export default async function ({ app, shell, BrowserWindow, ipcMain }) {
})
}
/*文件是否已经存在*/
function isHaveFile(path) {
return fs.existsSync(path)
}
/*判断是否已经存在这个名字的文件,如果已经存在则递增导出*/
function filterCopyFile(path, index = 0) {
if (isHaveFile(path) === true) {
index++
@ -234,6 +383,7 @@ export default async function ({ app, shell, BrowserWindow, ipcMain }) {
}
}
/*复制文件*/
function copyRelFile(source, destination, callback) {
return new Promise((resolve, reject) => {
const readStream = fs.createReadStream(source)
@ -256,6 +406,7 @@ export default async function ({ app, shell, BrowserWindow, ipcMain }) {
})
}
/*复制文件*/
function copyFile(source, destination, callback) {
let path = appRootFilePath + destination
createFolder('selfFile').then(() => {
@ -276,6 +427,7 @@ export default async function ({ app, shell, BrowserWindow, ipcMain }) {
})
}
/*创建文件夹*/
function createFolder(folderName) {
return new Promise((resolve, reject) => {
const folderPath = path.join(userDataPath, folderName)

View File

@ -1,72 +1,253 @@
import { app, shell, BrowserWindow, ipcMain } from 'electron'
import { app, shell, BrowserWindow, ipcMain, session, BrowserView } from 'electron'
import { join } from 'path'
import { electronApp, optimizer, is } from '@electron-toolkit/utils'
import icon from '../../resources/icon.png?asset'
import File from './file'
import Logger from './logger' // 日志封装
import chat from './chat' // chat封装
import Store from './store' // Store封装
import updateInit from './update'
// 代理 electron/remote
// 第一步引入remote
import remote from '@electron/remote/main'
// 第二步: 初始化remote
remote.initialize()
// 日志配置-初始化(日志直接绑定到console上)
if(!is.dev) Logger.initialize()
// 持久化数据-初始化
Store.initialize()
File({ app, shell, BrowserWindow, ipcMain })
function createWindow() {
// Create the browser window.
const mainWindow = new BrowserWindow({
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
loginWindow = new BrowserWindow({
width: 888,
height: 520,
show: false,
frame: false,
autoHideMenuBar: true,
maximizable: false,
resizable: false,
icon: join(__dirname, '../../resources/logo2.ico'),
...(process.platform === 'linux' ? { icon } : {}),
webPreferences: {
defaultEncoding: 'utf-8',
preload: join(__dirname, '../preload/index.js'),
sandbox: false,
nodeIntegration: true
nodeIntegration: true,
contextIsolation: false // 沙箱取消
}
})
loginWindow.type = 'login' // 唯一标识
// handleUpdate(loginWindow,ipcMain)
// const loginURL = is.dev ? `http://localhost:5173/#/login` : `file://${__dirname}/index.html/#/login`
// loginWindow.loadURL(loginURL)
if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
loginWindow.loadURL('http://localhost:5173/#/login')
} else {
loginWindow.loadFile(join(__dirname, '../renderer/index.html'), { hash: 'login' })
updateInit(loginWindow)
}
// loginWindow.webContents.openDevTools()
loginWindow.once('ready-to-show', () => {
loginWindow.show()
})
loginWindow.on('closed', () => {
loginWindow = null
})
remote.enable(loginWindow.webContents)
}
//主窗口
function createMainWindow() {
mainWindow = new BrowserWindow({
width: 1200,
minWidth: 1350,
height: 700,
show: false,
frame: false, // 无边框
autoHideMenuBar: true,
maximizable: false,
icon: join(__dirname, '../../resources/logo2.ico'),
...(process.platform === 'linux' ? { icon } : {}),
webPreferences: {
defaultEncoding: 'utf-8',
preload: join(__dirname, '../preload/index.js'),
sandbox: false,
// nodeIntegration: true,
nodeIntegration: true, // nodeApi调用
contextIsolation: false // 沙箱取消
// webSecurity: false // 跨域关闭
}
})
mainWindow.type = 'main' // 唯一标识
mainWindow.on('ready-to-show', () => {
mainWindow.show()
})
mainWindow.on('closed', () => {
setTimeout(() => {
// 延迟销毁
mainWindow = null
}, 1000)
// app.quit() // 主窗口关闭-结束所有进程
})
mainWindow.webContents.setWindowOpenHandler((details) => {
shell.openExternal(details.url)
return { action: 'deny' }
})
mainWindow.webContents.openDevTools()
// HMR for renderer base on electron-vite cli.
// Load the remote URL for development or the local html file for production.
// mainWindow.webContents.openDevTools()
if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
mainWindow.loadURL(process.env['ELECTRON_RENDERER_URL'])
// mainWindow.loadURL('https://file.ysaix.com:7868/')
} else {
// mainWindow.loadURL('https://file.ysaix.com:7868/')
mainWindow.loadFile(join(__dirname, '../renderer/index.html'))
}
// mainWindow.setAlwaysOnTop(true, "screen-saver") // 将窗口设置为顶层窗口
// mainWindow.setVisibleOnAllWorkspaces(true) // 如果窗口在所有工作区都可见
// 第三步: 开启remote服务
remote.enable(mainWindow.webContents)
}
// This method will be called when Electron has finished
// initialization and is ready to create browser windows.
// Some APIs can only be used after this event occurs.
app.whenReady().then(() => {
// Set app user model id for windows
// 打开外部链接窗口
let linkWin = {}
async function createLinkWin(data) {
if (linkWin[data.key]) return
linkWin[data.key] = new BrowserWindow({
show: false,
frame: true,
maximizable: true,
autoHideMenuBar: true,
...(process.platform === 'linux' ? { icon } : {}),
webPreferences: {
defaultEncoding: 'utf-8',
sandbox: false,
nodeIntegration: true,
worldSafeExecuteJavaScript: true,
contextIsolation: true
}
})
linkWin[data.key].type = 'link'+data.key // 唯一标识
let cookieDetails = { ...data.cookieData }
await linkWin[data.key].webContents.session.cookies
.set(cookieDetails)
.then(() => {})
.catch((error) => {})
data.fullPath = data.fullPath.replaceAll('//', '/')
if (data.fullPath.indexOf('?') !== -1) {
data.fullPath += '&urlSource=smarttalk&t' + Date.now()
}else {
data.fullPath += '?urlSource=smarttalk&t' + Date.now()
}
linkWin[data.key].loadURL(data.fullPath)
linkWin[data.key].once('ready-to-show', () => {
linkWin[data.key].show()
linkWin[data.key].maximize()
})
linkWin[data.key].on('closed', () => {
linkWin[data.key] = null
delete linkWin[data.key]
})
}
// 初始化完成
app.on('ready', () => {
appWatchError() // 监听app错误
process.env.LANG = 'en_US.UTF-8'
// 设置应用程序用户模型标识符
electronApp.setAppUserModelId('com.electron')
// Default open or close DevTools by F12 in development
// and ignore CommandOrControl + R in production.
// see https://github.com/alex8088/electron-toolkit/tree/master/packages/utils
//一个新的browserWindow 被创建时触发
app.on('browser-window-created', (_, window) => {
optimizer.watchWindowShortcuts(window)
})
//窗口 最大、最小、关闭
ipcMain.on('minimize-window', () => {
if (loginWindow) {
loginWindow.minimize()
}
if (mainWindow) {
mainWindow.minimize()
}
})
ipcMain.on('maximize-window', () => {
mainWindow.isMaximized() ? mainWindow.unmaximize() : mainWindow.maximize()
})
createWindow()
ipcMain.on('close-window', () => {
if (loginWindow) {
loginWindow.destroy()
}
if (mainWindow) {
mainWindow.close() // 先发出这个关闭指令
setTimeout(() => {
//
mainWindow.destroy()
}, 200)
}
})
// 打开主窗口
ipcMain.on('openMainWindow', () => {
if (!mainWindow) {
createMainWindow()
}
loginWindow.destroy()
loginWindow = null
})
// 打开登录窗口
ipcMain.on('openLoginWindow', () => {
if (!loginWindow) {
createLoginWindow()
}
mainWindow.destroy()
mainWindow = null
loginWindow.show()
loginWindow.focus()
})
//打开作业窗口
ipcMain.on('openWindow', (e, data) => {
createLinkWin(data)
})
// zdg: 消息监听
handleAll()
// 打开-登录窗口
createLoginWindow()
app.on('activate', function () {
// On macOS it's common to re-create a window in the app when the
// dock icon is clicked and there are no other windows open.
if (BrowserWindow.getAllWindows().length === 0) createWindow()
if (BrowserWindow.getAllWindows().length === 0) createLoginWindow()
})
})
@ -79,34 +260,62 @@ app.on('window-all-closed', () => {
}
})
ipcMain.on('toggle-top', (event) => {
const win = BrowserWindow.getFocusedWindow();
const isAlwaysOnTop = win.isAlwaysOnTop();
win.setAlwaysOnTop(!isAlwaysOnTop);
event.sender.send('top-status-changed', !isAlwaysOnTop);
})
// 监听全局事件
function handleAll() {
const chatInstance = chat.initialize() // im-chat 实例
// 新窗口创建-监听
ipcMain.on('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
})
// 用于监听-状态管理变化-同步所有窗口
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()
if (bool) { // 除了消息发送窗口和销毁的窗口 其他都发送
curWin.webContents.send('pinia-state-set', storeName, jsonStr)
}
}
})
// 用于监听-状态管理变化-初始同步
ipcMain.handle('pinia-state-init', (e, wid, storeName, jsonStr) => {
// console.log('pinia-state-init', jsonStr)
const win = BrowserWindow.fromId(wid)
win.webContents.send('pinia-state-set', storeName, jsonStr)
})
}
// app 崩溃监听器
function appWatchError() {
// 渲染进程崩溃
app.on('renderer-process-crashed', (event, webContents, killed) => {
console.error(
`APP-ERROR:renderer-process-crashed; event: ${JSON.stringify(event)}; webContents:${JSON.stringify(
webContents
)}; killed:${JSON.stringify(killed)}`
)
})
ipcMain.on('minimize-window', () => {
const win = BrowserWindow.getFocusedWindow();
win.minimize();
});
// GPU进程崩溃
app.on('gpu-process-crashed', (event, killed) => {
console.error(`APP-ERROR:gpu-process-crashed; event: ${JSON.stringify(event)}; killed: ${JSON.stringify(killed)}`)
})
ipcMain.on('maximize-window', () => {
const win = BrowserWindow.getFocusedWindow();
if (win.isMaximized()) {
win.unmaximize();
} else {
win.maximize();
}
});
// 渲染进程结束
app.on('render-process-gone', async (event, webContents, details) => {
console.error(
`APP-ERROR:render-process-gone; event: ${JSON.stringify(event)}; webContents:${JSON.stringify(
webContents
)}; details:${JSON.stringify(details)}`
)
})
ipcMain.on('close-window', () => {
const win = BrowserWindow.getFocusedWindow();
win.close();
});
ipcMain.on('set-winsize', (e, {x, y})=>{
const win = BrowserWindow.getFocusedWindow();
win.setSize(x,y);
win.center()
})
// 子进程结束
app.on('child-process-gone', async (event, details) => {
console.error(`APP-ERROR:child-process-gone; event: ${JSON.stringify(event)}; details:${JSON.stringify(details)}`)
})
}

52
src/main/logger.js Normal file
View File

@ -0,0 +1,52 @@
/**
* @description 日志配置
* @author zdg
* @date 2021-07-05 14:07:01
*/
// import log from 'electron-log'
import log from 'electron-log/main'
import { app } from 'electron'
import path from 'path'
// 关闭控制台打印
// 日志控制台等级默认值false
log.transports.console.level = false
// log.transports.console.level = 'info'
// 日志文件等级默认值false
log.transports.file.level = 'info'
// 日志文件名默认main.log
// log.transports.file.fileName = 'main.log';
// 日志大小默认10485761M达到最大上限后备份文件并重命名为main.old.log有且仅有一个备份文件
log.transports.file.maxSize = 10 * 1024 * 1024; // 文件最大不超过 10M
// 自定义日志文件滚动策略
log.transports.file.rollSize = 10 * 1024 * 1024; // 10MB
// 日志格式,默认:[{y}-{m}-{d} {h}:{i}:{s}.{ms}] [{level}]{scope} {text}
log.transports.file.format = '[{y}-{m}-{d} {h}:{i}:{s}.{ms}] [{level}]{scope} {text}'
let date = new Date()
let dateStr = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate()
// 文件位置及命名方式
// 默认位置为C:\Users\[user]\AppData\Roaming\[appname]\electron_log\
// 文件名为:年-月-日.log
// 自定义文件保存位置为安装目录下 \log\年-月-日.log
// log.transports.file.resolvePathFn = () => 'logs\\' + dateStr+ '.log';
log.transports.file.resolvePathFn = () => path.join(app.getPath('userData'), `logs/${dateStr}.log`)
// 有六个日志级别error, warn, info, verbose, debug, silly。默认是silly
export const logger = {
error: (...args) => log.error(...args),
warn: (...args) => log.warn(...args),
info: (...args) => log.info(...args),
verbose: (...args) => log.verbose(...args),
debug: (...args) => log.debug(...args),
silly: (...args) => log.silly(...args)
}
export function initialize(bool = true, type = 'all') {
log.initialize() // 为渲染器进行初始化
if (bool) { // 是否替换默认的console
if (type == 'all') Object.assign(console, log.functions)
else { // 替换指定类型
console[type] = log[type]
}
}
}
export default { initialize }

61
src/main/store.js Normal file
View File

@ -0,0 +1,61 @@
/**
* @description 解决 主进程|渲染进程 数据共享
*/
import Store from 'electron-store' // 持久化存储
// 设置ipc与渲染器通信
Store.initRenderer()
// 默认共享数据
const defaultData = {
session: { // 缓存(临时sessionStorage)
model: 'select', // 悬浮球-当前模式
showBoardAll: false, // 全屏画板-是否显示
isPdfWin: false, // pdf窗口是否打开
isToolWin: false, // 工具窗口是否打开
curSubjectNode: {
data: {}, // 当前教材节点 (包含当前教材 单元)
querySearch: {} // 查询资源所需参数
}
},
local: { // 本地(永久localStorage)
},
}
// 初始化
export function initialize(){
// 缓存数据-sessionStore
const sessionStore = new Store({
name: 'session-store', // 存储文件名
fileExtension: 'ini', // 文件后缀名
encryptionKey: 'BvPLmgCC4DSIG0KkTec5', // 数据加密-防止用户直接改配置
beforeEachMigration: (store, context) => { // 版本迁移回调
console.log(`[session-store] 迁移从 ${context.fromVersion}${context.toVersion}`);
},
migrations: { // 版本变化
'0.0.0': store => {
// store.set('debugPhase', true);
}
}
})
sessionStore.clear() // 先清除-所有缓存数据
sessionStore.set(defaultData.session) // 初始化-默认数据
// 缓存数据-localStore
const localStore = new Store({
name: 'local-store', // 存储文件名
fileExtension: 'ini', // 文件后缀名
encryptionKey: '6CyoHQmUaPmLzvVsh', // 数据加密-防止用户直接改配置
beforeEachMigration: (store, context) => { // 版本迁移回调
console.log(`[local-store] 迁移从 ${context.fromVersion}${context.toVersion}`);
},
migrations: { // 版本变化
'0.0.0': store => {
// store.set('debugPhase', true);
}
}
})
localStore.set(defaultData.local) // 初始化-默认数据
return {sessionStore, localStore}
}
export default { initialize }

66
src/main/update.js Normal file
View File

@ -0,0 +1,66 @@
import { dialog } from 'electron'
import logger from 'electron-log'
const updateURL = 'http://27.128.240.72:3000/zhuhao/AIx_Smarttalk/releases/tag/V1.0.0%28%E6%B5%8B%E8%AF%95%E7%89%88%29/'
// 主进程中的更新检查
const { autoUpdater } = require('electron-updater')
const updateInit = (win) => {
logger.info('进来了')
// 检查更新
autoUpdater.checkForUpdates()
// 自动下载
autoUpdater.autoDownload = false
// 设置版本更新服务器地址
// autoUpdater.setFeedURL(updateURL)
//监听更新事件
autoUpdater.on('update-available', (info) => {
logger.info('发现新版本')
dialog
.showMessageBox(win,{
type: 'info',
title: '新版本可用',
message: '有一个可用的新版本,要更新吗',
buttons: ['是', '否']
})
.then((result) => {
if (result.response === 0) {
// 用户选择更新,触发下载和安装
autoUpdater.downloadUpdate()
}
})
})
// 没有新版本
autoUpdater.on('update-not-available', () => {
logger.info('没有新版本')
})
// 更新发生错误
autoUpdater.on('error', () => {
logger.error('检查更新失败')
})
// 监听下载进度
autoUpdater.on('download-progress', (progressObj) => {
win.webContents.send('update-app-progress', progressObj.percent);
});
// 跟新下载完毕
autoUpdater.on('update-downloaded', () => {
dialog
.showMessageBox({
type: 'info',
title: '更新下载完成',
message: '点击确定重启获取最新内容',
buttons: ['确定']
})
.then(() => {
// 调用 quitAndInstall 来安装更新
autoUpdater.quitAndInstall()
})
})
}
export default updateInit

View File

@ -1,9 +1,11 @@
import { contextBridge } from 'electron'
import { electronAPI } from '@electron-toolkit/preload'
import TimRender from 'im_electron_sdk/dist/renderer' // im渲染部分实例
// Custom APIs for renderer
const api = {}
const api = {
preloadPath: __dirname, // 当前preload地址
getTimRender: () => new TimRender(), // im渲染部分实例
}
// Use `contextBridge` APIs to expose Electron APIs to
// renderer only if context isolation is enabled, otherwise
// just add to the DOM global.

View File

@ -2,13 +2,13 @@
<html>
<head>
<meta charset="UTF-8" />
<title>Electron</title>
<title>%VITE_APP_TITLE%</title>
<!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
<!-- <meta
http-equiv="Content-Security-Policy"
content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:"
/> -->
<meta http-equiv="Content-Security-Policy" content="connect-src *; default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src * 'self' data: blob:" />
<meta http-equiv="Content-Security-Policy" content="connect-src *; default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *;img-src * 'self' data: blob:" />
</head>

5430
src/renderer/public/aaa.pdf Normal file

File diff suppressed because it is too large Load Diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

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

View File

@ -0,0 +1,20 @@
import request from '@/utils/request'
// 创建对话
export const createChart = ({ headers, data }) => {
return request({
url: '/qf/createChart',
method: 'post',
headers,
data,
})
}
// 大模型对话
export const sendChart = ({ headers, data }) => {
return request({
url: '/qf/sendTalk',
method: 'post',
headers,
data,
})
}

View File

@ -0,0 +1,28 @@
/**
* @description: 后端接口api
* @author zdg
* @date 2023-07-03
*/
import request from '@/utils/request'
// /system/user/txCloudSign
export class ApiService {
// zdg: 公共请求-处理(可进行特殊处理)
static publicHttp(url, data, method, option = {}, type) {
method = method || 'get' // 默认GET
const config = { url, method }
if (!!data) config[method=='get'?'params':'data'] = data
if (!!option) Object.assign(config, option)
// 特殊格式处理
let headers
if (type == 'file') headers = { 'Content-Type': 'multipart/form-data' }
else if (type == 'json') headers = { 'Content-Type': 'application/json' }
else if (type == 'form') headers = { 'Content-Type': 'application/x-www-form-urlencoded' }
headers && (config.headers = { ...config.headers, ...headers })
return request(config)
}
}
// zdg: 腾讯云-即时通讯
export class imChat {
// 获取腾讯im-chat appid 签名
static getTxCloudSign = data => ApiService.publicHttp('/system/user/txCloudSign', data)
}

View File

@ -0,0 +1,200 @@
// 查询evaluation列表
import request from '@/utils/request'
// 查询班级列表
export function listClassmain(query) {
return request({
url: '/education/classmain/list',
method: 'get',
params: query
})
}
// 查询学生列表
export function listClassuser(query) {
return request({
url: '/education/classuser/list',
method: 'get',
params: query
})
}
// 新增班级
export function addClassmain(data) {
return request({
url: '/education/classmain',
method: 'post',
data: data
})
}
// 查询所有学科的列表
export function listEvaluation(query) {
return request({
url: '/education/evaluation/list',
method: 'get',
params: query
})
}
// 新增小组
export function addClassgroup(data) {
return request({
url: '/education/classgroup',
method: 'post',
data: data
})
}
//班级详情
export function getClassmain(id) {
return request({
url: '/education/classmain/' + id,
method: 'get'
})
}
// 获取小组列表
export function listClassgroup(query) {
return request({
url: '/education/classgroup/new/list',
method: 'get',
params: query
})
}
//删除小组
export function delClassgroup(id) {
return request({
url: '/education/classgroup/' + id,
method: 'delete'
})
}
//查询小组信息
export function getClassgroup(id) {
return request({
url: '/education/classgroup/' + id,
method: 'get'
})
}
//修改小组信息
export function updateClassgroup(data) {
return request({
url: '/education/classgroup',
method: 'put',
data: data
})
}
//新增学生
export function addStudentmain(data) {
return request({
url: '/education/studentmain',
method: 'post',
data: data
})
}
//修改学生信息
export function updateStudentmain(data) {
return request({
url: '/education/studentmain',
method: 'put',
data: data
})
}
//获取学生信息
export function getStudentmain(id) {
return request({
url: '/education/studentmain/' + id,
method: 'get'
})
}
//删除学生
export function leaveClass(data) {
return request({
url: '/education/classuser/leaveClass',
method: 'post',
data: data
})
}
//删除学生所有数据
export function removeStudentDataAll(id) {
return request({
url: '/education/studentmain/removeStudent/' + id,
method: 'post'
})
}
//删除教室
export function delClassroom(id) {
return request({
url: '/education/classroom/' + id,
method: 'delete'
})
}
//导入学生
export function addStudentmainByNameArray(data) {
return request({
url: '/education/studentmain/addByNameArray',
method: 'post',
data: data
})
}
//新增课程预约
export function addSmartClassReserv(data) {
return request({
url: '/smarttalk/classReserv/addSmartClassReserv',
method: 'post',
data: data
})
}
//修改课程预约
export function updateSmartClassReserv(data) {
return request({
url: '/smarttalk/classReserv/updateSmartClassReserv',
method: 'post',
data: data
})
}
//查询课程预约
export function getSelfReserv() {
return request({
url: '/smarttalk/classReserv/getSelfReserv',
method: 'get'
})
}
export function deleteSmartReserv(id) {
return request({
url: '/smarttalk/classReserv/' + id,
method: 'delete'
})
}
export function startClass(id, ex3) {
const params = {id}
!!ex3 && (params.ex3 = ex3)
return request({
url: '/smarttalk/classReserv/startClass',
method: 'get',
params
})
}
export function endClass(id) {
return request({
url: '/smarttalk/classReserv/endClass',
method: 'get',
params: {id}
})
}
/**
* @description 获取课堂信息
* @param {*} id
* @returns
*/
export function getClassInfo(id) {
return request({
url: '/smarttalk/classReserv/selectById',
method: 'get',
params: {id}
})
}
//加入班级
export function addClasses(data) {
return request({
url: '/smarttalk/audit/applyAddClass',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
})
}

View File

@ -0,0 +1,64 @@
// 查询evaluation列表
import request from '@/utils/request'
// 查询作业列表
export function listByDeadDate(query) {
return request({
url: '/education/classwork/listByDeadDate',
method: 'get',
params: query
})
}
//多个班级学生作业数据
export function listClassworkdataByDeadDate(query) {
return request({
url: '/education/classworkdata/listByDeadDate',
method: 'get',
params: query
})
}
// 查询classworkdata列表 班级作业列表
export function listClassworkdata(query) {
return request({
url: '/education/classworkdata/list',
method: 'get',
params: query
})
}
// 查询entpcoursework列表 课程作业列表
export function listEntpcoursework(query) {
return request({
url: '/education/entpcoursework/list',
method: 'get',
params: query
})
}
// 查询classworkeval列表 课堂作业列表
export function listClassworkeval(query) {
return request({
url: '/education/classworkeval/list',
method: 'get',
params: query
})
}
// 修改classworkeval
export function updateClassworkeval(data) {
return request({
url: '/education/classworkeval',
method: 'put',
data: data
})
}
// 修改classworkdata
export function updateClassworkdata(data) {
return request({
url: '/education/classworkdata',
method: 'put',
data: data
})
}

View File

@ -0,0 +1,35 @@
import request from '@/utils/request'
// 新增pdf圈点勾画
export const addsmartBookMark = (params) => {
return request({
url: '/smarttalk/bookMark/addSmartBookMark',
method: 'post',
data:params
})
}
// 修改pdf圈点勾画
export const updateSmartBookMarkContent = (params) => {
return request({
url: '/smarttalk/bookMark/updateSmartBookMarkContent',
method: 'post',
data:params
})
}
// 根据书id获取pdf圈点勾画
export const getBookMarkById = (bookId) => {
return request({
url: '/smarttalk/bookMark/' + bookId,
method: 'get'
})
}
//根据id删除对应页数
export function deleteBookMark(ids) {
return request({
url: '/smarttalk/bookMark/' + ids,
method: 'delete'
})
}

View File

@ -0,0 +1,111 @@
import request from '@/utils/request'
// 查询entpcoursework列表
export function listEntpcoursework(query) {
return request({
url: '/education/entpcoursework/list',
method: 'get',
params: query
})
}
// 查询entpcoursework详细
export function getEntpcoursework(id) {
return request({
url: '/education/entpcoursework/' + id,
method: 'get'
})
}
// 新增entpcoursework
export function addEntpcoursework(data) {
return request({
url: '/education/entpcoursework',
method: 'post',
data: data
})
}
// 修改entpcoursework
export function updateEntpcoursework(data) {
return request({
url: '/education/entpcoursework',
method: 'put',
data: data
})
}
// 删除entpcoursework
export function delEntpcoursework(id) {
return request({
url: '/education/entpcoursework/' + id,
method: 'delete'
})
}
// xuekubaoapi
export function xuekubaoAPI(data) {
return request({
url: '/education/entpcoursework/xuekubaoapi',
method: 'post',
data: data
})
}
// PPT文件上传
export function uploadEntpcourseworkFile(data) {
return request({
url: '/education/entpcoursework/uploadWord',
method: 'post',
data: data
})
}
// 查询entpcoursework列表
export function listEntpcourseworkNew(query) {
return request({
url: '/education/entpcoursework/new/list',
method: 'get',
params: query
})
}
/**
* @desc: 学科网接口api
* @return: {*}
* @param {*} path 请求路径 /xopqbm/questions(无需全拼, 后端学科网sdk自动处理)
* @param {*} method 请求方式 post/get
* @param {*} params 请求参数 {key: value,}
*/
export function xkwAPI(path, method, isPostBody, params) {
return request({
url: '/xkw/post',
method: 'post',
data: {
path: path,
method: method,
isPostBody: isPostBody,
params: params,
}
})
}
/**
* @desc: 图文识别接口 python_OCR_api
* @return: {*}
* @param {*} path 请求路径 /ocrApi/data
* @param {*} method 请求方式 post
* @param {*} params 请求参数 {key: value,}
*/
export function pyOCRAPI(path) {
return request({
url: '/ocrApi/data',
method: 'post',
data: {
imageBas64: path,
}
})
}

View File

@ -0,0 +1,162 @@
import request from '@/utils/request'
// 查询entpcoursefile列表
export function listEntpcoursefile(query) {
return request({
url: '/education/entpcoursefile/list',
method: 'get',
params: query
})
}
// zdg:查询entpcoursefile列表-新
export function listEntpcoursefileNew(query) {
return request({
url: '/education/entpcoursefile/new/list',
method: 'get',
params: query
})
}
// 查询entpcoursefile详细
export function getEntpcoursefile(id) {
return request({
url: '/education/entpcoursefile/' + id,
method: 'get'
})
}
// 新增entpcoursefile
export function addEntpcoursefile(data) {
return request({
url: '/education/entpcoursefile',
method: 'post',
data: data
})
}
// 新增entpcoursefile
export function addEntpcoursefileReturnId(data) {
return request({
url: '/education/entpcoursefile/addReturnId',
method: 'post',
data: data
})
}
// addFromId
export function addFromId(fromid, toid, entpid, entpcourseid, edituserid) {
return request({
url: '/education/entpcoursefile/addFromId/'+fromid+'/'+toid+'/'+entpid+'/'+entpcourseid+'/'+edituserid,
method: 'post'
})
}
// 修改entpcoursefile
export function updateEntpcoursefile(data) {
return request({
url: '/education/entpcoursefile',
method: 'put',
data: data
})
}
// 新增 修改接口
export function updateEntpcoursefileNew(data) {
return request({
url: '/education/entpcoursefile/newUpdateFile',
method: 'post',
data: data
})
}
// updateFileByIds
export function updateFileByIds(data) {
return request({
url: '/education/entpcoursefile/updateFileByIds',
method: 'post',
data: data
})
}
// updateFileByArray
export function updateFileByArray(data) {
return request({
url: '/education/entpcoursefile/updateFileByArray',
method: 'post',
data: data
})
}
// 修改entpcoursefile
export function updateFile2Redis(data) {
return request({
url: '/education/entpcoursefile/updateFile2Redis',
method: 'post',
data: data
})
}
// 删除entpcoursefile
export function delEntpcoursefile(id) {
return request({
url: '/education/entpcoursefile/' + id,
method: 'delete'
})
}
// 保存base64图片返回url
export function saveEntpCourseBase64File(data) {
return request({
url: '/education/entpcoursefile/saveBase64File',
method: 'post',
data: data
})
}
// 文件上传
export function saveEntpCourseBase64File2(data) {
return request({
url: '/education/entpcoursefile/saveBase64File2',
method: 'post',
data: data
})
}
// 保存PPT页面预览base64图片返回url
export function savePPTPreviewBase64File(data) {
return request({
url: '/education/entpcoursefile/savePreviewBase64',
method: 'post',
data: data
})
}
// PPT文件上传
export function saveEntpCoursePPT(data) {
return request({
url: '/education/entpcoursefile/importPPT',
method: 'post',
data: data
})
}
// PPT文件解析
export function parsePPT(data) {
return request({
url: '/education/entpcoursefile/parsePPT',
method: 'post',
data: data
})
}
// 修改ppt.slide.index
export function updateSlideIndex(data) {
return request({
url: '/education/entpcoursefile/saveSlideOrder',
method: 'post',
data: data
})
}

View File

@ -9,6 +9,21 @@ export const getSmarttalkPage = (params) => {
})
}
export const creatAPT = (params) => {
return request({
url: '/smarttalk/file/createApt',
method: 'post',
params
})
}
export const getPrepareById = (id) => {
return request({
url: '/smarttalk/file/' + id,
method: 'get'
})
}
export function deleteSmarttalk(id) {
return request({
url: '/smarttalk/file/' + id,

View File

@ -0,0 +1,64 @@
//查询第三方课件的接口
import request from '@/utils/request'
//获取学科
export const getSubjects = (params) => {
return request({
url: '/smarttalk/cnjy/getSubjects',
method: 'get',
params
})
}
//获取教材版本
export const getTextbookVersion = (params) => {
return request({
url: '/smarttalk/cnjy/getVersions',
method: 'get',
params
})
}
//获得书籍
export const getTextbook = (params) => {
return request({
url: '/smarttalk/cnjy/getBooks',
method: 'get',
params
})
}
//获取书籍章节
export const getBook = (params) => {
return request({
url: '/smarttalk/cnjy/getChapters',
method: 'get',
params
})
}
//获取知识点信息
export const getKnowledge = (params) => {
return request({
url: '/smarttalk/cnjy/getKnowledgePoints',
method: 'get',
params
})
}
//查询列表资源
export const getBookList = (params) => {
return request({
url: '/smarttalk/cnjy/getDocuments',
method: 'post',
params
})
}
//获取图片路径
export const getImgPath = (params) => {
return request({
url: '/smarttalk/cnjy/getPreview',
method: 'get',
params
})
}

View File

@ -56,4 +56,77 @@ export function getCodeImg() {
method: 'get',
timeout: 20000
})
}
// 注册模块-生成人机验证
export function captchaImg(data) {
return request({
url: '/captchaImg',
headers: {
isToken: false
},
method: 'get',
params: data
})
}
//注册模块-发送验证码
export function sendCode(data) {
return request({
url: '/smarttalk/register/authSendCode',
method: 'post',
data:data
})
}
//注册模块-申请注册
export function signIn(data) {
return request({
url: '/smarttalk/register/authSignIn',
method: 'post',
data:data
})
}
//登录模块-找回密码
export function retrievePwd(data) {
return request({
url: '/smarttalk/register/authRetrievePwd',
method: 'post',
data
})
}
//注册模块-获取学校
export function deptTree(data) {
return request({
url: '/smarttalk/register/authDeptTree',
method: 'get',
params:data
})
}
// 查询部门详细
export function getDept(query) {
return request({
url: '/system/dept/detail',
method: 'get',
params: query
})
}
// 查询classmain列表
export function listClassmain(query) {
return request({
url: '/education/classmain/list',
method: 'get',
params: query
})
}
// 查询evaluation列表
export function listEvaluation(query) {
return request({
url: '/smarttalk/register/authEvaluationList',
method: 'get',
params: query
})
}

View File

@ -9,7 +9,6 @@ export const listEvaluation = (params)=> {
})
}
export const addFileToPrepare = (params) => {
return request({
url: '/smarttalk/file/addFileToPrepare',
@ -17,3 +16,4 @@ export const addFileToPrepare = (params) => {
params
})
}

View File

@ -50,3 +50,9 @@ export function updateUserInfo(data) {
data: data
})
}
export function getUserInfo(userId) {
return request({
url: '/system/user/' + userId,
method: 'get'
})
}

View File

@ -0,0 +1,89 @@
import request from '@/utils/request'
// 查询classcourse列表
export function listClasscourse(query) {
return request({
url: '/education/classcourse/list',
method: 'get',
params: query
})
}
// 查询classcourse详细
export function getClasscourse(id) {
return request({
url: '/education/classcourse/' + id,
method: 'get'
})
}
// 新增classcourse
export function addClasscourse(data) {
return request({
url: '/education/classcourse',
method: 'post',
data: data
})
}
// 新增classcourse
export function addClasscourseReturnId(data) {
return request({
url: '/education/classcourse/saveReturnId',
method: 'post',
data: data
})
}
// 修改classcourse
export function updateClasscourse(data) {
return request({
url: '/education/classcourse',
method: 'put',
data: data
})
}
// 删除classcourse
export function delClasscourse(id) {
return request({
url: '/education/classcourse/' + id,
method: 'delete'
})
}
// 删除classcourse
export function delClasscourseWithData(id) {
return request({
url: '/education/classcourse/removeData/' + id,
method: 'delete'
})
}
// classcourse开始上课
export function startCourseTeaching(id) {
return request({
url: '/education/classcourse/startCourseTeaching/'+id,
method: 'post',
})
}
// 老师学生发送新的消息
export function sendCourseTeachingMsg(data) {
return request({
url: '/education/classcourse/sendCourseTeachingMsg',
method: 'post',
data: data
})
}
// 老师学生获取新的交互消息
export function getCourseTeachingMsg(id) {
return request({
url: '/education/classcourse/getCourseTeachingMsg/'+id,
method: 'post',
})
}

View File

@ -0,0 +1,54 @@
import request from '@/utils/request'
// 查询classwork列表
export function homeworklist(params) {
return request({
url: '/education/classwork/list',
method: 'get',
params
})
}
// 查询entpcourse列表
export function listEntpcourse(query) {
return request({
url: '/education/entpcourse/list',
method: 'get',
params: query
})
}
// 新增entpcourse
export function addEntpcourse(data) {
return request({
url: '/education/entpcourse',
method: 'post',
data: data
})
}
// 布置作业
export function saveByClassWorkArray(data) {
return request({
url: '/education/classwork/saveByClassWorkArray',
method: 'post',
data: data
})
}
// 删除classwork 作业
export function delClasswork(id) {
return request({
url: '/education/classwork/' + id,
method: 'delete'
})
}
// 新增classwork
export function addClassworkReturnId(data) {
return request({
url: '/education/classwork/saveAndReturnId',
method: 'post',
data: data
})
}

View File

@ -1,9 +1,9 @@
@font-face {
font-family: "iconfont"; /* Project id 2794390 */
src: url('iconfont.woff2?t=1721179711733') format('woff2'),
url('iconfont.woff?t=1721179711733') format('woff'),
url('iconfont.ttf?t=1721179711733') format('truetype'),
url('iconfont.svg?t=1721179711733#iconfont') format('svg');
src: url('iconfont.woff2?t=1725847033097') format('woff2'),
url('iconfont.woff?t=1725847033097') format('woff'),
url('iconfont.ttf?t=1725847033097') format('truetype'),
url('iconfont.svg?t=1725847033097#iconfont') format('svg');
}
.iconfont {
@ -14,6 +14,662 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-aijiqiren:before {
content: "\e73c";
}
.icon-saoyisao:before {
content: "\e691";
}
.icon-jiaoxuezhiliangfenxi:before {
content: "\e690";
}
.icon-jiaoxuejihua:before {
content: "\e7e9";
}
.icon-tongji:before {
content: "\e68f";
}
.icon-pigai:before {
content: "\e68d";
}
.icon-jiaoxuefansi:before {
content: "\e6b2";
}
.icon-kaoshi:before {
content: "\e68a";
}
.icon-yiwen:before {
content: "\e687";
}
.icon-yiwen-01:before {
content: "\e688";
}
.icon-yihuo:before {
content: "\e689";
}
.icon-a-yiwen:before {
content: "\e6b1";
}
.icon-zan:before {
content: "\e658";
}
.icon-zan1:before {
content: "\e659";
}
.icon-zan2:before {
content: "\e65a";
}
.icon-zan3:before {
content: "\e65c";
}
.icon-zan4:before {
content: "\e67c";
}
.icon-yizan:before {
content: "\e67e";
}
.icon-zan5:before {
content: "\e67f";
}
.icon-zan-yizan:before {
content: "\e680";
}
.icon-zan6:before {
content: "\e681";
}
.icon-MBEfenggeduosetubiao-xihuan:before {
content: "\e682";
}
.icon-zan7:before {
content: "\e683";
}
.icon-zan11:before {
content: "\e6ff";
}
.icon-zan8:before {
content: "\e684";
}
.icon-dianzan-red:before {
content: "\e685";
}
.icon-zan9:before {
content: "\e69e";
}
.icon-zanping:before {
content: "\100ae";
}
.icon-zan10:before {
content: "\e686";
}
.icon-arrangement:before {
content: "\e656";
}
.icon-zanwushuju:before {
content: "\e655";
}
.icon-xiangzuo:before {
content: "\e64d";
}
.icon-kechengziyuan1:before {
content: "\e647";
}
.icon-tubiaozhizuomobanyihuifu-:before {
content: "\e69d";
}
.icon-window-01:before {
content: "\e70b";
}
.icon-chuangkou-chuangkouhua:before {
content: "\e64b";
}
.icon-a-lujing13357:before {
content: "\e64c";
}
.icon-icon:before {
content: "\e640";
}
.icon-ke:before {
content: "\e641";
}
.icon-jiaocaixuanze:before {
content: "\e642";
}
.icon-organization-framework-line:before {
content: "\e9fe";
}
.icon-jiaocai:before {
content: "\e67b";
}
.icon-zaixiankaoshi:before {
content: "\e643";
}
.icon-mubiaohuizhi:before {
content: "\e652";
}
.icon-tupushujuyuan:before {
content: "\e653";
}
.icon-mubiao:before {
content: "\e723";
}
.icon-zhishitupu:before {
content: "\e644";
}
.icon-tupu:before {
content: "\f48c";
}
.icon-zhongwenwenxian:before {
content: "\e645";
}
.icon-tupu1:before {
content: "\e952";
}
.icon-kuangjia:before {
content: "\e6ea";
}
.icon-wenxian:before {
content: "\e7b6";
}
.icon-tupu-01:before {
content: "\e679";
}
.icon-tupu2:before {
content: "\e69c";
}
.icon-tupu3:before {
content: "\e6a7";
}
.icon-zuzhikuangjia:before {
content: "\e646";
}
.icon-tupu4:before {
content: "\e6d5";
}
.icon-a-kaoshi1:before {
content: "\eb13";
}
.icon-fankui:before {
content: "\e738";
}
.icon-tiku:before {
content: "\e621";
}
.icon-ldc-position:before {
content: "\e63a";
}
.icon-sucai:before {
content: "\e620";
}
.icon-pengyou:before {
content: "\e61a";
}
.icon-zuoye:before {
content: "\e61c";
}
.icon-jiaoxuefenxi:before {
content: "\e605";
}
.icon-wenjianjia:before {
content: "\ec17";
}
.icon-jiaoxueyanxiu:before {
content: "\e60d";
}
.icon-jiaoxuesheji:before {
content: "\e606";
}
.icon-zhuanyeziyuanku:before {
content: "\e651";
}
.icon-pengyouquan:before {
content: "\e616";
}
.icon-dangqianhuihua:before {
content: "\e675";
}
.icon-yanjiushi:before {
content: "\e607";
}
.icon-gongzuotai:before {
content: "\e676";
}
.icon-lunwen:before {
content: "\e60e";
}
.icon-decheng_xianshangxuexi:before {
content: "\e624";
}
.icon-jitibeike-:before {
content: "\e65b";
}
.icon-keti:before {
content: "\e6fe";
}
.icon-pengyouquan1:before {
content: "\e635";
}
.icon-beike1:before {
content: "\e61b";
}
.icon-fenxiang:before {
content: "\e611";
}
.icon-zhucetianjiahaoyou:before {
content: "\e8ca";
}
.icon-duoqudaojicheng:before {
content: "\e696";
}
.icon-yewukaizhan:before {
content: "\e612";
}
.icon-fankui1:before {
content: "\e6fa";
}
.icon-shezhi:before {
content: "\e614";
}
.icon-chayue:before {
content: "\e617";
}
.icon-baogao:before {
content: "\e630";
}
.icon-xuekezuhe:before {
content: "\e625";
}
.icon-fenxiang1:before {
content: "\eb24";
}
.icon-tongzhizhongxin:before {
content: "\eb43";
}
.icon-xiajia:before {
content: "\e618";
}
.icon-shengchanguochengguanli:before {
content: "\e62a";
}
.icon-kejian:before {
content: "\e64a";
}
.icon-liulan:before {
content: "\e648";
}
.icon-fabiao:before {
content: "\e654";
}
.icon-kecheng:before {
content: "\e619";
}
.icon-bianji1:before {
content: "\e61d";
}
.icon-pingjia:before {
content: "\e628";
}
.icon-zonghezhenduan:before {
content: "\e6a0";
}
.icon-banji:before {
content: "\e71e";
}
.icon-tousuyujianyi:before {
content: "\e729";
}
.icon-jiaoliu:before {
content: "\e6b8";
}
.icon-pingyi:before {
content: "\e79a";
}
.icon-xueqingfenxi:before {
content: "\e67a";
}
.icon-check:before {
content: "\e622";
}
.icon-upload:before {
content: "\e634";
}
.icon-taolun:before {
content: "\e61e";
}
.icon-tujing:before {
content: "\e947";
}
.icon-zixun:before {
content: "\e6b3";
}
.icon-liulan1:before {
content: "\e6b4";
}
.icon-yaosu:before {
content: "\e68c";
}
.icon-baogao1:before {
content: "\e62e";
}
.icon-shoucang:before {
content: "\e61f";
}
.icon-shenhe:before {
content: "\e623";
}
.icon-w_duoxuanti:before {
content: "\e677";
}
.icon-fenxi:before {
content: "\e76d";
}
.icon-kanshu:before {
content: "\e626";
}
.icon-qwe:before {
content: "\e627";
}
.icon-jiancha:before {
content: "\e6c1";
}
.icon-qunzu:before {
content: "\e62b";
}
.icon-zuopin:before {
content: "\e6a9";
}
.icon-shuyi_jiaoxueguanli:before {
content: "\e678";
}
.icon-liangsuan:before {
content: "\e657";
}
.icon-business-report:before {
content: "\e880";
}
.icon-xiangmupingshen:before {
content: "\e742";
}
.icon-xiangmushenbao:before {
content: "\e743";
}
.icon-xiajia1:before {
content: "\e62c";
}
.icon-a-fenxiang2:before {
content: "\e62f";
}
.icon-icon_kaoshifenxi:before {
content: "\e6d3";
}
.icon-a-ketangshilu1:before {
content: "\e631";
}
.icon-tubiao_moshileixingpeizhi:before {
content: "\e632";
}
.icon-xiezuo:before {
content: "\e633";
}
.icon-buzhi:before {
content: "\e636";
}
.icon-ziyuanfenxi:before {
content: "\e637";
}
.icon-shoucang1:before {
content: "\e638";
}
.icon-iconku-zhuanqu-:before {
content: "\e649";
}
.icon-PPT:before {
content: "\e639";
}
.icon-fabiaolunwen:before {
content: "\e772";
}
.icon-xiezuo1:before {
content: "\e63b";
}
.icon-fenxi1:before {
content: "\e63c";
}
.icon-kechengziyuan:before {
content: "\e6e9";
}
.icon-36zuoyepingtai:before {
content: "\e699";
}
.icon-jiekebiaozhunbijishu:before {
content: "\e63d";
}
.icon-xunzhang:before {
content: "\e63e";
}
.icon-jiaocaizhengding:before {
content: "\e6a4";
}
.icon-xinzengmoxing:before {
content: "\e7b8";
}
.icon-a-biaozhangxunzhangyingxiong:before {
content: "\e79d";
}
.icon-xunzhang1:before {
content: "\e63f";
}
.icon-paizhao-xianxing:before {
content: "\e8d1";
}
.icon-zhuye2:before {
content: "\e604";
}
.icon-zuoye2:before {
content: "\f48d";
}
.icon-zuoye1:before {
content: "\e610";
}
.icon-xiazai9:before {
content: "\e60b";
}
.icon-hudong:before {
content: "\e60c";
}
.icon-xiangpica:before {
content: "\e6be";
}
.icon-gengduo:before {
content: "\e62d";
}
.icon-jujiao:before {
content: "\e615";
}
.icon-huabi:before {
content: "\e795";
}
.icon-mouse:before {
content: "\e603";
}
.icon-xiayiye:before {
content: "\e68b";
}
.icon-shangyiye:before {
content: "\e68e";
}
.icon-shuangye:before {
content: "\e64e";
}
.icon-danyemoban:before {
content: "\e859";
}
.icon-lingdang:before {
content: "\e613";
}
.icon-yidongdaozu:before {
content: "\e67d";
}

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 354 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

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

File diff suppressed because it is too large Load Diff

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.

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