 朱浩
|
14428f2706
|
二期：BUG修复
|
2024-07-26 17:36:04 +08:00 |
|
朱浩
|
67bc54765c
|
Merge branch 'main' into zhuhao_dev
# Conflicts:
# src/renderer/src/views/classManage/index.vue
|
2024-07-26 15:39:00 +08:00 |
 yangws
|
4e6e11ac2c
|
Merge pull request 'fix:修改路由以及用户信息的问题；' (#73) from yangws into main
Reviewed-on: #73
|
2024-07-26 15:36:20 +08:00 |
|
yangws
|
a857912c83
|
fix:修改路由以及用户信息的问题；
|
2024-07-26 15:35:45 +08:00 |
|
朱浩
|
51c8c79b17
|
Merge branch 'main' into zhuhao_dev
|
2024-07-26 15:31:17 +08:00 |
|
朱浩
|
53e34dc515
|
二期：BUG修复
|
2024-07-26 15:22:58 +08:00 |
 zhangxuelin
|
b3bf366134
|
Merge pull request 'zdg' (#72) from zdg into main
Reviewed-on: #72
|
2024-07-26 14:39:17 +08:00 |
|
zhangxuelin
|
705dbf3832
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
# src/renderer/src/views/resource/index.vue
|
2024-07-26 14:37:32 +08:00 |
|
朱浩
|
03ce0df516
|
Merge branch 'main' into zhuhao_dev
|
2024-07-26 14:35:11 +08:00 |
|
yangws
|
ccf16176c6
|
Merge pull request 'fix:修改路由以及用户信息的问题；' (#71) from yangws into main
Reviewed-on: #71
|
2024-07-26 14:34:56 +08:00 |
|
zhangxuelin
|
ca61976291
|
Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-07-26 14:34:39 +08:00 |
|
zhangxuelin
|
af6236a751
|
设置pdf宽高
|
2024-07-26 14:34:35 +08:00 |
|
yangws
|
828abbbcb7
|
fix:修改路由以及用户信息的问题；
|
2024-07-26 14:34:16 +08:00 |
zdg
|
6c6c08abf6
|
优化
|
2024-07-26 14:26:00 +08:00 |
 lyc
|
7b87b5a6e3
|
Merge pull request '配置文件' (#70) from lyc-dev into main
|
2024-07-26 14:15:49 +08:00 |
|
lyc
|
80ee3c0f11
|
配置文件
|
2024-07-26 14:15:33 +08:00 |
|
lyc
|
f2ff4ac7d6
|
Merge pull request 'edit' (#69) from lyc-dev into main
|
2024-07-26 14:12:53 +08:00 |
|
lyc
|
479131ef21
|
edit
|
2024-07-26 14:12:40 +08:00 |
|
朱浩
|
c25978d30e
|
Merge branch 'main' into zhuhao_dev
|
2024-07-26 14:03:27 +08:00 |
|
zhangxuelin
|
1004567103
|
pdf展示
|
2024-07-26 13:57:04 +08:00 |
|
lyc
|
b85bb9b9cc
|
Merge pull request 'lyc-dev' (#68) from lyc-dev into main
|
2024-07-26 13:28:01 +08:00 |
|
lyc
|
3ae303322a
|
Merge branch 'main' into lyc-dev
|
2024-07-26 13:27:05 +08:00 |
|
lyc
|
df68c47cd3
|
资源只能删除自己的
|
2024-07-26 13:26:51 +08:00 |
|
zdg
|
beca8c21b6
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-07-26 12:52:22 +08:00 |
|
zdg
|
e6a854b1a2
|
Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
# src/main/index.js
# src/renderer/src/assets/iconfont/iconfont.css
# src/renderer/src/assets/iconfont/iconfont.ttf
# src/renderer/src/assets/iconfont/iconfont.woff
# src/renderer/src/assets/iconfont/iconfont.woff2
# src/renderer/src/views/resource/index.vue
|
2024-07-26 12:52:05 +08:00 |
|
zdg
|
d50d4722aa
|
工具栏悬浮
|
2024-07-26 12:48:03 +08:00 |
|
yangws
|
e6431c6ac6
|
Merge pull request 'add:班级管理；' (#67) from yangws into main
Reviewed-on: #67
|
2024-07-26 12:11:12 +08:00 |
|
yangws
|
d2f57fd18e
|
add:班级管理；
|
2024-07-26 12:09:31 +08:00 |
|
zhangxuelin
|
81fa22690e
|
图标css
|
2024-07-26 11:18:30 +08:00 |
|
zhangxuelin
|
22a678940d
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-07-26 11:13:54 +08:00 |
|
lyc
|
03bcade299
|
Merge pull request 'lyc-dev' (#66) from lyc-dev into main
|
2024-07-26 11:06:46 +08:00 |
|
lyc
|
8c7468ef7f
|
Merge branch 'main' into lyc-dev
|
2024-07-26 11:06:32 +08:00 |
|
lyc
|
7e3978d532
|
图标
|
2024-07-26 11:06:06 +08:00 |
|
zhangxuelin
|
925db8b743
|
1
|
2024-07-26 10:57:05 +08:00 |
|
zhangxuelin
|
baa41d00eb
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
# package.json
# src/main/index.js
# 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.svg
# src/renderer/src/assets/iconfont/iconfont.ttf
# src/renderer/src/assets/iconfont/iconfont.woff
# src/renderer/src/assets/iconfont/iconfont.woff2
# src/renderer/src/views/resource/index.vue
|
2024-07-26 10:51:46 +08:00 |
|
lyc
|
01d972f18e
|
Merge pull request '图标' (#65) from lyc-dev into main
|
2024-07-26 10:43:51 +08:00 |
|
lyc
|
c0c3324d9d
|
图标
|
2024-07-26 10:43:46 +08:00 |
|
zhangxuelin
|
4e2ac7c92e
|
pdf的展示 翻页 及数据回显
|
2024-07-26 10:26:34 +08:00 |
|
lyc
|
daaddfaaf2
|
Merge pull request 'lyc-dev' (#64) from lyc-dev into main
|
2024-07-26 09:44:11 +08:00 |
|
lyc
|
5fea7e094d
|
资源-上传修改
|
2024-07-26 09:43:59 +08:00 |
|
朱浩
|
9f9a611f89
|
二期：BUG修复
|
2024-07-26 09:11:55 +08:00 |
|
lyc
|
e221bedb81
|
Merge branch 'main' into lyc-dev
|
2024-07-25 16:45:36 +08:00 |
|
lyc
|
0ec1a7327a
|
更新
|
2024-07-25 16:45:17 +08:00 |
|
zdg
|
fe21b676a8
|
Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# 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.svg
# src/renderer/src/assets/iconfont/iconfont.ttf
# src/renderer/src/assets/iconfont/iconfont.woff
# src/renderer/src/assets/iconfont/iconfont.woff2
|
2024-07-25 13:31:28 +08:00 |
|
zdg
|
d2a2510e09
|
electron 代理
|
2024-07-25 13:24:31 +08:00 |
|
lyc
|
ed9f3d4189
|
Merge pull request '教学模型跳转' (#63) from lyc-dev into main
|
2024-07-25 10:52:39 +08:00 |
|
lyc
|
af20ff4931
|
教学模型跳转
|
2024-07-25 10:52:29 +08:00 |
|
朱浩
|
1b45ab4579
|
Merge branch 'main' into zhuhao_dev
|
2024-07-25 10:09:17 +08:00 |
|
朱浩
|
0a641fee06
|
二期：路由修改
|
2024-07-25 10:09:03 +08:00 |
|
lyc
|
08c365b0ed
|
Merge pull request '资源模块-新建权限' (#62) from lyc-dev into main
|
2024-07-25 10:08:17 +08:00 |