zhuhao
/
AIx_Smarttalk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 26 Wiki Activity
379 Commits 9 Branches 26 Tags 40 MiB
Commit Graph

253 Commits

Author SHA1 Message Date
朱浩 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 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 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 7e3978d532 图标 2024-07-26 11:06:06 +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 c0c3324d9d 图标 2024-07-26 10:43:46 +08:00
zhangxuelin 4e2ac7c92e pdf的展示 翻页 及数据回显 2024-07-26 10:26:34 +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
lyc 212d5be4d4 资源模块-新建权限 2024-07-25 10:07:59 +08:00
朱浩 e032d8514e 二期：切换备课时，从新获取列表 2024-07-25 09:35:01 +08:00
朱浩 88e306e8a2 Merge branch 'main' into zhuhao_dev 2024-07-25 09:19:56 +08:00
朱浩 e5c55cefda 二期：文件上传图标修复 2024-07-25 09:19:43 +08:00
lyc cda6e3e2c4 edit 2024-07-25 09:12:52 +08:00
zhangxuelin fd7686af9a Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 
# Conflicts:
#	package.json
 2024-07-24 16:22:00 +08:00
zhangxuelin ae86b1aa60 新增pdf界面 2024-07-24 16:21:12 +08:00
zdg 79d36ea6ba 画板-画笔 2024-07-24 16:20:35 +08:00
lyc ea5a069f85 Merge branch 'main' into lyc-dev 2024-07-24 15:24:03 +08:00
lyc bf9e7c96ff 平台资源管理员 2024-07-24 15:23:26 +08:00
朱浩 4e9c93da15 二期：头像相关问题修复 2024-07-24 14:48:18 +08:00
lyc e6da6ef65f 打开外部链接 2024-07-24 14:03:59 +08:00
zdg 666c4becd2 画笔 Fabric 2024-07-23 17:20:36 +08:00
lyc a618032d25 Merge branch 'main' into lyc-dev 2024-07-23 16:04:16 +08:00
朱浩 62248dfafa Merge branch 'main' into zhuhao_dev 
# Conflicts:
#	src/renderer/src/views/prepare/index.vue
 2024-07-23 16:01:53 +08:00
朱浩 2926b4bd63 二期：自动同步功能开发 2024-07-23 15:59:52 +08:00
lyc ac5cafe1e8 Merge branch 'main' into lyc-dev 2024-07-23 14:33:18 +08:00
lyc 0086ce4236 open win cookie 2024-07-23 14:33:07 +08:00
朱浩 af941a22b7 Merge pull request '二期：自动同步功能开发' (#56) from zhuhao_dev into main 
Reviewed-on: #56
 2024-07-23 14:32:01 +08:00
朱浩 4dc180a26f 二期：自动同步功能开发 2024-07-23 14:31:33 +08:00
lyc 3487cabc02 Merge pull request 'lyc-dev' (#55) from lyc-dev into main 2024-07-23 14:08:22 +08:00
lyc 5712e77a29 openwindow 2024-07-23 14:08:00 +08:00
朱浩 4c635e9fe3 二期：自动同步功能开发 2024-07-23 14:06:42 +08:00
lyc 4a5fb04362 Merge branch 'main' into lyc-dev 2024-07-23 13:46:32 +08:00
lyc d91f08d398 布置作业 2024-07-23 13:46:09 +08:00
朱浩 c8f1047124 Merge branch 'main' into zhuhao_dev 
# Conflicts:
#	src/renderer/src/views/prepare/index.vue
 2024-07-23 13:44:44 +08:00
朱浩 e1fc883870 二期：自动同步功能开发 2024-07-23 13:43:41 +08:00
lyc 125962b859 备课-增加头部布局 2024-07-23 10:23:18 +08:00
zdg 7782de699f Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk 
# Conflicts:
#	src/main/index.js
 2024-07-22 16:35:54 +08:00
zdg df87aafca4 悬浮球 2024-07-22 16:30:35 +08:00
lyc 3dc478e724 打开新网页窗口 2024-07-22 16:24:32 +08:00
lyc cefb6ae5a7 登录窗口/主窗口调整 2024-07-22 15:10:28 +08:00
lyc de1e0c5a2e window-tools 2024-07-22 11:24:36 +08:00
lyc e5e4359b5d 退出 跳转 2024-07-19 11:09:55 +08:00
lyc b16f067cee 删除一些无用图片 2024-07-19 09:33:52 +08:00
lyc be0a34f03e edit 2024-07-18 17:53:43 +08:00
lyc 7d80846e0c Merge branch 'main' into lyc-dev 2024-07-18 16:33:21 +08:00
朱浩 243561e656 Merge branch 'main' into zhuhao_dev 2024-07-18 16:28:21 +08:00
朱浩 6f18bf9344 基础文件上传核心开发 2024-07-18 16:28:00 +08:00
lyc 4b9b5c544f 合并冲突 2024-07-18 16:23:22 +08:00
lyc c8389645af 删除一些无用文件 2024-07-18 16:22:03 +08:00
yangws bdc67a6a0e fix: 更改图片的同时更改头像； 2024-07-18 16:00:46 +08:00
yangws acf0018a9c fix: 修改预览图片的功能； 2024-07-18 15:41:31 +08:00
yangws 385d6ed25e fix: 修改预览图片的功能； 2024-07-18 15:34:52 +08:00
lyc d702db24c3 暂时去掉请求实际限制 2024-07-18 15:24:06 +08:00
朱浩 e8d48d8bd9 Merge branch 'main' into zhuhao_dev 2024-07-18 15:17:45 +08:00
朱浩 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