白了个白
|
634ae460f3
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-09-13 15:32:58 +08:00 |
|
白了个白
|
1cc7007852
|
作业分离后 接口传参修改
|
2024-09-13 14:02:05 +08:00 |
 朱浩
|
502cf13168
|
Merge branch 'main' into zhuhao_dev
|
2024-09-13 09:53:55 +08:00 |
|
朱浩
|
a4fa5be295
|
文件上传修改
|
2024-09-13 09:30:36 +08:00 |
 yangws
|
1afaed082a
|
fix: 解决资源库报错的问题;
|
2024-09-12 16:52:47 +08:00 |
 lyc
|
1da3ca0ee0
|
Merge branch 'main' into lyc-dev
|
2024-09-12 16:03:42 +08:00 |
|
lyc
|
d4a6f74cfc
|
首页调整
|
2024-09-12 16:03:21 +08:00 |
 “zouyf”
|
63ad74c77f
|
Merge branch 'main' into zouyf_dev
|
2024-09-12 15:58:28 +08:00 |
|
“zouyf”
|
d171117f03
|
tmp
|
2024-09-12 15:58:12 +08:00 |
|
lyc
|
0426b85d3f
|
Merge pull request '工作台' (#201) from lyc-dev into main
|
2024-09-12 15:42:55 +08:00 |
|
lyc
|
17b8ce1dda
|
工作台
|
2024-09-12 15:42:43 +08:00 |
 zhangxuelin
|
0fa3c84f5e
|
修改注册bug
|
2024-09-12 11:09:51 +08:00 |
|
zhangxuelin
|
490536654a
|
Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-12 10:51:38 +08:00 |
|
zhangxuelin
|
2efb870a16
|
添加注册提示
|
2024-09-12 10:51:12 +08:00 |
|
yangws
|
5778a8955d
|
Merge pull request 'fix: 提示教材没有时选择教材;' (#200) from yangws into main
Reviewed-on: #200
|
2024-09-12 09:48:40 +08:00 |
|
yangws
|
6a33ea8023
|
fix: 提示教材没有时选择教材;
|
2024-09-12 09:47:46 +08:00 |
|
朱浩
|
bc0579fa32
|
排序问题处理
|
2024-09-12 09:47:35 +08:00 |
|
yangws
|
3fdf500366
|
fix: 样式修改，以及第三方资源名称不对应的情况;
|
2024-09-12 09:30:44 +08:00 |
zdg
|
1978d1bac1
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-11 20:05:30 +08:00 |
|
zdg
|
b9014b950a
|
密码找回
|
2024-09-11 20:05:18 +08:00 |
|
lyc
|
03ecbb1d50
|
Merge pull request 'ai助手-拖动' (#196) from lyc-dev into main
|
2024-09-11 16:51:56 +08:00 |
|
lyc
|
ec3b978185
|
ai助手-拖动
|
2024-09-11 16:50:47 +08:00 |
|
zdg
|
3632beebfa
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-11 16:17:16 +08:00 |
|
zdg
|
f0e87338fb
|
注册优化，修复
|
2024-09-11 16:17:05 +08:00 |
|
lyc
|
54266f8a37
|
Merge pull request '图片' (#195) from lyc-dev into main
|
2024-09-11 16:05:04 +08:00 |
|
lyc
|
82bed1be03
|
图片
|
2024-09-11 16:04:36 +08:00 |
|
lyc
|
8a74f17266
|
Merge pull request '头部展示学科' (#194) from lyc-dev into main
|
2024-09-11 15:42:39 +08:00 |
|
lyc
|
40c6e1303b
|
头部展示学科
|
2024-09-11 15:39:54 +08:00 |
|
yangws
|
6c60cd4442
|
fix:解决个人中心班级限制问题；
|
2024-09-11 14:42:48 +08:00 |
|
白了个白
|
d7761883f2
|
作业批阅：新增空列表展示与loading加载效果
|
2024-09-11 14:22:05 +08:00 |
|
白了个白
|
b34182eb39
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-09-11 11:28:03 +08:00 |
|
白了个白
|
300093cf74
|
作业批改优化：新增时间筛选接口 界面调整
|
2024-09-11 11:25:41 +08:00 |
|
yangws
|
08075746c0
|
fix:样式问题;
|
2024-09-11 09:48:27 +08:00 |
|
yangws
|
68df866db5
|
fix:修改添加的班级;
|
2024-09-10 17:55:48 +08:00 |
|
朱浩
|
0268f1af36
|
Merge branch 'main' into zhuhao_dev
|
2024-09-10 17:17:38 +08:00 |
|
朱浩
|
278dfd4d93
|
章节排序
|
2024-09-10 17:17:10 +08:00 |
|
lyc
|
e2017c3553
|
冲突-file-preview
|
2024-09-10 17:09:50 +08:00 |
|
lyc
|
0be3d131e2
|
聊天机器人
|
2024-09-10 17:07:00 +08:00 |
|
yangws
|
076a510109
|
add:新增加入班级;
|
2024-09-10 16:49:11 +08:00 |
|
zhangxuelin
|
7ed7b2efd2
|
添加跳转apt页面
|
2024-09-10 15:21:46 +08:00 |
|
zhangxuelin
|
eaf2d82ead
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-10 15:06:39 +08:00 |
|
朱浩
|
1b504a1653
|
Merge branch 'main' into zhuhao_dev
|
2024-09-10 15:04:18 +08:00 |
|
朱浩
|
85c61ca802
|
APT入口开发
|
2024-09-10 15:03:42 +08:00 |
|
zhangxuelin
|
7da1d97939
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-10 14:57:19 +08:00 |
|
白了个白
|
cb1c3c23fe
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-09-10 14:10:10 +08:00 |
|
白了个白
|
de1dee7380
|
题目转义判断
|
2024-09-10 14:09:50 +08:00 |
|
zhangxuelin
|
151cdbb1a1
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
# electron.vite.config.mjs
|
2024-09-10 14:07:04 +08:00 |
|
朱浩
|
9cad353d36
|
Merge branch 'main' into zhuhao_dev
|
2024-09-10 14:02:51 +08:00 |
|
朱浩
|
53f43019e9
|
APT入口开发
|
2024-09-10 14:01:58 +08:00 |
|
白了个白
|
7a4cc9eb64
|
1
|
2024-09-10 13:49:46 +08:00 |
|
白了个白
|
fd6aa2a56a
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-09-10 13:43:04 +08:00 |
|
zdg
|
ad2e6b92db
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-10 12:18:48 +08:00 |
|
白了个白
|
6be4b3526e
|
作业批改：优化轮询机制
|
2024-09-10 11:30:45 +08:00 |
|
zhangxuelin
|
bbe4037a71
|
注册账号
|
2024-09-10 10:37:32 +08:00 |
|
白了个白
|
0b6b0c318d
|
作业批改：报告迁入
|
2024-09-10 09:52:10 +08:00 |
|
“zouyf”
|
c618ec04c7
|
[考试分析] - 修改路由
|
2024-09-10 09:41:28 +08:00 |
|
zhangxuelin
|
c79e7966ee
|
注册
|
2024-09-09 18:14:57 +08:00 |
|
lyc
|
3a1cf6224a
|
chart
|
2024-09-09 17:57:08 +08:00 |
|
白了个白
|
2d89ef8de3
|
作业批改：概况
|
2024-09-09 17:53:55 +08:00 |
|
白了个白
|
44002ae78d
|
作业批改路径修改
|
2024-09-09 17:28:25 +08:00 |
|
白了个白
|
0e88eb8226
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-09-09 17:17:51 +08:00 |
|
白了个白
|
5bda6cfad2
|
批阅优化
|
2024-09-09 17:14:57 +08:00 |
|
朱浩
|
280313e638
|
Merge remote-tracking branch 'origin/main'
|
2024-09-09 16:54:19 +08:00 |
|
朱浩
|
ed7a8a124e
|
文件预览
|
2024-09-09 16:54:04 +08:00 |
|
“zouyf”
|
aab477999e
|
Merge branch 'main' into zouyf_dev
|
2024-09-09 16:44:40 +08:00 |
|
“zouyf”
|
d1b7101ba5
|
[考试分析] - 优化显示解析
|
2024-09-09 16:44:24 +08:00 |
|
白了个白
|
7cb84ffe37
|
作业批阅：附件预览
|
2024-09-09 15:50:55 +08:00 |
|
lyc
|
3cd8c51aae
|
Merge branch 'main' into lyc-dev
|
2024-09-09 09:51:06 +08:00 |
|
lyc
|
be187e1a2d
|
header路由报错
|
2024-09-09 09:48:28 +08:00 |
|
白了个白
|
04ac5dc8b5
|
作业批阅
|
2024-09-09 07:04:21 +08:00 |
|
zhangxuelin
|
aca464fddd
|
Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-09 01:15:19 +08:00 |
|
zhangxuelin
|
25d026bd13
|
新增注册页面
|
2024-09-09 01:14:26 +08:00 |
|
lyc
|
119e07bcea
|
新增工作台
|
2024-09-07 18:18:56 +08:00 |
|
“zouyf”
|
555960b8bd
|
Merge branch 'main' into zouyf_dev
|
2024-09-07 18:08:15 +08:00 |
|
“zouyf”
|
d709753534
|
[考试分析] - 添加
|
2024-09-07 18:07:32 +08:00 |
|
朱浩
|
acc29b02e4
|
解决版本问题
|
2024-09-06 15:33:25 +08:00 |
|
zdg
|
5ecba3fb62
|
默认群没清除，导致没有创建群
|
2024-09-05 16:28:15 +08:00 |
|
zdg
|
f5f33eaa63
|
im日志级别 Debbug
|
2024-09-05 16:18:34 +08:00 |
|
zdg
|
1c69d10263
|
修复-- bug 工具在桌面和pdf切换
|
2024-09-05 01:30:24 +08:00 |
|
zdg
|
b794d55cd7
|
注释掉
|
2024-09-05 01:05:29 +08:00 |
|
zdg
|
e740cb0c7e
|
Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-05 01:02:47 +08:00 |
|
zdg
|
3a83a31970
|
修复数据状态-生产环境 无法监听问题
|
2024-09-05 01:02:42 +08:00 |
|
zhangxuelin
|
e31858a3fe
|
修改pdf画笔bug
|
2024-09-04 21:06:21 +08:00 |
|
zdg
|
3a6b78bc76
|
修复bug-画笔
|
2024-09-04 20:43:47 +08:00 |
|
zdg
|
70e99e69ba
|
修复 bug
|
2024-09-04 19:50:23 +08:00 |
|
lyc
|
33e84ca006
|
资源推送
|
2024-09-04 16:28:36 +08:00 |
|
lyc
|
28a815169d
|
Merge branch 'main' into lyc-dev
|
2024-09-04 13:46:36 +08:00 |
|
zdg
|
e03e385dbc
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-03 18:03:30 +08:00 |
|
zdg
|
2aaa15230a
|
恢复 im 注释
|
2024-09-03 18:03:25 +08:00 |
|
zdg
|
7894214859
|
修复bug: #678 #652 #648
|
2024-09-03 18:02:46 +08:00 |
|
朱浩
|
fe41a63b2d
|
Merge pull request 'zhuhao_dev' (#170) from zhuhao_dev into main
Reviewed-on: #170
|
2024-09-03 16:39:57 +08:00 |
|
朱浩
|
cdf12cf213
|
区分生产和测试版本，测试版会直接显示测试版文字
|
2024-09-03 16:37:39 +08:00 |
|
yangws
|
cfac2086e6
|
fix：看不了学生信息；
|
2024-09-03 16:31:40 +08:00 |
|
朱浩
|
59ca00d6d1
|
Merge branch 'main' into zhuhao_dev
# Conflicts:
# package.json
|
2024-09-03 16:15:07 +08:00 |
|
zdg
|
b6504e114f
|
桌面，底部导航 多个窗口
|
2024-09-03 16:01:40 +08:00 |
|
lyc
|
931ed531ab
|
Merge branch 'main' into lyc-dev
|
2024-09-03 14:12:00 +08:00 |
|
zdg
|
eb3778dde2
|
修复bug-数据共享
|
2024-09-03 13:18:40 +08:00 |
|
lyc
|
a6bda302af
|
Merge branch 'main' into lyc-dev
|
2024-09-03 10:41:57 +08:00 |
|
zdg
|
0201385e75
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-02 22:22:14 +08:00 |
|
zdg
|
ea9af1440e
|
数据库共享：结合 pinia + electron-store
关闭开发 本地文件日志，只有生产有日志文件记录
|
2024-09-02 22:22:03 +08:00 |
|
zdg
|
b4c2751e8c
|
注释代码放开
|
2024-09-02 18:35:16 +08:00 |
|
yangws
|
22239090ea
|
fix：隐藏掉班级中心所有的操作按钮；
|
2024-09-02 16:57:54 +08:00 |
|
zdg
|
1d808950b5
|
优化bug
|
2024-09-02 16:33:25 +08:00 |
|
zdg
|
3f4e9c35b0
|
崩溃等，日志文件配置
|
2024-09-02 13:51:25 +08:00 |
|
zdg
|
b5d41050ae
|
数据共享-修改成 session local
永久和临时
|
2024-09-02 11:14:47 +08:00 |
|
朱浩
|
0e5ca5eff2
|
Merge branch 'main' into zhuhao_dev
|
2024-08-31 14:13:56 +08:00 |
|
lyc
|
eb481e265b
|
获取教材-单元、章节调整
|
2024-08-30 18:28:27 +08:00 |
|
lyc
|
ff97a2bef6
|
Merge pull request 'lyc-dev' (#163) from lyc-dev into main
|
2024-08-30 14:29:52 +08:00 |
|
lyc
|
05c567d1cd
|
console
|
2024-08-30 14:28:55 +08:00 |
|
lyc
|
1a6abfaa50
|
预约课程-时间限制
|
2024-08-30 14:15:15 +08:00 |
|
zdg
|
177df96d69
|
更新-logo
|
2024-08-30 13:45:01 +08:00 |
|
zdg
|
571bfc98f7
|
bug: 335 优化动画
|
2024-08-30 13:35:25 +08:00 |
|
yangws
|
1871e7e565
|
fix：修改老师创建查看自己小组的权限；
|
2024-08-30 09:32:22 +08:00 |
|
lyc
|
df8f4fcf92
|
Merge branch 'main' into lyc-dev
|
2024-08-29 16:48:39 +08:00 |
|
lyc
|
d6b4ae011d
|
预约课程-默认时间-时间限制
|
2024-08-29 16:45:17 +08:00 |
|
yangws
|
e6a0859f87
|
fix：无数据时处理；
|
2024-08-28 14:07:14 +08:00 |
|
zdg
|
1518d9c3ae
|
更新作业推送
|
2024-08-27 11:36:30 +08:00 |
|
lyc
|
23878f5843
|
Merge pull request '教学研究室-打开教材分析' (#157) from lyc-dev into main
|
2024-08-26 14:39:56 +08:00 |
|
lyc
|
144da0ace9
|
教学研究室-打开教材分析
|
2024-08-26 14:34:35 +08:00 |
|
zdg
|
13e755bb9a
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-08-26 11:48:41 +08:00 |
|
zdg
|
b5ce949172
|
恢复
|
2024-08-26 11:48:18 +08:00 |
|
zdg
|
d033c217d6
|
数据共享配置 渲染器和主进程
|
2024-08-26 11:47:10 +08:00 |
|
yangws
|
59be0c07d1
|
fix：年级不允许切换；
|
2024-08-26 09:30:26 +08:00 |
|
朱浩
|
e985c2e7af
|
Merge branch 'main' into zhuhao_dev
|
2024-08-23 12:01:51 +08:00 |
|
朱浩
|
0ea628d174
|
二期：打包IM
|
2024-08-23 12:01:43 +08:00 |
|
yangws
|
be222a2ba6
|
feat:修改固定住自己所选的学科学段;
|
2024-08-23 11:28:26 +08:00 |
|
lyc
|
386c4e09c6
|
冲突
|
2024-08-23 11:21:57 +08:00 |
|
zdg
|
6f6d56b37b
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-08-23 10:43:57 +08:00 |
|
zdg
|
c1f81a8e5c
|
更新 点赞，疑惑
|
2024-08-23 10:43:44 +08:00 |
|
lyc
|
d003ecf8ce
|
Merge branch 'main' into lyc-dev
|
2024-08-23 09:56:28 +08:00 |
|
lyc
|
146784bf26
|
增加一个预览文件
|
2024-08-23 09:56:14 +08:00 |
|
yangws
|
99ee438fd7
|
add:新增第三方对接素材;
|
2024-08-23 09:44:03 +08:00 |
|
lyc
|
2279bbb904
|
布置作业修改
|
2024-08-22 10:43:05 +08:00 |
|
lyc
|
b0d969546a
|
Merge branch 'main' into lyc-dev
|
2024-08-22 09:43:10 +08:00 |
|
lyc
|
8ec96996c6
|
增加预览pdf
|
2024-08-22 09:42:55 +08:00 |
|
zdg
|
86cd50b8a3
|
im-点赞 疑惑 作业布置
|
2024-08-22 09:14:21 +08:00 |
|
zdg
|
6d77d54bc1
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-08-21 09:18:15 +08:00 |
|
zdg
|
c57f21461a
|
点赞动画优化
|
2024-08-21 09:18:00 +08:00 |
|
lyc
|
d669b6ee42
|
Merge pull request '教材选择不区分上下册' (#148) from lyc-dev into main
|
2024-08-20 17:11:00 +08:00 |
|
lyc
|
13598615c7
|
教材选择不区分上下册
|
2024-08-20 14:24:18 +08:00 |
|
zdg
|
a80a3b006c
|
Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-08-20 14:21:29 +08:00 |
|
zdg
|
a2e72b855b
|
优化
|
2024-08-20 14:21:25 +08:00 |
|
zhangxuelin
|
1e0ff00503
|
1
|
2024-08-20 10:22:42 +08:00 |
|
zhangxuelin
|
b8ea091bb5
|
最小化pdf
|
2024-08-20 10:22:02 +08:00 |
|
朱浩
|
f38a14bc0b
|
Merge branch 'zdg' into zhuhao_dev
# Conflicts:
# package.json
# src/renderer/src/plugins/shareStore.js
|
2024-08-19 17:00:42 +08:00 |
|
朱浩
|
f98fa5a3f3
|
二期：打包IM
|
2024-08-19 16:30:57 +08:00 |
|
zdg
|
49c4c7245a
|
打包chat-im
|
2024-08-19 14:21:42 +08:00 |
|
朱浩
|
0ff0cd42bc
|
二期：修改自动同步检测逻辑
|
2024-08-16 18:10:20 +08:00 |
|
朱浩
|
6dfb2d4a8a
|
Merge branch 'main' into zhuhao_dev
|
2024-08-16 17:41:01 +08:00 |
|
zhangxuelin
|
56483a9a49
|
shareStore状态优化
|
2024-08-16 17:33:27 +08:00 |