zhuhao
/
AIx_Smarttalk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 26 Wiki Activity
965 Commits 9 Branches 26 Tags 40 MiB
Commit Graph

663 Commits

Author SHA1 Message Date
lyc ce8b2e6ab0 路由title 2024-09-19 15:55:19 +08:00
白了个白 9eb6d991c1 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-19 15:31:45 +08:00
白了个白 0cbb513a60 作业批改：常规作业ui修改 2024-09-19 15:29:52 +08:00
lyc be765b21b6 Merge pull request 'lyc-dev' (#223) from lyc-dev into main 2024-09-19 15:15:26 +08:00
lyc 34c1c66b31 edit 教材 2024-09-19 15:15:16 +08:00
lyc 5f06657b09 教学实践 2024-09-19 14:58:54 +08:00
白了个白 3ec25f07b4 作业批改：接口传参未传状态值bug修改 2024-09-19 14:25:33 +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
白了个白 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
lyc db2be260a7 教材edit 2024-09-19 11:25:01 +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
朱浩 81f873bcc3 Merge branch 'main' into zhuhao_dev 2024-09-18 17:31:14 +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
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
朱浩 7303128334 Merge branch 'main' into zhuhao_dev 2024-09-18 14:14:35 +08:00
yangws acd66c11fa fix: 个人中心任选学科报错问题; 2024-09-18 14:04:58 +08:00
朱浩 f90e2548c6 Merge branch 'main' into zhuhao_dev 2024-09-18 13:56:53 +08:00
yangws 3b9877e788 fix: 解决资源库报错的问题; 2024-09-18 13:55:30 +08:00
朱浩 fb48984e7f APT上课 2024-09-18 11:29:39 +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
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
朱浩 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 b279d36c89 edit 2024-09-14 15:12:36 +08:00
lyc 8013b1c2cc edit 2024-09-14 14:59:35 +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 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
lyc 8063783284 作业查询 2024-09-13 17:19:17 +08:00
lyc 8753951796 工作台、资源库调整 2024-09-13 17:03:30 +08:00
白了个白 490add5467 工作台右侧工作动态的作业， 新增可点击并弹框批改 2024-09-13 16:27:09 +08:00
白了个白 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