zhuhao
/
AIx_Smarttalk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 18 Wiki Activity
824 Commits 9 Branches 18 Tags 36 MiB
Commit Graph

69 Commits

Author SHA1 Message Date
zdg 67d7395c47 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 
# Conflicts:
#	src/renderer/src/views/desktop/container/work-trend.vue
 2024-09-14 17:32:04 +08:00
zdg 741e7336f3 上课 2024-09-14 16:39:31 +08:00
朱浩 502cf13168 Merge branch 'main' into zhuhao_dev 2024-09-13 09:53:55 +08:00
朱浩 a4fa5be295 文件上传修改 2024-09-13 09:30:36 +08:00
yangws 1afaed082a fix: 解决资源库报错的问题; 2024-09-12 16:52:47 +08:00
朱浩 bc0579fa32 排序问题处理 2024-09-12 09:47:35 +08:00
朱浩 77e76fcf7d 版本升级2.0 2024-09-10 17:21:49 +08:00
yangws 076a510109 add:新增加入班级; 2024-09-10 16:49:11 +08:00
zhangxuelin 151cdbb1a1 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 
# Conflicts:
#	electron.vite.config.mjs
 2024-09-10 14:07:04 +08:00
zdg ad2e6b92db Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-10 12:18:48 +08:00
zhangxuelin c79e7966ee 注册 2024-09-09 18:14:57 +08:00
白了个白 44002ae78d 作业批改路径修改 2024-09-09 17:28:25 +08:00
白了个白 0e88eb8226 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-09 17:17:51 +08:00
白了个白 7cb84ffe37 作业批阅：附件预览 2024-09-09 15:50:55 +08:00
lyc 3cd8c51aae Merge branch 'main' into lyc-dev 2024-09-09 09:51:06 +08:00
lyc 119e07bcea 新增工作台 2024-09-07 18:18:56 +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