zhangxuelin
|
590b318757
|
作业弹窗
|
2024-12-12 16:12:32 +08:00 |
CYS
|
4421ee7fea
|
Merge pull request '政治课标dataset_id修改' (#120) from cys_dev into main
Reviewed-on: #120
|
2024-12-12 16:05:55 +08:00 |
cys
|
19ef95447c
|
1
|
2024-12-12 16:04:43 +08:00 |
白了个白
|
892b4ee3b0
|
教程分析:pdf页面展示修改
|
2024-12-12 15:26:14 +08:00 |
zdg
|
5e04a4c2c2
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
|
2024-12-12 12:21:53 +08:00 |
zdg
|
ca93eb72ac
|
更新消息
|
2024-12-12 12:21:47 +08:00 |
小杨
|
78cc5edd39
|
fix:修改pptlist添加活动的bug;
|
2024-12-12 11:26:26 +08:00 |
朱浩
|
9f4e232d6f
|
Merge remote-tracking branch 'origin/main'
|
2024-12-12 11:20:12 +08:00 |
朱浩
|
afc9fe89d1
|
解决按钮层级问题
|
2024-12-12 11:19:38 +08:00 |
朱浩
|
894ed269ce
|
解决生产无法关闭PPTIST页面问题
|
2024-12-12 11:17:12 +08:00 |
zdg
|
b15fa29ffa
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
|
2024-12-12 11:02:22 +08:00 |
zhangxuelin
|
64d2dbcabb
|
Merge pull request '点赞疑问' (#117) from zxl into main
Reviewed-on: #117
|
2024-12-12 10:58:09 +08:00 |
zhangxuelin
|
f4cb3a8916
|
点赞疑问
|
2024-12-12 10:57:48 +08:00 |
小杨
|
e522fc8ee5
|
清除debugger;
|
2024-12-12 10:53:15 +08:00 |
小杨
|
bbed835ffe
|
fix:修改ppt添加活动的bug;
|
2024-12-12 10:52:10 +08:00 |
zdg
|
9ef4812acb
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
|
2024-12-12 10:31:00 +08:00 |
zhangxuelin
|
979621b515
|
点赞和疑问
|
2024-12-12 10:28:32 +08:00 |
zdg
|
d313f901a3
|
去掉注释
|
2024-12-11 17:32:11 +08:00 |
zdg
|
8990ffdc58
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
|
2024-12-11 17:17:01 +08:00 |
zdg
|
13b1a895a4
|
上课 socket
|
2024-12-11 17:16:55 +08:00 |
朱浩
|
9c7aeb1a27
|
Merge remote-tracking branch 'origin/main'
|
2024-12-11 17:11:22 +08:00 |
lyc
|
dad772713f
|
edit
|
2024-12-11 17:04:12 +08:00 |
朱浩
|
a9faeea3fd
|
Merge remote-tracking branch 'origin/main'
|
2024-12-11 17:03:04 +08:00 |
朱浩
|
02ab1ffa8e
|
霞客
|
2024-12-11 16:42:46 +08:00 |
朱浩
|
10e76add35
|
霞客
|
2024-12-11 16:35:52 +08:00 |
lyc
|
c1325db9e7
|
Merge pull request 'edit 模板' (#112) from lyc-dev into main
|
2024-12-11 15:07:56 +08:00 |
lyc
|
cbc12a3d43
|
edit 模板
|
2024-12-11 15:07:25 +08:00 |
白了个白
|
c8dd19382e
|
作业管理:作业名称为空保存判断
|
2024-12-11 14:51:07 +08:00 |
zhangxuelin
|
e4afb26e4e
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
|
2024-12-11 13:50:50 +08:00 |
zhangxuelin
|
d60d8822a6
|
修改动画不能展示问题
|
2024-12-11 13:50:25 +08:00 |
朱浩
|
90137bc3a2
|
Merge remote-tracking branch 'origin/main'
|
2024-12-11 13:37:07 +08:00 |
朱浩
|
82c61a3fa7
|
大模型首页
|
2024-12-11 13:36:49 +08:00 |
朱浩
|
48d631a17c
|
大模型首页
|
2024-12-11 11:11:47 +08:00 |
zhangxuelin
|
432c1ff71d
|
pptist点赞组件
|
2024-12-11 11:02:22 +08:00 |
朱浩
|
7f595c09a9
|
大模型首页
|
2024-12-11 10:33:18 +08:00 |
朱浩
|
c8e10d4fe1
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# src/renderer/src/components/file-image/index.vue
# src/renderer/src/views/model/index.vue
|
2024-12-11 10:31:29 +08:00 |
朱浩
|
f916660156
|
大模型首页
|
2024-12-11 10:28:55 +08:00 |
zdg
|
bb0aa82e82
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
|
2024-12-11 10:06:30 +08:00 |
zdg
|
8ed13a3146
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
# Conflicts:
# src/renderer/src/AixPPTist/src/api/index.ts
# src/renderer/src/views/prepare/index.vue
|
2024-12-11 10:06:23 +08:00 |
zhangxuelin
|
bace41e12e
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
|
2024-12-11 09:58:08 +08:00 |
zhangxuelin
|
04e204928d
|
添加ppt 视频url替换
|
2024-12-11 09:57:39 +08:00 |
zdg
|
9e5609fbdd
|
ppt上课
|
2024-12-11 09:44:52 +08:00 |
lyc
|
a1a4e11de7
|
add icon
|
2024-12-11 09:40:51 +08:00 |
lyc
|
7e9ac2bf74
|
Merge branch 'main' into lyc-dev
|
2024-12-10 15:43:14 +08:00 |
lyc
|
013669dd35
|
edit 模板
|
2024-12-10 15:42:59 +08:00 |
小杨
|
c159d6be1a
|
fix:清除debugger;
|
2024-12-10 15:38:19 +08:00 |
小杨
|
e7c6ab9e8d
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev
|
2024-12-10 15:34:51 +08:00 |
小杨
|
85d06f306a
|
fix:ppt活动添加;
|
2024-12-10 15:34:46 +08:00 |
朱浩
|
656a58693f
|
Merge remote-tracking branch 'origin/main'
|
2024-12-10 14:20:08 +08:00 |
“zouyf”
|
9603406a0b
|
1
|
2024-12-10 11:09:32 +08:00 |
“zouyf”
|
10a7e73c64
|
Merge branch 'main' into zouyf_dev
|
2024-12-10 10:59:48 +08:00 |
“zouyf”
|
2c238b5706
|
1
|
2024-12-10 10:54:21 +08:00 |
“zouyf”
|
b47feb4a3a
|
1
|
2024-12-10 10:46:22 +08:00 |
朱浩
|
772b196b31
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# src/renderer/src/views/prepare/index.vue
|
2024-12-10 10:44:04 +08:00 |
zhangxuelin
|
80ac4a6e1c
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
|
2024-12-10 10:40:21 +08:00 |
朱浩
|
757edb0f67
|
改名AIPPT
|
2024-12-10 10:40:08 +08:00 |
“zouyf”
|
c79911cc99
|
Merge branch 'main' into zouyf_dev
|
2024-12-10 10:40:07 +08:00 |
zhangxuelin
|
1987783fda
|
添加作业弹窗
|
2024-12-10 10:40:00 +08:00 |
“zouyf”
|
755cfc615a
|
试题分页查询回顶部
|
2024-12-10 10:39:39 +08:00 |
白了个白
|
122487cf8b
|
ppts习题插入:个人题库 习题截图放到ppts里面转换
|
2024-12-10 10:24:30 +08:00 |
“zouyf”
|
2e81c706b1
|
Merge branch 'main' into zouyf_dev
|
2024-12-10 10:13:00 +08:00 |
“zouyf”
|
2360d95f1c
|
pptList试题转图片优化
|
2024-12-10 10:12:47 +08:00 |
zdg
|
4f68ae27b3
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
|
2024-12-10 10:09:00 +08:00 |
zdg
|
38c041465e
|
ppt上课
|
2024-12-10 10:08:53 +08:00 |
zhangxuelin
|
f035cf87ea
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
# Conflicts:
# src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue
|
2024-12-10 09:43:43 +08:00 |
zhangxuelin
|
e56eb059be
|
替换上传图片 视频url为线上url
|
2024-12-10 09:41:59 +08:00 |
小杨
|
23e59531ea
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev
|
2024-12-09 17:25:30 +08:00 |
小杨
|
9e021edc67
|
fix:添加活动;
|
2024-12-09 17:25:25 +08:00 |
“zouyf”
|
d90b7c695a
|
1
|
2024-12-09 17:14:37 +08:00 |
“zouyf”
|
d07dd4455c
|
1
|
2024-12-09 16:50:00 +08:00 |
“zouyf”
|
23c397e18a
|
Merge branch 'main' into zouyf_dev
|
2024-12-09 15:01:43 +08:00 |
“zouyf”
|
78858111bb
|
pptList样式修改
|
2024-12-09 15:01:25 +08:00 |
zdg
|
97962d591f
|
删除无效代码
|
2024-12-09 13:54:44 +08:00 |
zdg
|
86154148c6
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
# Conflicts:
# src/renderer/src/views/prepare/container/class-start.vue
|
2024-12-09 13:52:24 +08:00 |
zdg
|
44092a21bf
|
ppt上课
|
2024-12-09 13:51:00 +08:00 |
“zouyf”
|
728ce16c8b
|
Merge branch 'main' into zouyf_dev
|
2024-12-09 13:46:32 +08:00 |
小杨
|
5b1d921378
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev
|
2024-12-09 11:16:48 +08:00 |
lyc
|
93fa916084
|
Merge branch 'main' into lyc-dev
|
2024-12-09 10:56:20 +08:00 |
lyc
|
24d6d5887f
|
pptlist edit
|
2024-12-09 10:56:04 +08:00 |
朱浩
|
222b0f54f8
|
Merge remote-tracking branch 'origin/main'
|
2024-12-09 10:51:25 +08:00 |
朱浩
|
e0a56b37ef
|
改名AIPPT
|
2024-12-09 10:51:07 +08:00 |
白了个白
|
464f39dac8
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
|
2024-12-09 10:16:42 +08:00 |
白了个白
|
8e72b50c68
|
ppts:图片样式 裁剪逻辑样式修改
|
2024-12-09 10:16:17 +08:00 |
小杨
|
0aa09e9d9a
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev
|
2024-12-09 09:30:08 +08:00 |
lyc
|
cb5445f9a9
|
Merge branch 'main' into lyc-dev
|
2024-12-06 16:40:03 +08:00 |
lyc
|
560e6f0e70
|
插入素材-pptlist
|
2024-12-06 16:39:47 +08:00 |
“zouyf”
|
bbe2281781
|
Merge branch 'baigl' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zouyf_dev
|
2024-12-06 15:32:02 +08:00 |
“zouyf”
|
66881b0025
|
Merge branch 'main' into zouyf_dev
|
2024-12-06 15:30:41 +08:00 |
“zouyf”
|
e43c9fd038
|
1
|
2024-12-06 15:30:09 +08:00 |
白了个白
|
da1c80406f
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
|
2024-12-06 15:29:35 +08:00 |
白了个白
|
e3199b43de
|
1
|
2024-12-06 15:26:22 +08:00 |
朱浩
|
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 |