zhuhao
/
AIx_Smarttalk_WS
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 3 Wiki Activity
751 Commits 10 Branches 3 Tags 32 MiB
Commit Graph

579 Commits

Author SHA1 Message Date
朱浩 a78497b263 Merge remote-tracking branch 'origin/main' 2024-12-06 14:21:19 +08:00
朱浩 65670af54f s生成PPT 2024-12-06 14:21:05 +08:00
zdg 209ab7fafc 弹窗进度条 2024-12-06 14:15:01 +08:00
朱浩 87dcd9d5c3 Merge remote-tracking branch 'origin/main' 2024-12-05 15:47:38 +08:00
小杨 0e18d74bb9 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev 2024-12-05 14:47:27 +08:00
小杨 399c4b5461 add:添加活动页面; 2024-12-05 14:47:23 +08:00
“zouyf” 35c088c25a Merge branch 'main' into zouyf_dev 2024-12-05 14:37:13 +08:00
“zouyf” 028eb0f752 [考试分析] - 增加分页及优化题型获取 2024-12-05 14:36:50 +08:00
zdg b28abdff50 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-05 14:21:43 +08:00
zdg b428260703 类型异常 2024-12-05 14:21:36 +08:00
lyc b5f824ceea Merge pull request 'edit' (#88) from lyc-dev into main 2024-12-05 10:36:59 +08:00
lyc d3b3e3bcb5 edit 2024-12-05 10:36:34 +08:00
zdg 53f26d96d4 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-05 09:44:51 +08:00
zdg 7d7b50fa3e 类型定义 2024-12-05 09:44:45 +08:00
白了个白 5fe9359d64 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-04 17:30:30 +08:00
白了个白 be9d33fcd3 pptist： canvasTool 里面 新增插入试题 2024-12-04 17:30:01 +08:00
lyc 09e3264ee7 Merge pull request 'edit' (#85) from lyc-dev into main 2024-12-04 17:16:34 +08:00
lyc 7845d9bb1a edit 2024-12-04 17:15:20 +08:00
zdg d542064ee3 ppt生成课堂备课 2024-12-04 17:08:51 +08:00
朱浩 9803c09c43 s生成PPT 2024-12-04 17:04:20 +08:00
zdg 0e5d84fcd2 ppt生产 2024-12-04 16:41:38 +08:00
朱浩 7811bbfe3e s生成PPT 2024-12-04 16:28:52 +08:00
zdg 91ceb712bf 异常修复 2024-12-04 15:45:45 +08:00
zdg a192640899 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-04 15:42:38 +08:00
zdg 08a16929f7 还原本地测试代码 2024-12-04 15:32:56 +08:00
lyc 42e8149443 Merge pull request 'lyc-dev' (#81) from lyc-dev into main 2024-12-04 15:14:22 +08:00
lyc 8b429a4174 edit 2024-12-04 15:13:53 +08:00
白了个白 23795f2419 Merge branch 'yws_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-04 15:09:05 +08:00
白了个白 ea204de407 1 2024-12-04 15:05:48 +08:00
白了个白 a31b8d7376 pptist：canvastool 新增 插入习题按钮 2024-12-04 14:58:47 +08:00
小杨 8d03c927b9 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev 2024-12-04 14:58:02 +08:00
小杨 edabc0336f add：新增pptlist活动列表; 2024-12-04 14:57:56 +08:00
白了个白 df474db4a5 1 2024-12-04 14:38:28 +08:00
白了个白 328e623db7 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-04 14:36:53 +08:00
白了个白 8ad041e963 1 2024-12-04 14:34:25 +08:00
zdg 3b851887ca Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-04 14:33:30 +08:00
zdg e6333e49f0 更新ppt 2024-12-04 14:33:08 +08:00
cys 59bc2fba86 Merge branch 'cys_dev' 2024-12-04 10:27:45 +08:00
lyc 3ad4391e10 edit 模板 2024-12-03 10:11:51 +08:00
“zouyf” 7b59d78ce3 1 2024-12-02 17:30:24 +08:00
“zouyf” 330a9acddb 避免多次点击 2024-12-02 17:25:10 +08:00
“zouyf” 90dff4d5c7 Merge branch 'main' into zouyf_dev 2024-12-02 16:36:12 +08:00
白了个白 7c304650ad Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-02 15:35:13 +08:00
lyc 1a267e5696 Merge pull request 'lyc-dev' (#76) from lyc-dev into main 2024-12-02 14:25:30 +08:00
lyc cd6ca2e4e7 最大最小化icon 2024-12-02 14:24:02 +08:00
“zouyf” 99c90bf9a3 Merge branch 'main' into zouyf_dev 2024-12-02 10:44:51 +08:00
白了个白 40053c6c79 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-02 10:19:30 +08:00
zdg 482cab5cd3 ppt 优化 2024-11-28 16:15:25 +08:00
“zouyf” c3620a11ee 1 2024-11-28 14:17:32 +08:00
zdg 0d68e6efa7 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-11-28 09:33:48 +08:00
zdg a9443035c2 ppt文件转入数据 2024-11-27 17:58:25 +08:00
lyc 7b4e54cb16 edit 2024-11-27 17:31:54 +08:00
白了个白 eb428eaddf Merge branch 'zouyf_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-27 16:58:39 +08:00
“zouyf” e30e3fd42d Merge branch 'main' into zouyf_dev 2024-11-27 16:58:18 +08:00
“zouyf” 81f704b2a5 1 2024-11-27 15:48:22 +08:00
lyc 58e80d590e Merge pull request 'edit' (#74) from lyc-dev into main 2024-11-27 14:38:49 +08:00
lyc 8a1c5d7186 edit 2024-11-27 14:38:22 +08:00
zdg 7c3f3ea8fb Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-11-27 14:21:00 +08:00
zdg f2b1a097bb 更新ppt-排序 2024-11-27 14:20:52 +08:00
朱浩 a6e6f450c5 s生成PPT 2024-11-27 14:19:24 +08:00
白了个白 944dff1b00 1 2024-11-27 14:15:00 +08:00
zdg c555de5fe5 修复pptx 2024-11-27 14:09:32 +08:00
zdg a10d3b078b Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-11-27 13:45:57 +08:00
zdg c1bba6e443 pptist 基础功能 2024-11-27 13:45:48 +08:00
lyc 231a7b6dce Merge pull request 'edit' (#72) from lyc-dev into main 2024-11-27 12:02:35 +08:00
lyc 310d9d3a2b edit 2024-11-27 12:02:14 +08:00
lyc fae380f9c6 Merge pull request 'edit' (#71) from lyc-dev into main 2024-11-27 11:21:39 +08:00
lyc a68fb21203 edit 2024-11-27 11:21:18 +08:00
朱浩 2c6ccd893b s生成PPT 2024-11-27 11:03:35 +08:00
朱浩 540e5f0179 Merge remote-tracking branch 'origin/main' 2024-11-27 10:59:44 +08:00
朱浩 8a8f90ce16 s生成PPT 2024-11-27 10:58:29 +08:00
朱浩 050f87a84a s生成PPT 2024-11-27 10:58:00 +08:00
小杨 5b49eef8e8 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev 2024-11-27 10:51:50 +08:00
小杨 1060929532 fix：修改个人中心默认修改； 2024-11-27 10:51:43 +08:00
白了个白 222f558807 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-27 10:41:03 +08:00
白了个白 ef5dfc8ed1 习题筛选修改 2024-11-27 10:39:21 +08:00
小杨 7a6f57a9b7 fix：个人中心修改学科问题； 2024-11-27 10:29:39 +08:00
白了个白 48571086c3 1 2024-11-27 10:12:39 +08:00
白了个白 b967c684d6 1 2024-11-27 10:11:35 +08:00
白了个白 84e8acdef7 Merge branch 'zouyf_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-27 10:03:38 +08:00
白了个白 d8c4556393 1 2024-11-27 10:01:53 +08:00
“zouyf” 2d9518804e Merge branch 'main' into zouyf_dev 
# Conflicts:
#	src/renderer/src/views/profile/userInfo.vue
 2024-11-26 17:09:05 +08:00
“zouyf” e405eb041b 更新章节下知识点 2024-11-26 17:06:46 +08:00
lyc eb197db4fd 框架设计-edit 2024-11-26 16:07:13 +08:00
lyc 5808798b95 模板修改 2024-11-26 14:55:14 +08:00
lyc 393587848f 模板修改 2024-11-26 14:52:52 +08:00
小杨 1882fd0dae fix：修改个人中心修改学科的时候不生效的问题； 2024-11-26 10:36:41 +08:00
小杨 e1caa441cb add：新增第三方资源筛选； 2024-11-26 09:35:25 +08:00
“zouyf” 09e6bec69f 优化菁优网api接口 2024-11-25 17:23:31 +08:00
“zouyf” d26af6446a 试题编辑-回显知识点 2024-11-25 15:19:15 +08:00
zouyf ca3f2658a7 Merge pull request '1' (#64) from zouyf_dev into main 
Reviewed-on: #64
 2024-11-25 11:19:34 +08:00
“zouyf” cd1fc036a2 1 2024-11-25 11:18:45 +08:00
白了个白 42f24041db Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-25 11:11:20 +08:00
zouyf 727299aac9 Merge pull request 'zouyf_dev' (#63) from zouyf_dev into main 
Reviewed-on: #63
 2024-11-25 11:07:13 +08:00
lyc 27b0457eef Merge pull request 'edit' (#62) from lyc-dev into main 2024-11-25 11:00:42 +08:00
lyc 34e74c5ec6 edit 2024-11-25 10:59:56 +08:00
“zouyf” 208f5d496f Merge branch 'main' into zouyf_dev 2024-11-25 10:59:40 +08:00
“zouyf” 122fb41690 [习题上传] - 章节下增加对应知识点数据 2024-11-25 10:59:27 +08:00
朱浩 eb4a58b306 Merge remote-tracking branch 'origin/main' 2024-11-25 10:54:33 +08:00
白了个白 b081000f11 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-25 09:41:57 +08:00
“zouyf” 630a7b4c50 1 2024-11-22 16:57:19 +08:00
zdg 349bdbd181 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 
# Conflicts:
#	src/renderer/index.html
#	src/renderer/src/views/model/index.vue
 2024-11-22 15:55:44 +08:00
zdg 8707b54420 pptList 功能二开 2024-11-22 15:18:42 +08:00
白了个白 124b584e38 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-22 15:12:20 +08:00
朱浩 f08b5a8bee Merge remote-tracking branch 'origin/main' 2024-11-22 11:07:11 +08:00
朱浩 e2255544da BUG修复 2024-11-22 11:06:57 +08:00
“zouyf” c4c1115abb 增加根据用户id查询 2024-11-22 11:03:19 +08:00
“zouyf” db99dbf0d8 Merge branch 'main' into zouyf_dev 2024-11-22 10:49:05 +08:00
“zouyf” 3b6878ece5 更新下划线格式化 2024-11-22 10:48:37 +08:00
朱浩 cbc6f21100 没有教材-的datasetid 2024-11-22 10:47:44 +08:00
白了个白 639178c827 作业布置：查看推送记录bug修复 2024-11-22 10:02:04 +08:00
朱浩 cb3485f10f Merge remote-tracking branch 'origin/main' 2024-11-22 09:58:09 +08:00
朱浩 cbb6a10c1d 窗口初始化最大化 2024-11-22 09:58:01 +08:00
zouyf 95c93f19ee Merge pull request 'zouyf_dev' (#58) from zouyf_dev into main 
Reviewed-on: #58
 2024-11-22 09:54:36 +08:00
“zouyf” dcd1a3bb05 1 2024-11-22 09:54:05 +08:00
“zouyf” 5ac33bd1ca 1 2024-11-22 09:53:15 +08:00
小杨 2641845ce0 fix：新增图标； 2024-11-22 09:52:21 +08:00
朱浩 e1a12ff0e0 个别文字说明修改 2024-11-22 09:48:43 +08:00
“zouyf” bd50a7cdf0 Merge branch 'main' into zouyf_dev 2024-11-22 09:42:15 +08:00
“zouyf” 94e609164a 替换菁优网填空标识 2024-11-22 09:41:58 +08:00
朱浩 4fbd77c40c Merge remote-tracking branch 'origin/main' 2024-11-22 09:34:38 +08:00
白了个白 437bff2cdd Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-22 09:33:32 +08:00
白了个白 6a6d932852 作业管理 2024-11-22 09:33:04 +08:00
朱浩 d3b5493810 Merge remote-tracking branch 'origin/main' 2024-11-22 09:18:02 +08:00
白了个白 2fd17df429 1 2024-11-21 17:35:52 +08:00
lyc 663ecb962c model/index.vue 冲突 解决 2024-11-21 17:33:36 +08:00
朱浩 398de60dcd 关闭自动同步文件，超过150M文件不允许加入课程 2024-11-21 17:32:47 +08:00
lyc 2f99a00a47 模板-考试分析 2024-11-21 17:31:26 +08:00
白了个白 9efca5c7d8 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-21 16:33:06 +08:00
小杨 c858186d9f fix：样式调整； 2024-11-21 16:32:11 +08:00
白了个白 7d41653036 Merge branch 'zouyf_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-21 16:30:54 +08:00
“zouyf” ad006bb218 开放mathtype 2024-11-21 16:27:35 +08:00
白了个白 6ea3246428 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-21 16:22:10 +08:00
白了个白 877c971415 习题上传： 2024-11-21 16:15:14 +08:00
小杨 08f0b63741 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev 2024-11-21 16:03:11 +08:00
小杨 a711aef5f3 fix：作业管理样式修改； 2024-11-21 16:03:07 +08:00
“zouyf” ebed58ea9e 优化个人中心选择学科 2024-11-21 15:58:57 +08:00
朱浩 c8aa529621 Merge remote-tracking branch 'origin/main' 2024-11-21 15:43:56 +08:00
朱浩 60f2790b0c BUG修复 2024-11-21 15:43:28 +08:00
白了个白 14bfef6903 个人题库：题目新增修改 2024-11-21 15:30:55 +08:00
白了个白 cbf2c29bb4 Merge branch 'zouyf_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-21 15:07:07 +08:00
白了个白 d25f2521a6 1 2024-11-21 15:06:44 +08:00
“zouyf” 2511a6cc32 优化查找图标 2024-11-21 15:02:40 +08:00
小杨 ce523bdcd5 fix：合并主分支； 2024-11-21 14:38:19 +08:00
小杨 7e0718498f fix：修改样式； 2024-11-21 14:35:00 +08:00
朱浩 adbb4f0067 Merge remote-tracking branch 'origin/main' 2024-11-21 13:52:29 +08:00
朱浩 def9433647 PPTist接入 2024-11-21 13:52:17 +08:00
白了个白 30b2b9b964 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-21 11:21:16 +08:00
白了个白 cadb8088a6 习题上传：习题内容识别迁移 2024-11-21 11:20:58 +08:00
lyc 538e9190c7 Merge branch 'main' into lyc-dev 2024-11-21 10:57:31 +08:00
lyc 5567e94235 模板 2024-11-21 10:56:35 +08:00
白了个白 ab8fe885cb 1 2024-11-21 10:36:00 +08:00
白了个白 853fb871ef 1 2024-11-20 17:35:08 +08:00
白了个白 41db306f77 1 2024-11-20 17:31:14 +08:00
白了个白 0f9c2a7d53 Merge branch 'zouyf_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-20 17:13:31 +08:00
白了个白 bf51f5084f 1 2024-11-20 17:13:07 +08:00
“zouyf” 96f25ab987 1 2024-11-20 16:51:51 +08:00
白了个白 2f2350531a 1 2024-11-20 16:20:45 +08:00
“zouyf” 0d0327f956 1 2024-11-20 16:20:09 +08:00
白了个白 5cbe56d1bf 作业管理 2024-11-20 15:30:18 +08:00
“zouyf” d5a8da438a Merge branch 'main' into zouyf_dev 
# Conflicts:
#	package.json
 2024-11-20 15:29:21 +08:00
lyc 0ccdbfe37a 冲突 2024-11-20 15:25:25 +08:00
lyc 1a0a2f9a67 模板 2024-11-20 15:23:42 +08:00
“zouyf” 51eea95a45 Merge branch 'main' into zouyf_dev 
# Conflicts:
#	package.json
 2024-11-20 15:10:50 +08:00
“zouyf” 3483076b66 1 2024-11-20 15:09:25 +08:00
白了个白 9534622067 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-20 14:33:08 +08:00
白了个白 761f19cf22 习题上传：待完善 2024-11-20 14:32:40 +08:00
“zouyf” 4bc5e3411f Merge branch 'baigl' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zouyf_dev 2024-11-20 09:55:42 +08:00
zdg 82091fbef5 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-11-19 17:26:11 +08:00
zdg 76a14264d7 屏蔽git原始信息 2024-11-19 17:25:57 +08:00
lyc c803ecd796 教学框架设计 2024-11-19 17:08:34 +08:00
小杨 639c07bccd fix：样式调整； 2024-11-19 16:37:17 +08:00
小杨 1f6427ff21 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yangws_ws 2024-11-19 16:37:06 +08:00
zdg 13f4aa25b8 优化ppt相关代码 2024-11-19 16:19:13 +08:00
白了个白 fcc881a2fa 1 2024-11-19 15:49:53 +08:00
“zouyf” 769f77c190 Merge branch 'baigl' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zouyf_dev 2024-11-19 14:51:20 +08:00
白了个白 748a0b7a5f Merge branch 'yangws_ws' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-19 10:17:56 +08:00
白了个白 b8224dedd8 新增习题上传插件：vue-cropper 2024-11-19 10:17:30 +08:00
小杨 232c5690bf add：左侧的树； 2024-11-19 10:16:36 +08:00
lyc 19283456d4 Merge branch 'main' into lyc-dev 2024-11-19 10:01:09 +08:00
白了个白 bff83162d3 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-19 10:01:05 +08:00
朱浩 fd0499cefa Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS 2024-11-19 09:59:59 +08:00
朱浩 4baf9f0062 PPTist接入 2024-11-19 09:59:34 +08:00
lyc 1a88d63893 冲突 2024-11-19 09:57:36 +08:00
白了个白 d357a15f12 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-19 09:51:14 +08:00
白了个白 f8d0e846cd 新增习题：待完善 2024-11-19 09:50:47 +08:00
小杨 da83bcec5c fix：样式修改； 2024-11-19 09:42:19 +08:00
lyc d283b60af7 模板 2024-11-18 17:31:01 +08:00
朱浩 6e3efe7843 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS 2024-11-18 17:29:10 +08:00
朱浩 432dbcc6fa PPTist接入 2024-11-18 17:28:56 +08:00
lyc 0f63afd277 Merge branch 'main' into lyc-dev 2024-11-18 10:17:23 +08:00
“zouyf” bffa1a0aae Merge branch 'main' into zouyf_dev 2024-11-18 10:01:45 +08:00
lyc f168e04405 模板 2024-11-16 23:37:11 +08:00
zhangxuelin 2f3a2b7aae Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-11-15 14:42:59 +08:00
zhangxuelin 98b1155fb7 添加人机验证 2024-11-15 14:42:39 +08:00
白了个白 e322103089 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-15 11:16:22 +08:00
白了个白 640a8a6dd9 新增作业管理 2024-11-15 11:15:23 +08:00
lyc 7b65a19483 Merge pull request 'lyc-dev' (#39) from lyc-dev into main 2024-11-14 11:20:41 +08:00
lyc 18495d0811 编辑提示词 dialog 2024-11-14 11:17:52 +08:00
小杨 27017fc946 fix：部分修改优化； 2024-11-14 09:51:13 +08:00
lyc 39efd18bc6 模板更多按钮 2024-11-13 17:30:15 +08:00
小杨 3d2b102355 add：主页进入详情的页面； 2024-11-13 17:07:06 +08:00
“zouyf” 3195159a1a 优化滚动条 2024-11-13 14:36:39 +08:00
小杨 af0dd7f565 add:作业管理样式； 2024-11-13 11:27:02 +08:00
朱浩 a2c14b0d0a Merge remote-tracking branch 'origin/main' 2024-11-13 11:23:16 +08:00
朱浩 fe04f8acbd 三方资源加入备课 2024-11-13 11:23:08 +08:00
lyc 3f6f6124b3 模板 2024-11-13 11:22:53 +08:00
lyc 31adcd8460 Merge pull request 'lyc-dev' (#34) from lyc-dev into main 2024-11-13 10:23:02 +08:00
lyc 601e9f023a 模板 2024-11-13 10:23:56 +08:00
lyc 2de27f3d88 模板 2024-11-13 10:11:36 +08:00
朱浩 3949d55d64 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS 2024-11-13 09:25:20 +08:00
朱浩 4fb763eb6a 三方资源加入备课 2024-11-13 09:25:07 +08:00
小杨 d809842b93 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yangws_ws 2024-11-12 17:32:58 +08:00
小杨 280f875e99 add：作业管理页面，以及修复bug； 2024-11-12 17:32:52 +08:00
zhangxuelin 53308a09d1 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-11-12 17:28:39 +08:00
zhangxuelin e5b6473de4 修改学校管理字段 2024-11-12 17:28:21 +08:00
lyc 244a4b2b43 Merge pull request '模板' (#31) from lyc-dev into main 2024-11-12 17:09:26 +08:00
lyc 7dc10cb986 模板 2024-11-12 17:09:18 +08:00
白了个白 be138b8c58 作业批改：已交未交背景显示修复 2024-11-12 16:51:49 +08:00
朱浩 fb6e0da6ff Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	src/renderer/src/views/prepare/components/treeLog.vue
 2024-11-12 15:52:42 +08:00
朱浩 34fec10fc1 三方资源加入备课 2024-11-12 15:51:22 +08:00
白了个白 b5176e41b3 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-12 15:30:30 +08:00
白了个白 36b6d1cc05 作业设计：加载习题更改为分页模式 2024-11-12 15:29:50 +08:00
小杨 2513215a52 fix：修改格式； 2024-11-12 14:47:47 +08:00
zhangxuelin 5b7007a2fc Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-11-12 14:32:47 +08:00
zhangxuelin 23470cc188 修改认证图标颜色 2024-11-12 14:32:24 +08:00
小杨 52da91f8ec fix：修改格式传值； 2024-11-12 11:04:49 +08:00
小杨 3ade7f7a35 fix：不改变原数据； 2024-11-12 10:46:01 +08:00
小杨 866abbcd7e fix：添加章节组件； 2024-11-12 09:55:25 +08:00
小杨 5dc9e4e20d add：章节节点选择； 2024-11-12 09:49:09 +08:00
zhangxuelin 21cf2c9cfa Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-11-12 09:31:02 +08:00
zhangxuelin 9031fca09c no message 2024-11-12 09:30:45 +08:00
lyc 0ec8ec7480 路由冲突 2024-11-11 17:28:49 +08:00
lyc 5a1b95ea5d Merge pull request 'lyc-dev' (#22) from lyc-dev into main 2024-11-11 17:28:10 +08:00
白了个白 317dc9f184 1 2024-11-11 17:25:55 +08:00
lyc c3ef8d881e 模板 2024-11-11 17:16:06 +08:00
白了个白 0cc3d970d1 作业设计：课程切换数据覆盖bug修复 2024-11-11 15:06:40 +08:00
白了个白 a0bfb5be70 作业设计：课程选择太快增加防抖 2024-11-11 10:13:41 +08:00
白了个白 f53d7f104c Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-11 10:03:48 +08:00
白了个白 cbd706fed1 习题查询：加上分页传参 2024-11-08 15:38:13 +08:00
zhangxuelin e07d01f0a1 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-11-08 14:47:02 +08:00
zhangxuelin 5c60a30a8a 重新认证 2024-11-08 14:46:43 +08:00
白了个白 e002066da6 作业设计：题源同步2.0 web版 2024-11-08 09:54:57 +08:00
lyc 756d7fdaa1 模板 2024-11-07 14:14:46 +08:00
白了个白 6e3959328b Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-07 09:44:55 +08:00
白了个白 3c32f5d823 作业批改：逻辑与界面更改 2024-11-07 09:44:28 +08:00
lyc d05e50218d 模板 2024-11-06 17:33:32 +08:00
zhangxuelin 45b93b8980 首页展示学校 2024-11-06 17:30:31 +08:00
zhangxuelin 79f38ad18f no message 2024-11-06 17:06:17 +08:00
zhangxuelin 652c46c33b Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 
# Conflicts:
#	src/renderer/src/assets/iconfont/iconfont.css
#	src/renderer/src/assets/iconfont/iconfont.js
#	src/renderer/src/assets/iconfont/iconfont.json
#	src/renderer/src/assets/iconfont/iconfont.ttf
#	src/renderer/src/assets/iconfont/iconfont.woff
#	src/renderer/src/assets/iconfont/iconfont.woff2
#	src/renderer/src/router/index.js
 2024-11-06 17:04:39 +08:00
zhangxuelin dd8c48f3ae 学校加入 注册 登录注册 加入学校审批 2024-11-06 16:55:40 +08:00
白了个白 625f82880f 1 2024-11-06 11:24:53 +08:00
lyc 71e6b74dd4 调整路由 2024-11-05 00:39:06 +08:00
lyc 2ca3d89d1c 模板 2024-11-04 15:45:11 +08:00
lyc 9d3e11f336 Merge branch 'main' into lyc-dev 2024-11-01 16:51:51 +08:00
lyc b63eb6631d 模板 2024-11-01 16:51:26 +08:00
lyc a75502415c 更新图标 2024-10-31 14:40:48 +08:00
lyc b7e8798552 Merge pull request 'lyc-dev' (#13) from lyc-dev into main 2024-10-31 14:40:14 +08:00
小杨 e44909f747 fix：学科学段联动； 2024-10-31 14:26:35 +08:00
lyc 8bc0ab460c 教学工作台面包屑 2024-10-31 14:05:24 +08:00
zhangxuelin bbf85c4337 注册 2024-10-30 17:25:04 +08:00
小杨 1c463ed58b add：创建班级; 2024-10-30 15:54:48 +08:00
zhangxuelin 9167751c6c Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 
# Conflicts:
#	src/renderer/src/layout/components/Aside.vue
 2024-10-30 15:08:25 +08:00
zhangxuelin 7319c396c4 新增加入学校 学校认证 2024-10-30 15:06:37 +08:00
lyc 32ab4dbbfb Merge pull request '更新图标' (#10) from lyc-dev into main 2024-10-30 10:54:01 +08:00
lyc 9d742a1e21 更新图标 2024-10-30 10:54:44 +08:00
小杨 7a18c1927a fix：个人中心修改； 2024-10-30 10:50:30 +08:00
lyc 923d0f1f9a init 2.5 2024-10-30 10:39:00 +08:00
zhangxuelin b7dc080840 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-10-30 10:24:16 +08:00
zhangxuelin 41d6b35340 登录 2024-10-30 10:23:38 +08:00
lyc 01f32869ba Merge pull request '2.5init' (#7) from lyc-dev into main 2024-10-30 09:59:45 +08:00
lyc 61be71674c 2.5init 2024-10-30 10:00:23 +08:00
小杨 a8dbd41bdb add:个人中心UI还原; 2024-10-29 17:30:48 +08:00
lyc 208c3b00dd 2.5init 2024-10-29 17:25:27 +08:00
lyc 74a65479c7 2.5init 2024-10-29 15:11:06 +08:00
lyc 4e6d619762 2.5init 2024-10-29 15:06:02 +08:00
lyc 48938c29a3 2.5init 2024-10-29 14:34:33 +08:00
lyc 1e9b92d53a 2.5init 2024-10-29 14:26:09 +08:00
朱浩 1d9976f9ec 文枢AI2.5初始化 2024-10-25 14:38:32 +08:00