Commit Graph

99 Commits

Author SHA1 Message Date
朱浩 8a90da5b64 接入AI生成PPT的功能 2024-10-16 14:29:43 +08:00
朱浩 4b2f2aa73a Merge branch 'main' into zhuhao_dev 2024-10-10 10:12:57 +08:00
朱浩 71bd199f4a 打开调试窗口 2024-10-10 10:12:38 +08:00
zdg a7743ba249 优化 2024-10-09 09:30:42 +08:00
朱浩 926f45f232 Merge branch 'main' into zhuhao_dev 2024-09-27 10:13:02 +08:00
朱浩 5c0cc9a91c 版本提升 2024-09-27 10:12:49 +08:00
lyc 3b84a340aa 上课里面的章节,教材edit 2024-09-26 16:38:29 +08:00
lyc eb78a80131 工作台-edit 2024-09-25 16:12:55 +08:00
lyc 9329da9ddf 章节切换 edit 2024-09-24 17:36:43 +08:00
朱浩 0d71dee801 更名文枢课堂 2024-09-24 11:03:40 +08:00
朱浩 ef9fe838a3 BUG修复 2024-09-20 16:56:26 +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
zdg 741e7336f3 上课 2024-09-14 16:39:31 +08:00
朱浩 3a20f453c6 APT上课 2024-09-14 16:00:45 +08:00
朱浩 a4fa5be295 文件上传修改 2024-09-13 09:30:36 +08:00
朱浩 bc0579fa32 排序问题处理 2024-09-12 09:47:35 +08:00
朱浩 59ca00d6d1 Merge branch 'main' into zhuhao_dev
# Conflicts:
#	package.json
2024-09-03 16:15:07 +08:00
zdg ea9af1440e 数据库共享:结合 pinia + electron-store
关闭开发 本地文件日志,只有生产有日志文件记录
2024-09-02 22:22:03 +08:00
zdg 3f4e9c35b0 崩溃等,日志文件配置 2024-09-02 13:51:25 +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
zdg d033c217d6 数据共享配置 渲染器和主进程 2024-08-26 11:47:10 +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
lyc 146784bf26 增加一个预览文件 2024-08-23 09:56:14 +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
zdg 49c4c7245a 打包chat-im 2024-08-19 14:21:42 +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
zdg 631fcf38f7 恢复 2024-08-16 17:07:06 +08:00
朱浩 88177d610e Merge branch 'main' into zhuhao_dev 2024-08-16 13:42:55 +08:00
朱浩 57b7d3d601 二期:修改自动同步检测逻辑 2024-08-16 13:42:19 +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
lyc 0d1a96b202 窗口minwidth 2024-08-15 15:15:22 +08:00
lyc a17be49850 禁用双击最大化 2024-08-15 14:57:08 +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
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
zdg 1c67ce1b8f im通信 2024-08-14 16:31:08 +08:00
朱浩 1aded1d50a 二期:修复中文目录无法打开文件的问题 2024-08-14 15:45:27 +08:00
lyc bc5a6e961d 作业布置 2024-08-13 16:14:41 +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
朱浩 fe26d348fc 二期:版本升级自动下载进度提示问题 2024-08-13 11:11:29 +08:00
zdg 0ffa45313b 优化-数据状态共享
im-chat
2024-08-13 09:07:28 +08:00
朱浩 c2876ff983 二期:预约开发 2024-08-09 17:20:55 +08:00
朱浩 ae500c94ce 二期:预约开发 2024-08-09 15:06:13 +08:00
朱浩 5db876ebfa 二期:解决新建文件失败问题 2024-08-07 17:44:36 +08:00
朱浩 3bcb0a2ef3 Merge branch 'main' into zhuhao_dev 2024-08-07 11:13:07 +08:00
朱浩 528e7876a9 二期:延长本地同步自动计时速率 2024-08-07 11:12:18 +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