Commit Graph

703 Commits

Author SHA1 Message Date
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
lyc 9d38f715a1 edit 2024-08-12 09:38:39 +08:00
朱浩 b4c9db619e Merge pull request '二期:预约开发' (#115) from zhuhao_dev into main
Reviewed-on: #115
2024-08-09 17:42:56 +08:00
朱浩 7cf3487bfb 二期:预约开发 2024-08-09 17:42:19 +08:00
朱浩 74275ac327 Merge pull request 'zhuhao_dev' (#114) from zhuhao_dev into main
Reviewed-on: #114
2024-08-09 17:27:14 +08:00
朱浩 c29a3d7a77 二期:预约开发 2024-08-09 17:26:04 +08:00
朱浩 b8325d336b Merge branch 'main' into zhuhao_dev
# Conflicts:
#	src/renderer/src/views/prepare/index.vue
#	src/renderer/src/views/tool/sphere.vue
2024-08-09 17:25:23 +08:00
朱浩 c2876ff983 二期:预约开发 2024-08-09 17:20:55 +08:00
zhengdegang 6035803db1 Merge pull request 'zdg' (#113) from zdg into main
Reviewed-on: #113
2024-08-09 17:20:15 +08:00
zdg f9de8514ed Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-08-09 17:19:19 +08:00
zdg cc8ea2b043 点赞组件 2024-08-09 17:19:00 +08:00
lyc 9e0e2a41f2 Merge pull request 'lyc-dev' (#112) from lyc-dev into main 2024-08-09 17:17:43 +08:00
lyc 3fcd0cdb21 Merge branch 'main' into lyc-dev 2024-08-09 17:09:59 +08:00
lyc 815b2b15cb Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk 2024-08-09 17:09:54 +08:00
lyc eb17167feb 作业 2024-08-09 17:09:15 +08:00
朱浩 ae500c94ce 二期:预约开发 2024-08-09 15:06:13 +08:00
lyc 258a99bc36 上课作业 2024-08-09 09:43:14 +08:00
朱浩 e5845a6714 二期:预约列表开发 2024-08-08 17:44:03 +08:00
朱浩 1c1ec2be71 Merge branch 'main' into zhuhao_dev
# Conflicts:
#	src/renderer/src/views/prepare/index.vue
2024-08-08 17:41:08 +08:00
朱浩 572bdb5fec 二期:预约列表开发 2024-08-08 17:39:06 +08:00