Commit Graph

1447 Commits

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