zyy
|
29f027077d
|
调整考试结果页面接口对接
|
2020-05-29 17:49:26 +08:00 |
|
zyy
|
243a5763bc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 16:55:53 +08:00 |
|
zyy
|
16ebf3e013
|
调整竞赛结果流程，列车放大流程
|
2020-05-29 16:55:25 +08:00 |
|
joylink_cuiweidong
|
6fe1a0c22b
|
新版地图绘图 高级数据交路代码调整
|
2020-05-29 16:23:38 +08:00 |
|
joylink_cuiweidong
|
2fd42c22f9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 14:05:03 +08:00 |
|
joylink_cuiweidong
|
7449b6b2a3
|
综合演练 仿真聊天代码调整
|
2020-05-29 14:03:43 +08:00 |
|
fan
|
e0b5f1d249
|
提示调整
|
2020-05-29 13:02:44 +08:00 |
|
fan
|
2abe815c87
|
理论考试缓存调整
|
2020-05-29 11:18:44 +08:00 |
|
fan
|
f21751fcd3
|
哈尔滨title调整&理论考试缓存调整
|
2020-05-29 11:08:38 +08:00 |
|
fan
|
e5467af549
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 09:20:10 +08:00 |
|
fan
|
97f2b84741
|
调整小交路颜色
|
2020-05-29 09:19:59 +08:00 |
|
joylink_cuiweidong
|
edcefeab07
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 09:17:16 +08:00 |
|
joylink_cuiweidong
|
8c99f4a3ce
|
西安一/三号线的侧边栏 代码调整
|
2020-05-29 09:16:35 +08:00 |
|
zyy
|
3aeb6f85bd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 18:48:50 +08:00 |
|
zyy
|
88be776582
|
调整样式
|
2020-05-28 18:48:28 +08:00 |
|
joylink_cuiweidong
|
cf6dadf46b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 18:39:11 +08:00 |
|
joylink_cuiweidong
|
65569da4cd
|
西安一/三号线的侧边栏 代码调整
|
2020-05-28 18:38:49 +08:00 |
|
zyy
|
79e76bbfb1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 18:34:47 +08:00 |
|
zyy
|
e63a299a77
|
校验裁判打分最大分值
|
2020-05-28 18:34:34 +08:00 |
|
fan
|
2a1ce3543f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 18:29:03 +08:00 |
|
fan
|
fffd6f0be7
|
调整运行图加载lineCode获取
|
2020-05-28 18:28:46 +08:00 |
|
zyy
|
474dcc2d74
|
新增车站字段
|
2020-05-28 18:17:15 +08:00 |
|
zyy
|
f1a66f8f73
|
调整站台轨关联站台也会修改
|
2020-05-28 18:08:20 +08:00 |
|
fan
|
5e97623b06
|
逻辑区段始终点偏移量设置调整
|
2020-05-28 17:47:52 +08:00 |
|
zyy
|
84afa25fe3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 17:09:51 +08:00 |
|
zyy
|
e569702907
|
增加裁判平台修改分数
|
2020-05-28 17:09:22 +08:00 |
|
fan
|
601aed6f5b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 16:41:04 +08:00 |
|
fan
|
80d016a2b5
|
公共菜单调整
|
2020-05-28 16:40:52 +08:00 |
|
joylink_cuiweidong
|
8822e8b3c7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/jsxt/competition/theory/quiz/index.vue
|
2020-05-28 15:31:11 +08:00 |
|
joylink_cuiweidong
|
c502d755f9
|
竞赛平台代码调整
|
2020-05-28 15:28:18 +08:00 |
|
fan
|
76ba1caf8a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 15:04:07 +08:00 |
|
fan
|
c300fe2f5f
|
理论考试倒计时
|
2020-05-28 15:03:58 +08:00 |
|
zyy
|
6ae66333e4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 15:02:53 +08:00 |
|
zyy
|
a76261e018
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 15:02:30 +08:00 |
|
zyy
|
55f57e2135
|
调整保存字段
|
2020-05-28 15:02:15 +08:00 |
|
joylink_cuiweidong
|
652e9aa5d7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 14:51:24 +08:00 |
|
joylink_cuiweidong
|
eda29adf11
|
竞赛代码调整
|
2020-05-28 14:50:57 +08:00 |
|
zyy
|
6eefedb434
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 14:39:21 +08:00 |
|
zyy
|
df4dc3eea9
|
调整供电线路保存，福州皮肤配置文件调整
|
2020-05-28 14:39:06 +08:00 |
|
sunzhenyu
|
bfe172ff30
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 13:39:50 +08:00 |
|
sunzhenyu
|
fe5bfa50e0
|
三维cctv修改
|
2020-05-28 13:39:41 +08:00 |
|
sunzhenyu
|
1fa3e7f6d8
|
修改三维仿真通信中初始化信息修改后调用
|
2020-05-28 13:33:39 +08:00 |
|
joylink_cuiweidong
|
0939eecf59
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 13:22:20 +08:00 |
|
joylink_cuiweidong
|
27981666b1
|
仿真聊天代码调整
|
2020-05-28 13:21:51 +08:00 |
|
fan
|
e5d4a31dce
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 11:28:06 +08:00 |
|
fan
|
d301e9d9f4
|
整理公共菜单
|
2020-05-28 11:27:53 +08:00 |
|
joylink_cuiweidong
|
062cdc69dd
|
综合演练聊天代码调整
|
2020-05-28 10:35:16 +08:00 |
|
joylink_cuiweidong
|
a302ab24c1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 10:16:33 +08:00 |
|
joylink_cuiweidong
|
a471120ea0
|
综合演练 聊天代码调整
|
2020-05-28 10:16:13 +08:00 |
|
fan
|
e846a7d272
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 09:54:58 +08:00 |
|