zdg #105

Merged
zhengdegang merged 17 commits from zdg into main 2024-08-07 16:11:14 +08:00

17 Commits

Author SHA1 Message Date
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
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
zdg 7dfa51f5dc 侧边工具栏 2024-08-07 10:34:34 +08:00
zhangxuelin db496ee154 窗口根据控制 2024-08-07 09:23:07 +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
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