Commit Graph

1666 Commits

Author SHA1 Message Date
joylink_cuiweidong
1427b42d25 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-02 18:00:08 +08:00
joylink_cuiweidong
6680ea03cf 道岔绘图调整(除了哈尔滨线路外,其余线路反位不显示岔芯 直角梯形D) 2020-09-02 17:59:50 +08:00
zyy
69388e4f91 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-02 17:11:23 +08:00
zyy
efcd46cf37 增加宁波三区段样式,增加目的码表单 2020-09-02 17:11:06 +08:00
joylink_cuiweidong
647897b2c4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-02 14:33:58 +08:00
joylink_cuiweidong
2010edad72 宁波一号线站台设置停站时间操作代码调整 2020-09-02 14:33:41 +08:00
fan
910517e076 剧本调整 2020-09-02 10:59:04 +08:00
fan
5f04b0e25b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-02 10:18:28 +08:00
fan
dda0a719ba 宁波三菜单调整 2020-09-02 10:17:58 +08:00
joylink_cuiweidong
61d9f294d8 哈尔滨线路代码调整 2020-09-02 10:15:50 +08:00
fan
0d026649f3 删除日志 2020-09-02 09:23:27 +08:00
fan
86c1dff4be Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-02 09:17:50 +08:00
fan
ecbb6a964f 接收重置仿真信息时清除活动列车 2020-09-02 09:17:27 +08:00
zyy
c93cff772d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-01 18:09:38 +08:00
zyy
a3489f0942 调整区段显示及优化 2020-09-01 18:09:25 +08:00
fan
a5cbbcb3af Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-01 17:11:24 +08:00
fan
fcd2c41517 成员司机排序&福州新版折返策略教学调整 2020-09-01 17:11:09 +08:00
joylink_cuiweidong
bcc92b6672 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-01 16:45:39 +08:00
joylink_cuiweidong
8a4d98612e 哈尔滨线路实训代码调整 2020-09-01 16:45:23 +08:00
zyy
57cb96eb48 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/newMap/mapsystemNew/common/index.vue
2020-09-01 15:11:59 +08:00
zyy
5590e43bd5 调整代码 2020-09-01 15:10:35 +08:00
joylink_cuiweidong
c76205790a 宁波一号线实训操作代码调整 2020-08-31 15:58:55 +08:00
joylink_cuiweidong
3ff902ee14 区段鼠标事件调整 2020-08-31 13:41:33 +08:00
fan
246568175f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-31 13:28:32 +08:00
fan
c44a081afa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-31 13:27:38 +08:00
fan
8c07cf764a 代码调整 2020-08-31 13:27:27 +08:00
zyy
41fe728af4 调整运行图显示 2020-08-31 13:25:26 +08:00
joylink_cuiweidong
2637b952f3 代码调整 2020-08-31 10:31:36 +08:00
joylink_cuiweidong
b98039d5fd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-31 10:13:39 +08:00
joylink_cuiweidong
8027bc90ae 宁波福州佛山默认不显示道岔区段的名称调整 2020-08-31 10:13:26 +08:00
zyy
778387a0e9 调整扣车流程, 状态 2020-08-31 10:11:02 +08:00
zyy
ae02d527c9 调整福州线路新版操作 2020-08-28 17:47:17 +08:00
zyy
5dcfee72d6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 17:22:26 +08:00
zyy
adb62a3209 增加列车右键操作,调整配置 2020-08-28 17:22:12 +08:00
fan
ba505a899e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 16:58:33 +08:00
fan
a28f7a3975 调度大赛调整 2020-08-28 16:58:17 +08:00
joylink_cuiweidong
d5dabca2c6 代码调整
区段(parentCode)字段处理
2020-08-28 16:52:19 +08:00
joylink_cuiweidong
b4c5a29026 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 14:43:47 +08:00
joylink_cuiweidong
3ffffffe8d 宁波一号线实训调整
剧本编制代码调整
2020-08-28 14:43:30 +08:00
zyy
a5180c306c 调整运行图 2020-08-28 14:29:59 +08:00
fan
4c8e447d59 运行图参数调整 2020-08-28 13:16:14 +08:00
zyy
d991a65517 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 11:31:10 +08:00
zyy
1f8641e3ea 调整运行图 2020-08-28 11:30:55 +08:00
fan
0adf841597 行调大赛调整 2020-08-28 10:59:44 +08:00
fan
3c016a5c4b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 17:21:13 +08:00
fan
deded7ed6e 宁波三号线菜单调整 2020-08-27 16:48:03 +08:00
zyy
ad29ed8890 调整考试系统加载流程 2020-08-27 16:43:37 +08:00
zyy
06699507e4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 13:13:29 +08:00
zyy
8a3287ca22 删除多余代码注释 2020-08-27 13:13:15 +08:00
fan
9dc290a550 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 10:45:54 +08:00