Commit Graph

801 Commits

Author SHA1 Message Date
zyy
0091a593e5 调整福州线路顶部栏显示名称字段 2020-04-15 14:19:22 +08:00
joylink_cuiweidong
9ddafdedf5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-15 13:07:34 +08:00
joylink_cuiweidong
47e2ca8d76 北京一号线 地图配置文件调整 2020-04-15 13:06:58 +08:00
zyy
c2f8eeb250 调整佛山线路站台方向显示 2020-04-15 13:06:32 +08:00
zyy
25272e4fdd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-15 11:17:33 +08:00
zyy
6cb2939631 调整西安二号线道岔状态显示 2020-04-15 11:17:19 +08:00
joylink_cuiweidong
2a50ce7287 设计平台 加载计划运行图管理 创建通用运行图 地图过滤 2020-04-15 10:34:33 +08:00
zyy
87ca3e5556 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/config/deviceStyle.js
#	src/jmapNew/theme/factory.js
2020-04-15 10:08:47 +08:00
zyy
7ea8fd7add 调整佛山线路全线取消扣车操作, 增加西安二号线皮肤 2020-04-15 10:06:26 +08:00
fan
8a7de3c22c 佛山皮肤调整 2020-04-15 09:44:44 +08:00
fan
e9ee5112d4 佛山皮肤调整 2020-04-15 09:33:21 +08:00
fan
b833ac1acd 佛山皮肤调整 2020-04-15 09:19:47 +08:00
fan
09f3c4b969 调整西安二号线配置 2020-04-15 09:07:23 +08:00
fan
2613b68413 佛山列车显示调整&西安二号线集中站分割符 2020-04-14 18:51:09 +08:00
fan
61c2260d93 西安二号线调整 2020-04-14 15:45:13 +08:00
fan
c8a500c5dd 佛山运行图添加目的地码 2020-04-14 11:34:13 +08:00
zyy
cc984c8eb0 调整佛山线路,成都一号线运行图 方向信息 2020-04-14 10:27:33 +08:00
zyy
feca56f94b 调整字段名称显示,调整佛山线路标注字段 2020-04-14 09:48:54 +08:00
joylink_cuiweidong
7f7318814c 北京一号线 现地 取消进路 信号重开步骤代码调整 2020-04-13 18:43:50 +08:00
fan
319d458ca0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-13 18:31:38 +08:00
fan
b7e6b9a8c1 佛山运行图导入上行时间调整&西安二号线车站调整 2020-04-13 18:30:21 +08:00
joylink_cuiweidong
be187cf1b3 北京一号线 操作定义 代码调整 2020-04-13 17:57:10 +08:00
fan
20491dac81 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-13 17:13:52 +08:00
fan
f91c8e37d2 佛山运行图导入参数调整&西安二号线车站调整 2020-04-13 17:12:33 +08:00
zyy
2dc975ef7a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-13 17:04:01 +08:00
zyy
df92090509 增加配置中侧防数据,调整接口 2020-04-13 17:03:48 +08:00
joylink_cuiweidong
db93886f7e 哈尔滨线路 实训操作代码调整 2020-04-13 16:29:39 +08:00
joylink_cuiweidong
8475870cf8 哈尔滨/宁波 现地 实训设置当前所在集中站 代码调整 2020-04-13 14:54:35 +08:00
joylink_cuiweidong
ccf028e5bb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-13 13:08:30 +08:00
joylink_cuiweidong
e083015580 西安二号线 屏蔽门和站台的状态代码调整 2020-04-13 13:08:17 +08:00
fan
472dd1b62a 佛山运行图导入校验调整&西安二号线车站调整 2020-04-13 10:43:02 +08:00
joylink_cuiweidong
98c6736c17 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 19:14:36 +08:00
joylink_cuiweidong
43c7f2c094 哈尔滨一号线 现地 自排开关 信号重开 信号关灯操作处理 2020-04-10 18:59:50 +08:00
fan
08d02e9563 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 17:51:36 +08:00
fan
b0797644f9 实训课程编辑调整&线二号线调整 2020-04-10 17:50:26 +08:00
zyy
2d70c294f8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 17:24:12 +08:00
zyy
3bfb74d55b 调整绘图隐藏元素 2020-04-10 17:23:53 +08:00
fan
26e9c33736 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 16:47:20 +08:00
fan
11586aef30 哈尔滨现地显示BUG调整&西安二号线皮肤调整 2020-04-10 16:45:41 +08:00
joylink_cuiweidong
22d587a7a8 哈尔滨 行调 道岔操作 实训操作定义修改 2020-04-10 16:44:07 +08:00
joylink_cuiweidong
4be8b2dd87 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 15:22:08 +08:00
joylink_cuiweidong
0133b3b5d9 代码调整 2020-04-10 15:21:46 +08:00
fan
165bde34ef Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 14:08:26 +08:00
fan
bb69f81e99 哈尔滨指令调整 2020-04-10 14:07:05 +08:00
joylink_cuiweidong
f0a4491cb8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 14:05:37 +08:00
joylink_cuiweidong
e05057bf3f 宁波一号线 自动折返代码调整 2020-04-10 14:05:20 +08:00
fan
c294e00d46 实训定义调整 2020-04-10 13:26:37 +08:00
joylink_cuiweidong
9e45a0d342 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 10:42:19 +08:00
joylink_cuiweidong
888ae6e936 宁波一号线 自动折返按钮实训操作代码调整 2020-04-10 10:41:41 +08:00
fan
162bd4c9f2 宁波一号线:实训问题调整 2020-04-10 10:16:58 +08:00