joylink_cuiweidong
|
c986e22d53
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/ningbo_03/menus/menuBar.vue
|
2021-03-10 16:50:43 +08:00 |
|
ival
|
9991bf605d
|
增加确实窗口
|
2021-03-10 16:48:57 +08:00 |
|
joylink_cuiweidong
|
e8c7fbdfff
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/ningbo_03/menus/menuBar.vue
# src/jmapNew/theme/ningbo_03/menus/menuDialog/signalCanBlock.vue
|
2021-03-10 16:48:26 +08:00 |
|
joylink_cuiweidong
|
96eef9053e
|
宁波三号线 菜单操作 代码调整
|
2021-03-10 16:39:53 +08:00 |
|
ival
|
3759386e1f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-10 15:09:24 +08:00 |
|
ival
|
90bdb12e57
|
线路：宁波3
问题：优化初始化操作的事件模型
|
2021-03-10 15:09:15 +08:00 |
|
fan
|
0b361fd0fc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-10 13:19:39 +08:00 |
|
fan
|
0bf5e348a0
|
岔芯不生成车次窗
|
2021-03-10 13:19:17 +08:00 |
|
fan
|
f9c9e25d08
|
登录路径错误调整
|
2021-03-10 10:31:16 +08:00 |
|
joylink_cuiweidong
|
4edb42bbbc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-10 10:25:39 +08:00 |
|
joylink_cuiweidong
|
2146b28b9a
|
宁波三号线 运行线 代码调整
|
2021-03-10 10:25:05 +08:00 |
|
ival
|
1aa009075f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-03-09 18:37:31 +08:00 |
|
ival
|
0c98c06440
|
线路：宁波3
任务：修改带初始化的界面操作
|
2021-03-09 18:37:20 +08:00 |
|
joylink_cuiweidong
|
b434824d97
|
运行图编制 删除重复的页面
|
2021-03-09 17:11:58 +08:00 |
|
joylink_cuiweidong
|
208041fb24
|
运行图编制 删除暂时无用的文件
|
2021-03-09 16:50:38 +08:00 |
|
joylink_cuiweidong
|
e7c89ef4bf
|
运行图编制 删除暂时无用的文件
|
2021-03-09 16:35:40 +08:00 |
|
joylink_cuiweidong
|
b7a24387b4
|
运行图编制 删除无用与重复的文件
|
2021-03-09 16:11:27 +08:00 |
|
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 |
|