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

662 Commits

Author SHA1 Message Date
白了个白 e59071c16b Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-23 09:21:13 +08:00
白了个白 e70d6b0539 unitid 保存 2024-09-23 09:15:39 +08:00
白了个白 96098c899f 作业设计 2024-09-23 09:14:13 +08:00
朱浩 6b9949dfae BUG修复 2024-09-22 16:55:00 +08:00
朱浩 27c7033522 Merge pull request 'yangws' (#249) from yangws into main 
Reviewed-on: #249
 2024-09-22 16:47:12 +08:00
朱浩 4c66cc90c0 BUG修复 2024-09-22 16:46:37 +08:00
lyc cafea2d719 跳转增加bookid 2024-09-22 16:41:49 +08:00
yangws d5afede36c fix:2.0.4bug修改; 2024-09-22 16:28:10 +08:00
朱浩 79b9a0726a 打包联通文枢课堂 2024-09-22 14:27:48 +08:00
朱浩 274c80ad0a Merge branch 'main' into zhuhao_dev 2024-09-22 14:02:02 +08:00
yangws a64ba24742 fix:2.0.4bug修改; 2024-09-22 12:51:58 +08:00
lyc 19a3b948c5 点击章节 存储章节id （临时） 2024-09-22 12:34:15 +08:00
朱浩 622cdfe0fe BUG修复 #811,V2.0.3 APT设计-添加活动，与当前选择的章节不一致 2024-09-22 11:14:19 +08:00
朱浩 78b795bf4f BUG修复 #801,V2.0.3 教学实践-作业，红框部分去掉 2024-09-22 10:53:23 +08:00
lyc 71f7e4e5a1 注册账号-班级修改为可选 2024-09-22 10:38:31 +08:00
zdg 6935bec1e4 测试 2024-09-21 12:05:46 +08:00
qinqing 2532dc5fc2 解决冲突 2024-09-20 16:58:25 +08:00
朱浩 3cced30959 Merge branch 'main' into zhuhao_dev 2024-09-20 16:56:44 +08:00
朱浩 ef9fe838a3 BUG修复 2024-09-20 16:56:26 +08:00
qinqing f67380b2c9 PDF插件 2024-09-20 16:52:59 +08:00
zhangxuelin 8975784ce0 修改工具拖动 2024-09-20 16:27:12 +08:00
lyc e586755b75 Merge pull request 'edit' (#241) from lyc-dev into main 2024-09-20 15:38:39 +08:00
lyc ef771f4e0b edit 2024-09-20 15:38:37 +08:00
朱浩 ac599a2c39 BUG修复 2024-09-20 15:29:21 +08:00
lyc 00871797bf edit 2024-09-20 15:24:23 +08:00
lyc f9a87143aa edit 2024-09-20 15:19:33 +08:00
zdg c93eeeb308 修复异常 2024-09-20 15:16:34 +08:00
zdg ca57e72e9c 解决 值为null问题 2024-09-20 15:04:14 +08:00
zdg e0d3a6da6a Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-20 14:56:54 +08:00
zdg 1a9b426ec3 修复-上课 提示 2024-09-20 14:56:48 +08:00
lyc c6477d5ca9 edit 2024-09-20 14:34:22 +08:00
lyc 27ec047981 edit 教材选择 2024-09-20 14:30:36 +08:00
zdg 51cb1989a1 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-20 13:53:53 +08:00
zdg 4ab4d5dff2 恢复修改 2024-09-20 13:53:42 +08:00
lyc 80d6e1c59c Merge pull request 'edit' (#232) from lyc-dev into main 2024-09-20 13:41:22 +08:00
lyc 75c6777933 edit 2024-09-20 13:41:18 +08:00
朱浩 2531c25d7c BUG修复 2024-09-20 09:21:31 +08:00
朱浩 e002ef5f7d Merge branch 'main' into zhuhao_dev 2024-09-20 09:18:30 +08:00
朱浩 2ca637072d BUG修复 2024-09-20 09:18:12 +08:00
白了个白 ef6c3d2a2b Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-19 16:57:03 +08:00
白了个白 9ea05568e1 作业批改：同步web端164逻辑修改 2024-09-19 16:56:15 +08:00
zdg c5075af2fc 已上课 2024-09-19 16:37:07 +08:00
zdg 7da60f0815 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-19 16:35:43 +08:00
zdg 02a25db5e2 修复 2024-09-19 16:35:36 +08:00
yangws 59de30b6b2 Merge pull request 'fix: 解决空数据的判断;' (#227) from yangws into main 
Reviewed-on: #227
 2024-09-19 16:03:39 +08:00
yangws 746cb150c4 fix: 解决空数据的判断; 2024-09-19 16:02:56 +08:00
lyc 893be27671 切换学科 2024-09-19 16:02:42 +08:00
lyc b0b429c7aa Merge pull request '切换学科' (#226) from lyc-dev into main 2024-09-19 16:02:41 +08:00
lyc dbfa1a4037 Merge pull request '路由title' (#225) from lyc-dev into main 2024-09-19 15:55:19 +08:00
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