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

145 Commits

Author SHA1 Message Date
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
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
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
朱浩 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