 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 |
 lyc
|
74b0cf5fdb
|
Merge pull request 'login 修改' (#103) from lyc-dev into main
|
2024-08-07 10:32:02 +08:00 |
|
lyc
|
df7658a17d
|
login 修改
|
2024-08-07 10:31:08 +08:00 |
|
zhangxuelin
|
db496ee154
|
窗口根据控制
|
2024-08-07 09:23:07 +08:00 |
|
lyc
|
8a9fa83c04
|
Merge pull request '登录修改' (#102) from lyc-dev into main
|
2024-08-06 15:02:59 +08:00 |
|
lyc
|
9a6f37528c
|
登录修改
|
2024-08-06 15:02:40 +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 |
 zhengdegang
|
d64b469ac8
|
Merge pull request 'zdg' (#101) from zdg into main
Reviewed-on: #101
|
2024-08-05 17:49:43 +08:00 |
|
zdg
|
19901d802f
|
状态管理-多窗口共享
|
2024-08-05 17:46:48 +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 |
|
zdg
|
8d558c47f5
|
多窗口状态共享
|
2024-08-05 17:10:57 +08:00 |
|
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 |