 zhangxuelin
|
7d3007bbf2
|
Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-08-12 13:40:07 +08:00 |
|
zhangxuelin
|
bf99c4dd00
|
bug修改
|
2024-08-12 13:40:03 +08:00 |
 朱浩
|
d690a4ae70
|
Merge pull request '二期：预约开发' (#117) from zhuhao_dev into main
Reviewed-on: #117
|
2024-08-12 09:43:00 +08:00 |
|
朱浩
|
974aaf3522
|
二期：预约开发
|
2024-08-12 09:41:01 +08:00 |
 lyc
|
524eedc451
|
Merge pull request 'edit' (#116) from lyc-dev into main
|
2024-08-12 09:38:59 +08:00 |
|
lyc
|
9d38f715a1
|
edit
|
2024-08-12 09:38:39 +08:00 |
|
朱浩
|
b4c9db619e
|
Merge pull request '二期：预约开发' (#115) from zhuhao_dev into main
Reviewed-on: #115
|
2024-08-09 17:42:56 +08:00 |
|
朱浩
|
7cf3487bfb
|
二期：预约开发
|
2024-08-09 17:42:19 +08:00 |
|
朱浩
|
74275ac327
|
Merge pull request 'zhuhao_dev' (#114) from zhuhao_dev into main
Reviewed-on: #114
|
2024-08-09 17:27:14 +08:00 |
|
朱浩
|
c29a3d7a77
|
二期：预约开发
|
2024-08-09 17:26:04 +08:00 |
|
朱浩
|
b8325d336b
|
Merge branch 'main' into zhuhao_dev
# Conflicts:
# src/renderer/src/views/prepare/index.vue
# src/renderer/src/views/tool/sphere.vue
|
2024-08-09 17:25:23 +08:00 |
|
朱浩
|
c2876ff983
|
二期：预约开发
|
2024-08-09 17:20:55 +08:00 |
 zhengdegang
|
6035803db1
|
Merge pull request 'zdg' (#113) from zdg into main
Reviewed-on: #113
|
2024-08-09 17:20:15 +08:00 |
zdg
|
f9de8514ed
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-08-09 17:19:19 +08:00 |
|
zdg
|
cc8ea2b043
|
点赞组件
|
2024-08-09 17:19:00 +08:00 |
|
lyc
|
9e0e2a41f2
|
Merge pull request 'lyc-dev' (#112) from lyc-dev into main
|
2024-08-09 17:17:43 +08:00 |
|
lyc
|
3fcd0cdb21
|
Merge branch 'main' into lyc-dev
|
2024-08-09 17:09:59 +08:00 |
|
lyc
|
815b2b15cb
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk
|
2024-08-09 17:09:54 +08:00 |
|
lyc
|
eb17167feb
|
作业
|
2024-08-09 17:09:15 +08:00 |
|
朱浩
|
ae500c94ce
|
二期：预约开发
|
2024-08-09 15:06:13 +08:00 |
|
lyc
|
258a99bc36
|
上课作业
|
2024-08-09 09:43:14 +08:00 |
|
朱浩
|
e5845a6714
|
二期：预约列表开发
|
2024-08-08 17:44:03 +08:00 |
|
朱浩
|
1c1ec2be71
|
Merge branch 'main' into zhuhao_dev
# Conflicts:
# src/renderer/src/views/prepare/index.vue
|
2024-08-08 17:41:08 +08:00 |
|
朱浩
|
572bdb5fec
|
二期：预约列表开发
|
2024-08-08 17:39:06 +08:00 |
|
朱浩
|
7974aeabe4
|
二期：预约列表开发
|
2024-08-08 17:38:45 +08:00 |
|
zhangxuelin
|
c11b9765e6
|
Merge pull request 'zdg' (#111) from zdg into main
Reviewed-on: #111
|
2024-08-08 17:37:41 +08:00 |
|
lyc
|
0e34b6a1e9
|
Merge pull request 'lyc-dev' (#110) from lyc-dev into main
|
2024-08-08 17:03:47 +08:00 |
|
lyc
|
b10be40ddc
|
作业
|
2024-08-08 17:03:18 +08:00 |
|
zhangxuelin
|
964e99c186
|
不打开工具栏不允许操作数据
|
2024-08-08 17:02:18 +08:00 |
|
zhangxuelin
|
e1e9f171e0
|
读取本地pdf文件
|
2024-08-08 16:50:21 +08:00 |
|
zhangxuelin
|
a8f9c828d7
|
更改地址
|
2024-08-08 14:27:22 +08:00 |
|
朱浩
|
c56039270c
|
Merge pull request 'zhuhao_dev' (#109) from zhuhao_dev into main
Reviewed-on: #109
|
2024-08-08 14:05:48 +08:00 |
|
朱浩
|
32c64d073b
|
二期：解决无法同时打开多个的问题
|
2024-08-08 14:04:00 +08:00 |
|
lyc
|
1498b9bc9f
|
Merge branch 'main' into lyc-dev
|
2024-08-08 11:22:59 +08:00 |
|
lyc
|
9a8d0e61d5
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk
|
2024-08-08 11:22:54 +08:00 |
|
lyc
|
d4b24f8d71
|
Merge branch 'main' into lyc-dev
|
2024-08-08 11:22:17 +08:00 |
|
lyc
|
ccf4211f44
|
上课作业
|
2024-08-08 11:22:05 +08:00 |
|
朱浩
|
aaa75df73b
|
Merge branch 'main' into zhuhao_dev
|
2024-08-08 10:41:20 +08:00 |
|
lyc
|
6ddd172bb9
|
Merge pull request '取消课件文件限制' (#108) from lyc-dev into main
|
2024-08-08 10:32:25 +08:00 |
|
lyc
|
00d23f4b31
|
取消课件文件限制
|
2024-08-08 10:32:02 +08:00 |
|
朱浩
|
54d9f6d782
|
Merge branch 'main' into zhuhao_dev
|
2024-08-07 17:44:50 +08:00 |
|
朱浩
|
5db876ebfa
|
二期：解决新建文件失败问题
|
2024-08-07 17:44:36 +08:00 |
|
zhengdegang
|
6b1ec46360
|
Merge pull request 'zdg' (#107) from zdg into main
Reviewed-on: #107
|
2024-08-07 17:38:37 +08:00 |
|
zdg
|
8fc1339419
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-08-07 17:37:57 +08:00 |
|
zdg
|
0c8af75e2a
|
更新样式-工具
|
2024-08-07 17:36:56 +08:00 |
|
zhengdegang
|
b8f2eb24e2
|
Merge pull request 'zdg' (#106) from zdg into main
Reviewed-on: #106
|
2024-08-07 17:06:15 +08:00 |
|
zdg
|
618618f736
|
工具-下课
|
2024-08-07 17:04:32 +08:00 |
|
zdg
|
43afd575de
|
下课
|
2024-08-07 16:52:46 +08:00 |
|
zhengdegang
|
8c2362ff4f
|
Merge pull request 'zdg' (#105) from zdg into main
Reviewed-on: #105
|
2024-08-07 16:11:12 +08:00 |
|
zhangxuelin
|
4687d62b90
|
1
|
2024-08-07 16:10:34 +08:00 |