Commit Graph

798 Commits

Author SHA1 Message Date
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
zdg 05074f3145 优化-工具类拖动折叠
清除所有画布内容
2024-08-02 16:06:07 +08:00
lyc 34b35d8beb Merge pull request '选择学生checkbox 大小修改' (#95) from lyc-dev into main 2024-08-02 15:33:40 +08:00
lyc 921ce6ecb0 选择学生checkbox 大小修改 2024-08-02 15:08:36 +08:00
lyc 1be862a0f2 Merge pull request 'lyc-dev' (#94) from lyc-dev into main 2024-08-02 14:50:58 +08:00
lyc 9ef553f8eb 作业 冲突 2024-08-02 14:49:48 +08:00
lyc e53eab0c31 作业删除 2024-08-02 14:30:27 +08:00
朱浩 1a51af93f6 Merge pull request '二期:样式修改' (#93) from zhuhao_dev into main
Reviewed-on: #93
2024-08-02 14:18:51 +08:00
朱浩 ae4f7d3b49 二期:样式修改 2024-08-02 14:18:11 +08:00
lyc 0ba717de6e 删除作业 2024-08-02 10:32:09 +08:00
lyc 6e29229e95 冲突 作业 2024-08-02 10:03:24 +08:00
lyc df84893509 布置作业 2024-08-02 10:01:05 +08:00
zhengdegang f32dd848cc Merge pull request 'zdg' (#92) from zdg into main
Reviewed-on: #92
2024-08-02 09:23:13 +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
朱浩 43d75f94dd Merge pull request 'zhuhao_dev' (#91) from zhuhao_dev into main
Reviewed-on: #91
2024-08-01 17:47:51 +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 d46b01cca2 Merge pull request 'lyc-dev' (#90) from lyc-dev into main 2024-08-01 11:27:38 +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
朱浩 4248fd4504 Merge pull request 'zhuhao_dev' (#89) from zhuhao_dev into main
Reviewed-on: #89
2024-07-31 16:47:27 +08:00
朱浩 241b0d3f24 Merge branch 'main' into zhuhao_dev 2024-07-31 16:46:58 +08:00
朱浩 ede8dfd533 二期:bug修复 2024-07-31 16:46:37 +08:00
朱浩 8f54d17439 Merge pull request 'zhuhao_dev' (#88) from zhuhao_dev into main
Reviewed-on: #88
2024-07-31 16:05:53 +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 8f3925f57a Merge pull request 'fix:主页页面;' (#87) from yangws into main
Reviewed-on: #87
2024-07-31 09:21:38 +08:00
yangws 370396e2b8 fix:主页页面; 2024-07-31 09:20:30 +08:00