 朱浩
|
fb6e0da6ff
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# src/renderer/src/views/prepare/components/treeLog.vue
|
2024-11-12 15:52:42 +08:00 |
|
朱浩
|
34fec10fc1
|
三方资源加入备课
|
2024-11-12 15:51:22 +08:00 |
 baigl
|
c150564797
|
Merge pull request 'baigl' (#29) from baigl into main
Reviewed-on: #29
|
2024-11-12 15:31:35 +08:00 |
白了个白
|
b5176e41b3
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
|
2024-11-12 15:30:30 +08:00 |
|
白了个白
|
36b6d1cc05
|
作业设计：加载习题更改为分页模式
|
2024-11-12 15:29:50 +08:00 |
 yangws
|
c6b65102bd
|
Merge pull request 'fix：修改格式；' (#28) from yangws_ws into main
Reviewed-on: #28
|
2024-11-12 14:49:19 +08:00 |
小杨
|
2513215a52
|
fix：修改格式；
|
2024-11-12 14:47:47 +08:00 |
 zhangxuelin
|
488ad420d7
|
Merge pull request 'zxl' (#27) from zxl into main
Reviewed-on: #27
|
2024-11-12 14:34:17 +08:00 |
|
zhangxuelin
|
5b7007a2fc
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
|
2024-11-12 14:32:47 +08:00 |
|
zhangxuelin
|
23470cc188
|
修改认证图标颜色
|
2024-11-12 14:32:24 +08:00 |
|
yangws
|
82b1258019
|
Merge pull request 'fix：修改格式传值；' (#26) from yangws_ws into main
Reviewed-on: #26
|
2024-11-12 11:05:13 +08:00 |
|
小杨
|
52da91f8ec
|
fix：修改格式传值；
|
2024-11-12 11:04:49 +08:00 |
|
yangws
|
58bc348eed
|
Merge pull request 'fix：不改变原数据；' (#25) from yangws_ws into main
Reviewed-on: #25
|
2024-11-12 10:46:25 +08:00 |
|
小杨
|
3ade7f7a35
|
fix：不改变原数据；
|
2024-11-12 10:46:01 +08:00 |
|
yangws
|
68a6050ba7
|
Merge pull request 'fix：添加章节组件；' (#24) from yangws_ws into main
Reviewed-on: #24
|
2024-11-12 09:55:54 +08:00 |
|
小杨
|
866abbcd7e
|
fix：添加章节组件；
|
2024-11-12 09:55:25 +08:00 |
|
yangws
|
b3b4f29d5d
|
Merge pull request 'add：章节节点选择；' (#23) from yangws_ws into main
Reviewed-on: #23
|
2024-11-12 09:49:34 +08:00 |
|
小杨
|
5dc9e4e20d
|
add：章节节点选择；
|
2024-11-12 09:49:09 +08:00 |
|
zhangxuelin
|
21cf2c9cfa
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
|
2024-11-12 09:31:02 +08:00 |
|
zhangxuelin
|
9031fca09c
|
no message
|
2024-11-12 09:30:45 +08:00 |
 lyc
|
5a1b95ea5d
|
Merge pull request 'lyc-dev' (#22) from lyc-dev into main
|
2024-11-11 17:28:10 +08:00 |
|
lyc
|
0ec8ec7480
|
路由冲突
|
2024-11-11 17:28:49 +08:00 |
|
baigl
|
2c1e9923c5
|
Merge pull request 'baigl' (#21) from baigl into main
Reviewed-on: #21
|
2024-11-11 17:27:09 +08:00 |
|
白了个白
|
2f58722206
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
|
2024-11-11 17:26:12 +08:00 |
|
白了个白
|
317dc9f184
|
1
|
2024-11-11 17:25:55 +08:00 |
|
lyc
|
c3ef8d881e
|
模板
|
2024-11-11 17:16:06 +08:00 |
|
baigl
|
3f81e36dd9
|
Merge pull request 'baigl' (#20) from baigl into main
Reviewed-on: #20
|
2024-11-11 15:07:29 +08:00 |
|
白了个白
|
ecc74e4666
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
|
2024-11-11 15:06:57 +08:00 |
|
白了个白
|
0cc3d970d1
|
作业设计：课程切换数据覆盖bug修复
|
2024-11-11 15:06:40 +08:00 |
|
baigl
|
3c4c035703
|
Merge pull request 'baigl' (#19) from baigl into main
Reviewed-on: #19
|
2024-11-11 10:19:10 +08:00 |
|
白了个白
|
a0bfb5be70
|
作业设计：课程选择太快增加防抖
|
2024-11-11 10:13:41 +08:00 |
|
白了个白
|
f53d7f104c
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
|
2024-11-11 10:03:48 +08:00 |
|
zhangxuelin
|
225982ec0c
|
Merge pull request 'zxl' (#18) from zxl into main
Reviewed-on: #18
|
2024-11-08 17:24:13 +08:00 |
|
白了个白
|
cbd706fed1
|
习题查询：加上分页传参
|
2024-11-08 15:38:13 +08:00 |
|
zhangxuelin
|
e07d01f0a1
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
|
2024-11-08 14:47:02 +08:00 |
|
zhangxuelin
|
5c60a30a8a
|
重新认证
|
2024-11-08 14:46:43 +08:00 |
|
baigl
|
d7857d9f45
|
Merge pull request 'baigl' (#17) from baigl into main
Reviewed-on: #17
|
2024-11-08 09:55:56 +08:00 |
|
白了个白
|
f4f2ebb0cf
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
|
2024-11-08 09:55:15 +08:00 |
|
白了个白
|
e002066da6
|
作业设计：题源同步2.0 web版
|
2024-11-08 09:54:57 +08:00 |
|
lyc
|
756d7fdaa1
|
模板
|
2024-11-07 14:14:46 +08:00 |
|
baigl
|
8bc50b3ab4
|
Merge pull request 'baigl' (#16) from baigl into main
Reviewed-on: #16
|
2024-11-07 09:46:27 +08:00 |
|
白了个白
|
6e3959328b
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
|
2024-11-07 09:44:55 +08:00 |
|
白了个白
|
3c32f5d823
|
作业批改：逻辑与界面更改
|
2024-11-07 09:44:28 +08:00 |
|
lyc
|
d05e50218d
|
模板
|
2024-11-06 17:33:32 +08:00 |
|
zhangxuelin
|
dbb0f44b1c
|
Merge pull request 'zxl' (#15) from zxl into main
Reviewed-on: #15
|
2024-11-06 17:31:41 +08:00 |
|
zhangxuelin
|
45b93b8980
|
首页展示学校
|
2024-11-06 17:30:31 +08:00 |
|
zhangxuelin
|
79f38ad18f
|
no message
|
2024-11-06 17:06:17 +08:00 |
|
zhangxuelin
|
652c46c33b
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
# Conflicts:
# src/renderer/src/assets/iconfont/iconfont.css
# src/renderer/src/assets/iconfont/iconfont.js
# src/renderer/src/assets/iconfont/iconfont.json
# src/renderer/src/assets/iconfont/iconfont.ttf
# src/renderer/src/assets/iconfont/iconfont.woff
# src/renderer/src/assets/iconfont/iconfont.woff2
# src/renderer/src/router/index.js
|
2024-11-06 17:04:39 +08:00 |
|
zhangxuelin
|
dd8c48f3ae
|
学校加入 注册 登录注册 加入学校审批
|
2024-11-06 16:55:40 +08:00 |
|
白了个白
|
625f82880f
|
1
|
2024-11-06 11:24:53 +08:00 |