Commit Graph

694 Commits

Author SHA1 Message Date
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
朱浩 786c6816ec Merge pull request 'zhuhao_dev' (#183) from zhuhao_dev into main
Reviewed-on: #183
2024-09-10 15:04:51 +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
baigl 3603c4e0f2 Merge pull request 'baigl' (#182) from baigl into main
Reviewed-on: #182
2024-09-10 14:11:05 +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
朱浩 a2c962e94d Merge pull request 'zhuhao_dev' (#181) from zhuhao_dev into main
Reviewed-on: #181
2024-09-10 14:03:35 +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
baigl 4996af57c7 Merge pull request 'baigl' (#180) from baigl into main
Reviewed-on: #180
2024-09-10 13:51:02 +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 d896209948 Merge pull request '[考试分析] - 修改路由' (#179) from zouyf_dev into main
Reviewed-on: #179
2024-09-10 09:43:13 +08:00
“zouyf” c618ec04c7 [考试分析] - 修改路由 2024-09-10 09:41:28 +08:00
zhangxuelin c79e7966ee 注册 2024-09-09 18:14:57 +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 4b71008bee Merge pull request 'zouyf_dev' (#178) from zouyf_dev into main
Reviewed-on: #178
2024-09-09 16:47:27 +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 47f3202444 Merge pull request 'lyc-dev' (#177) from lyc-dev into main 2024-09-09 09:51:28 +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
白了个白 0c506a09f2 Merge branch 'baigl' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-09 09:28:57 +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
朱浩 78ac6e5ca6 解决版本问题 2024-09-06 15:38:50 +08:00
朱浩 acc29b02e4 解决版本问题 2024-09-06 15:33:25 +08:00
zhengdegang 12da4ac2c0 Merge pull request 'zdg' (#176) from zdg into main
Reviewed-on: #176
2024-09-05 16:32:57 +08:00
zdg 5ecba3fb62 默认群没清除,导致没有创建群 2024-09-05 16:28:15 +08:00
zdg f5f33eaa63 im日志级别 Debbug 2024-09-05 16:18:34 +08:00
zhengdegang 090bc5997c Merge pull request 'zdg' (#175) from zdg into main
Reviewed-on: #175
2024-09-05 01:31:11 +08:00
zdg 1c69d10263 修复-- bug 工具在桌面和pdf切换 2024-09-05 01:30:24 +08:00
zdg b794d55cd7 注释掉 2024-09-05 01:05:29 +08:00