 yangws
|
c0c7fa3298
|
Merge pull request 'add：主页进入详情的页面；' (#37) from yangws_ws into main
Reviewed-on: #37
|
2024-11-13 17:07:30 +08:00 |
小杨
|
3d2b102355
|
add：主页进入详情的页面；
|
2024-11-13 17:07:06 +08:00 |
|
yangws
|
4feeb2ef56
|
Merge pull request 'add:作业管理样式；' (#36) from yangws_ws into main
Reviewed-on: #36
|
2024-11-13 11:27:35 +08:00 |
|
小杨
|
af0dd7f565
|
add:作业管理样式；
|
2024-11-13 11:27:02 +08:00 |
 朱浩
|
a2c14b0d0a
|
Merge remote-tracking branch 'origin/main'
|
2024-11-13 11:23:16 +08:00 |
|
朱浩
|
fe04f8acbd
|
三方资源加入备课
|
2024-11-13 11:23:08 +08:00 |
 lyc
|
54c2215668
|
Merge pull request '模板' (#35) from lyc-dev into main
|
2024-11-13 11:22:07 +08:00 |
|
lyc
|
3f6f6124b3
|
模板
|
2024-11-13 11:22:53 +08:00 |
|
lyc
|
31adcd8460
|
Merge pull request 'lyc-dev' (#34) from lyc-dev into main
|
2024-11-13 10:23:02 +08:00 |
|
lyc
|
601e9f023a
|
模板
|
2024-11-13 10:23:56 +08:00 |
|
lyc
|
2de27f3d88
|
模板
|
2024-11-13 10:11:36 +08:00 |
|
朱浩
|
3949d55d64
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS
|
2024-11-13 09:25:20 +08:00 |
|
朱浩
|
4fb763eb6a
|
三方资源加入备课
|
2024-11-13 09:25:07 +08:00 |
|
yangws
|
779bbfe179
|
Merge pull request 'yangws_ws' (#33) from yangws_ws into main
Reviewed-on: #33
|
2024-11-12 17:33:58 +08:00 |
|
小杨
|
d809842b93
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yangws_ws
|
2024-11-12 17:32:58 +08:00 |
|
小杨
|
280f875e99
|
add：作业管理页面，以及修复bug；
|
2024-11-12 17:32:52 +08:00 |
 zhangxuelin
|
f9a5a5b0dd
|
Merge pull request 'zxl' (#32) from zxl into main
Reviewed-on: #32
|
2024-11-12 17:29:56 +08:00 |
|
zhangxuelin
|
53308a09d1
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
|
2024-11-12 17:28:39 +08:00 |
|
zhangxuelin
|
e5b6473de4
|
修改学校管理字段
|
2024-11-12 17:28:21 +08:00 |
|
lyc
|
244a4b2b43
|
Merge pull request '模板' (#31) from lyc-dev into main
|
2024-11-12 17:09:26 +08:00 |
|
lyc
|
7dc10cb986
|
模板
|
2024-11-12 17:09:18 +08:00 |
 baigl
|
4fdb9a3ecc
|
Merge pull request '作业批改：已交未交背景显示修复' (#30) from baigl into main
Reviewed-on: #30
|
2024-11-12 16:52:40 +08:00 |
白了个白
|
be138b8c58
|
作业批改：已交未交背景显示修复
|
2024-11-12 16:51:49 +08:00 |
|
朱浩
|
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
|
0ec8ec7480
|
路由冲突
|
2024-11-11 17:28:49 +08:00 |
|
lyc
|
5a1b95ea5d
|
Merge pull request 'lyc-dev' (#22) from lyc-dev into main
|
2024-11-11 17:28:10 +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 |