 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 |