 lyc
|
c803ecd796
|
教学框架设计
|
2024-11-19 17:08:34 +08:00 |
|
lyc
|
19283456d4
|
Merge branch 'main' into lyc-dev
|
2024-11-19 10:01:09 +08:00 |
 朱浩
|
fd0499cefa
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS
|
2024-11-19 09:59:59 +08:00 |
|
朱浩
|
4baf9f0062
|
PPTist接入
|
2024-11-19 09:59:34 +08:00 |
|
lyc
|
1a88d63893
|
冲突
|
2024-11-19 09:57:36 +08:00 |
 yangws
|
c1ce87f640
|
Merge pull request 'fix：样式修改；' (#42) from yangws_ws into main
Reviewed-on: #42
|
2024-11-19 09:42:54 +08:00 |
小杨
|
da83bcec5c
|
fix：样式修改；
|
2024-11-19 09:42:19 +08:00 |
|
lyc
|
d283b60af7
|
模板
|
2024-11-18 17:31:01 +08:00 |
|
朱浩
|
6e3efe7843
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS
|
2024-11-18 17:29:10 +08:00 |
|
朱浩
|
432dbcc6fa
|
PPTist接入
|
2024-11-18 17:28:56 +08:00 |
|
lyc
|
0f63afd277
|
Merge branch 'main' into lyc-dev
|
2024-11-18 10:17:23 +08:00 |
|
lyc
|
f168e04405
|
模板
|
2024-11-16 23:37:11 +08:00 |
 zhangxuelin
|
cae55eac0b
|
Merge pull request 'zxl' (#41) from zxl into main
Reviewed-on: #41
|
2024-11-15 14:43:48 +08:00 |
|
zhangxuelin
|
2f3a2b7aae
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
|
2024-11-15 14:42:59 +08:00 |
|
zhangxuelin
|
98b1155fb7
|
添加人机验证
|
2024-11-15 14:42:39 +08:00 |
 baigl
|
135cc4802f
|
Merge pull request 'baigl' (#40) from baigl into main
Reviewed-on: #40
|
2024-11-15 11:19:18 +08:00 |
白了个白
|
e322103089
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
|
2024-11-15 11:16:22 +08:00 |
|
白了个白
|
640a8a6dd9
|
新增作业管理
|
2024-11-15 11:15:23 +08:00 |
|
lyc
|
7b65a19483
|
Merge pull request 'lyc-dev' (#39) from lyc-dev into main
|
2024-11-14 11:20:41 +08:00 |
|
lyc
|
18495d0811
|
编辑提示词 dialog
|
2024-11-14 11:17:52 +08:00 |
|
yangws
|
3b053531f9
|
Merge pull request 'fix：部分修改优化；' (#38) from yangws_ws into main
Reviewed-on: #38
|
2024-11-14 09:51:48 +08:00 |
|
小杨
|
27017fc946
|
fix：部分修改优化；
|
2024-11-14 09:51:13 +08:00 |
|
lyc
|
39efd18bc6
|
模板更多按钮
|
2024-11-13 17:30:15 +08:00 |
|
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
|
3f6f6124b3
|
模板
|
2024-11-13 11:22:53 +08:00 |
|
lyc
|
54c2215668
|
Merge pull request '模板' (#35) from lyc-dev into main
|
2024-11-13 11:22:07 +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 |