Commit Graph

384 Commits

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