Commit Graph

3704 Commits

Author SHA1 Message Date
fan
8ad0544dc2 创建小站台时,不设置区段为站台轨 2020-03-11 18:00:45 +08:00
fan
939360917e 调整信号机接近区段颜色变化 2020-03-11 16:58:14 +08:00
fan
3273724484 调整自动折返非空校验 2020-03-11 15:50:47 +08:00
fan
95e2832cec 删除打印日志 2020-03-11 15:14:38 +08:00
fan
036fa8811e Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-11 15:10:26 +08:00
fan
ef60af34c0 绘图预览切换现地行调显示 2020-03-11 15:10:08 +08:00
fan
5d39b8e84e 绘图显示调整 2020-03-11 10:53:09 +08:00
joylink_cuiweidong
4ceaba9c59 北京一号线新版指令代码调整 2020-03-11 10:52:36 +08:00
joylink_cuiweidong
c0819a4745 北京一号线新版指令操作代码调整 2020-03-11 10:36:45 +08:00
joylink_cuiweidong
0db45c3956 代码调整 2020-03-10 20:24:24 +08:00
joylink_cuiweidong
27c8b0204e 成都一号线 列车精确位置三角代码修改 2020-03-10 20:15:47 +08:00
fan
3ef47d146d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-10 18:56:12 +08:00
fan
50bb1ad59e 绘图高级数据调整 2020-03-10 18:56:03 +08:00
zyy
8c71459ac1 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/jmapNew/shape/Automactic/index.js
2020-03-10 14:47:13 +08:00
zyy
c51302638f 调整区段分隔符 2020-03-10 14:45:30 +08:00
fan
36ae4e001e 成都三现地调整 2020-03-10 13:22:41 +08:00
fan
394b80e0e9 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-10 13:05:36 +08:00
fan
ee53da67bc 调整点击设备中组成元素的数据处理 2020-03-10 13:05:20 +08:00
joylink_cuiweidong
a65ad91129 站台绘图代码调整 2020-03-10 11:16:53 +08:00
joylink_cuiweidong
ed3adcab6b 北京一号线 现地 自动进路操作代码调整 2020-03-10 11:11:18 +08:00
fan
6980bb099f 调整公共绘图元素显示条件 2020-03-10 10:21:33 +08:00
fan
91531c7521 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-10 10:08:40 +08:00
fan
f6a43ed6aa 宁波一调整道岔正反操为联动操作 2020-03-10 10:08:28 +08:00
fan
a4e5bf3d81 现地行调显示区分 2020-03-10 09:49:05 +08:00
joylink_cuiweidong
259f688ef5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-09 19:42:29 +08:00
joylink_cuiweidong
6c39080e7c 成都一号线 列车小三角添加 2020-03-09 19:41:51 +08:00
fan
75218e87ce 自动折返按钮调整 2020-03-09 18:47:50 +08:00
fan
d45950fa68 自动折返调整 2020-03-09 18:35:01 +08:00
fan
96a9c73c29 列车位置调整 2020-03-09 18:25:25 +08:00
fan
1148ea5ad8 Merge branches 'dev' and 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-09 17:38:28 +08:00
fan
7f4e6fb13c 初始化按计划行车状态and其他调整 2020-03-09 17:38:15 +08:00
zyy
751a8e792c Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/jmapNew/config/skinCode/haerbin_01.js
2020-03-09 17:03:08 +08:00
zyy
103afa9f05 调整哈尔滨线路道岔显示问题 2020-03-09 17:02:13 +08:00
fan
2b971cdf12 初始化按计划行车状态and其他调整 2020-03-09 14:23:44 +08:00
fan
815e4446d4 哈尔滨列车调整 2020-03-09 09:58:49 +08:00
zyy
482df0de33 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-07 19:12:45 +08:00
zyy
6acbf78688 哈尔滨站台状态调整 2020-03-07 19:12:19 +08:00
joylink_fanyuhong
26a5c0bf41 哈尔滨车调整 2020-03-07 18:57:01 +08:00
joylink_fanyuhong
357265d905 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-07 18:32:59 +08:00
joylink_fanyuhong
2ca260d502 哈尔滨创建计划车 2020-03-07 18:32:51 +08:00
zyy
a1416b9a23 调整哈尔滨线路扣车状态 2020-03-07 11:05:38 +08:00
joylink_cuiweidong
157a505e72 代码调整 2020-03-06 21:31:07 +08:00
joylink_cuiweidong
f3d152bdfc 代码调整 2020-03-06 21:26:58 +08:00
joylink_cuiweidong
e1fccdeb2a 代码调整 2020-03-06 20:57:24 +08:00
joylink_cuiweidong
bb204dd72a 列车 跳停 扣车 车门 状态代码调整 2020-03-06 20:47:39 +08:00
joylink_fanyuhong
3745815a5b 代码调整
(cherry picked from commit 14e054b)
2020-03-06 20:42:40 +08:00
joylink_fanyuhong
f685279c6d 代码调整
(cherry picked from commit 709b9ec)
2020-03-06 20:42:29 +08:00
joylink_fanyuhong
9d56738ddc 成都一显示调整
(cherry picked from commit c5701cd)
2020-03-06 20:42:17 +08:00
joylink_fanyuhong
7f53be45b1 进路调整,绘图相关调整
(cherry picked from commit e9749da)
2020-03-06 20:42:04 +08:00
zyy
b92b2ff786 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-06 19:02:34 +08:00