朱浩
|
27c7033522
|
Merge pull request 'yangws' (#249) from yangws into main
Reviewed-on: #249
|
2024-09-22 16:47:12 +08:00 |
朱浩
|
4c66cc90c0
|
BUG修复
|
2024-09-22 16:46:37 +08:00 |
lyc
|
c2b54714ac
|
Merge pull request '跳转增加bookid' (#248) from lyc-dev into main
|
2024-09-22 16:41:45 +08:00 |
lyc
|
cafea2d719
|
跳转增加bookid
|
2024-09-22 16:41:49 +08:00 |
yangws
|
d5afede36c
|
fix:2.0.4bug修改;
|
2024-09-22 16:28:10 +08:00 |
朱浩
|
03e61c8440
|
Merge pull request '打包联通文枢课堂' (#247) from zhuhao_dev into main
Reviewed-on: #247
|
2024-09-22 14:28:29 +08:00 |
朱浩
|
79b9a0726a
|
打包联通文枢课堂
|
2024-09-22 14:27:48 +08:00 |
朱浩
|
0ccde18f00
|
Merge pull request 'zhuhao_dev' (#246) from zhuhao_dev into main
Reviewed-on: #246
|
2024-09-22 14:02:32 +08:00 |
朱浩
|
274c80ad0a
|
Merge branch 'main' into zhuhao_dev
|
2024-09-22 14:02:02 +08:00 |
yangws
|
923006eab1
|
Merge pull request 'fix:2.0.4bug修改;' (#245) from yangws into main
Reviewed-on: #245
|
2024-09-22 12:52:53 +08:00 |
yangws
|
a64ba24742
|
fix:2.0.4bug修改;
|
2024-09-22 12:51:58 +08:00 |
lyc
|
df1f8737bd
|
Merge pull request '点击章节 存储章节id (临时)' (#244) from lyc-dev into main
|
2024-09-22 12:34:16 +08:00 |
lyc
|
19a3b948c5
|
点击章节 存储章节id (临时)
|
2024-09-22 12:34:15 +08:00 |
朱浩
|
622cdfe0fe
|
BUG修复 #811,V2.0.3 APT设计-添加活动,与当前选择的章节不一致
|
2024-09-22 11:14:19 +08:00 |
朱浩
|
78b795bf4f
|
BUG修复 #801,V2.0.3 教学实践-作业,红框部分去掉
|
2024-09-22 10:53:23 +08:00 |
lyc
|
92667a7d25
|
Merge pull request '注册账号-班级修改为可选' (#243) from lyc-dev into main
|
2024-09-22 10:38:38 +08:00 |
lyc
|
71f7e4e5a1
|
注册账号-班级修改为可选
|
2024-09-22 10:38:31 +08:00 |
朱浩
|
3cced30959
|
Merge branch 'main' into zhuhao_dev
|
2024-09-20 16:56:44 +08:00 |
朱浩
|
ef9fe838a3
|
BUG修复
|
2024-09-20 16:56:26 +08:00 |
zhangxuelin
|
9ff824e082
|
Merge pull request '修改工具拖动' (#242) from zdg into main
Reviewed-on: #242
|
2024-09-20 16:27:54 +08:00 |
zhangxuelin
|
8975784ce0
|
修改工具拖动
|
2024-09-20 16:27:12 +08:00 |
lyc
|
e586755b75
|
Merge pull request 'edit' (#241) from lyc-dev into main
|
2024-09-20 15:38:39 +08:00 |
lyc
|
ef771f4e0b
|
edit
|
2024-09-20 15:38:37 +08:00 |
朱浩
|
049768c8b6
|
Merge pull request 'BUG修复' (#240) from zhuhao_dev into main
Reviewed-on: #240
|
2024-09-20 15:29:56 +08:00 |
朱浩
|
ac599a2c39
|
BUG修复
|
2024-09-20 15:29:21 +08:00 |
lyc
|
00871797bf
|
edit
|
2024-09-20 15:24:23 +08:00 |
lyc
|
fa7a44472b
|
Merge pull request 'edit' (#239) from lyc-dev into main
|
2024-09-20 15:24:19 +08:00 |
lyc
|
85529ad81f
|
Merge pull request 'edit' (#238) from lyc-dev into main
|
2024-09-20 15:20:27 +08:00 |
lyc
|
f9a87143aa
|
edit
|
2024-09-20 15:19:33 +08:00 |
zhengdegang
|
17ef183741
|
Merge pull request 'zdg' (#237) from zdg into main
Reviewed-on: #237
|
2024-09-20 15:17:16 +08:00 |
zdg
|
d5833f6f03
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-20 15:16:43 +08:00 |
zdg
|
c93eeeb308
|
修复异常
|
2024-09-20 15:16:34 +08:00 |
zhengdegang
|
0d48111e50
|
Merge pull request '解决 值为null问题' (#236) from zdg into main
Reviewed-on: #236
|
2024-09-20 15:06:33 +08:00 |
zdg
|
ca57e72e9c
|
解决 值为null问题
|
2024-09-20 15:04:14 +08:00 |
zhengdegang
|
928a1401db
|
Merge pull request 'zdg' (#235) from zdg into main
Reviewed-on: #235
|
2024-09-20 14:57:41 +08:00 |
zdg
|
e0d3a6da6a
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-20 14:56:54 +08:00 |
zdg
|
1a9b426ec3
|
修复-上课 提示
|
2024-09-20 14:56:48 +08:00 |
lyc
|
d4cfedf883
|
Merge pull request 'lyc-dev' (#234) from lyc-dev into main
|
2024-09-20 14:43:21 +08:00 |
lyc
|
b5fd1f2a9d
|
edit
|
2024-09-20 14:42:58 +08:00 |
lyc
|
c6477d5ca9
|
edit
|
2024-09-20 14:34:22 +08:00 |
lyc
|
27ec047981
|
edit 教材选择
|
2024-09-20 14:30:36 +08:00 |
zhengdegang
|
7da4defed4
|
Merge pull request 'zdg' (#233) from zdg into main
Reviewed-on: #233
|
2024-09-20 13:54:51 +08:00 |
zdg
|
51cb1989a1
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-20 13:53:53 +08:00 |
zdg
|
4ab4d5dff2
|
恢复修改
|
2024-09-20 13:53:42 +08:00 |
lyc
|
80d6e1c59c
|
Merge pull request 'edit' (#232) from lyc-dev into main
|
2024-09-20 13:41:22 +08:00 |
lyc
|
75c6777933
|
edit
|
2024-09-20 13:41:18 +08:00 |
朱浩
|
a75f151b19
|
Merge pull request 'BUG修复' (#231) from zhuhao_dev into main
Reviewed-on: #231
|
2024-09-20 09:22:02 +08:00 |
朱浩
|
2531c25d7c
|
BUG修复
|
2024-09-20 09:21:31 +08:00 |
朱浩
|
9e5527d822
|
Merge pull request 'zhuhao_dev' (#230) from zhuhao_dev into main
Reviewed-on: #230
|
2024-09-20 09:19:10 +08:00 |
朱浩
|
e002ef5f7d
|
Merge branch 'main' into zhuhao_dev
|
2024-09-20 09:18:30 +08:00 |
朱浩
|
2ca637072d
|
BUG修复
|
2024-09-20 09:18:12 +08:00 |
baigl
|
bd7f6f765f
|
Merge pull request 'baigl' (#229) from baigl into main
Reviewed-on: #229
|
2024-09-19 16:58:13 +08:00 |
白了个白
|
ef6c3d2a2b
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-09-19 16:57:03 +08:00 |
白了个白
|
9ea05568e1
|
作业批改:同步web端164逻辑修改
|
2024-09-19 16:56:15 +08:00 |
zhengdegang
|
93a061ca78
|
Merge pull request 'zdg' (#228) from zdg into main
Reviewed-on: #228
|
2024-09-19 16:37:45 +08:00 |
zdg
|
c5075af2fc
|
已上课
|
2024-09-19 16:37:07 +08:00 |
zdg
|
7da60f0815
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-19 16:35:43 +08:00 |
zdg
|
02a25db5e2
|
修复
|
2024-09-19 16:35:36 +08:00 |
yangws
|
59de30b6b2
|
Merge pull request 'fix: 解决空数据的判断;' (#227) from yangws into main
Reviewed-on: #227
|
2024-09-19 16:03:39 +08:00 |
yangws
|
746cb150c4
|
fix: 解决空数据的判断;
|
2024-09-19 16:02:56 +08:00 |
lyc
|
893be27671
|
切换学科
|
2024-09-19 16:02:42 +08:00 |
lyc
|
b0b429c7aa
|
Merge pull request '切换学科' (#226) from lyc-dev into main
|
2024-09-19 16:02:41 +08:00 |
lyc
|
dbfa1a4037
|
Merge pull request '路由title' (#225) from lyc-dev into main
|
2024-09-19 15:55:19 +08:00 |
lyc
|
ce8b2e6ab0
|
路由title
|
2024-09-19 15:55:19 +08:00 |
baigl
|
a082b437b7
|
Merge pull request 'baigl' (#224) from baigl into main
Reviewed-on: #224
|
2024-09-19 15:32:32 +08:00 |
白了个白
|
9eb6d991c1
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-09-19 15:31:45 +08:00 |
白了个白
|
0cbb513a60
|
作业批改:常规作业ui修改
|
2024-09-19 15:29:52 +08:00 |
lyc
|
be765b21b6
|
Merge pull request 'lyc-dev' (#223) from lyc-dev into main
|
2024-09-19 15:15:26 +08:00 |
lyc
|
34c1c66b31
|
edit 教材
|
2024-09-19 15:15:16 +08:00 |
lyc
|
5f06657b09
|
教学实践
|
2024-09-19 14:58:54 +08:00 |
白了个白
|
3ec25f07b4
|
作业批改:接口传参未传状态值bug修改
|
2024-09-19 14:25:33 +08:00 |
zhengdegang
|
aa35621b59
|
Merge pull request 'zdg' (#222) from zdg into main
Reviewed-on: #222
|
2024-09-19 12:03:47 +08:00 |
zdg
|
49de9ee9c2
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-19 12:02:51 +08:00 |
zdg
|
0ef5ef424f
|
bug修复,以及代码优化
|
2024-09-19 12:02:31 +08:00 |
baigl
|
89ae43a458
|
Merge pull request 'baigl' (#221) from baigl into main
Reviewed-on: #221
|
2024-09-19 11:30:20 +08:00 |
白了个白
|
9d7aad1946
|
Merge branch 'zouyf_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-09-19 11:28:45 +08:00 |
lyc
|
db2be260a7
|
教材edit
|
2024-09-19 11:25:01 +08:00 |
baigl
|
b06ad0f411
|
Merge pull request 'baigl' (#220) from baigl into main
Reviewed-on: #220
|
2024-09-19 10:58:42 +08:00 |
白了个白
|
129f875469
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-09-19 10:54:31 +08:00 |
白了个白
|
2c6da76cf7
|
作业设计跳转web端逻辑修改
|
2024-09-19 10:52:33 +08:00 |
ekooo
|
499e428138
|
Merge branch 'main' into zouyf_dev
# Conflicts:
# src/renderer/src/components/set-homework/index.vue
|
2024-09-18 20:02:53 +08:00 |
朱浩
|
81f873bcc3
|
Merge branch 'main' into zhuhao_dev
|
2024-09-18 17:31:14 +08:00 |
lyc
|
c58322ca0b
|
Merge pull request '作业查询修改' (#219) from lyc-dev into main
|
2024-09-18 16:11:59 +08:00 |
lyc
|
08dad41e4d
|
作业查询修改
|
2024-09-18 16:11:54 +08:00 |
zhengdegang
|
675613bbee
|
Merge pull request 'zdg' (#218) from zdg into main
Reviewed-on: #218
|
2024-09-18 15:01:31 +08:00 |
zdg
|
9188df0d94
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-18 15:00:30 +08:00 |
zdg
|
4e8560b033
|
解决二维码不出现的问题
|
2024-09-18 15:00:17 +08:00 |
“zouyf”
|
4e835cac82
|
Merge branch 'main' into zouyf_dev
|
2024-09-18 14:57:46 +08:00 |
朱浩
|
7303128334
|
Merge branch 'main' into zhuhao_dev
|
2024-09-18 14:14:35 +08:00 |
yangws
|
d047e85d03
|
Merge pull request 'fix: 个人中心任选学科报错问题;' (#217) from yangws into main
Reviewed-on: #217
|
2024-09-18 14:05:31 +08:00 |
yangws
|
acd66c11fa
|
fix: 个人中心任选学科报错问题;
|
2024-09-18 14:04:58 +08:00 |
朱浩
|
f90e2548c6
|
Merge branch 'main' into zhuhao_dev
|
2024-09-18 13:56:53 +08:00 |
yangws
|
c32bd6eef4
|
Merge pull request 'fix: 解决资源库报错的问题;' (#216) from yangws into main
Reviewed-on: #216
|
2024-09-18 13:56:28 +08:00 |
yangws
|
3b9877e788
|
fix: 解决资源库报错的问题;
|
2024-09-18 13:55:30 +08:00 |
朱浩
|
fb48984e7f
|
APT上课
|
2024-09-18 11:29:39 +08:00 |
lyc
|
aaa2aef3ca
|
move-file
|
2024-09-18 11:13:32 +08:00 |
lyc
|
5cfd5747a1
|
Merge pull request 'move-file' (#215) from lyc-dev into main
|
2024-09-18 11:13:31 +08:00 |
lyc
|
04263cd519
|
Merge pull request '预约课程-时间限制修改' (#214) from lyc-dev into main
|
2024-09-18 10:53:27 +08:00 |
lyc
|
aee945f90f
|
预约课程-时间限制修改
|
2024-09-18 10:53:22 +08:00 |
白了个白
|
bae24601ef
|
Merge branch 'zouyf_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-09-18 10:24:55 +08:00 |
白了个白
|
980e4d66e8
|
作业设计
|
2024-09-18 10:23:13 +08:00 |
lyc
|
7439c9759a
|
Merge pull request '布置作业-截止时间默认当前时间' (#213) from lyc-dev into main
|
2024-09-18 09:42:58 +08:00 |
lyc
|
ddd53943b8
|
布置作业-截止时间默认当前时间
|
2024-09-18 09:42:35 +08:00 |
ekooo
|
70ba70df45
|
[作业设计] - 增加页面
|
2024-09-17 19:56:32 +08:00 |
baigl
|
7ae8547d41
|
Merge pull request '作业批改 loading Bug修复' (#212) from baigl into main
Reviewed-on: #212
|
2024-09-14 17:38:44 +08:00 |
zhengdegang
|
c5c28b4bf5
|
Merge pull request 'zdg' (#211) from zdg into main
Reviewed-on: #211
|
2024-09-14 17:34:21 +08:00 |
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 |
白了个白
|
46adf4c058
|
作业批改 loading Bug修复
|
2024-09-14 17:00:14 +08:00 |
zdg
|
f615efbd88
|
Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-14 16:39:38 +08:00 |
zdg
|
741e7336f3
|
上课
|
2024-09-14 16:39:31 +08:00 |
朱浩
|
a67f801356
|
Merge pull request 'zhuhao_dev' (#210) from zhuhao_dev into main
Reviewed-on: #210
|
2024-09-14 16:01:51 +08:00 |
朱浩
|
1c89217fbf
|
Merge branch 'main' into zhuhao_dev
|
2024-09-14 16:01:08 +08:00 |
朱浩
|
3a20f453c6
|
APT上课
|
2024-09-14 16:00:45 +08:00 |
朱浩
|
dfa5c7d99b
|
APT上课
|
2024-09-14 15:59:40 +08:00 |
lyc
|
e144fbe36a
|
Merge pull request 'lyc-dev' (#209) from lyc-dev into main
|
2024-09-14 15:13:05 +08:00 |
lyc
|
b279d36c89
|
edit
|
2024-09-14 15:12:36 +08:00 |
lyc
|
8013b1c2cc
|
edit
|
2024-09-14 14:59:35 +08:00 |
baigl
|
610aac6985
|
Merge pull request 'baigl' (#208) from baigl into main
Reviewed-on: #208
|
2024-09-14 14:22:36 +08:00 |
白了个白
|
6c85654608
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-09-14 14:22:02 +08:00 |
白了个白
|
a5b6cd3516
|
1
|
2024-09-14 14:18:13 +08:00 |
lyc
|
01718f573b
|
Merge pull request '警告' (#207) from lyc-dev into main
|
2024-09-14 13:44:42 +08:00 |
lyc
|
ec9c673b5a
|
警告
|
2024-09-14 13:44:35 +08:00 |
白了个白
|
578fc9feba
|
1
|
2024-09-14 10:23:45 +08:00 |
白了个白
|
f49cba5e36
|
作业管理:放开作业设计弹窗、作业布置的外部链接跳转;批阅界面需求变更调整;
|
2024-09-14 10:14:40 +08:00 |
lyc
|
a92176174a
|
Merge pull request '作业查询' (#206) from lyc-dev into main
|
2024-09-13 17:19:55 +08:00 |
lyc
|
8063783284
|
作业查询
|
2024-09-13 17:19:17 +08:00 |
lyc
|
eadc6f1440
|
Merge pull request '工作台、资源库调整' (#205) from lyc-dev into main
|
2024-09-13 17:07:48 +08:00 |
lyc
|
8753951796
|
工作台、资源库调整
|
2024-09-13 17:03:30 +08:00 |
白了个白
|
490add5467
|
工作台右侧工作动态的作业, 新增可点击并弹框批改
|
2024-09-13 16:27:09 +08:00 |
白了个白
|
634ae460f3
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-09-13 15:32:58 +08:00 |
白了个白
|
1cc7007852
|
作业分离后 接口传参修改
|
2024-09-13 14:02:05 +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
|
e907a1c07a
|
Merge pull request 'fix: 解决资源库报错的问题;' (#204) from yangws into main
Reviewed-on: #204
|
2024-09-12 16:53:15 +08:00 |
yangws
|
1afaed082a
|
fix: 解决资源库报错的问题;
|
2024-09-12 16:52:47 +08:00 |
lyc
|
69362a6153
|
Merge pull request 'lyc-dev' (#203) from lyc-dev into main
|
2024-09-12 16:03:56 +08:00 |
lyc
|
1da3ca0ee0
|
Merge branch 'main' into lyc-dev
|
2024-09-12 16:03:42 +08:00 |
lyc
|
d4a6f74cfc
|
首页调整
|
2024-09-12 16:03:21 +08:00 |
zouyf
|
f57c67aab2
|
Merge pull request 'zouyf_dev' (#202) from zouyf_dev into main
Reviewed-on: #202
|
2024-09-12 15:58:59 +08:00 |
“zouyf”
|
63ad74c77f
|
Merge branch 'main' into zouyf_dev
|
2024-09-12 15:58:28 +08:00 |
“zouyf”
|
d171117f03
|
tmp
|
2024-09-12 15:58:12 +08:00 |
lyc
|
0426b85d3f
|
Merge pull request '工作台' (#201) from lyc-dev into main
|
2024-09-12 15:42:55 +08:00 |
lyc
|
17b8ce1dda
|
工作台
|
2024-09-12 15:42:43 +08:00 |
zhangxuelin
|
0fa3c84f5e
|
修改注册bug
|
2024-09-12 11:09:51 +08:00 |
zhangxuelin
|
490536654a
|
Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-12 10:51:38 +08:00 |
zhangxuelin
|
2efb870a16
|
添加注册提示
|
2024-09-12 10:51:12 +08:00 |
yangws
|
5778a8955d
|
Merge pull request 'fix: 提示教材没有时选择教材;' (#200) from yangws into main
Reviewed-on: #200
|
2024-09-12 09:48:40 +08:00 |
朱浩
|
e4e23e7508
|
Merge pull request '排序问题处理' (#199) from zhuhao_dev into main
Reviewed-on: #199
|
2024-09-12 09:48:14 +08:00 |
yangws
|
6a33ea8023
|
fix: 提示教材没有时选择教材;
|
2024-09-12 09:47:46 +08:00 |
朱浩
|
bc0579fa32
|
排序问题处理
|
2024-09-12 09:47:35 +08:00 |
yangws
|
3357cf8a78
|
Merge pull request 'fix: 样式修改,以及第三方资源名称不对应的情况;' (#198) from yangws into main
Reviewed-on: #198
|
2024-09-12 09:31:57 +08:00 |
yangws
|
3fdf500366
|
fix: 样式修改,以及第三方资源名称不对应的情况;
|
2024-09-12 09:30:44 +08:00 |
zhengdegang
|
e985417675
|
Merge pull request 'zdg' (#197) from zdg into main
Reviewed-on: #197
|
2024-09-11 20:06:20 +08:00 |
zdg
|
1978d1bac1
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-11 20:05:30 +08:00 |
zdg
|
b9014b950a
|
密码找回
|
2024-09-11 20:05:18 +08:00 |
lyc
|
03ecbb1d50
|
Merge pull request 'ai助手-拖动' (#196) from lyc-dev into main
|
2024-09-11 16:51:56 +08:00 |
lyc
|
ec3b978185
|
ai助手-拖动
|
2024-09-11 16:50:47 +08:00 |
zdg
|
3632beebfa
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-11 16:17:16 +08:00 |
zdg
|
f0e87338fb
|
注册优化,修复
|
2024-09-11 16:17:05 +08:00 |
lyc
|
54266f8a37
|
Merge pull request '图片' (#195) from lyc-dev into main
|
2024-09-11 16:05:04 +08:00 |
lyc
|
82bed1be03
|
图片
|
2024-09-11 16:04:36 +08:00 |
lyc
|
8a74f17266
|
Merge pull request '头部展示学科' (#194) from lyc-dev into main
|
2024-09-11 15:42:39 +08:00 |
lyc
|
40c6e1303b
|
头部展示学科
|
2024-09-11 15:39:54 +08:00 |
yangws
|
ee196b6eb8
|
Merge pull request 'fix:解决个人中心班级限制问题;' (#193) from yangws into main
Reviewed-on: #193
|
2024-09-11 14:43:25 +08:00 |
yangws
|
6c60cd4442
|
fix:解决个人中心班级限制问题;
|
2024-09-11 14:42:48 +08:00 |
baigl
|
471d73a224
|
Merge pull request '作业批阅:新增空列表展示与loading加载效果' (#192) from baigl into main
Reviewed-on: #192
|
2024-09-11 14:30:31 +08:00 |
白了个白
|
d7761883f2
|
作业批阅:新增空列表展示与loading加载效果
|
2024-09-11 14:22:05 +08:00 |
baigl
|
d4b1e547de
|
Merge pull request 'baigl' (#191) from baigl into main
Reviewed-on: #191
|
2024-09-11 11:29:52 +08:00 |
白了个白
|
b34182eb39
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-09-11 11:28:03 +08:00 |
白了个白
|
300093cf74
|
作业批改优化:新增时间筛选接口 界面调整
|
2024-09-11 11:25:41 +08:00 |
yangws
|
aaf03eb60d
|
Merge pull request 'fix:样式问题;' (#190) from yangws into main
Reviewed-on: #190
|
2024-09-11 09:49:07 +08:00 |
yangws
|
08075746c0
|
fix:样式问题;
|
2024-09-11 09:48:27 +08:00 |
yangws
|
8ec93353bc
|
Merge pull request 'fix:修改添加的班级;' (#189) from yangws into main
Reviewed-on: #189
|
2024-09-10 17:56:33 +08:00 |
yangws
|
68df866db5
|
fix:修改添加的班级;
|
2024-09-10 17:55:48 +08:00 |
朱浩
|
add564c4ed
|
Merge pull request 'zhuhao_dev' (#188) from zhuhao_dev into main
Reviewed-on: #188
|
2024-09-10 17:22:22 +08:00 |
朱浩
|
77e76fcf7d
|
版本升级2.0
|
2024-09-10 17:21:49 +08:00 |
朱浩
|
0268f1af36
|
Merge branch 'main' into zhuhao_dev
|
2024-09-10 17:17:38 +08:00 |
朱浩
|
278dfd4d93
|
章节排序
|
2024-09-10 17:17:10 +08:00 |
lyc
|
db6ebbdbaf
|
Merge pull request 'lyc-dev' (#187) from lyc-dev into main
|
2024-09-10 17:10:04 +08:00 |
lyc
|
e2017c3553
|
冲突-file-preview
|
2024-09-10 17:09:50 +08:00 |
lyc
|
0be3d131e2
|
聊天机器人
|
2024-09-10 17:07:00 +08:00 |
yangws
|
8ec738de46
|
Merge pull request 'add:新增加入班级;' (#185) from yangws into main
Reviewed-on: #185
|
2024-09-10 16:50:30 +08:00 |
yangws
|
076a510109
|
add:新增加入班级;
|
2024-09-10 16:49:11 +08:00 |
zhangxuelin
|
ee9e5d1326
|
Merge pull request 'zdg' (#184) from zdg into main
Reviewed-on: #184
|
2024-09-10 16:16:44 +08:00 |
zhangxuelin
|
7ed7b2efd2
|
添加跳转apt页面
|
2024-09-10 15:21:46 +08:00 |
zhangxuelin
|
eaf2d82ead
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-10 15:06:39 +08:00 |
朱浩
|
786c6816ec
|
Merge pull request 'zhuhao_dev' (#183) from zhuhao_dev into main
Reviewed-on: #183
|
2024-09-10 15:04:51 +08:00 |
朱浩
|
1b504a1653
|
Merge branch 'main' into zhuhao_dev
|
2024-09-10 15:04:18 +08:00 |
朱浩
|
85c61ca802
|
APT入口开发
|
2024-09-10 15:03:42 +08:00 |
zhangxuelin
|
7da1d97939
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-10 14:57:19 +08:00 |
baigl
|
3603c4e0f2
|
Merge pull request 'baigl' (#182) from baigl into main
Reviewed-on: #182
|
2024-09-10 14:11:05 +08:00 |
白了个白
|
cb1c3c23fe
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-09-10 14:10:10 +08:00 |
白了个白
|
de1dee7380
|
题目转义判断
|
2024-09-10 14:09:50 +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 |
朱浩
|
a2c962e94d
|
Merge pull request 'zhuhao_dev' (#181) from zhuhao_dev into main
Reviewed-on: #181
|
2024-09-10 14:03:35 +08:00 |
朱浩
|
9cad353d36
|
Merge branch 'main' into zhuhao_dev
|
2024-09-10 14:02:51 +08:00 |
朱浩
|
53f43019e9
|
APT入口开发
|
2024-09-10 14:01:58 +08:00 |
baigl
|
4996af57c7
|
Merge pull request 'baigl' (#180) from baigl into main
Reviewed-on: #180
|
2024-09-10 13:51:02 +08:00 |
白了个白
|
7a4cc9eb64
|
1
|
2024-09-10 13:49:46 +08:00 |
白了个白
|
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
|
d896209948
|
Merge pull request '[考试分析] - 修改路由' (#179) from zouyf_dev into main
Reviewed-on: #179
|
2024-09-10 09:43:13 +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
|
4b71008bee
|
Merge pull request 'zouyf_dev' (#178) from zouyf_dev into main
Reviewed-on: #178
|
2024-09-09 16:47:27 +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
|
47f3202444
|
Merge pull request 'lyc-dev' (#177) from lyc-dev into main
|
2024-09-09 09:51:28 +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 |
白了个白
|
0c506a09f2
|
Merge branch 'baigl' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-09-09 09:28:57 +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 |
朱浩
|
78ac6e5ca6
|
解决版本问题
|
2024-09-06 15:38:50 +08:00 |
朱浩
|
acc29b02e4
|
解决版本问题
|
2024-09-06 15:33:25 +08:00 |
zhengdegang
|
12da4ac2c0
|
Merge pull request 'zdg' (#176) from zdg into main
Reviewed-on: #176
|
2024-09-05 16:32:57 +08:00 |
zdg
|
5ecba3fb62
|
默认群没清除,导致没有创建群
|
2024-09-05 16:28:15 +08:00 |
zdg
|
f5f33eaa63
|
im日志级别 Debbug
|
2024-09-05 16:18:34 +08:00 |
zhengdegang
|
090bc5997c
|
Merge pull request 'zdg' (#175) from zdg into main
Reviewed-on: #175
|
2024-09-05 01:31:11 +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
|
28b5a131fd
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-05 01:03:25 +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
|
30f7b9d5b3
|
Merge pull request '修复bug-画笔' (#174) from zdg into main
Reviewed-on: #174
|
2024-09-04 21:12:24 +08:00 |
zhangxuelin
|
37810586b7
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-04 21:09:45 +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 |
zhengdegang
|
10a1342b95
|
Merge pull request '修复 bug' (#173) from zdg into main
Reviewed-on: #173
|
2024-09-04 19:51:06 +08:00 |
zdg
|
70e99e69ba
|
修复 bug
|
2024-09-04 19:50:23 +08:00 |
lyc
|
3171c0b3f9
|
Merge pull request 'lyc-dev' (#172) from lyc-dev into main
|
2024-09-04 16:29:09 +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 |
zhengdegang
|
eace8b56d8
|
Merge pull request 'zdg' (#171) from zdg into main
Reviewed-on: #171
|
2024-09-03 18:11:46 +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
|
7bb8d2afeb
|
Merge pull request 'fix:看不了学生信息;' (#169) from yangws into main
Reviewed-on: #169
|
2024-09-03 16:33:03 +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 |
zhengdegang
|
5433e47d0b
|
Merge pull request '修复bug-数据共享' (#168) from zdg into main
Reviewed-on: #168
|
2024-09-03 13:19:35 +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 |
zhengdegang
|
411ef757e2
|
Merge pull request 'zdg' (#167) from zdg into main
Reviewed-on: #167
|
2024-09-02 22:23:07 +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
|
c5257b760a
|
Merge pull request 'fix:隐藏掉班级中心所有的操作按钮;' (#166) from yangws into main
Reviewed-on: #166
|
2024-09-02 16:58:33 +08:00 |
yangws
|
22239090ea
|
fix:隐藏掉班级中心所有的操作按钮;
|
2024-09-02 16:57:54 +08:00 |
zdg
|
1d808950b5
|
优化bug
|
2024-09-02 16:33:25 +08:00 |
zhengdegang
|
cb0d60b93e
|
Merge pull request 'zdg' (#165) from zdg into main
Reviewed-on: #165
|
2024-09-02 13:53:21 +08:00 |
zdg
|
d65af70a34
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-02 13:51:36 +08:00 |
zdg
|
3f4e9c35b0
|
崩溃等,日志文件配置
|
2024-09-02 13:51:25 +08:00 |
zhengdegang
|
a133c322f3
|
Merge pull request 'zdg' (#164) from zdg into main
Reviewed-on: #164
|
2024-09-02 11:15:52 +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 |
zdg
|
fa77c6cc6b
|
版本
|
2024-08-30 17:29:15 +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 |
zhengdegang
|
2ae200cc9e
|
Merge pull request 'zdg' (#162) from zdg into main
Reviewed-on: #162
|
2024-08-30 13:46:48 +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
|
b249df2dff
|
Merge pull request 'fix:修改老师创建查看自己小组的权限;' (#161) from yangws into main
Reviewed-on: #161
|
2024-08-30 09:33:01 +08:00 |
yangws
|
1871e7e565
|
fix:修改老师创建查看自己小组的权限;
|
2024-08-30 09:32:22 +08:00 |
lyc
|
bb56c3fdab
|
Merge pull request 'lyc-dev' (#160) from lyc-dev into main
|
2024-08-29 16:50:05 +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
|
bf7f740aaf
|
Merge pull request 'fix:无数据时处理;' (#159) from yangws into main
Reviewed-on: #159
|
2024-08-28 14:07:56 +08:00 |
yangws
|
e6a0859f87
|
fix:无数据时处理;
|
2024-08-28 14:07:14 +08:00 |
zhengdegang
|
3d8dc4320d
|
Merge pull request '更新作业推送' (#158) from zdg into main
Reviewed-on: #158
|
2024-08-27 11:38:46 +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 |
zhengdegang
|
46098aa733
|
Merge pull request 'zdg' (#156) from zdg into main
Reviewed-on: #156
|
2024-08-26 11:50:11 +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
|
edfdf8b9ad
|
Merge pull request 'fix:年级不允许切换;' (#155) from yangws into main
Reviewed-on: #155
|
2024-08-26 09:31:02 +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 |
朱浩
|
d4982d47c7
|
二期:打包IM
|
2024-08-23 12:01:21 +08:00 |
yangws
|
0ad99e9ac2
|
Merge pull request 'feat:修改固定住自己所选的学科学段;' (#154) from yangws into main
Reviewed-on: #154
|
2024-08-23 11:28:52 +08:00 |
yangws
|
be222a2ba6
|
feat:修改固定住自己所选的学科学段;
|
2024-08-23 11:28:26 +08:00 |
lyc
|
b922219602
|
Merge pull request 'lyc-dev' (#153) from lyc-dev into main
|
2024-08-23 11:22:52 +08:00 |
lyc
|
386c4e09c6
|
冲突
|
2024-08-23 11:21:57 +08:00 |
zhengdegang
|
b738ade9a4
|
Merge pull request 'zdg' (#152) from zdg into main
Reviewed-on: #152
|
2024-08-23 10:45:00 +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
|
88e63f376c
|
Merge pull request 'add:新增第三方对接素材;' (#151) from yangws into main
Reviewed-on: #151
|
2024-08-23 09:45:04 +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 |
zhengdegang
|
968b5d3e43
|
Merge pull request 'zdg' (#150) from zdg into main
Reviewed-on: #150
|
2024-08-22 09:29:49 +08:00 |
zdg
|
c0fd0ae9d3
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-08-22 09:28:17 +08:00 |
zdg
|
86cd50b8a3
|
im-点赞 疑惑 作业布置
|
2024-08-22 09:14:21 +08:00 |
zhengdegang
|
9240c055f4
|
Merge pull request 'zdg' (#149) from zdg into main
Reviewed-on: #149
|
2024-08-21 09:21:06 +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
|
d30b4a230a
|
Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-08-20 10:22:05 +08:00 |
zhangxuelin
|
b8ea091bb5
|
最小化pdf
|
2024-08-20 10:22:02 +08:00 |
zdg
|
04a03b0c43
|
配置到公共环境,所有环境都使用
|
2024-08-20 09:54:24 +08:00 |
zdg
|
f7ad8d4c71
|
Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-08-19 17:15:09 +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 |
zdg
|
49c4c7245a
|
打包chat-im
|
2024-08-19 14:21:42 +08:00 |
朱浩
|
5f6839058a
|
二期:打包IM
|
2024-08-19 14:18:39 +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 |
zhengdegang
|
4fd47d2f2f
|
Merge pull request 'zdg' (#147) from zdg into main
Reviewed-on: #147
|
2024-08-16 17:35:43 +08:00 |
zhangxuelin
|
44bec9fab4
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-08-16 17:33:41 +08:00 |
zhangxuelin
|
56483a9a49
|
shareStore状态优化
|
2024-08-16 17:33:27 +08:00 |
zhengdegang
|
4f6c7f157c
|
Merge pull request 'zdg' (#146) from zdg into main
Reviewed-on: #146
|
2024-08-16 17:08:11 +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
|
f8eece2ff6
|
Merge pull request 'fix:课件改为线上的;' (#145) from yangws into main
Reviewed-on: #145
|
2024-08-16 14:34:40 +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 |
zhengdegang
|
6bc2579c2e
|
Merge pull request 'zdg' (#144) from zdg into main
Reviewed-on: #144
|
2024-08-16 13:42:39 +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 |
朱浩
|
c19631eb89
|
Merge pull request '二期:保存用户不成功的问题' (#143) from zhuhao_dev into main
Reviewed-on: #143
|
2024-08-16 09:11:50 +08:00 |
朱浩
|
b8896bf53d
|
二期:保存用户不成功的问题
|
2024-08-16 09:11:10 +08:00 |
朱浩
|
6f5eee4289
|
Merge pull request 'zhuhao_dev' (#142) from zhuhao_dev into main
Reviewed-on: #142
|
2024-08-16 09:07:02 +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
|
f7b00b1ccd
|
Merge pull request 'fix:个人信息宽度调整;' (#141) from yangws into main
Reviewed-on: #141
|
2024-08-15 15:59:41 +08:00 |
yangws
|
c94563fd43
|
fix:个人信息宽度调整;
|
2024-08-15 15:58:58 +08:00 |
lyc
|
c1a34c61c9
|
Merge pull request 'lyc-dev' (#140) from lyc-dev into main
|
2024-08-15 15:16:07 +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
|
71fe8a0a8f
|
Merge pull request 'fix:上传存图片路径之前取的缓存接口getUserProfile(),并且去掉前缀dev-api保证图片回显;' (#139) from yangws into main
Reviewed-on: #139
|
2024-08-15 15:11:43 +08:00 |
yangws
|
b8f95eb20f
|
fix:上传存图片路径之前取的缓存接口getUserProfile(),并且去掉前缀dev-api保证图片回显;
|
2024-08-15 15:10:42 +08:00 |
lyc
|
5328607ce1
|
Merge pull request '禁用双击最大化' (#138) from lyc-dev into main
|
2024-08-15 14:57:29 +08:00 |
lyc
|
a17be49850
|
禁用双击最大化
|
2024-08-15 14:57:08 +08:00 |
yangws
|
2a4dac58ac
|
Merge pull request 'fix:上传存图片路径之前取的缓存接口getUserProfile(),并且去掉前缀dev-api保证图片回显;' (#137) from yangws into main
Reviewed-on: #137
|
2024-08-15 14:11:32 +08:00 |
yangws
|
0fe264054c
|
fix:上传存图片路径之前取的缓存接口getUserProfile(),并且去掉前缀dev-api保证图片回显;
|
2024-08-15 14:10:29 +08:00 |
lyc
|
f632bab6b3
|
Merge pull request 'lyc-dev' (#136) from lyc-dev into main
|
2024-08-15 13:58:17 +08:00 |
lyc
|
ae52510c7c
|
Merge branch 'main' into lyc-dev
|
2024-08-15 13:57:36 +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
|
cf3129ed66
|
Merge pull request 'lyc-dev' (#135) from lyc-dev into main
|
2024-08-15 10:32:15 +08:00 |
lyc
|
97e035398c
|
Merge branch 'main' into lyc-dev
|
2024-08-15 10:31:34 +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 |
lyc
|
decfb09eb4
|
Merge pull request 'lyc-dev' (#134) from lyc-dev into main
Reviewed-on: #134
|
2024-08-15 09:59:07 +08:00 |
zhangxuelin
|
1dce3f6f70
|
窗口修改
|
2024-08-15 09:57:46 +08:00 |
lyc
|
2a84455f05
|
教材封面baseUrl
|
2024-08-15 09:55:37 +08:00 |
zhangxuelin
|
d9ae544022
|
Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
# src/renderer/src/utils/tool.js
|
2024-08-14 17:50:16 +08:00 |
zhangxuelin
|
b520858f3f
|
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
|
2024-08-14 17:48:32 +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 |
朱浩
|
6616ac640e
|
Merge pull request 'zhuhao_dev' (#133) from zhuhao_dev into main
Reviewed-on: #133
|
2024-08-14 17:22:19 +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
|
c64fbe49e9
|
Merge pull request 'fix:上传存图片路径;' (#132) from yangws into main
Reviewed-on: #132
|
2024-08-14 16:32:23 +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
|
acbd36ca88
|
Merge pull request 'yangws' (#131) from yangws into main
Reviewed-on: #131
|
2024-08-14 15:58:42 +08:00 |
yangws
|
1e52abc170
|
fix:新加个人中心修改学段;
|
2024-08-14 15:58:06 +08:00 |
yangws
|
1a1f20d175
|
Merge remote-tracking branch 'origin/main' into yangws
|
2024-08-14 15:57:20 +08:00 |
朱浩
|
1aded1d50a
|
二期:修复中文目录无法打开文件的问题
|
2024-08-14 15:45:27 +08:00 |
lyc
|
94ae78bffc
|
Merge branch 'main' into lyc-dev
|
2024-08-14 14:57:17 +08:00 |
lyc
|
c72d103082
|
查询作业修改
|
2024-08-14 14:57:00 +08:00 |
lyc
|
22f35a6638
|
Merge pull request 'lyc-dev' (#130) from lyc-dev into main
|
2024-08-14 14:08:52 +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 |
朱浩
|
0964cc0965
|
Merge pull request 'zhuhao_dev' (#129) from zhuhao_dev into main
Reviewed-on: #129
|
2024-08-14 11:00:45 +08:00 |
朱浩
|
219e4abdc0
|
Merge branch 'main' into zhuhao_dev
|
2024-08-14 11:00:13 +08:00 |
朱浩
|
c3709bf0c7
|
二期:BUG修复
|
2024-08-14 11:00:01 +08:00 |
朱浩
|
e6a06a67b8
|
Merge pull request 'zhuhao_dev' (#128) from zhuhao_dev into main
Reviewed-on: #128
|
2024-08-14 10:00:47 +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 |
yangws
|
f6bf811ee5
|
Merge remote-tracking branch 'origin/main' into yangws
|
2024-08-14 09:54:34 +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
|
d18c47994a
|
Merge pull request '作业' (#126) from lyc-dev into main
|
2024-08-13 17:39:38 +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
|
bc9c6a3c89
|
Merge pull request 'lyc-dev' (#125) from lyc-dev into main
|
2024-08-13 16:23:03 +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 |
yangws
|
3b52f9acc4
|
Merge pull request 'fix:去掉defineProps,以及修改备课-课标研读,高考研读,教学大模型链接不能同时跳转的bug;' (#124) from yangws into main
Reviewed-on: #124
|
2024-08-13 15:16:09 +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 |
白了个白
|
9ab62f180e
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-08-13 13:53:19 +08:00 |
yangws
|
f60fdbafa0
|
Merge pull request 'fix🐛资源-平台资源和校本资源里别人上传的文件不应该可以编辑名称;' (#123) from yangws into main
Reviewed-on: #123
|
2024-08-13 11:32:10 +08:00 |
yangws
|
776be8eaac
|
fix🐛资源-平台资源和校本资源里别人上传的文件不应该可以编辑名称;
|
2024-08-13 11:31:39 +08:00 |
朱浩
|
67320f897e
|
Merge pull request 'zhuhao_dev' (#122) from zhuhao_dev into main
Reviewed-on: #122
|
2024-08-13 11:28:27 +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
|
444daa3cec
|
Merge pull request 'fix🐛资源-平台资源和校本资源里别人上传的文件不应该可以编辑名称;' (#121) from yangws into main
Reviewed-on: #121
|
2024-08-13 11:06:53 +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 |
朱浩
|
732e4c9a64
|
Merge branch 'main' into zhuhao_dev
|
2024-08-12 16:53:44 +08:00 |
yangws
|
6c717ea345
|
Merge pull request 'fix:修改更改科目主页课程不能更新的问题;' (#119) from yangws into main
Reviewed-on: #119
|
2024-08-12 16:53:29 +08:00 |
yangws
|
c4c4bca54a
|
fix:修改更改科目主页课程不能更新的问题;
|
2024-08-12 16:52:41 +08:00 |
朱浩
|
e89ffd4416
|
二期:版本切换
|
2024-08-12 16:51:10 +08:00 |
lyc
|
cc1faa7f88
|
Merge pull request '作业' (#118) from lyc-dev into main
|
2024-08-12 15:56:46 +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
|
524eedc451
|
Merge pull request 'edit' (#116) from lyc-dev into main
|
2024-08-12 09:38:59 +08:00 |
lyc
|
9d38f715a1
|
edit
|
2024-08-12 09:38:39 +08:00 |
朱浩
|
b4c9db619e
|
Merge pull request '二期:预约开发' (#115) from zhuhao_dev into main
Reviewed-on: #115
|
2024-08-09 17:42:56 +08:00 |
朱浩
|
7cf3487bfb
|
二期:预约开发
|
2024-08-09 17:42:19 +08:00 |
朱浩
|
74275ac327
|
Merge pull request 'zhuhao_dev' (#114) from zhuhao_dev into main
Reviewed-on: #114
|
2024-08-09 17:27:14 +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 |
zhengdegang
|
6035803db1
|
Merge pull request 'zdg' (#113) from zdg into main
Reviewed-on: #113
|
2024-08-09 17:20:15 +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
|
9e0e2a41f2
|
Merge pull request 'lyc-dev' (#112) from lyc-dev into main
|
2024-08-09 17:17:43 +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 |
朱浩
|
572bdb5fec
|
二期:预约列表开发
|
2024-08-08 17:39:06 +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 |
朱浩
|
c56039270c
|
Merge pull request 'zhuhao_dev' (#109) from zhuhao_dev into main
Reviewed-on: #109
|
2024-08-08 14:05:48 +08:00 |
朱浩
|
32c64d073b
|
二期:解决无法同时打开多个的问题
|
2024-08-08 14:04:00 +08:00 |
lyc
|
1498b9bc9f
|
Merge branch 'main' into lyc-dev
|
2024-08-08 11:22:59 +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
|
d4b24f8d71
|
Merge branch 'main' into lyc-dev
|
2024-08-08 11:22:17 +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 |
zhengdegang
|
6b1ec46360
|
Merge pull request 'zdg' (#107) from zdg into main
Reviewed-on: #107
|
2024-08-07 17:38:37 +08:00 |
zdg
|
8fc1339419
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-08-07 17:37:57 +08:00 |
zdg
|
0c8af75e2a
|
更新样式-工具
|
2024-08-07 17:36:56 +08:00 |
zhengdegang
|
b8f2eb24e2
|
Merge pull request 'zdg' (#106) from zdg into main
Reviewed-on: #106
|
2024-08-07 17:06:15 +08:00 |
zdg
|
618618f736
|
工具-下课
|
2024-08-07 17:04:32 +08:00 |
zdg
|
43afd575de
|
下课
|
2024-08-07 16:52:46 +08:00 |
zhengdegang
|
8c2362ff4f
|
Merge pull request 'zdg' (#105) from zdg into main
Reviewed-on: #105
|
2024-08-07 16:11:12 +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 |
朱浩
|
bd2024eed2
|
Merge pull request 'zhuhao_dev' (#104) from zhuhao_dev into main
Reviewed-on: #104
|
2024-08-07 15:51:11 +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 |
朱浩
|
82456a7f96
|
二期:打包生产配置添加
|
2024-08-07 11:11:55 +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 |
zhengdegang
|
d64b469ac8
|
Merge pull request 'zdg' (#101) from zdg into main
Reviewed-on: #101
|
2024-08-05 17:49:43 +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
|
9ab5f65409
|
Merge pull request 'lyc-dev' (#100) from lyc-dev into main
|
2024-08-05 17:05:16 +08:00 |
lyc
|
95e9fc528a
|
教材默认图标
|
2024-08-05 17:03:13 +08:00 |
lyc
|
e38235fd6b
|
Merge pull request '作业修改' (#99) from lyc-dev into main
|
2024-08-05 16:25:19 +08:00 |
lyc
|
26c46e33c7
|
Merge branch 'main' into lyc-dev
|
2024-08-05 16:24:58 +08:00 |
lyc
|
ce274237dc
|
作业修改
|
2024-08-05 16:24:46 +08:00 |
lyc
|
d46d312b37
|
Merge pull request 'login' (#98) from lyc-dev into main
|
2024-08-05 09:49:25 +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 |
朱浩
|
2ef129d5c1
|
Merge pull request '二期:软件名称修改' (#97) from zhuhao_dev into main
Reviewed-on: #97
|
2024-08-02 17:13:44 +08:00 |
朱浩
|
6b8c6c8c7f
|
二期:软件名称修改
|
2024-08-02 17:12:45 +08:00 |
zhengdegang
|
fa5e132c2d
|
Merge pull request 'zdg' (#96) from zdg into main
Reviewed-on: #96
|
2024-08-02 16:09:31 +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
|
34b35d8beb
|
Merge pull request '选择学生checkbox 大小修改' (#95) from lyc-dev into main
|
2024-08-02 15:33:40 +08:00 |
lyc
|
921ce6ecb0
|
选择学生checkbox 大小修改
|
2024-08-02 15:08:36 +08:00 |
lyc
|
1be862a0f2
|
Merge pull request 'lyc-dev' (#94) from lyc-dev into main
|
2024-08-02 14:50:58 +08:00 |
lyc
|
9ef553f8eb
|
作业 冲突
|
2024-08-02 14:49:48 +08:00 |
lyc
|
e53eab0c31
|
作业删除
|
2024-08-02 14:30:27 +08:00 |
朱浩
|
1a51af93f6
|
Merge pull request '二期:样式修改' (#93) from zhuhao_dev into main
Reviewed-on: #93
|
2024-08-02 14:18:51 +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 |
zhengdegang
|
f32dd848cc
|
Merge pull request 'zdg' (#92) from zdg into main
Reviewed-on: #92
|
2024-08-02 09:23:13 +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 |
朱浩
|
43d75f94dd
|
Merge pull request 'zhuhao_dev' (#91) from zhuhao_dev into main
Reviewed-on: #91
|
2024-08-01 17:47:51 +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
|
d46b01cca2
|
Merge pull request 'lyc-dev' (#90) from lyc-dev into main
|
2024-08-01 11:27:38 +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 |
朱浩
|
4248fd4504
|
Merge pull request 'zhuhao_dev' (#89) from zhuhao_dev into main
Reviewed-on: #89
|
2024-07-31 16:47:27 +08:00 |
朱浩
|
241b0d3f24
|
Merge branch 'main' into zhuhao_dev
|
2024-07-31 16:46:58 +08:00 |
朱浩
|
ede8dfd533
|
二期:bug修复
|
2024-07-31 16:46:37 +08:00 |
朱浩
|
8f54d17439
|
Merge pull request 'zhuhao_dev' (#88) from zhuhao_dev into main
Reviewed-on: #88
|
2024-07-31 16:05:53 +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
|
8f3925f57a
|
Merge pull request 'fix:主页页面;' (#87) from yangws into main
Reviewed-on: #87
|
2024-07-31 09:21:38 +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
|
51943f0595
|
Merge pull request 'yangws' (#85) from yangws into main
Reviewed-on: #85
|
2024-07-30 16:12:09 +08:00 |
yangws
|
9edc6d6e2b
|
fix:学生列表高度问题;
|
2024-07-30 16:11:38 +08:00 |
yangws
|
2a9b39f5e9
|
Merge pull request 'fix:修改头像上传;' (#84) from yangws into main
Reviewed-on: #84
|
2024-07-30 16:02:39 +08:00 |
yangws
|
04eca3435e
|
Merge remote-tracking branch 'origin/main' into yangws
|
2024-07-30 16:02:09 +08:00 |
yangws
|
1e79807a4b
|
fix:修改头像上传;
|
2024-07-30 16:02:01 +08:00 |
yangws
|
594f380785
|
Merge pull request 'fix:修改添加班级的问题;' (#83) from yangws into main
Reviewed-on: #83
|
2024-07-30 10:17:26 +08:00 |
yangws
|
817ea8790e
|
fix:修改添加班级的问题;
|
2024-07-30 10:16:46 +08:00 |
zhengdegang
|
b317471e66
|
Merge pull request 'zdg' (#82) from zdg into main
Reviewed-on: #82
|
2024-07-30 10:07:28 +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
|
d5165fa3b0
|
Merge branch 'main' into lyc-dev
|
2024-07-30 09:44:31 +08:00 |
lyc
|
b65cd95558
|
新增打开作业反馈
|
2024-07-30 09:44:09 +08:00 |
lyc
|
d6c302fc04
|
Merge pull request '退出' (#81) from lyc-dev into main
|
2024-07-29 16:06:41 +08:00 |
lyc
|
277a5ec873
|
退出
|
2024-07-29 16:05:52 +08:00 |
lyc
|
77c1ca7d50
|
Merge pull request 'lyc-dev' (#80) from lyc-dev into main
|
2024-07-29 14:13:12 +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 |
lyc
|
1f0b02ea61
|
Merge branch 'main' into lyc-dev
|
2024-07-29 09:22:21 +08:00 |
lyc
|
71a380f9e0
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk
|
2024-07-29 09:22:12 +08:00 |
朱浩
|
f057320625
|
Merge pull request '二期:BUG修复' (#79) from zhuhao_dev into main
Reviewed-on: #79
|
2024-07-27 00:26:44 +08:00 |
朱浩
|
2f4d48a8c0
|
二期:BUG修复
|
2024-07-27 00:25:46 +08:00 |
zhengdegang
|
529197c9dc
|
Merge pull request 'zdg' (#78) from zdg into main
Reviewed-on: #78
|
2024-07-26 22:16:51 +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 |
朱浩
|
3ad5871505
|
Merge pull request 'zhuhao_dev' (#77) from zhuhao_dev into main
Reviewed-on: #77
|
2024-07-26 17:36:49 +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 |
lyc
|
e3016b5aff
|
Merge branch 'main' into lyc-dev
|
2024-07-26 17:24:07 +08:00 |
lyc
|
1da1db8378
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk
|
2024-07-26 17:23:58 +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
|
fb607c6f83
|
Merge pull request 'fix:高度自适应问题;' (#76) from yangws into main
Reviewed-on: #76
|
2024-07-26 16:01:25 +08:00 |
yangws
|
52dfb52161
|
fix:高度自适应问题;
|
2024-07-26 16:00:59 +08:00 |
lyc
|
ef77069329
|
Merge branch 'main' into lyc-dev
|
2024-07-26 15:43:44 +08:00 |
lyc
|
0cfc352c5a
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk
|
2024-07-26 15:43:38 +08:00 |
lyc
|
9fa06cfabb
|
1
|
2024-07-26 15:43:25 +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
|
0d53cabbed
|
Merge pull request 'fix:修改字体颜色;' (#74) from yangws into main
Reviewed-on: #74
|
2024-07-26 15:38:39 +08:00 |
yangws
|
e6a08c857a
|
fix:修改字体颜色;
|
2024-07-26 15:38:13 +08:00 |
yangws
|
4e6e11ac2c
|
Merge pull request 'fix:修改路由以及用户信息的问题;' (#73) from yangws into main
Reviewed-on: #73
|
2024-07-26 15:36:20 +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 |
lyc
|
18be8cc96a
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk
|
2024-07-26 14:42:00 +08:00 |
lyc
|
f6e5511e94
|
ico
|
2024-07-26 14:41:46 +08:00 |
zhangxuelin
|
b3bf366134
|
Merge pull request 'zdg' (#72) from zdg into main
Reviewed-on: #72
|
2024-07-26 14:39:17 +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
|
7b87b5a6e3
|
Merge pull request '配置文件' (#70) from lyc-dev into main
|
2024-07-26 14:15:49 +08:00 |
lyc
|
80ee3c0f11
|
配置文件
|
2024-07-26 14:15:33 +08:00 |
lyc
|
f2ff4ac7d6
|
Merge pull request 'edit' (#69) from lyc-dev into main
|
2024-07-26 14:12:53 +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
|
b85bb9b9cc
|
Merge pull request 'lyc-dev' (#68) from lyc-dev into main
|
2024-07-26 13:28:01 +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
|
e6431c6ac6
|
Merge pull request 'add:班级管理;' (#67) from yangws into main
Reviewed-on: #67
|
2024-07-26 12:11:12 +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
|
03bcade299
|
Merge pull request 'lyc-dev' (#66) from lyc-dev into main
|
2024-07-26 11:06:46 +08:00 |
lyc
|
8c7468ef7f
|
Merge branch 'main' into lyc-dev
|
2024-07-26 11:06:32 +08:00 |
lyc
|
7e3978d532
|
图标
|
2024-07-26 11:06:06 +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
|
01d972f18e
|
Merge pull request '图标' (#65) from lyc-dev into main
|
2024-07-26 10:43:51 +08:00 |
lyc
|
c0c3324d9d
|
图标
|
2024-07-26 10:43:46 +08:00 |
zhangxuelin
|
4e2ac7c92e
|
pdf的展示 翻页 及数据回显
|
2024-07-26 10:26:34 +08:00 |
lyc
|
daaddfaaf2
|
Merge pull request 'lyc-dev' (#64) from lyc-dev into main
|
2024-07-26 09:44:11 +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 |
朱浩
|
415a4c17c1
|
Merge pull request 'zhuhao_dev' (#61) from zhuhao_dev into main
Reviewed-on: #61
|
2024-07-25 09:20:57 +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
|
78e666d6c1
|
Merge pull request 'lyc-dev' (#60) from lyc-dev into main
|
2024-07-25 09:15:03 +08:00 |
lyc
|
580ab2ee5b
|
Merge branch 'main' into lyc-dev
|
2024-07-25 09:14:35 +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
|
75595562db
|
Merge pull request 'lyc-dev' (#59) from lyc-dev into main
|
2024-07-24 15:27:57 +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 |
朱浩
|
d0bf9c0768
|
Merge pull request 'zhuhao_dev' (#58) from zhuhao_dev into main
Reviewed-on: #58
|
2024-07-24 14:49:32 +08:00 |
朱浩
|
eff5688e42
|
Merge branch 'main' into zhuhao_dev
|
2024-07-24 14:48:36 +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 |
朱浩
|
a25be335e6
|
Merge pull request 'zhuhao_dev' (#57) from zhuhao_dev into main
Reviewed-on: #57
|
2024-07-23 16:02:27 +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 |
朱浩
|
7106d75964
|
Merge pull request '二期:自动同步功能开发' (#54) from zhuhao_dev into main
Reviewed-on: #54
|
2024-07-23 14:07:13 +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 |
朱浩
|
5afa31b8c3
|
Merge pull request 'zhuhao_dev' (#53) from zhuhao_dev into main
Reviewed-on: #53
|
2024-07-23 13:45:27 +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
|
c81b74b9de
|
Merge pull request 'lyc-dev' (#52) from lyc-dev into main
|
2024-07-23 10:23:45 +08:00 |
lyc
|
2fbc3e272b
|
Merge branch 'main' into lyc-dev
|
2024-07-23 10:23:34 +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
|
5f05ad8bea
|
Merge pull request '打开新网页窗口' (#51) from lyc-dev into main
|
2024-07-22 16:25:13 +08:00 |
lyc
|
3dc478e724
|
打开新网页窗口
|
2024-07-22 16:24:32 +08:00 |
lyc
|
d72d0ae956
|
Merge pull request '登录窗口/主窗口调整' (#50) from lyc-dev into main
|
2024-07-22 15:11:06 +08:00 |
lyc
|
cefb6ae5a7
|
登录窗口/主窗口调整
|
2024-07-22 15:10:28 +08:00 |
lyc
|
7b09c8ec81
|
Merge pull request 'window-tools' (#49) from lyc-dev into main
|
2024-07-22 11:25:26 +08:00 |
lyc
|
de1e0c5a2e
|
window-tools
|
2024-07-22 11:24:36 +08:00 |
baigl
|
954f43d8b3
|
vscode 行尾爆红eslintrc 关闭
|
2024-07-19 14:31:54 +08:00 |