 “zouyf”
|
7f9afedef9
|
Merge branch 'main' into zouyf_dev
# Conflicts:
# src/renderer/src/components/set-homework/index.vue
|
2024-09-19 14:05:16 +08:00 |
 zhengdegang
|
aa35621b59
|
Merge pull request 'zdg' (#222) from zdg into main
Reviewed-on: #222
|
2024-09-19 12:03:47 +08:00 |
zdg
|
49de9ee9c2
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-19 12:02:51 +08:00 |
|
zdg
|
0ef5ef424f
|
bug修复，以及代码优化
|
2024-09-19 12:02:31 +08:00 |
 baigl
|
89ae43a458
|
Merge pull request 'baigl' (#221) from baigl into main
Reviewed-on: #221
|
2024-09-19 11:30:20 +08:00 |
白了个白
|
9d7aad1946
|
Merge branch 'zouyf_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-09-19 11:28:45 +08:00 |
|
“zouyf”
|
7dcfd487fc
|
Merge branch 'main' into zouyf_dev
# Conflicts:
# src/renderer/src/components/set-homework/index.vue
|
2024-09-19 11:11:51 +08:00 |
|
baigl
|
b06ad0f411
|
Merge pull request 'baigl' (#220) from baigl into main
Reviewed-on: #220
|
2024-09-19 10:58:42 +08:00 |
|
白了个白
|
129f875469
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-09-19 10:54:31 +08:00 |
|
白了个白
|
2c6da76cf7
|
作业设计跳转web端逻辑修改
|
2024-09-19 10:52:33 +08:00 |
|
ekooo
|
499e428138
|
Merge branch 'main' into zouyf_dev
# Conflicts:
# src/renderer/src/components/set-homework/index.vue
|
2024-09-18 20:02:53 +08:00 |
 lyc
|
c58322ca0b
|
Merge pull request '作业查询修改' (#219) from lyc-dev into main
|
2024-09-18 16:11:59 +08:00 |
|
lyc
|
08dad41e4d
|
作业查询修改
|
2024-09-18 16:11:54 +08:00 |
|
zhengdegang
|
675613bbee
|
Merge pull request 'zdg' (#218) from zdg into main
Reviewed-on: #218
|
2024-09-18 15:01:31 +08:00 |
|
zdg
|
9188df0d94
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-18 15:00:30 +08:00 |
|
zdg
|
4e8560b033
|
解决二维码不出现的问题
|
2024-09-18 15:00:17 +08:00 |
|
“zouyf”
|
4e835cac82
|
Merge branch 'main' into zouyf_dev
|
2024-09-18 14:57:46 +08:00 |
 yangws
|
d047e85d03
|
Merge pull request 'fix: 个人中心任选学科报错问题;' (#217) from yangws into main
Reviewed-on: #217
|
2024-09-18 14:05:31 +08:00 |
|
yangws
|
acd66c11fa
|
fix: 个人中心任选学科报错问题;
|
2024-09-18 14:04:58 +08:00 |
|
yangws
|
c32bd6eef4
|
Merge pull request 'fix: 解决资源库报错的问题;' (#216) from yangws into main
Reviewed-on: #216
|
2024-09-18 13:56:28 +08:00 |
|
yangws
|
3b9877e788
|
fix: 解决资源库报错的问题;
|
2024-09-18 13:55:30 +08:00 |
|
lyc
|
aaa2aef3ca
|
move-file
|
2024-09-18 11:13:32 +08:00 |
|
lyc
|
5cfd5747a1
|
Merge pull request 'move-file' (#215) from lyc-dev into main
|
2024-09-18 11:13:31 +08:00 |
|
lyc
|
04263cd519
|
Merge pull request '预约课程-时间限制修改' (#214) from lyc-dev into main
|
2024-09-18 10:53:27 +08:00 |
|
lyc
|
aee945f90f
|
预约课程-时间限制修改
|
2024-09-18 10:53:22 +08:00 |
|
白了个白
|
bae24601ef
|
Merge branch 'zouyf_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-09-18 10:24:55 +08:00 |
|
白了个白
|
980e4d66e8
|
作业设计
|
2024-09-18 10:23:13 +08:00 |
|
lyc
|
7439c9759a
|
Merge pull request '布置作业-截止时间默认当前时间' (#213) from lyc-dev into main
|
2024-09-18 09:42:58 +08:00 |
|
lyc
|
ddd53943b8
|
布置作业-截止时间默认当前时间
|
2024-09-18 09:42:35 +08:00 |
|
ekooo
|
70ba70df45
|
[作业设计] - 增加页面
|
2024-09-17 19:56:32 +08:00 |
|
baigl
|
7ae8547d41
|
Merge pull request '作业批改 loading Bug修复' (#212) from baigl into main
Reviewed-on: #212
|
2024-09-14 17:38:44 +08:00 |
|
zhengdegang
|
c5c28b4bf5
|
Merge pull request 'zdg' (#211) from zdg into main
Reviewed-on: #211
|
2024-09-14 17:34:21 +08:00 |
|
zdg
|
67d7395c47
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
# src/renderer/src/views/desktop/container/work-trend.vue
|
2024-09-14 17:32:04 +08:00 |
|
白了个白
|
46adf4c058
|
作业批改 loading Bug修复
|
2024-09-14 17:00:14 +08:00 |
|
zdg
|
f615efbd88
|
Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-14 16:39:38 +08:00 |
|
zdg
|
741e7336f3
|
上课
|
2024-09-14 16:39:31 +08:00 |
 朱浩
|
a67f801356
|
Merge pull request 'zhuhao_dev' (#210) from zhuhao_dev into main
Reviewed-on: #210
|
2024-09-14 16:01:51 +08:00 |
|
朱浩
|
1c89217fbf
|
Merge branch 'main' into zhuhao_dev
|
2024-09-14 16:01:08 +08:00 |
|
朱浩
|
3a20f453c6
|
APT上课
|
2024-09-14 16:00:45 +08:00 |
|
朱浩
|
dfa5c7d99b
|
APT上课
|
2024-09-14 15:59:40 +08:00 |
|
lyc
|
e144fbe36a
|
Merge pull request 'lyc-dev' (#209) from lyc-dev into main
|
2024-09-14 15:13:05 +08:00 |
|
lyc
|
b279d36c89
|
edit
|
2024-09-14 15:12:36 +08:00 |
|
lyc
|
8013b1c2cc
|
edit
|
2024-09-14 14:59:35 +08:00 |
|
baigl
|
610aac6985
|
Merge pull request 'baigl' (#208) from baigl into main
Reviewed-on: #208
|
2024-09-14 14:22:36 +08:00 |
|
白了个白
|
6c85654608
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-09-14 14:22:02 +08:00 |
|
白了个白
|
a5b6cd3516
|
1
|
2024-09-14 14:18:13 +08:00 |
|
lyc
|
01718f573b
|
Merge pull request '警告' (#207) from lyc-dev into main
|
2024-09-14 13:44:42 +08:00 |
|
lyc
|
ec9c673b5a
|
警告
|
2024-09-14 13:44:35 +08:00 |
|
白了个白
|
578fc9feba
|
1
|
2024-09-14 10:23:45 +08:00 |
|
白了个白
|
f49cba5e36
|
作业管理：放开作业设计弹窗、作业布置的外部链接跳转；批阅界面需求变更调整；
|
2024-09-14 10:14:40 +08:00 |