Commit Graph

47 Commits

Author SHA1 Message Date
朱浩 62a5339d04 二期:首页样式修改 2024-08-01 17:46:56 +08:00
朱浩 15f6b5dcbd 二期:首页开发 2024-07-31 16:04:49 +08:00
zdg f35c6a97b7 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-07-30 10:05:35 +08:00
zdg 45770d15c1 优化生产环境静态文件加载 2024-07-30 10:04:49 +08:00
lyc 2565f86260 login cookie 2024-07-29 14:12:39 +08:00
zdg 5ac36dd569 bug修复 2024-07-26 22:15:12 +08:00
朱浩 51c8c79b17 Merge branch 'main' into zhuhao_dev 2024-07-26 15:31:17 +08:00
朱浩 c25978d30e Merge branch 'main' into zhuhao_dev 2024-07-26 14:03:27 +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
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
朱浩 9f9a611f89 二期:BUG修复 2024-07-26 09:11:55 +08:00
lyc 0ec1a7327a 更新 2024-07-25 16:45:17 +08:00
zdg d2a2510e09 electron 代理 2024-07-25 13:24:31 +08:00
lyc cda6e3e2c4 edit 2024-07-25 09:12:52 +08:00
lyc e6da6ef65f 打开外部链接 2024-07-24 14:03:59 +08:00
zdg 666c4becd2 画笔 Fabric 2024-07-23 17:20:36 +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
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 e5e4359b5d 退出 跳转 2024-07-19 11:09:55 +08:00
lyc b16f067cee 删除一些无用图片 2024-07-19 09:33:52 +08:00
朱浩 6f18bf9344 基础文件上传核心开发 2024-07-18 16:28:00 +08:00
朱浩 a30d2945a0 基础文件上传核心开发 2024-07-18 15:17:15 +08:00
朱浩 36989c5ba3 Merge branch 'main' into zhuhao_dev
# Conflicts:
#	src/renderer/src/layout/index.vue
2024-07-17 21:24:25 +08:00
lyc 38c1cf1236 资源修改 2024-07-17 15:37:23 +08:00
lyc ac9032a84f 修改窗口大小 2024-07-17 15:18:53 +08:00
朱浩 bbd5332ce5 基础文件上传核心开发 2024-07-16 17:50:01 +08:00
朱浩 3369f39374 基础文件上传核心开发 2024-07-15 20:05:15 +08:00
朱浩 bf4b9f97a3 基础文件上传核心开发 2024-07-15 15:25:15 +08:00
朱浩 267bee6dd4 文件下载,文件复制,文件使用本地默认程序打开的API基础实现 2024-07-10 20:26:26 +08:00
lyc 355cc0532a init 2024-07-08 16:24:56 +08:00