 lyc
|
bb486e2bd2
|
教材切换 edit
|
2024-09-25 11:24:23 +08:00 |
白了个白
|
5089ecce3d
|
作业批改：查询排序更改
|
2024-09-25 11:22:52 +08:00 |
 朱浩
|
b884700a62
|
Merge branch 'main' into zhuhao_dev
|
2024-09-25 11:10:54 +08:00 |
|
朱浩
|
4816a7c5c8
|
#817 V2.0.7 教学实践-开始上课逻辑
|
2024-09-25 11:10:31 +08:00 |
 qinqing
|
443ecf0ecf
|
Merge branch 'main' into qinqing_dev
|
2024-09-25 10:11:36 +08:00 |
|
白了个白
|
d247d22288
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-09-25 10:10:29 +08:00 |
|
白了个白
|
a3084e0546
|
1
|
2024-09-25 10:10:06 +08:00 |
|
白了个白
|
551bd62ae3
|
1
|
2024-09-25 10:09:09 +08:00 |
|
qinqing
|
b7adda1510
|
Merge branch 'main' into qinqing_dev
|
2024-09-25 10:06:57 +08:00 |
|
qinqing
|
a3e6aca890
|
PDF阅读器样式层级更新
|
2024-09-25 10:05:28 +08:00 |
 “zouyf”
