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 |
|
joylink_cuiweidong
|
8aefb3ff6c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 16:56:19 +08:00 |
|
joylink_cuiweidong
|
663f25cddc
|
竞赛代码调整
|
2020-05-25 16:56:00 +08:00 |
|
fan
|
d30a6fe111
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 16:53:10 +08:00 |
|
fan
|
3ec64f3794
|
列车菜单调整
|
2020-05-25 16:52:54 +08:00 |
|
joylink_cuiweidong
|
9f1c594a4f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 16:45:19 +08:00 |
|
joylink_cuiweidong
|
ab8ea51140
|
代码调整
|
2020-05-25 16:44:26 +08:00 |
|
zyy
|
e0c6f6a12a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 16:38:15 +08:00 |
|
zyy
|
f06419e963
|
调整裁判平台进入仿真操作
|
2020-05-25 16:38:03 +08:00 |
|
joylink_cuiweidong
|
3bd5572e58
|
裁判系统代码调整
|
2020-05-25 16:29:13 +08:00 |
|
joylink_cuiweidong
|
0f21696e19
|
裁判平台代码调整
|
2020-05-25 16:15:15 +08:00 |
|
joylink_cuiweidong
|
8a104a09f6
|
代码调整
|
2020-05-25 15:45:51 +08:00 |
|
joylink_cuiweidong
|
40d7d960cf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 15:43:58 +08:00 |
|
joylink_cuiweidong
|
3d10668abf
|
竞赛系统代码调整
|
2020-05-25 15:43:36 +08:00 |
|
zyy
|
fb6ba36680
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 15:06:47 +08:00 |
|
zyy
|
1ae2793221
|
调整绘图界面字体皮肤配置
|
2020-05-25 15:06:34 +08:00 |
|
joylink_cuiweidong
|
b67adf1afb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 14:56:02 +08:00 |
|
joylink_cuiweidong
|
992892ee6b
|
竞赛代码调整
|
2020-05-25 14:55:42 +08:00 |
|
fan
|
76a329d9af
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 14:06:26 +08:00 |
|
fan
|
8621198acf
|
调整信号机菜单显示&修改列车识别号调整
|
2020-05-25 14:06:16 +08:00 |
|
joylink_cuiweidong
|
0f863cffe1
|
竞赛系统代码调整
|
2020-05-25 13:49:44 +08:00 |
|
joylink_cuiweidong
|
af46cd3ff9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 13:49:14 +08:00 |
|
zyy
|
9d7e4f928f
|
调整竞赛系统进入仿真界面流程
|
2020-05-25 13:48:43 +08:00 |
|
joylink_cuiweidong
|
bf1b2801bc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 13:41:42 +08:00 |
|
joylink_cuiweidong
|
3b0d842b97
|
竞赛代码调整
|
2020-05-25 13:40:25 +08:00 |
|
fan
|
30e92a0f35
|
西安一三号线更新运行图预览不显示方向code
|
2020-05-25 11:26:42 +08:00 |
|
fan
|
e4dec85a72
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 11:00:24 +08:00 |
|
fan
|
c74eaaaab6
|
人工车头码车显示调整
|
2020-05-25 11:00:10 +08:00 |
|
zyy
|
a2e0522a30
|
调整判断状态
|
2020-05-25 10:53:01 +08:00 |
|
zyy
|
04f41456d9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/jsxt/competition/examDetail.vue
# src/views/jsxt/refereeList/index.vue
|
2020-05-25 10:47:20 +08:00 |
|
zyy
|
cf8e39f765
|
调整流程
|
2020-05-25 10:45:56 +08:00 |
|
joylink_cuiweidong
|
d41f874bdc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/api/competition.js
# src/views/jsxt/refereeList/index.vue
|
2020-05-25 10:36:21 +08:00 |
|
fan
|
6012a5ce5c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 10:32:27 +08:00 |
|
fan
|
58118ba06a
|
西安一三日期显示调整
|
2020-05-25 10:32:14 +08:00 |
|
joylink_cuiweidong
|
24ed5f502d
|
竞赛代码调整
|
2020-05-25 10:31:32 +08:00 |
|
zyy
|
15643b0d05
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 10:29:14 +08:00 |
|
zyy
|
f90514777a
|
调整竞赛系统登录流程，调整接口字段
|
2020-05-25 10:29:03 +08:00 |
|
joylink_cuiweidong
|
6cf41569c4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 09:52:42 +08:00 |
|
joylink_cuiweidong
|
46e6dec30e
|
竞赛系统代码调整
|
2020-05-25 09:52:23 +08:00 |
|
zyy
|
f60d72aaf8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 09:40:27 +08:00 |
|
zyy
|
aa6d821fed
|
调整裁判平台人员列表字段
|
2020-05-25 09:40:14 +08:00 |
|
joylink_cuiweidong
|
b74b070367
|
竞赛系统代码调整
|
2020-05-25 09:29:34 +08:00 |
|
program-walker
|
cf6f018929
|
Merge remote-tracking branch 'origin/test'
|
2020-05-23 17:26:16 +08:00 |
|