joylink_cuiweidong
|
ffe7214c11
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-09 15:58:16 +08:00 |
|
joylink_cuiweidong
|
ae948f80cc
|
删除多余的 运行图编制文件
|
2021-03-09 15:57:59 +08:00 |
|
fan
|
b2bb43b47f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-09 15:47:15 +08:00 |
|
fan
|
c9f656c4a7
|
西安一实训调整
|
2021-03-09 15:46:54 +08:00 |
|
joylink_cuiweidong
|
0e99302cf3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-09 15:41:35 +08:00 |
|
joylink_cuiweidong
|
cb8e07863e
|
运行图代码调整
|
2021-03-09 15:41:05 +08:00 |
|
ival
|
c28be4acd7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-09 14:57:24 +08:00 |
|
ival
|
605280e7d5
|
1.宁波3号线 操作修正
2.运行图编辑修改数据计算错误的问题
|
2021-03-09 14:57:14 +08:00 |
|
joylink_cuiweidong
|
f89d557393
|
运行图代码调整
|
2021-03-09 14:55:03 +08:00 |
|
joylink_cuiweidong
|
b3af1646dd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-09 14:46:07 +08:00 |
|
joylink_cuiweidong
|
d4aa841077
|
运行图代码调整
|
2021-03-09 14:45:50 +08:00 |
|
fan
|
f2a7955bf3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-09 14:44:16 +08:00 |
|
fan
|
fd49034b57
|
南京十一站调整&添加线路配置switchTurnOperationCanRecoverSplitFault
|
2021-03-09 14:43:40 +08:00 |
|
joylink_cuiweidong
|
0ec4a64f5d
|
运行图编制 代码调整
|
2021-03-09 14:30:45 +08:00 |
|
joylink_cuiweidong
|
2afd703938
|
代码调整
|
2021-03-09 11:04:40 +08:00 |
|
joylink_cuiweidong
|
5352671383
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/planMonitor/editTool/menus/addTask.vue
|
2021-03-09 10:34:16 +08:00 |
|
joylink_cuiweidong
|
2a74ff0c48
|
运行图编制代码调整
|
2021-03-09 10:31:56 +08:00 |
|
ival
|
b1552ccba5
|
Merge remote-tracking branch 'remotes/origin/test-tj' into test
# Conflicts:
# src/jmapNew/theme/ningbo_03/menus/menuBar.vue
# src/jmapNew/theme/ningbo_03/menus/menuDialog/signalCanBlock.vue
# src/jmapNew/theme/ningbo_03/menus/menuDialog/signalGuide.vue
|
2021-03-09 10:17:25 +08:00 |
|
ival
|
8febc0c1d1
|
线路：宁波3
问题：操作方式调整
|
2021-03-09 10:14:16 +08:00 |
|
ival
|
a62248d4a6
|
优化运行图代码，防止报错
|
2021-03-09 10:03:21 +08:00 |
|
ival
|
1a1fbbfd69
|
优化运行图计算
|
2021-03-09 09:33:05 +08:00 |
|
ival
|
d993771f72
|
线路：南京2
问题：修改岔区设限报错问题，以及点击设置store值得优化
|
2021-03-09 09:24:08 +08:00 |
|
ival
|
1e881ad0db
|
线路：南京2
问题：修改岔区设限报错问题，以及点击设置store值得优化
|
2021-03-09 09:20:25 +08:00 |
|
fan
|
ee6d3b41b1
|
实训调整
|
2021-03-08 18:03:33 +08:00 |
|
fan
|
48e26565df
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-08 16:20:42 +08:00 |
|
fan
|
a6d81b5e3a
|
实训调整&ibp图片更换
|
2021-03-08 16:20:29 +08:00 |
|
joylink_cuiweidong
|
c39350daf3
|
运行图 代码调整
|
2021-03-08 15:20:47 +08:00 |
|
joylink_cuiweidong
|
142168fd14
|
宁波三号线 信号机操作代码调整
|
2021-03-08 13:49:14 +08:00 |
|
joylink_cuiweidong
|
03cab67c62
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-08 13:13:30 +08:00 |
|
joylink_cuiweidong
|
58c9ac7df7
|
宁波三号线 信号机 引导 操作代码调整
|
2021-03-08 13:13:06 +08:00 |
|
ival
|
12b804e110
|
Merge remote-tracking branch 'remotes/origin/test-tj' into test
|
2021-03-08 13:05:11 +08:00 |
|
ival
|
c8296f27db
|
同步代码
|
2021-03-08 13:04:39 +08:00 |
|
ival
|
886bec7aea
|
问题：运行图设置折返例行取值错误的问题
|
2021-03-08 11:30:46 +08:00 |
|
fan
|
2a977c8b43
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-08 10:12:21 +08:00 |
|
fan
|
5614d90776
|
添加线路配置配置generateDestination: '是否生成目的地码定义（泰雷兹）'
|
2021-03-08 10:12:01 +08:00 |
|
ival
|
788ddfc228
|
线路：通用menuBar
问题：点击空白关闭多级菜单时，所有层级都关闭。
|
2021-03-08 09:42:02 +08:00 |
|
ival
|
faaded9b1e
|
线路：通用menuBar
问题：点击空白关闭多级菜单时，所有层级都关闭。
|
2021-03-08 09:41:07 +08:00 |
|
ival
|
c4af252a3e
|
线路：福州
问题：修改福州信号关灯操作中，没有关闭一次弹窗的问题
|
2021-03-08 09:27:02 +08:00 |
|
ival
|
46d139e8a5
|
Merge branch 'test-tj' of https://git.code.tencent.com/lian-cbtc/jl-client into test-tj
|
2021-03-08 09:17:30 +08:00 |
|
ival
|
11df0526b0
|
线路：福州
问题：修改福州信号关灯操作中，没有关闭一次弹窗的问题
|
2021-03-08 09:17:18 +08:00 |
|
joylink_cuiweidong
|
c841a6457c
|
宁波三号线 代码调整
|
2021-03-05 18:03:16 +08:00 |
|
joylink_cuiweidong
|
4e133ff643
|
Merge branch 'test-tj' of https://git.code.tencent.com/lian-cbtc/jl-client into test-tj
# Conflicts:
# src/views/planMonitor/newEditTool/menus/modifyingStationIntervalTime.vue
|
2021-03-05 17:56:54 +08:00 |
|
ival
|
d5c29af3fb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-05 17:54:34 +08:00 |
|
ival
|
4ca2403d36
|
问题：修改弹窗问题
|
2021-03-05 17:53:19 +08:00 |
|
joylink_cuiweidong
|
43c8c577ae
|
代码调整
|
2021-03-05 17:50:22 +08:00 |
|
ival
|
07eaf3d8d4
|
问题：修改弹窗问题
|
2021-03-05 17:47:30 +08:00 |
|
fan
|
ae20d55493
|
成都名称调整
|
2021-03-05 17:44:32 +08:00 |
|
ival
|
a565e1f204
|
修改编辑运行图路基问题
|
2021-03-05 16:44:32 +08:00 |
|
ival
|
b9014f4118
|
问题：运行图到站停站数据计算
|
2021-03-05 16:07:51 +08:00 |
|
ival
|
f3532e980d
|
Merge branch 'test-tj' of https://git.code.tencent.com/lian-cbtc/jl-client into test-tj
|
2021-03-05 15:39:17 +08:00 |
|