zyy
|
b7d4eb7bda
|
调整区段绘图元素层级，调整字段显示
|
2020-05-27 10:36:40 +08:00 |
|
fan
|
accfc78a65
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 10:33:51 +08:00 |
|
fan
|
d492634c98
|
生成试题理论调整
|
2020-05-27 10:33:26 +08:00 |
|
joylink_cuiweidong
|
9051a15605
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 09:57:21 +08:00 |
|
joylink_cuiweidong
|
5beb834384
|
竞赛系统 实操试题删除修改代码调整
|
2020-05-27 09:56:59 +08:00 |
|
zyy
|
e9f35e6804
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 09:09:49 +08:00 |
|
zyy
|
0a54a5988e
|
调整理论列表
|
2020-05-27 09:09:29 +08:00 |
|
fan
|
1aeb7e0d33
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 18:44:24 +08:00 |
|
fan
|
8e2537a9d0
|
生成试题调整
|
2020-05-26 18:43:59 +08:00 |
|
zyy
|
ee16508b02
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 18:30:43 +08:00 |
|
zyy
|
94dddea3bd
|
调整字段显示
|
2020-05-26 18:30:17 +08:00 |
|
joylink_cuiweidong
|
0ada88bafc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 18:28:34 +08:00 |
|
joylink_cuiweidong
|
f91a46552b
|
实操列表添加修改代码调整
|
2020-05-26 18:28:18 +08:00 |
|
zyy
|
438ccb2404
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 18:12:57 +08:00 |
|
zyy
|
92b144ddeb
|
调整理论考试接口调整，字段
|
2020-05-26 18:12:42 +08:00 |
|
joylink_cuiweidong
|
4fb37b3c7b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 17:56:17 +08:00 |
|
joylink_cuiweidong
|
d8cfcbd595
|
添加实操列表页面和实操创建页面
|
2020-05-26 17:55:11 +08:00 |
|
fan
|
eea3557635
|
生成试题调整
|
2020-05-26 17:35:55 +08:00 |
|
fan
|
31a82432d1
|
生成试题
|
2020-05-26 17:33:19 +08:00 |
|
fan
|
cb9f67eb7c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 16:17:34 +08:00 |
|
fan
|
7587475f38
|
调整列车操作&调整列车在人工车和头码车下的详情显示
|
2020-05-26 16:17:16 +08:00 |
|
zyy
|
6354b60a58
|
调整字段
|
2020-05-26 16:01:41 +08:00 |
|
zyy
|
04ed45e498
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 15:59:23 +08:00 |
|
zyy
|
d161492fed
|
添加题库管理流程
|
2020-05-26 15:59:11 +08:00 |
|
joylink_cuiweidong
|
2336fe7fbe
|
代码调整
|
2020-05-26 13:33:12 +08:00 |
|
joylink_cuiweidong
|
187024b5b7
|
代码调整
|
2020-05-26 13:10:29 +08:00 |
|
joylink_cuiweidong
|
6886ea3190
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 13:04:21 +08:00 |
|
joylink_cuiweidong
|
a354264097
|
竞赛代码调整
|
2020-05-26 13:03:37 +08:00 |
|
zyy
|
b413c2f0f2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 12:12:13 +08:00 |
|
zyy
|
83343d54b8
|
调整竞赛系统逻辑
|
2020-05-26 12:11:59 +08:00 |
|
fan
|
678581f079
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 11:10:49 +08:00 |
|
fan
|
ae9cce3557
|
LCD屏控制
|
2020-05-26 11:10:37 +08:00 |
|
zyy
|
7382a0d1e2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 10:30:22 +08:00 |
|
zyy
|
c1cead3475
|
调整报名系统报名提示
|
2020-05-26 10:30:11 +08:00 |
|
joylink_cuiweidong
|
630b2b16d1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 10:19:13 +08:00 |
|
joylink_cuiweidong
|
681e67468f
|
竞赛代码调整
|
2020-05-26 10:18:54 +08:00 |
|
zyy
|
66ad222321
|
删除注释
|
2020-05-26 09:51:24 +08:00 |
|
zyy
|
fde7e609c6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 09:43:23 +08:00 |
|
zyy
|
d10fccb624
|
调整竞赛流程
|
2020-05-26 09:43:09 +08:00 |
|
fan
|
ff5f0d61cb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 09:21:59 +08:00 |
|
fan
|
f27c766b9b
|
列车调整
|
2020-05-26 09:21:48 +08:00 |
|
joylink_cuiweidong
|
c667b7f980
|
竞赛代码调整
|
2020-05-25 18:50:38 +08:00 |
|
joylink_cuiweidong
|
0967316106
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/displayNew/chatView/chatBox.vue
|
2020-05-25 18:34:30 +08:00 |
|
joylink_cuiweidong
|
83192e2bd5
|
代码调整
|
2020-05-25 18:33:36 +08:00 |
|
joylink_cuiweidong
|
1db4c0e193
|
竞赛代码调整
|
2020-05-25 18:32:59 +08:00 |
|
zyy
|
dc33306c96
|
调整参赛人员路由判断
|
2020-05-25 18:26:05 +08:00 |
|
zyy
|
ef9dc7c25e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/xian_01/menus/menuTrain.vue
|
2020-05-25 17:58:11 +08:00 |
|
zyy
|
f329e30049
|
调整西安一三 号线路 右键操作
|
2020-05-25 17:57:24 +08:00 |
|
fan
|
b5b228b1a0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 17:08:07 +08:00 |
|
fan
|
fe45d9b1ac
|
添加扣车跳停命令提示换行符
|
2020-05-25 17:07:58 +08:00 |
|