zdg
|
ada2e63060
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
# src/main/index.js
|
2024-09-27 15:53:42 +08:00 |
|
zdg
|
eaf9d508d4
|
apt上课-无需登录
|
2024-09-27 15:52:07 +08:00 |
 朱浩
|
716c1dd0a9
|
Merge pull request 'zhuhao_dev' (#285) from zhuhao_dev into main
Reviewed-on: #285
|
2024-09-27 15:15:28 +08:00 |
 “zouyf”
|
cb15855fc1
|
Merge branch 'main' into zouyf_dev
|
2024-09-27 15:11:57 +08:00 |
|
朱浩
|
76f053d8c8
|
Merge branch 'main' into zhuhao_dev
|
2024-09-27 15:11:45 +08:00 |
 yangws
|
988c6160bb
|
Merge pull request 'fix : 样式问题；' (#284) from yangws into main
Reviewed-on: #284
|
2024-09-27 15:08:23 +08:00 |
小杨
|
0119a92501
|
fix : 样式问题；
|
2024-09-27 15:07:58 +08:00 |
|
yangws
|
e1dfc0f8b4
|
Merge pull request 'fix：新建分组前清空操作;' (#283) from yangws into main
Reviewed-on: #283
|
2024-09-27 15:06:30 +08:00 |
|
小杨
|
31f9ec61ea
|
fix：新建分组前清空操作;
|
2024-09-27 15:05:49 +08:00 |
|
“zouyf”
|
7b3f00ba67
|
Merge branch 'main' into zouyf_dev
# Conflicts:
# src/renderer/src/views/classTask/teachClassTask.vue
|
2024-09-27 14:52:51 +08:00 |
 baigl
|
042f8e5907
|
Merge pull request 'baigl' (#282) from baigl into main
Reviewed-on: #282
|
2024-09-27 14:50:22 +08:00 |
|
“zouyf”
|
2ca4117561
|
1
|
2024-09-27 14:50:18 +08:00 |
白了个白
|
db20978575
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-09-27 14:49:21 +08:00 |
|
白了个白
|
2887528e9e
|
作业批改ui调整
|
2024-09-27 14:48:52 +08:00 |
|
baigl
|
34900832ba
|
Merge pull request 'baigl' (#281) from baigl into main
Reviewed-on: #281
|
2024-09-27 12:52:57 +08:00 |
|
白了个白
|
2e1fe84bcd
|
作业批改--学生未提交，老师批阅后批阅数未更新的bug修复
|
2024-09-27 12:49:10 +08:00 |
|
白了个白
|
2b074df0b5
|
1
|
2024-09-27 11:21:56 +08:00 |
|
白了个白
|
065e215a81
|
工作台-作业批改界面更改
|
2024-09-27 11:20:48 +08:00 |
|
白了个白
|
c78c166044
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-09-27 11:09:13 +08:00 |
|
白了个白
|
aa6a996808
|
新增作业批改窗口页面
|
2024-09-27 11:04:52 +08:00 |
|
朱浩
|
0511256094
|
Merge branch 'main' into zhuhao_dev
|
2024-09-27 11:01:16 +08:00 |
 lyc
|
2a75aef245
|
丑
|
2024-09-27 11:01:03 +08:00 |
|
lyc
|
bd82605109
|
Merge pull request '丑' (#280) from lyc-dev into main
|
2024-09-27 11:01:00 +08:00 |
|
朱浩
|
e2e8cae690
|
背景色
|
2024-09-27 11:00:03 +08:00 |
|
lyc
|
1edef92586
|
Merge pull request '工作台-edit' (#279) from lyc-dev into main
|
2024-09-27 10:32:06 +08:00 |
|
lyc
|
d330b4cd55
|
工作台-edit
|
2024-09-27 10:32:00 +08:00 |
|
朱浩
|
db2218b1c5
|
Merge pull request 'zhuhao_dev' (#278) from zhuhao_dev into main
Reviewed-on: #278
|
2024-09-27 10:13:44 +08:00 |
|
朱浩
|
926f45f232
|
Merge branch 'main' into zhuhao_dev
|
2024-09-27 10:13:02 +08:00 |
|
朱浩
|
5c0cc9a91c
|
版本提升
|
2024-09-27 10:12:49 +08:00 |
 zhengdegang
|
1152859479
|
Merge pull request 'zdg' (#277) from zdg into main
Reviewed-on: #277
|
2024-09-27 09:29:44 +08:00 |
|
zdg
|
68cf2bae1f
|
屏蔽注释打印
|
2024-09-27 09:27:51 +08:00 |
|
zdg
|
785b70d888
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-27 09:16:55 +08:00 |
|
zdg
|
cae110c686
|
去掉打印
|
2024-09-27 09:16:42 +08:00 |
 qinqing
|
0d5e9755cb
|
Merge pull request 'qinqing_dev' (#276) from qinqing_dev into main
Reviewed-on: #276
|
2024-09-26 17:26:22 +08:00 |
|
qinqing
|
8eff515fd8
|
从main分支合并，解决冲突
|
2024-09-26 17:25:24 +08:00 |
|
qinqing
|
cf38097739
|
优化PDF插件几课标教材分析逻辑优化
|
2024-09-26 17:18:55 +08:00 |
|
lyc
|
21215150bb
|
Merge branch 'main' into lyc-dev
|
2024-09-26 16:39:20 +08:00 |
|
lyc
|
773a795707
|
Merge pull request 'lyc-dev' (#275) from lyc-dev into main
|
2024-09-26 16:39:19 +08:00 |
|
lyc
|
3b84a340aa
|
上课里面的章节，教材edit
|
2024-09-26 16:38:29 +08:00 |
|
zouyf
|
b1b4d8e9e1
|
Merge pull request 'zouyf_dev' (#274) from zouyf_dev into main
Reviewed-on: #274
|
2024-09-26 16:26:07 +08:00 |
|
“zouyf”
|
c3bd7b31ee
|
Merge branch 'main' into zouyf_dev
|
2024-09-26 16:25:28 +08:00 |
|
“zouyf”
|
def2bd32da
|
[作业概况] - 增加点击调用
|
2024-09-26 16:25:09 +08:00 |
|
lyc
|
2ec9941a20
|
Merge pull request '教材切换-edit' (#273) from lyc-dev into main
|
2024-09-26 16:08:56 +08:00 |
|
lyc
|
8a60ce4ef9
|
教材切换-edit
|
2024-09-26 16:08:55 +08:00 |
|
zouyf
|
9b33b7d6e6
|
Merge pull request 'zouyf_dev' (#272) from zouyf_dev into main
Reviewed-on: #272
|
2024-09-26 14:13:56 +08:00 |
|
“zouyf”
|
8a0b73d07b
|
Merge branch 'main' into zouyf_dev
|
2024-09-26 14:10:43 +08:00 |
|
“zouyf”
|
4066992aa2
|
[作业批改] - 优化
|
2024-09-26 14:10:27 +08:00 |
|
zouyf
|
23b9ab3801
|
1
|
2024-09-25 21:04:04 +08:00 |
|
“zouyf”
|
a2a263a35a
|
1
|
2024-09-25 17:34:31 +08:00 |
|
lyc
|
bf7258f005
|
Merge pull request 'lyc-dev' (#271) from lyc-dev into main
|
2024-09-25 16:13:59 +08:00 |