861 Commits

Author	SHA1	Message	Date
白了个白	fd6aa2a56a	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl	2024-09-10 13:43: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
白了个白	6be4b3526e	作业批改：优化轮询机制	2024-09-10 11:30:45 +08:00
zhangxuelin	bbe4037a71	注册账号	2024-09-10 10:37:32 +08:00
白了个白	0b6b0c318d	作业批改：报告迁入	2024-09-10 09:52:10 +08:00
“zouyf”	c618ec04c7	[考试分析] - 修改路由	2024-09-10 09:41:28 +08:00
zhangxuelin	c79e7966ee	注册	2024-09-09 18:14:57 +08:00
lyc	3a1cf6224a	chart	2024-09-09 17:57:08 +08:00
白了个白	2d89ef8de3	作业批改：概况	2024-09-09 17:53:55 +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
白了个白	5bda6cfad2	批阅优化	2024-09-09 17:14:57 +08:00
朱浩	280313e638	Merge remote-tracking branch 'origin/main'	2024-09-09 16:54:19 +08:00
朱浩	ed7a8a124e	文件预览	2024-09-09 16:54:04 +08:00
“zouyf”	aab477999e	Merge branch 'main' into zouyf_dev	2024-09-09 16:44:40 +08:00
“zouyf”	d1b7101ba5	[考试分析] - 优化显示解析	2024-09-09 16:44:24 +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	be187e1a2d	header路由报错	2024-09-09 09:48:28 +08:00
白了个白	04ac5dc8b5	作业批阅	2024-09-09 07:04:21 +08:00
zhangxuelin	aca464fddd	Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg	2024-09-09 01:15:19 +08:00
zhangxuelin	25d026bd13	新增注册页面	2024-09-09 01:14:26 +08:00
lyc	119e07bcea	新增工作台	2024-09-07 18:18:56 +08:00
“zouyf”	555960b8bd	Merge branch 'main' into zouyf_dev	2024-09-07 18:08:15 +08:00
“zouyf”	d709753534	[考试分析] - 添加	2024-09-07 18:07:32 +08:00
朱浩	acc29b02e4	解决版本问题	2024-09-06 15:33:25 +08:00
zdg	5ecba3fb62	默认群没清除，导致没有创建群	2024-09-05 16:28:15 +08:00
zdg	f5f33eaa63	im日志级别 Debbug	2024-09-05 16:18:34 +08:00
zdg	1c69d10263	修复-- bug 工具在桌面和pdf切换	2024-09-05 01:30:24 +08:00
zdg	b794d55cd7	注释掉	2024-09-05 01:05:29 +08:00
zdg	e740cb0c7e	Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg	2024-09-05 01:02:47 +08:00
zdg	3a83a31970	修复数据状态-生产环境 无法监听问题	2024-09-05 01:02:42 +08:00
zhangxuelin	e31858a3fe	修改pdf画笔bug	2024-09-04 21:06:21 +08:00
zdg	3a6b78bc76	修复bug-画笔	2024-09-04 20:43:47 +08:00
zdg	70e99e69ba	修复 bug	2024-09-04 19:50:23 +08:00
lyc	33e84ca006	资源推送	2024-09-04 16:28:36 +08:00
lyc	28a815169d	Merge branch 'main' into lyc-dev	2024-09-04 13:46:36 +08:00
zdg	e03e385dbc	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg	2024-09-03 18:03:30 +08:00
zdg	2aaa15230a	恢复 im 注释	2024-09-03 18:03:25 +08:00
zdg	7894214859	修复bug: #678 #652 #648	2024-09-03 18:02:46 +08:00
朱浩	fe41a63b2d	Merge pull request 'zhuhao_dev' (#170) from zhuhao_dev into main ... Reviewed-on: #170	2024-09-03 16:39:57 +08:00
朱浩	cdf12cf213	区分生产和测试版本，测试版会直接显示测试版文字	2024-09-03 16:37:39 +08:00
yangws	cfac2086e6	fix：看不了学生信息；	2024-09-03 16:31:40 +08:00
朱浩	59ca00d6d1	Merge branch 'main' into zhuhao_dev ... # Conflicts: # package.json	2024-09-03 16:15:07 +08:00
zdg	b6504e114f	桌面，底部导航 多个窗口	2024-09-03 16:01:40 +08:00
lyc	931ed531ab	Merge branch 'main' into lyc-dev	2024-09-03 14:12:00 +08:00
zdg	eb3778dde2	修复bug-数据共享	2024-09-03 13:18:40 +08:00
lyc	a6bda302af	Merge branch 'main' into lyc-dev	2024-09-03 10:41:57 +08:00
zdg	0201385e75	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg	2024-09-02 22:22:14 +08:00
zdg	ea9af1440e	数据库共享：结合 pinia + electron-store ... 关闭开发 本地文件日志，只有生产有日志文件记录	2024-09-02 22:22:03 +08:00
zdg	b4c2751e8c	注释代码放开	2024-09-02 18:35:16 +08:00
yangws	22239090ea	fix：隐藏掉班级中心所有的操作按钮；	2024-09-02 16:57:54 +08:00
zdg	1d808950b5	优化bug	2024-09-02 16:33:25 +08:00
zdg	3f4e9c35b0	崩溃等，日志文件配置	2024-09-02 13:51:25 +08:00
zdg	b5d41050ae	数据共享-修改成 session local ... 永久和临时	2024-09-02 11:14:47 +08:00
朱浩	0e5ca5eff2	Merge branch 'main' into zhuhao_dev	2024-08-31 14:13:56 +08:00
lyc	eb481e265b	获取教材-单元、章节调整	2024-08-30 18:28:27 +08:00
lyc	ff97a2bef6	Merge pull request 'lyc-dev' (#163) from lyc-dev into main	2024-08-30 14:29:52 +08:00
lyc	05c567d1cd	console	2024-08-30 14:28:55 +08:00
lyc	1a6abfaa50	预约课程-时间限制	2024-08-30 14:15:15 +08:00
zdg	177df96d69	更新-logo	2024-08-30 13:45:01 +08:00
zdg	571bfc98f7	bug: 335 优化动画	2024-08-30 13:35:25 +08:00
yangws	1871e7e565	fix：修改老师创建查看自己小组的权限；	2024-08-30 09:32:22 +08:00
lyc	df8f4fcf92	Merge branch 'main' into lyc-dev	2024-08-29 16:48:39 +08:00
lyc	d6b4ae011d	预约课程-默认时间-时间限制	2024-08-29 16:45:17 +08:00
yangws	e6a0859f87	fix：无数据时处理；	2024-08-28 14:07:14 +08:00
zdg	1518d9c3ae	更新作业推送	2024-08-27 11:36:30 +08:00
lyc	23878f5843	Merge pull request '教学研究室-打开教材分析' (#157) from lyc-dev into main	2024-08-26 14:39:56 +08:00
lyc	144da0ace9	教学研究室-打开教材分析	2024-08-26 14:34:35 +08:00
zdg	13e755bb9a	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg	2024-08-26 11:48:41 +08:00
zdg	b5ce949172	恢复	2024-08-26 11:48:18 +08:00
zdg	d033c217d6	数据共享配置 渲染器和主进程	2024-08-26 11:47:10 +08:00
yangws	59be0c07d1	fix：年级不允许切换；	2024-08-26 09:30:26 +08:00
朱浩	e985c2e7af	Merge branch 'main' into zhuhao_dev	2024-08-23 12:01:51 +08:00
朱浩	0ea628d174	二期：打包IM	2024-08-23 12:01:43 +08:00
yangws	be222a2ba6	feat:修改固定住自己所选的学科学段;	2024-08-23 11:28:26 +08:00
lyc	386c4e09c6	冲突	2024-08-23 11:21:57 +08:00
zdg	6f6d56b37b	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg	2024-08-23 10:43:57 +08:00
zdg	c1f81a8e5c	更新 点赞，疑惑	2024-08-23 10:43:44 +08:00
lyc	d003ecf8ce	Merge branch 'main' into lyc-dev	2024-08-23 09:56:28 +08:00
lyc	146784bf26	增加一个预览文件	2024-08-23 09:56:14 +08:00
yangws	99ee438fd7	add:新增第三方对接素材;	2024-08-23 09:44:03 +08:00
lyc	2279bbb904	布置作业修改	2024-08-22 10:43:05 +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
zdg	86cd50b8a3	im-点赞 疑惑 作业布置	2024-08-22 09:14:21 +08:00
zdg	6d77d54bc1	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg	2024-08-21 09:18:15 +08:00
zdg	c57f21461a	点赞动画优化	2024-08-21 09:18:00 +08:00
lyc	d669b6ee42	Merge pull request '教材选择不区分上下册' (#148) from lyc-dev into main	2024-08-20 17:11:00 +08:00
lyc	13598615c7	教材选择不区分上下册	2024-08-20 14:24:18 +08:00
zdg	a80a3b006c	Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg	2024-08-20 14:21:29 +08:00
zdg	a2e72b855b	优化	2024-08-20 14:21:25 +08:00
zhangxuelin	1e0ff00503	1	2024-08-20 10:22:42 +08:00
zhangxuelin	b8ea091bb5	最小化pdf	2024-08-20 10:22:02 +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	49c4c7245a	打包chat-im	2024-08-19 14:21:42 +08:00
朱浩	0ff0cd42bc	二期：修改自动同步检测逻辑	2024-08-16 18:10:20 +08:00
朱浩	6dfb2d4a8a	Merge branch 'main' into zhuhao_dev	2024-08-16 17:41:01 +08:00
zhangxuelin	56483a9a49	shareStore状态优化	2024-08-16 17:33:27 +08:00
zdg	631fcf38f7	恢复	2024-08-16 17:07:06 +08:00
zdg	cf477398c9	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg	2024-08-16 16:43:06 +08:00
zdg	e3e704d95d	修复	2024-08-16 16:41:05 +08:00
yangws	7fc7135d73	fix:课件改为线上的;	2024-08-16 14:33:46 +08:00
朱浩	88177d610e	Merge branch 'main' into zhuhao_dev	2024-08-16 13:42:55 +08:00
朱浩	57b7d3d601	二期：修改自动同步检测逻辑	2024-08-16 13:42:19 +08:00
zdg	75caf13d8b	im-chat	2024-08-16 13:41:33 +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
zdg	a3b7248977	Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg	2024-08-16 10:15:17 +08:00
zdg	6ae7c2c4b7	优化im	2024-08-16 10:15:12 +08:00
朱浩	b8896bf53d	二期：保存用户不成功的问题	2024-08-16 09:11:10 +08:00
朱浩	aec8e9a21f	Merge remote-tracking branch 'origin/main'	2024-08-16 09:05:13 +08:00
朱浩	de909adccb	二期：修复图片加载失败无法点击的问题	2024-08-15 16:23:07 +08:00
yangws	c94563fd43	fix:个人信息宽度调整;	2024-08-15 15:58:58 +08:00
lyc	a68b2a2805	Merge branch 'main' into lyc-dev	2024-08-15 15:15:40 +08:00
lyc	0d1a96b202	窗口minwidth	2024-08-15 15:15:22 +08:00
yangws	b8f95eb20f	fix:上传存图片路径之前取的缓存接口getUserProfile（），并且去掉前缀dev-api保证图片回显;	2024-08-15 15:10:42 +08:00
lyc	a17be49850	禁用双击最大化	2024-08-15 14:57:08 +08:00
yangws	0fe264054c	fix:上传存图片路径之前取的缓存接口getUserProfile（），并且去掉前缀dev-api保证图片回显;	2024-08-15 14:10:29 +08:00
lyc	86d5f33119	登录 修改	2024-08-15 13:57:23 +08:00
zhangxuelin	2ed62802ce	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg	2024-08-15 11:21:48 +08:00
zhangxuelin	2ee5e24e6f	课程预约显示 bug修改	2024-08-15 11:18:33 +08:00
lyc	6e8c96ce2e	布置作业默认日期修改	2024-08-15 10:31:11 +08:00
zhangxuelin	3448a029c6	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg	2024-08-15 10:25:29 +08:00
zhangxuelin	1dce3f6f70	窗口修改	2024-08-15 09:57:46 +08:00
lyc	2a84455f05	教材封面baseUrl	2024-08-15 09:55:37 +08:00
zdg	758a4b09c9	提交	2024-08-14 17:47:42 +08:00
lyc	ba9b381b69	Merge branch 'main' into lyc-dev	2024-08-14 17:27:34 +08:00
zdg	716c16928e	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg	2024-08-14 17:23:39 +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
朱浩	f3619817f9	Merge branch 'main' into zhuhao_dev	2024-08-14 17:21:38 +08:00
zdg	bb1d5da104	保存-群id	2024-08-14 16:53:40 +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
lyc	4754ed641c	上课-作业 修改	2024-08-14 16:40:43 +08:00
yangws	3c2dbb722a	fix:上传存图片路径;	2024-08-14 16:31:30 +08:00
zdg	1c67ce1b8f	im通信	2024-08-14 16:31:08 +08:00
yangws	1e52abc170	fix:新加个人中心修改学段;	2024-08-14 15:58:06 +08:00
朱浩	1aded1d50a	二期：修复中文目录无法打开文件的问题	2024-08-14 15:45:27 +08:00
lyc	c72d103082	查询作业修改	2024-08-14 14:57:00 +08:00
lyc	bf783cf940	作业	2024-08-14 14:07:53 +08:00
lyc	b255e48be5	冲突	2024-08-14 14:06:02 +08:00
lyc	41b0660559	打开外部链接 url 增加参数	2024-08-14 14:03:06 +08:00
朱浩	c3709bf0c7	二期：BUG修复	2024-08-14 11:00:01 +08:00
朱浩	ea4afb409f	Merge branch 'main' into zhuhao_dev ... # Conflicts: # src/renderer/src/views/prepare/index.vue	2024-08-14 10:00:16 +08:00
朱浩	79055dc1c2	二期：BUG修复	2024-08-14 09:58:14 +08:00
yangws	e3a04c0add	Merge pull request 'fix:修改个人中心宽度，预约课件删除及时回应；' (#127) from yangws into main ... Reviewed-on: #127	2024-08-14 09:56:10 +08:00
朱浩	3b872f371f	Merge branch 'main' into zhuhao_dev	2024-08-13 17:43:49 +08:00
朱浩	7fc04faad1	二期：BUG修复	2024-08-13 17:43:34 +08:00
lyc	7b804f9e62	作业	2024-08-13 17:39:23 +08:00
yangws	62367c13d3	fix:修改个人中心宽度，预约课件删除及时回应；	2024-08-13 17:33:04 +08:00
朱浩	8f50174595	二期：BUG修复	2024-08-13 16:46:47 +08:00
lyc	e2d9b61fbe	作业	2024-08-13 16:22:35 +08:00
lyc	bc5a6e961d	作业布置	2024-08-13 16:14:41 +08:00
lyc	2b5acf272d	Merge branch 'main' into lyc-dev	2024-08-13 15:39:06 +08:00
lyc	9dda6b934c	作业-布置	2024-08-13 15:38:56 +08:00
zhangxuelin	799dbed676	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg ... # Conflicts: # src/main/index.js # src/renderer/src/plugins/shareStore.js # src/renderer/src/views/prepare/index.vue # src/renderer/src/views/tool/sphere.vue	2024-08-13 15:30:38 +08:00
lyc	a1e00ba716	Merge branch 'main' into lyc-dev	2024-08-13 15:15:37 +08:00
lyc	acc4d7c81e	icon	2024-08-13 15:15:03 +08:00
zhangxuelin	f80e7dee2a	代码优化	2024-08-13 15:14:26 +08:00
yangws	1f9788498a	fix:去掉defineProps,以及修改备课-课标研读，高考研读，教学大模型链接不能同时跳转的bug;	2024-08-13 15:12:55 +08:00
yangws	776be8eaac	fix🐛资源-平台资源和校本资源里别人上传的文件不应该可以编辑名称;	2024-08-13 11:31:39 +08:00
朱浩	2cdc33d706	Merge branch 'main' into zhuhao_dev	2024-08-13 11:27:56 +08:00
朱浩	f334adfda9	二期：BUG修复	2024-08-13 11:27:42 +08:00
朱浩	fe26d348fc	二期：版本升级自动下载进度提示问题	2024-08-13 11:11:29 +08:00
yangws	c7d2eba5bb	fix🐛资源-平台资源和校本资源里别人上传的文件不应该可以编辑名称;	2024-08-13 11:06:09 +08:00
zhangxuelin	2bf82dc294	Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg ... # Conflicts: # src/renderer/src/views/tool/sphere.vue	2024-08-13 09:11:31 +08:00
zhangxuelin	cc5c823071	1	2024-08-13 09:09:49 +08:00
zdg	8df3871f7d	Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg ... # Conflicts: # src/renderer/src/components/pdf/index.vue # src/renderer/src/views/classBegins/index.vue	2024-08-13 09:09:08 +08:00
zdg	0ffa45313b	优化-数据状态共享 ... im-chat	2024-08-13 09:07:28 +08:00
lyc	c4e82017e5	Merge pull request '作业' (#120) from lyc-dev into main	2024-08-12 16:55:21 +08:00
lyc	d4fc68c902	作业	2024-08-12 16:55:05 +08:00
yangws	c4c4bca54a	fix:修改更改科目主页课程不能更新的问题；	2024-08-12 16:52:41 +08:00
lyc	0b67ca30f8	作业	2024-08-12 15:55:50 +08:00
zhangxuelin	7d3007bbf2	Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg	2024-08-12 13:40:07 +08:00
zhangxuelin	bf99c4dd00	bug修改	2024-08-12 13:40:03 +08:00
朱浩	d690a4ae70	Merge pull request '二期：预约开发' (#117) from zhuhao_dev into main ... Reviewed-on: #117	2024-08-12 09:43:00 +08:00
朱浩	974aaf3522	二期：预约开发	2024-08-12 09:41:01 +08:00
lyc	9d38f715a1	edit	2024-08-12 09:38:39 +08:00
朱浩	7cf3487bfb	二期：预约开发	2024-08-09 17:42:19 +08:00
朱浩	c29a3d7a77	二期：预约开发	2024-08-09 17:26:04 +08:00
朱浩	b8325d336b	Merge branch 'main' into zhuhao_dev ... # Conflicts: # src/renderer/src/views/prepare/index.vue # src/renderer/src/views/tool/sphere.vue	2024-08-09 17:25:23 +08:00
朱浩	c2876ff983	二期：预约开发	2024-08-09 17:20:55 +08:00
zdg	f9de8514ed	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg	2024-08-09 17:19:19 +08:00
zdg	cc8ea2b043	点赞组件	2024-08-09 17:19:00 +08:00
lyc	3fcd0cdb21	Merge branch 'main' into lyc-dev	2024-08-09 17:09:59 +08:00
lyc	815b2b15cb	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk	2024-08-09 17:09:54 +08:00
lyc	eb17167feb	作业	2024-08-09 17:09:15 +08:00
朱浩	ae500c94ce	二期：预约开发	2024-08-09 15:06:13 +08:00
lyc	258a99bc36	上课作业	2024-08-09 09:43:14 +08:00
朱浩	e5845a6714	二期：预约列表开发	2024-08-08 17:44:03 +08:00
朱浩	1c1ec2be71	Merge branch 'main' into zhuhao_dev ... # Conflicts: # src/renderer/src/views/prepare/index.vue	2024-08-08 17:41:08 +08:00
朱浩	7974aeabe4	二期：预约列表开发	2024-08-08 17:38:45 +08:00
zhangxuelin	c11b9765e6	Merge pull request 'zdg' (#111) from zdg into main ... Reviewed-on: #111	2024-08-08 17:37:41 +08:00
lyc	0e34b6a1e9	Merge pull request 'lyc-dev' (#110) from lyc-dev into main	2024-08-08 17:03:47 +08:00
lyc	b10be40ddc	作业	2024-08-08 17:03:18 +08:00
zhangxuelin	964e99c186	不打开工具栏不允许操作数据	2024-08-08 17:02:18 +08:00
zhangxuelin	e1e9f171e0	读取本地pdf文件	2024-08-08 16:50:21 +08:00
zhangxuelin	a8f9c828d7	更改地址	2024-08-08 14:27:22 +08:00
朱浩	32c64d073b	二期：解决无法同时打开多个的问题	2024-08-08 14:04:00 +08:00
lyc	9a8d0e61d5	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk	2024-08-08 11:22:54 +08:00
lyc	ccf4211f44	上课作业	2024-08-08 11:22:05 +08:00
朱浩	aaa75df73b	Merge branch 'main' into zhuhao_dev	2024-08-08 10:41:20 +08:00
lyc	6ddd172bb9	Merge pull request '取消课件文件限制' (#108) from lyc-dev into main	2024-08-08 10:32:25 +08:00
lyc	00d23f4b31	取消课件文件限制	2024-08-08 10:32:02 +08:00
朱浩	54d9f6d782	Merge branch 'main' into zhuhao_dev	2024-08-07 17:44:50 +08:00
朱浩	5db876ebfa	二期：解决新建文件失败问题	2024-08-07 17:44:36 +08:00
zdg	0c8af75e2a	更新样式-工具	2024-08-07 17:36:56 +08:00
zdg	618618f736	工具-下课	2024-08-07 17:04:32 +08:00
zdg	43afd575de	下课	2024-08-07 16:52:46 +08:00
zhangxuelin	4687d62b90	1	2024-08-07 16:10:34 +08:00
zhangxuelin	2a78cb40dc	重复打开课本	2024-08-07 16:08:54 +08:00
zdg	d12b5bb29f	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg ... # Conflicts: # src/renderer/src/views/prepare/index.vue	2024-08-07 16:04:44 +08:00
zdg	5430cb8c50	Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg	2024-08-07 16:02:54 +08:00
zdg	6f890843ab	重复开始上课	2024-08-07 16:02:36 +08:00
朱浩	9f510187c0	二期：教材打开开发	2024-08-07 15:49:37 +08:00
zhangxuelin	dca4eaae91	1	2024-08-07 15:36:07 +08:00
zhangxuelin	d64122775a	Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg ... # Conflicts: # src/renderer/src/components/pdf/index.vue # src/renderer/src/views/classBegins/index.vue # src/renderer/src/views/tool/sphere.vue	2024-08-07 15:31:59 +08:00
zhangxuelin	29ad68e5ab	pdf功能设置	2024-08-07 15:19:58 +08:00
zdg	4e2512ed77	优化	2024-08-07 15:14:34 +08:00
zdg	c9d377aa74	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg	2024-08-07 12:26:30 +08:00
zdg	7221a203e9	Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg ... # Conflicts: # src/renderer/src/views/tool/sphere.vue	2024-08-07 12:26:19 +08:00
朱浩	3bcb0a2ef3	Merge branch 'main' into zhuhao_dev	2024-08-07 11:13:07 +08:00
朱浩	9018abb673	二期：预约课程修改	2024-08-07 11:12:51 +08:00
朱浩	a55a662ce9	二期：文件大小改为500M	2024-08-07 11:12:38 +08:00
朱浩	528e7876a9	二期：延长本地同步自动计时速率	2024-08-07 11:12:18 +08:00
zdg	7dfa51f5dc	侧边工具栏	2024-08-07 10:34:34 +08:00
lyc	74b0cf5fdb	Merge pull request 'login 修改' (#103) from lyc-dev into main	2024-08-07 10:32:02 +08:00
lyc	df7658a17d	login 修改	2024-08-07 10:31:08 +08:00
zhangxuelin	db496ee154	窗口根据控制	2024-08-07 09:23:07 +08:00
lyc	8a9fa83c04	Merge pull request '登录修改' (#102) from lyc-dev into main	2024-08-06 15:02:59 +08:00
lyc	9a6f37528c	登录修改	2024-08-06 15:02:40 +08:00
zhangxuelin	a6fff59601	Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg	2024-08-06 14:07:07 +08:00
zhangxuelin	2a670c1447	添加画布接口	2024-08-06 14:07:02 +08:00
zdg	19901d802f	状态管理-多窗口共享	2024-08-05 17:46:48 +08:00
zdg	22a92ee84b	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg	2024-08-05 17:11:19 +08:00
zdg	8d558c47f5	多窗口状态共享	2024-08-05 17:10:57 +08:00
lyc	95e9fc528a	教材默认图标	2024-08-05 17:03:13 +08:00
lyc	ce274237dc	作业修改	2024-08-05 16:24:46 +08:00
lyc	fb84977321	login	2024-08-05 09:48:48 +08:00
zhangxuelin	1d4cad94c1	Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg	2024-08-05 09:47:38 +08:00
zhangxuelin	da78c7e1e8	更改画板	2024-08-05 09:47:33 +08:00
朱浩	6b8c6c8c7f	二期：软件名称修改	2024-08-02 17:12:45 +08:00
zdg	99c6fe85d4	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg	2024-08-02 16:07:35 +08:00
zdg	05074f3145	优化-工具类拖动折叠 ... 清除所有画布内容	2024-08-02 16:06:07 +08:00
lyc	921ce6ecb0	选择学生checkbox 大小修改	2024-08-02 15:08:36 +08:00
lyc	9ef553f8eb	作业 冲突	2024-08-02 14:49:48 +08:00
lyc	e53eab0c31	作业删除	2024-08-02 14:30:27 +08:00
朱浩	ae4f7d3b49	二期：样式修改	2024-08-02 14:18:11 +08:00
lyc	0ba717de6e	删除作业	2024-08-02 10:32:09 +08:00
lyc	6e29229e95	冲突 作业	2024-08-02 10:03:24 +08:00
lyc	df84893509	布置作业	2024-08-02 10:01:05 +08:00
zdg	bb02f92bb2	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg	2024-08-02 09:22:18 +08:00
zdg	dbf6b665a8	工具栏-拖动 折叠	2024-08-02 09:21:57 +08:00
朱浩	62a5339d04	二期：首页样式修改	2024-08-01 17:46:56 +08:00
朱浩	191ead45cb	Merge branch 'main' into zhuhao_dev	2024-08-01 14:33:52 +08:00
朱浩	cac9490256	二期：首页样式修改	2024-08-01 14:33:40 +08:00
lyc	57aa718711	修复先进入备课报错	2024-08-01 11:26:50 +08:00
lyc	0d41a5a62f	冲突	2024-08-01 11:14:07 +08:00
lyc	510258361f	作业	2024-08-01 11:12:58 +08:00
zdg	ee53207d31	关闭打印	2024-08-01 10:45:47 +08:00
zdg	24c2540436	工具栏-橡皮擦	2024-08-01 10:44:52 +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
朱浩	ede8dfd533	二期：bug修复	2024-07-31 16:46:37 +08:00
朱浩	15f6b5dcbd	二期：首页开发	2024-07-31 16:04:49 +08:00
zdg	b4e7867922	测试	2024-07-31 11:23:37 +08:00
zdg	ba64ff931b	插件重新整理	2024-07-31 10:04:12 +08:00
朱浩	955d3a6d7d	Merge branch 'main' into zhuhao_dev	2024-07-31 09:25:57 +08:00
朱浩	b7f45bbd33	二期：添加配置	2024-07-31 09:25:44 +08:00
yangws	370396e2b8	fix:主页页面；	2024-07-31 09:20:30 +08:00
lyc	0eb047b3f2	Merge branch 'main' into lyc-dev	2024-07-30 17:03:14 +08:00
lyc	9f5115f4a3	Merge pull request 'lyc-dev' (#86) from lyc-dev into main	2024-07-30 17:03:01 +08:00
lyc	12332348b0	备课模块---查询作业列表	2024-07-30 17:02:23 +08:00
yangws	9edc6d6e2b	fix:学生列表高度问题;	2024-07-30 16:11:38 +08:00
yangws	1e79807a4b	fix:修改头像上传;	2024-07-30 16:02:01 +08:00
yangws	817ea8790e	fix:修改添加班级的问题；	2024-07-30 10:16:46 +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
zdg	604a20b9b0	生产环境-文件获取	2024-07-30 10:00:48 +08:00
lyc	b65cd95558	新增打开作业反馈	2024-07-30 09:44:09 +08:00
lyc	277a5ec873	退出	2024-07-29 16:05:52 +08:00
lyc	2565f86260	login cookie	2024-07-29 14:12:39 +08:00
zdg	b2b95db8fb	本地测试	2024-07-29 10:18:15 +08:00
zhangxuelin	d7ecb2d547	1	2024-07-29 10:10:39 +08:00
朱浩	2f4d48a8c0	二期：BUG修复	2024-07-27 00:25:46 +08:00
zdg	5ac36dd569	bug修复	2024-07-26 22:15:12 +08:00
zdg	8b7e64765b	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg	2024-07-26 19:20:25 +08:00
zdg	4d17465c24	Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg	2024-07-26 19:20:20 +08:00
zhangxuelin	3097491df2	1	2024-07-26 17:43:35 +08:00
朱浩	71aff5d1f8	Merge branch 'main' into zhuhao_dev	2024-07-26 17:36:16 +08:00
朱浩	14428f2706	二期：BUG修复	2024-07-26 17:36:04 +08:00
zdg	dd577385af	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg	2024-07-26 17:04:14 +08:00
yangws	52dfb52161	fix:高度自适应问题；	2024-07-26 16:00:59 +08:00
朱浩	7d4f9bdbf9	Merge pull request 'zhuhao_dev' (#75) from zhuhao_dev into main ... Reviewed-on: #75	2024-07-26 15:39:44 +08:00
朱浩	67bc54765c	Merge branch 'main' into zhuhao_dev ... # Conflicts: # src/renderer/src/views/classManage/index.vue	2024-07-26 15:39:00 +08:00
yangws	e6a08c857a	fix:修改字体颜色；	2024-07-26 15:38:13 +08:00
yangws	a857912c83	fix:修改路由以及用户信息的问题；	2024-07-26 15:35:45 +08:00
zhangxuelin	0d2fe7655f	设置pdf 比例	2024-07-26 15:32:43 +08:00
朱浩	51c8c79b17	Merge branch 'main' into zhuhao_dev	2024-07-26 15:31:17 +08:00
朱浩	53e34dc515	二期：BUG修复	2024-07-26 15:22:58 +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
朱浩	03ce0df516	Merge branch 'main' into zhuhao_dev	2024-07-26 14:35:11 +08:00
yangws	ccf16176c6	Merge pull request 'fix:修改路由以及用户信息的问题；' (#71) from yangws into main ... Reviewed-on: #71	2024-07-26 14:34:56 +08:00
zhangxuelin	ca61976291	Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg	2024-07-26 14:34:39 +08:00
zhangxuelin	af6236a751	设置pdf宽高	2024-07-26 14:34:35 +08:00
yangws	828abbbcb7	fix:修改路由以及用户信息的问题；	2024-07-26 14:34:16 +08:00
zdg	6c6c08abf6	优化	2024-07-26 14:26:00 +08:00
lyc	479131ef21	edit	2024-07-26 14:12:40 +08:00
朱浩	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