 yangws
|
3d8f7c2a3a
|
Merge pull request 'fix：修改pptlist添加活动的bug；' (#118) from yws_dev into main
Reviewed-on: #118
|
2024-12-12 11:27:19 +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 |
 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 |
|
yangws
|
69db6bd8b1
|
Merge pull request '清除debugger;' (#116) from yws_dev into main
Reviewed-on: #116
|
2024-12-12 10:53:38 +08:00 |
|
小杨
|
e522fc8ee5
|
清除debugger;
|
2024-12-12 10:53:15 +08:00 |
|
yangws
|
5b50404d3c
|
Merge pull request 'fix：修改ppt添加活动的bug；' (#115) from yws_dev into main
Reviewed-on: #115
|
2024-12-12 10:52:40 +08:00 |
|
小杨
|
bbed835ffe
|
fix：修改ppt添加活动的bug；
|
2024-12-12 10:52:10 +08:00 |
|
zhangxuelin
|
d9bdd5424f
|
Merge pull request '点赞和疑问' (#114) from zxl into main
Reviewed-on: #114
|
2024-12-12 10:29:16 +08:00 |
|
zhangxuelin
|
979621b515
|
点赞和疑问
|
2024-12-12 10:28:32 +08:00 |
|
朱浩
|
9c7aeb1a27
|
Merge remote-tracking branch 'origin/main'
|
2024-12-11 17:11:22 +08:00 |
 lyc
|
7545e68a62
|
Merge pull request 'edit' (#113) from lyc-dev into main
|
2024-12-11 17:04:37 +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 |
|
朱浩
|
5493de7a61
|
版本升级
|
2024-12-11 17:02:44 +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 |
 baigl
|
44b341f7ac
|
Merge pull request '作业管理：作业名称为空保存判断' (#111) from baigl into main
Reviewed-on: #111
|
2024-12-11 14:55:07 +08:00 |
白了个白
|
c8dd19382e
|
作业管理：作业名称为空保存判断
|
2024-12-11 14:51:07 +08:00 |
|
zhangxuelin
|
f2faa882a8
|
Merge pull request 'zxl' (#110) from zxl into main
Reviewed-on: #110
|
2024-12-11 13:51:14 +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
|
1835f76e56
|
Merge pull request 'pptist点赞组件' (#109) from zxl into main
Reviewed-on: #109
|
2024-12-11 11:02:44 +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 |
 zhengdegang
|
e0107814ea
|
Merge pull request 'zdg_dev' (#108) from zdg_dev into main
Reviewed-on: #108
|
2024-12-11 10:07:58 +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
|
82b70558c2
|
Merge pull request 'zxl' (#107) from zxl into main
Reviewed-on: #107
|
2024-12-11 09:59:16 +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
|
50aff2f158
|
Merge pull request 'add icon' (#106) from lyc-dev into main
|
2024-12-11 09:41:16 +08:00 |
|
lyc
|
a1a4e11de7
|
add icon
|
2024-12-11 09:40:51 +08:00 |
|
lyc
|
20fe5be502
|
Merge pull request 'lyc-dev' (#105) from lyc-dev into main
|
2024-12-10 15:44:00 +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 |
|
yangws
|
3ca20cd327
|
Merge pull request 'fix:清除debugger;' (#104) from yws_dev into main
Reviewed-on: #104
|
2024-12-10 15:38:42 +08:00 |
|
小杨
|
c159d6be1a
|
fix:清除debugger;
|
2024-12-10 15:38:19 +08:00 |
|
yangws
|
cc44a86437
|
Merge pull request 'yws_dev' (#103) from yws_dev into main
Reviewed-on: #103
|
2024-12-10 15:35:20 +08:00 |