白了个白
|
7cb84ffe37
|
作业批阅：附件预览
|
2024-09-09 15:50:55 +08:00 |
 朱浩
|
78ac6e5ca6
|
解决版本问题
|
2024-09-06 15:38:50 +08:00 |
|
朱浩
|
59ca00d6d1
|
Merge branch 'main' into zhuhao_dev
# Conflicts:
# package.json
|
2024-09-03 16:15:07 +08:00 |
|
朱浩
|
0e5ca5eff2
|
Merge branch 'main' into zhuhao_dev
|
2024-08-31 14:13:56 +08:00 |
zdg
|
fa77c6cc6b
|
版本
|
2024-08-30 17:29:15 +08:00 |
|
zdg
|
d033c217d6
|
数据共享配置 渲染器和主进程
|
2024-08-26 11:47:10 +08:00 |
|
朱浩
|
e985c2e7af
|
Merge branch 'main' into zhuhao_dev
|
2024-08-23 12:01:51 +08:00 |
|
朱浩
|
d4982d47c7
|
二期：打包IM
|
2024-08-23 12:01:21 +08:00 |
 lyc
|
b0d969546a
|
Merge branch 'main' into lyc-dev
|
2024-08-22 09:43:10 +08:00 |
|
lyc
|
8ec96996c6
|
增加预览pdf
|
2024-08-22 09:42:55 +08:00 |
|
朱浩
|
f38a14bc0b
|
Merge branch 'zdg' into zhuhao_dev
# Conflicts:
# package.json
# src/renderer/src/plugins/shareStore.js
|
2024-08-19 17:00:42 +08:00 |
|
朱浩
|
f98fa5a3f3
|
二期：打包IM
|
2024-08-19 16:30:57 +08:00 |
|
zdg
|
6fb7369ce5
|
配置im 打包
|
2024-08-19 14:37:18 +08:00 |
|
朱浩
|
5f6839058a
|
二期：打包IM
|
2024-08-19 14:18:39 +08:00 |
|
朱浩
|
0ff0cd42bc
|
二期：修改自动同步检测逻辑
|
2024-08-16 18:10:20 +08:00 |
|
zdg
|
7fb98309fb
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-08-16 10:15:31 +08:00 |
|
朱浩
|
de909adccb
|
二期：修复图片加载失败无法点击的问题
|
2024-08-15 16:23:07 +08:00 |
|
zdg
|
0da2b25586
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
# src/renderer/src/utils/tool.js
# src/renderer/src/views/prepare/index.vue
# src/renderer/src/views/tool/components/side.vue
# src/renderer/src/views/tool/sphere.vue
|
2024-08-14 17:23:32 +08:00 |
|
zdg
|
69f54a217b
|
Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
# src/main/index.js
# src/renderer/src/views/tool/sphere.vue
|
2024-08-14 16:42:59 +08:00 |
|
zdg
|
1c67ce1b8f
|
im通信
|
2024-08-14 16:31:08 +08:00 |
|
朱浩
|
c3709bf0c7
|
二期：BUG修复
|
2024-08-14 11:00:01 +08:00 |
|
朱浩
|
e89ffd4416
|
二期：版本切换
|
2024-08-12 16:51:10 +08:00 |
|
朱浩
|
7cf3487bfb
|
二期：预约开发
|
2024-08-09 17:42:19 +08:00 |
|
朱浩
|
32c64d073b
|
二期：解决无法同时打开多个的问题
|
2024-08-08 14:04:00 +08:00 |
|
朱浩
|
82456a7f96
|
二期：打包生产配置添加
|
2024-08-07 11:11:55 +08:00 |
|
朱浩
|
6b8c6c8c7f
|
二期：软件名称修改
|
2024-08-02 17:12:45 +08:00 |
|
zdg
|
e788174a3a
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-07-31 17:22:08 +08:00 |
|
zdg
|
89ef820366
|
橡皮擦
|
2024-07-31 17:22:03 +08:00 |
|
zdg
|
ba64ff931b
|
插件重新整理
|
2024-07-31 10:04:12 +08:00 |
 yangws
|
1e79807a4b
|
fix:修改头像上传;
|
2024-07-30 16:02:01 +08:00 |
|
zdg
|
45770d15c1
|
优化生产环境静态文件加载
|
2024-07-30 10:04:49 +08:00 |
|
朱浩
|
14428f2706
|
二期：BUG修复
|
2024-07-26 17:36:04 +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 |
|
lyc
|
80ee3c0f11
|
配置文件
|
2024-07-26 14:15:33 +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 |
|
yangws
|
d2f57fd18e
|
add:班级管理；
|
2024-07-26 12:09:31 +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
|
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 |
|
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
|
bf9e7c96ff
|
平台资源管理员
|
2024-07-24 15:23:26 +08:00 |
|
zdg
|
666c4becd2
|
画笔 Fabric
|
2024-07-23 17:20:36 +08:00 |
|
朱浩
|
e1fc883870
|
二期：自动同步功能开发
|
2024-07-23 13:43:41 +08:00 |
|
yangws
|
385d6ed25e
|
fix: 修改预览图片的功能；
|
2024-07-18 15:34:52 +08:00 |
 cys
|
6c6b931740
|
头像
|
2024-07-18 09:34:15 +08:00 |