 朱浩
|
219e4abdc0
|
Merge branch 'main' into zhuhao_dev
|
2024-08-14 11:00:13 +08:00 |
|
朱浩
|
c3709bf0c7
|
二期：BUG修复
|
2024-08-14 11:00:01 +08:00 |
|
朱浩
|
e6a06a67b8
|
Merge pull request 'zhuhao_dev' (#128) from zhuhao_dev into main
Reviewed-on: #128
|
2024-08-14 10:00:47 +08:00 |
|
朱浩
|
ea4afb409f
|
Merge branch 'main' into zhuhao_dev
# Conflicts:
# src/renderer/src/views/prepare/index.vue
|
2024-08-14 10:00:16 +08:00 |
|
朱浩
|
79055dc1c2
|
二期：BUG修复
|
2024-08-14 09:58:14 +08:00 |
 yangws
|
e3a04c0add
|
Merge pull request 'fix:修改个人中心宽度，预约课件删除及时回应；' (#127) from yangws into main
Reviewed-on: #127
|
2024-08-14 09:56:10 +08:00 |
|
yangws
|
f6bf811ee5
|
Merge remote-tracking branch 'origin/main' into yangws
|
2024-08-14 09:54:34 +08:00 |
|
朱浩
|
3b872f371f
|
Merge branch 'main' into zhuhao_dev
|
2024-08-13 17:43:49 +08:00 |
|
朱浩
|
7fc04faad1
|
二期：BUG修复
|
2024-08-13 17:43:34 +08:00 |
 lyc
|
d18c47994a
|
Merge pull request '作业' (#126) from lyc-dev into main
|
2024-08-13 17:39:38 +08:00 |
|
lyc
|
7b804f9e62
|
作业
|
2024-08-13 17:39:23 +08:00 |
|
yangws
|
62367c13d3
|
fix:修改个人中心宽度，预约课件删除及时回应；
|
2024-08-13 17:33:04 +08:00 |
|
朱浩
|
8f50174595
|
二期：BUG修复
|
2024-08-13 16:46:47 +08:00 |
|
lyc
|
bc9c6a3c89
|
Merge pull request 'lyc-dev' (#125) from lyc-dev into main
|
2024-08-13 16:23:03 +08:00 |
|
lyc
|
e2d9b61fbe
|
作业
|
2024-08-13 16:22:35 +08:00 |
|
lyc
|
bc5a6e961d
|
作业布置
|
2024-08-13 16:14:41 +08:00 |
|
lyc
|
2b5acf272d
|
Merge branch 'main' into lyc-dev
|
2024-08-13 15:39:06 +08:00 |
|
lyc
|
9dda6b934c
|
作业-布置
|
2024-08-13 15:38:56 +08:00 |
 zhangxuelin
|
799dbed676
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
# src/main/index.js
# src/renderer/src/plugins/shareStore.js
# src/renderer/src/views/prepare/index.vue
# src/renderer/src/views/tool/sphere.vue
|
2024-08-13 15:30:38 +08:00 |
|
yangws
|
3b52f9acc4
|
Merge pull request 'fix:去掉defineProps,以及修改备课-课标研读，高考研读，教学大模型链接不能同时跳转的bug;' (#124) from yangws into main
Reviewed-on: #124
|
2024-08-13 15:16:09 +08:00 |
|
lyc
|
a1e00ba716
|
Merge branch 'main' into lyc-dev
|
2024-08-13 15:15:37 +08:00 |
|
lyc
|
acc4d7c81e
|
icon
|
2024-08-13 15:15:03 +08:00 |
|
zhangxuelin
|
f80e7dee2a
|
代码优化
|
2024-08-13 15:14:26 +08:00 |
|
yangws
|
1f9788498a
|
fix:去掉defineProps,以及修改备课-课标研读，高考研读，教学大模型链接不能同时跳转的bug;
|
2024-08-13 15:12:55 +08:00 |
白了个白
|
9ab62f180e
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-08-13 13:53:19 +08:00 |
|
yangws
|
f60fdbafa0
|
Merge pull request 'fix🐛资源-平台资源和校本资源里别人上传的文件不应该可以编辑名称;' (#123) from yangws into main
Reviewed-on: #123
|
2024-08-13 11:32:10 +08:00 |
|
yangws
|
776be8eaac
|
fix🐛资源-平台资源和校本资源里别人上传的文件不应该可以编辑名称;
|
2024-08-13 11:31:39 +08:00 |
|
朱浩
|
67320f897e
|
Merge pull request 'zhuhao_dev' (#122) from zhuhao_dev into main
Reviewed-on: #122
|
2024-08-13 11:28:27 +08:00 |
|
朱浩
|
2cdc33d706
|
Merge branch 'main' into zhuhao_dev
|
2024-08-13 11:27:56 +08:00 |
|
朱浩
|
f334adfda9
|
二期：BUG修复
|
2024-08-13 11:27:42 +08:00 |
|
朱浩
|
fe26d348fc
|
二期：版本升级自动下载进度提示问题
|
2024-08-13 11:11:29 +08:00 |
|
yangws
|
444daa3cec
|
Merge pull request 'fix🐛资源-平台资源和校本资源里别人上传的文件不应该可以编辑名称;' (#121) from yangws into main
Reviewed-on: #121
|
2024-08-13 11:06:53 +08:00 |
|
yangws
|
c7d2eba5bb
|
fix🐛资源-平台资源和校本资源里别人上传的文件不应该可以编辑名称;
|
2024-08-13 11:06:09 +08:00 |
|
zhangxuelin
|
2bf82dc294
|
Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
# src/renderer/src/views/tool/sphere.vue
|
2024-08-13 09:11:31 +08:00 |
|
zhangxuelin
|
cc5c823071
|
1
|
2024-08-13 09:09:49 +08:00 |
zdg
|
8df3871f7d
|
Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
# src/renderer/src/components/pdf/index.vue
# src/renderer/src/views/classBegins/index.vue
|
2024-08-13 09:09:08 +08:00 |
|
zdg
|
0ffa45313b
|
优化-数据状态共享
im-chat
|
2024-08-13 09:07:28 +08:00 |
|
lyc
|
c4e82017e5
|
Merge pull request '作业' (#120) from lyc-dev into main
|
2024-08-12 16:55:21 +08:00 |
|
lyc
|
d4fc68c902
|
作业
|
2024-08-12 16:55:05 +08:00 |
|
朱浩
|
732e4c9a64
|
Merge branch 'main' into zhuhao_dev
|
2024-08-12 16:53:44 +08:00 |
|
yangws
|
6c717ea345
|
Merge pull request 'fix:修改更改科目主页课程不能更新的问题；' (#119) from yangws into main
Reviewed-on: #119
|
2024-08-12 16:53:29 +08:00 |
|
yangws
|
c4c4bca54a
|
fix:修改更改科目主页课程不能更新的问题；
|
2024-08-12 16:52:41 +08:00 |
|
朱浩
|
e89ffd4416
|
二期：版本切换
|
2024-08-12 16:51:10 +08:00 |
|
lyc
|
cc1faa7f88
|
Merge pull request '作业' (#118) from lyc-dev into main
|
2024-08-12 15:56:46 +08:00 |
|
lyc
|
0b67ca30f8
|
作业
|
2024-08-12 15:55:50 +08:00 |
|
zhangxuelin
|
7d3007bbf2
|
Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-08-12 13:40:07 +08:00 |
|
zhangxuelin
|
bf99c4dd00
|
bug修改
|
2024-08-12 13:40:03 +08:00 |
|
朱浩
|
d690a4ae70
|
Merge pull request '二期：预约开发' (#117) from zhuhao_dev into main
Reviewed-on: #117
|
2024-08-12 09:43:00 +08:00 |
|
朱浩
|
974aaf3522
|
二期：预约开发
|
2024-08-12 09:41:01 +08:00 |
|
lyc
|
524eedc451
|
Merge pull request 'edit' (#116) from lyc-dev into main
|
2024-08-12 09:38:59 +08:00 |