Commit Graph

211 Commits

Author SHA1 Message Date
朱浩 ae4f7d3b49 二期:样式修改 2024-08-02 14:18:11 +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
朱浩 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 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
朱浩 ede8dfd533 二期:bug修复 2024-07-31 16:46:37 +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 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 9edc6d6e2b fix:学生列表高度问题; 2024-07-30 16:11:38 +08:00
yangws 1e79807a4b fix:修改头像上传; 2024-07-30 16:02:01 +08:00
yangws 817ea8790e fix:修改添加班级的问题; 2024-07-30 10:16:46 +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 b65cd95558 新增打开作业反馈 2024-07-30 09:44:09 +08:00
lyc 277a5ec873 退出 2024-07-29 16:05:52 +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
朱浩 2f4d48a8c0 二期:BUG修复 2024-07-27 00:25:46 +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
朱浩 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
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 52dfb52161 fix:高度自适应问题; 2024-07-26 16:00:59 +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 e6a08c857a fix:修改字体颜色; 2024-07-26 15:38:13 +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