joylink_cuiweidong
|
6ca7474eb1
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
# Conflicts:
# src/views/organization/trainingDesign/index.vue
|
2022-10-27 10:00:06 +08:00 |
|
joylink_cuiweidong
|
b63159ff08
|
代码调整
|
2022-10-27 09:58:53 +08:00 |
|
fan
|
d2050dacd8
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-27 09:48:51 +08:00 |
|
fan
|
4a6fe5bc87
|
发布内容管理调整
|
2022-10-27 09:48:25 +08:00 |
|
dong
|
18c07ff9a2
|
代码调整
|
2022-10-27 09:13:01 +08:00 |
|
joylink_cuiweidong
|
1381bd8a9c
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-26 18:17:36 +08:00 |
|
joylink_cuiweidong
|
75f7165750
|
实训管理代码调整
|
2022-10-26 18:16:54 +08:00 |
|
dong
|
a163ba51db
|
代码调整
|
2022-10-26 17:25:48 +08:00 |
|
dong
|
48fe57cde1
|
代码调整
|
2022-10-26 17:08:09 +08:00 |
|
dong
|
df9e1f4132
|
权限分发和用户权限管理
|
2022-10-26 15:31:55 +08:00 |
|
dong
|
0936e40deb
|
代码调整
|
2022-10-26 14:48:10 +08:00 |
|
Yuan
|
157e1ed45b
|
考试管理 题目数量校验
|
2022-10-26 11:25:40 +08:00 |
|
Yuan
|
491b28125b
|
考试管理 题目数量校验
|
2022-10-26 09:39:00 +08:00 |
|
fan
|
9e4576d30c
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-25 18:02:42 +08:00 |
|
fan
|
c8d71db508
|
代码调整
|
2022-10-25 18:02:23 +08:00 |
|
joylink_cuiweidong
|
7dee28ea8e
|
代码调整
|
2022-10-25 17:23:44 +08:00 |
|
joylink_cuiweidong
|
e308f3acb8
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-25 15:18:38 +08:00 |
|
joylink_cuiweidong
|
21b526bce0
|
代码调整
|
2022-10-25 15:18:22 +08:00 |
|
dong
|
f4a53f6404
|
代码调整
|
2022-10-25 11:01:28 +08:00 |
|
fan
|
205fce9512
|
代码调整
|
2022-10-25 10:45:23 +08:00 |
|
joylink_cuiweidong
|
6d20dcb132
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-24 18:21:16 +08:00 |
|
joylink_cuiweidong
|
1475848fea
|
综合演练代码调整
|
2022-10-24 18:20:45 +08:00 |
|
Yuan
|
d4538b441d
|
Merge branch 'test_dispaly' of git.code.tencent.com:lian-cbtc/jl-client into test_dispaly
|
2022-10-24 18:13:47 +08:00 |
|
Yuan
|
90a1c03bd4
|
考试面板样式修改
|
2022-10-24 18:13:43 +08:00 |
|
fan
|
67492c4e90
|
代码调整
|
2022-10-24 17:34:14 +08:00 |
|
fan
|
20354a0389
|
语音指令识别错误提示
|
2022-10-24 16:44:15 +08:00 |
|
fan
|
cb61f11753
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-24 16:41:53 +08:00 |
|
fan
|
18f1c6231b
|
大铁菜单调整
|
2022-10-24 16:41:38 +08:00 |
|
joylink_cuiweidong
|
1d565398e9
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-24 16:21:52 +08:00 |
|
joylink_cuiweidong
|
63c362635a
|
代码调整
|
2022-10-24 16:21:38 +08:00 |
|
Yuan
|
4e0635b7ad
|
考试-理论
|
2022-10-24 15:31:54 +08:00 |
|
Yuan
|
8976cfd474
|
Merge branch 'test_dispaly' of git.code.tencent.com:lian-cbtc/jl-client into test_dispaly
|
2022-10-24 13:47:44 +08:00 |
|
Yuan
|
a11c8d8829
|
理论考试提交
|
2022-10-24 13:47:36 +08:00 |
|
dong
|
9cd804e2b7
|
代码调整
|
2022-10-24 13:24:40 +08:00 |
|
Yuan
|
0fe83a4f31
|
考试-理论
|
2022-10-24 13:16:01 +08:00 |
|
Yuan
|
44fcdee7cf
|
WIP:考试面板
|
2022-10-24 13:12:14 +08:00 |
|
joylink_cuiweidong
|
b1b00fd57b
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-24 10:42:52 +08:00 |
|
joylink_cuiweidong
|
2e492ad27f
|
CCTV去掉删除按钮
|
2022-10-24 10:41:36 +08:00 |
|
fan
|
32409d4baf
|
代码调整
|
2022-10-24 10:03:46 +08:00 |
|
fan
|
bcca6e1db0
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-21 18:03:45 +08:00 |
|
fan
|
fb0d06a491
|
代码调整
|
2022-10-21 18:03:36 +08:00 |
|
joylink_cuiweidong
|
bc48d4c82e
|
代码调整
|
2022-10-21 16:53:24 +08:00 |
|
joylink_cuiweidong
|
16beaf8f94
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
# Conflicts:
# src/views/newMap/display/terminals/index.vue
# src/views/newMap/display/terminals/terminalMenu.vue
|
2022-10-21 16:49:14 +08:00 |
|
joylink_cuiweidong
|
42dc17d87e
|
大客流视图代码调整
|
2022-10-21 16:46:35 +08:00 |
|
fan
|
afa5a9aeab
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
Conflicts:
src/views/newMap/display/terminals/index.vue
src/views/newMap/display/terminals/terminalMenu.vue
|
2022-10-21 16:12:55 +08:00 |
|
fan
|
354192e953
|
代码调整
|
2022-10-21 16:10:05 +08:00 |
|
joylink_cuiweidong
|
363cd1fda9
|
Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly
|
2022-10-21 15:52:37 +08:00 |
|
joylink_cuiweidong
|
baf089d889
|
大客流策略客户端 代码调整
|
2022-10-21 15:52:20 +08:00 |
|
dong
|
a97d34d3f3
|
功能管理和权限管理调整
|
2022-10-21 15:21:15 +08:00 |
|
joylink_cuiweidong
|
583830d573
|
修改三维图片和数据的地址
|
2022-10-21 14:15:58 +08:00 |
|