|
2a4b0281c2
|
Merge branch 'main' into zouyf_dev
|
2024-09-25 09:51:35 +08:00 |
|
“zouyf”
|
b76a589672
|
增加菁优网样式
|
2024-09-25 09:51:09 +08:00 |
|
lyc
|
7845d0e0a1
|
跳转修改
|
2024-09-25 09:42:58 +08:00 |
|
lyc
|
40089a2cd0
|
Merge branch 'main' into lyc-dev
|
2024-09-24 17:37:03 +08:00 |
|
lyc
|
9329da9ddf
|
章节切换 edit
|
2024-09-24 17:36:43 +08:00 |
|
qinqing
|
f7262effc3
|
Merge pull request 'qinqing_dev' (#263) from qinqing_dev into main
Reviewed-on: #263
|
2024-09-24 17:27:07 +08:00 |
|
qinqing
|
8fd5edf141
|
Merge branch 'main' into qinqing_dev
|
2024-09-24 17:25:36 +08:00 |
|
qinqing
|
ff441c6579
|
Merge branch 'qinqing_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into qinqing_dev
|
2024-09-24 17:23:52 +08:00 |
|
qinqing
|
cf331b9c63
|
课标分析切换教材
|
2024-09-24 17:23:34 +08:00 |
|
白了个白
|
0fc08f647f
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-09-24 16:33:19 +08:00 |
|
白了个白
|
d4a20347db
|
1
|
2024-09-24 16:29:28 +08:00 |
|
白了个白
|
2a95f08bb2
|
作业布置
|
2024-09-24 16:27:49 +08:00 |
|
白了个白
|
a33ff1abea
|
作业批改--orderby导致无数据 bug修复
|
2024-09-24 16:24:31 +08:00 |
|
朱浩
|
d3a3acdedc
|
解决冲突
|
2024-09-24 16:22:41 +08:00 |
|
朱浩
|
1a678afb89
|
Merge branch 'main' into zhuhao_dev
|
2024-09-24 16:21:06 +08:00 |
|
朱浩
|
d46a86e303
|
更名文枢课堂
|
2024-09-24 16:20:06 +08:00 |
|
qinqing
|
65f959c492
|
Merge pull request 'main' (#258) from main into qinqing_dev
Reviewed-on: #258
|
2024-09-24 15:36:42 +08:00 |
|
qinqing
|
4d7b69c8c2
|
课标分析
|
2024-09-24 15:35:36 +08:00 |
小杨
|
c1d6cb7767
|
fix: 解除注释的部分；
|
2024-09-24 13:55:37 +08:00 |
|
白了个白
|
458596547e
|
作业设计-习题训练 添加知识点
|
2024-09-24 13:52:52 +08:00 |
|
朱浩
|
53ce42cc59
|
Merge branch 'main' into zhuhao_dev
|
2024-09-24 11:03:58 +08:00 |
|
朱浩
|
0d71dee801
|
更名文枢课堂
|
2024-09-24 11:03:40 +08:00 |
|
白了个白
|
5f8ea627d0
|
作业设计-课堂展示
|
2024-09-24 11:02:04 +08:00 |
|
白了个白
|
820a4e04f7
|
作业设计-常规作业
|
2024-09-24 10:14:23 +08:00 |
|
白了个白
|
2e2e29808f
|
作业批改-ui样式调整
|
2024-09-24 09:31:14 +08:00 |
|
白了个白
|
f346285528
|
作业设计--常规作业
|
2024-09-23 17:33:35 +08:00 |
zdg
|
20ca8f71d6
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-23 17:27:42 +08:00 |
|
zdg
|
c9292af67b
|
优化-下课和stroe监听相关bug
|
2024-09-23 17:26:44 +08:00 |
|
lyc
|
852b92e1f3
|
首页跳转
|
2024-09-23 17:22:43 +08:00 |
|
qinqing
|
56a44740b6
|
合并代码
|
2024-09-23 17:12:44 +08:00 |
|
qinqing
|
f00fa243c1
|
调用切换课本
|
2024-09-23 17:08:35 +08:00 |
|
qinqing
|
82e02f472b
|
添加课标分析入口
|
2024-09-23 17:08:02 +08:00 |
|
qinqing
|
3e532c1afd
|
隐藏工具栏
|
2024-09-23 17:07:06 +08:00 |
|
lyc
|
713a592bcf
|
跳转修改
|
2024-09-23 16:49:48 +08:00 |
|
白了个白
|
54a24ed077
|
作业设计：框架梳理
|
2024-09-23 15:33:00 +08:00 |
|
lyc
|
3dc36cbc34
|
Merge pull request '生成图片地址修改' (#254) from lyc-dev into main
|
2024-09-23 13:01:46 +08:00 |
|
lyc
|
781829373a
|
生成图片地址修改
|
2024-09-23 13:01:13 +08:00 |
|
朱浩
|
1be00156a8
|
去除console
|
2024-09-23 11:07:59 +08:00 |
|
朱浩
|
dafe13a1a7
|
Merge branch 'main' into zhuhao_dev
|
2024-09-23 11:07:47 +08:00 |
|
zdg
|
7145658d13
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-23 11:05:20 +08:00 |
|
zdg
|
372371e2f0
|
解决下课异常
|
2024-09-23 11:05:14 +08:00 |
|
lyc
|
2f49d42418
|
推出 提示正在上课
|
2024-09-23 10:38:21 +08:00 |
|
朱浩
|
3b4f463883
|
BUG修复
|
2024-09-23 10:31:47 +08:00 |
|
zdg
|
a05cf19e74
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
|
2024-09-23 10:14:31 +08:00 |
|
白了个白
|
6b24749db9
|
作业设计：习题训练添加
|
2024-09-23 10:04:40 +08:00 |
|
朱浩
|
9a5581cea3
|
Merge branch 'main' into zhuhao_dev
|
2024-09-23 10:01:45 +08:00 |
|
lyc
|
60e31f4b43
|
edit
|
2024-09-23 09:58:47 +08:00 |
|
白了个白
|
e59071c16b
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl
|
2024-09-23 09:21:13 +08:00 |
|
白了个白
|
e70d6b0539
|
unitid 保存
|
2024-09-23 09:15:39 +08:00 |
|
白了个白
|
96098c899f
|
作业设计
|
2024-09-23 09:14:13 +08:00 |
|
朱浩
|
6b9949dfae
|
BUG修复
|
2024-09-22 16:55:00 +08:00 |
|
朱浩
|
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
|
cafea2d719
|
跳转增加bookid
|
2024-09-22 16:41:49 +08:00 |
 yangws
|
d5afede36c
|
fix:2.0.4bug修改;
|
2024-09-22 16:28:10 +08:00 |
|
朱浩
|
79b9a0726a
|
打包联通文枢课堂
|
2024-09-22 14:27:48 +08:00 |
|
朱浩
|
274c80ad0a
|
Merge branch 'main' into zhuhao_dev
|
2024-09-22 14:02:02 +08:00 |
|
yangws
|
a64ba24742
|
fix:2.0.4bug修改;
|
2024-09-22 12:51:58 +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
|
71f7e4e5a1
|
注册账号-班级修改为可选
|
2024-09-22 10:38:31 +08:00 |
|
zdg
|
6935bec1e4
|
测试
|
2024-09-21 12:05:46 +08:00 |
|
qinqing
|
2532dc5fc2
|
解决冲突
|
2024-09-20 16:58:25 +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 |
|
qinqing
|
f67380b2c9
|
PDF插件
|
2024-09-20 16:52:59 +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 |
|
朱浩
|
ac599a2c39
|
BUG修复
|
2024-09-20 15:29:21 +08:00 |
|
lyc
|
00871797bf
|
edit
|
2024-09-20 15:24:23 +08:00 |
|
lyc
|
f9a87143aa
|
edit
|
2024-09-20 15:19:33 +08:00 |
|
zdg
|
c93eeeb308
|
修复异常
|
2024-09-20 15:16:34 +08:00 |
|
zdg
|
ca57e72e9c
|
解决 值为null问题
|
2024-09-20 15:04:14 +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
|
c6477d5ca9
|
edit
|
2024-09-20 14:34:22 +08:00 |
|
lyc
|
27ec047981
|
edit 教材选择
|
2024-09-20 14:30:36 +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 |
|
朱浩
|
2531c25d7c
|
BUG修复
|
2024-09-20 09:21:31 +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 |
|
白了个白
|
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 |
|
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 |
|
白了个白
|
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 |
|
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 |
|
白了个白
|
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 |
|
白了个白
|
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 |
|
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
|
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
|
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 |
|
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 |
|
朱浩
|
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
|
b279d36c89
|
edit
|
2024-09-14 15:12:36 +08:00 |
|
lyc
|
8013b1c2cc
|
edit
|
2024-09-14 14:59:35 +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
|
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
|
8063783284
|
作业查询
|
2024-09-13 17:19:17 +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
|
1afaed082a
|
fix: 解决资源库报错的问题;
|
2024-09-12 16:52:47 +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”
|
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 |
|
yangws
|
6a33ea8023
|
fix: 提示教材没有时选择教材;
|
2024-09-12 09:47:46 +08:00 |
|
朱浩
|
bc0579fa32
|
排序问题处理
|
2024-09-12 09:47:35 +08:00 |
|
yangws
|
3fdf500366
|
fix: 样式修改，以及第三方资源名称不对应的情况;
|
2024-09-12 09:30:44 +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
|
6c60cd4442
|
fix:解决个人中心班级限制问题；
|
2024-09-11 14:42:48 +08:00 |
|
白了个白
|
d7761883f2
|
作业批阅：新增空列表展示与loading加载效果
|
2024-09-11 14:22:05 +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
|
08075746c0
|
fix:样式问题;
|
2024-09-11 09:48:27 +08:00 |
|
yangws
|
68df866db5
|
fix:修改添加的班级;
|
2024-09-10 17:55:48 +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
|
e2017c3553
|
冲突-file-preview
|
2024-09-10 17:09:50 +08:00 |
|
lyc
|
0be3d131e2
|
聊天机器人
|
2024-09-10 17:07:00 +08:00 |
|
yangws
|
076a510109
|
add:新增加入班级;
|
2024-09-10 16:49:11 +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 |
|
朱浩
|
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 |
|
白了个白
|
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 |
|
朱浩
|
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 |
|
白了个白
|
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”
|
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 |