 朱浩
|
a30d2945a0
|
基础文件上传核心开发
|
2024-07-18 15:17:15 +08:00 |
 lyc
|
effe6c3272
|
修改一些打包的问题
|
2024-07-18 15:14:11 +08:00 |
|
lyc
|
b9c9269452
|
Merge branch 'main' into lyc-dev
|
2024-07-18 11:11:04 +08:00 |
|
lyc
|
1d069c72a3
|
资源修改
|
2024-07-18 11:10:44 +08:00 |
 yangws
|
412e0a01ac
|
fix: 修改头像预览，头像上传bug，以及黄色报错问题；
|
2024-07-18 10:45:33 +08:00 |
 cys
|
fbd0f9764e
|
Merge branch 'main' into cys
|
2024-07-18 09:35:33 +08:00 |
|
cys
|
6c6b931740
|
头像
|
2024-07-18 09:34:15 +08:00 |
|
lyc
|
950f6c82f3
|
Merge pull request '资源模块修改' (#32) from lyc-dev into main
|
2024-07-18 09:32:36 +08:00 |
|
lyc
|
644dfe883a
|
edit
|
2024-07-18 09:29:55 +08:00 |
|
lyc
|
2acaaa20df
|
资源修改
|
2024-07-18 09:29:15 +08:00 |
|
lyc
|
b14799d4ca
|
资源修改
|
2024-07-18 09:22:01 +08:00 |
|
朱浩
|
50fc1e106d
|
基础文件上传核心开发
|
2024-07-18 09:13:57 +08:00 |
|
lyc
|
c03e8d4d2c
|
资源修改
|
2024-07-18 09:10:43 +08:00 |
|
lyc
|
2a517bb272
|
Merge branch 'main' into lyc-dev
|
2024-07-18 09:00:34 +08:00 |
|
朱浩
|
36989c5ba3
|
Merge branch 'main' into zhuhao_dev
# Conflicts:
# src/renderer/src/layout/index.vue
|
2024-07-17 21:24:25 +08:00 |
|
朱浩
|
fb46f3e04c
|
基础文件上传核心开发
|
2024-07-17 21:23:18 +08:00 |
|
lyc
|
d6f82cf91a
|
资源模块修改
|
2024-07-17 19:35:51 +08:00 |
|
lyc
|
5b67c4baaa
|
资源模块修改
|
2024-07-17 18:32:29 +08:00 |
|
lyc
|
38c1cf1236
|
资源修改
|
2024-07-17 15:37:23 +08:00 |
|
lyc
|
17fca86860
|
Merge pull request 'lyc-dev' (#29) from lyc-dev into main
|
2024-07-17 15:19:19 +08:00 |
|
lyc
|
ac9032a84f
|
修改窗口大小
|
2024-07-17 15:18:53 +08:00 |
|
lyc
|
b10b850b9a
|
备课
|
2024-07-17 14:34:02 +08:00 |
|
朱浩
|
896e13c467
|
Merge branch 'main' into zhuhao_dev
|
2024-07-17 14:27:01 +08:00 |
|
朱浩
|
69e835a743
|
基础文件上传核心开发
|
2024-07-17 14:24:04 +08:00 |
|
cys
|
fbb9fed298
|
Merge branch 'main' into cys
|
2024-07-17 14:20:31 +08:00 |
|
cys
|
cfd81b0d76
|
个人中心开发
|
2024-07-17 14:16:50 +08:00 |
|
朱浩
|
6b369a5e12
|
Merge branch 'main' into zhuhao_dev
|
2024-07-17 13:42:31 +08:00 |
|
朱浩
|
f7ca6079ae
|
基础文件上传核心开发
|
2024-07-17 13:42:12 +08:00 |
|
lyc
|
8fe2602598
|
修改资源
|
2024-07-17 11:34:09 +08:00 |
|
lyc
|
bf9cf39355
|
资源模块修改
|
2024-07-17 09:26:31 +08:00 |
|
朱浩
|
2a31a70a49
|
Merge branch 'main' into zhuhao_dev
|
2024-07-16 17:50:18 +08:00 |
|
朱浩
|
bbd5332ce5
|
基础文件上传核心开发
|
2024-07-16 17:50:01 +08:00 |
|
lyc
|
42f3689066
|
资源修改
|
2024-07-16 16:25:56 +08:00 |
|
朱浩
|
73b898a1ad
|
Merge branch 'main' into zhuhao_dev
|
2024-07-15 20:05:34 +08:00 |
|
朱浩
|
3369f39374
|
基础文件上传核心开发
|
2024-07-15 20:05:15 +08:00 |
|
lyc
|
d8ce99b53f
|
删除
|
2024-07-15 19:41:52 +08:00 |
|
lyc
|
cfe0fd3394
|
根据文件名 查找对应图标
|
2024-07-15 18:46:31 +08:00 |
|
lyc
|
7a862761f9
|
Merge branch 'main' into lyc-dev
|
2024-07-15 18:23:30 +08:00 |
|
lyc
|
3a9f596487
|
edit
|
2024-07-15 18:23:15 +08:00 |
|
朱浩
|
48501e9195
|
基础文件上传核心开发
|
2024-07-15 18:21:57 +08:00 |
|
朱浩
|
94fc5c45a1
|
Merge branch 'main' into zhuhao_dev
|
2024-07-15 16:13:42 +08:00 |
|
朱浩
|
27394568a4
|
基础文件上传核心开发
|
2024-07-15 16:13:26 +08:00 |
|
lyc
|
8fd378ec1d
|
Merge pull request '修改 没有parentNode 为null' (#22) from lyc-dev into main
|
2024-07-15 15:32:37 +08:00 |
|
lyc
|
166c601075
|
修改 没有parentNode 为null
|
2024-07-15 15:32:09 +08:00 |
|
朱浩
|
9ad99c523f
|
Merge branch 'main' into zhuhao_dev
# Conflicts:
# src/renderer/src/components/choose-textbook/index.vue
|
2024-07-15 15:25:59 +08:00 |
|
朱浩
|
bf4b9f97a3
|
基础文件上传核心开发
|
2024-07-15 15:25:15 +08:00 |
|
lyc
|
0cac6ef996
|
教材change
|
2024-07-15 15:21:10 +08:00 |
|
lyc
|
966d5eaca6
|
教材默认选中
|
2024-07-15 10:57:37 +08:00 |
|
lyc
|
122d0d0a4c
|
资源列表添加图标
|
2024-07-14 18:58:26 +08:00 |
|
lyc
|
2680188e60
|
Merge branch 'main' into lyc-dev
|
2024-07-14 16:49:39 +08:00 |
|
lyc
|
4eaca4c681
|
教材增加选中效果
|
2024-07-14 16:49:17 +08:00 |
|
朱浩
|
55ecc03de2
|
Merge branch 'main' into zhuhao_dev
|
2024-07-12 17:57:53 +08:00 |
|
朱浩
|
38b8d5292f
|
基础文件上传核心开发
|
2024-07-12 17:57:45 +08:00 |
|
lyc
|
51ade77d9b
|
edit
|
2024-07-12 17:56:27 +08:00 |
|
lyc
|
0a386f277e
|
edit
|
2024-07-12 14:40:56 +08:00 |
|
朱浩
|
12d8346896
|
Merge branch 'main' into zhuhao_dev
# Conflicts:
# src/renderer/src/views/resource/index.vue
|
2024-07-11 17:34:26 +08:00 |
|
lyc
|
631d6d5a04
|
iconfont
|
2024-07-11 17:32:49 +08:00 |
|
朱浩
|
240f4b24bd
|
基础框架微调
|
2024-07-11 17:32:24 +08:00 |
|
朱浩
|
65ef2d6026
|
Merge branch 'main' into zhuhao_dev
|
2024-07-11 14:31:17 +08:00 |
|
朱浩
|
ed6fd5e89b
|
基础框架微调
|
2024-07-11 14:30:08 +08:00 |
|
lyc
|
c21eca7eb6
|
edit
|
2024-07-11 14:29:45 +08:00 |
|
lyc
|
d08e75776d
|
Merge branch 'main' into lyc-dev
|
2024-07-11 11:41:00 +08:00 |
|
lyc
|
4f600ced49
|
一些样式修改
|
2024-07-11 11:40:38 +08:00 |
|
朱浩
|
cc194caaab
|
Merge branch 'main' into zhuhao_dev
|
2024-07-10 20:26:40 +08:00 |
|
朱浩
|
267bee6dd4
|
文件下载，文件复制，文件使用本地默认程序打开的API基础实现
|
2024-07-10 20:26:26 +08:00 |
|
lyc
|
08eda419e0
|
edit
|
2024-07-10 20:21:22 +08:00 |
|
lyc
|
de9d57cbbc
|
edit
|
2024-07-10 18:04:28 +08:00 |
|
lyc
|
ef273b86b1
|
edit
|
2024-07-10 17:55:32 +08:00 |
|
lyc
|
a6f99d3900
|
edit
|
2024-07-10 16:05:16 +08:00 |
|
lyc
|
c64e946aee
|
edit
|
2024-07-10 09:56:26 +08:00 |
|
lyc
|
50c2deb051
|
edit
|
2024-07-10 09:42:49 +08:00 |
|
朱浩
|
dbcb17fc7e
|
Merge branch 'main' into zhuhao_dev
|
2024-07-09 17:49:49 +08:00 |
|
lyc
|
bd263fc598
|
Merge branch 'main' into lyc-dev
|
2024-07-09 17:48:51 +08:00 |
|
lyc
|
77a6a4855f
|
edit
|
2024-07-09 17:48:20 +08:00 |
|
朱浩
|
300e9130aa
|
解决框架标黄，头部退出添加，头像添加
|
2024-07-09 17:47:58 +08:00 |
|
朱浩
|
f5d94a710c
|
解决无法缩小问题，解决跳转登录失败问题
|
2024-07-09 16:45:40 +08:00 |
|
朱浩
|
07f982c0b3
|
基础上传功能实现
|
2024-07-09 16:19:33 +08:00 |
|
朱浩
|
4f32e6f1b2
|
基础修改
|
2024-07-09 14:59:34 +08:00 |
|
朱浩
|
790aa54601
|
Merge branch 'main' into zhuhao_dev
# Conflicts:
# src/renderer/src/layout/index.vue
# src/renderer/src/router/index.js
|
2024-07-09 14:53:15 +08:00 |
|
lyc
|
053bdd321e
|
edit
|
2024-07-09 14:50:36 +08:00 |
|
朱浩
|
13f4adcf6b
|
基础修改
|
2024-07-09 14:50:30 +08:00 |
|
lyc
|
355cc0532a
|
init
|
2024-07-08 16:24:56 +08:00 |