fan
|
2e385e7fe2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-20 17:11:02 +08:00 |
|
fan
|
fdf63db248
|
车站计轴复位（未完）
|
2021-02-20 17:10:10 +08:00 |
|
lVAL
|
17057cc014
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/config/skinCode/ningbo_01.js
|
2021-02-20 17:03:45 +08:00 |
|
lVAL
|
69f5379356
|
调整福州1号线实训
|
2021-02-20 17:02:40 +08:00 |
|
fan
|
871b9beb5d
|
merge
|
2021-02-20 15:57:34 +08:00 |
|
fan
|
7413d131c3
|
区域选择
|
2021-02-20 15:55:53 +08:00 |
|
joylink_cuiweidong
|
f38c4fcb91
|
代码调整
|
2021-02-20 15:51:39 +08:00 |
|
joylink_cuiweidong
|
466d57b4be
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-20 15:05:36 +08:00 |
|
joylink_cuiweidong
|
86ac34e899
|
泰雷兹 宁波三号线 控制权转移代码调整
|
2021-02-20 15:05:25 +08:00 |
|
joylink_cuiweidong
|
858c7dd7a7
|
宁波三号线（泰雷兹线路） 系统扣车设置/取消 操作添加
|
2021-02-20 15:03:44 +08:00 |
|
fan
|
7483b1be46
|
调整综合演练现地设备显示
|
2021-02-20 13:28:11 +08:00 |
|
fan
|
37d44bf6d2
|
现地 设备显示调整
|
2021-02-20 10:42:25 +08:00 |
|
fan
|
8a2f3b02ac
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-20 09:28:34 +08:00 |
|
fan
|
7e80d34e50
|
宁波一 信号机封锁调整
|
2021-02-20 09:27:21 +08:00 |
|
lVAL
|
c6ecccc788
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 18:30:34 +08:00 |
|
lVAL
|
7583442a2f
|
优化，排列进路加载速度
|
2021-02-19 18:30:26 +08:00 |
|
fan
|
fdeebc9e60
|
添加线路配置参数
|
2021-02-19 18:27:26 +08:00 |
|
fan
|
14f8b05538
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 18:26:02 +08:00 |
|
fan
|
77af4b9288
|
宁波一： 操作流程调整
|
2021-02-19 18:25:51 +08:00 |
|
lVAL
|
1f438bb2ee
|
修改 宁波车次窗显示状态
|
2021-02-19 17:39:38 +08:00 |
|
lVAL
|
4a64a59ce4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 17:27:20 +08:00 |
|
lVAL
|
3b53548ba1
|
宁波1号线 鼠标选择高亮状态
|
2021-02-19 17:27:10 +08:00 |
|
fan
|
5fe0250639
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 14:47:32 +08:00 |
|
fan
|
d083f56a7e
|
宁波一： 操作流程调整
|
2021-02-19 14:47:23 +08:00 |
|
joylink_cuiweidong
|
7d3dfc2d31
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 13:28:53 +08:00 |
|
joylink_cuiweidong
|
414aa1a3ca
|
地图绘制 列车数据模型更改
|
2021-02-19 13:28:19 +08:00 |
|
fan
|
159cd4cdf0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 11:06:20 +08:00 |
|
fan
|
2f8c2a3d42
|
宁波一： 设置扣车流程调整&区故解二次确认调整提示
|
2021-02-19 11:06:03 +08:00 |
|
lVAL
|
86a420d8ec
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 10:43:06 +08:00 |
|
lVAL
|
b7ea10b459
|
修改宁波3号线 操作中的部分bug
|
2021-02-19 10:42:58 +08:00 |
|
fan
|
b44011057c
|
宁波一： 取消进路流程调整
|
2021-02-19 10:10:53 +08:00 |
|
fan
|
10bef80096
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 09:32:01 +08:00 |
|
fan
|
b43537cf94
|
宁波一： 排列进路流程微调
|
2021-02-19 09:31:35 +08:00 |
|
lVAL
|
2aff2be8b4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 09:26:36 +08:00 |
|
lVAL
|
1030f13d37
|
修改宁波3号线，二次确认 锁闭标题问题；
修改西安2号线，定操、反操实训第一步描述错误。
|
2021-02-19 09:26:26 +08:00 |
|
fan
|
baa0ba70a3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 09:12:39 +08:00 |
|
fan
|
827e52e0f4
|
宁波一： 全站进路交自动控
|
2021-02-19 09:12:09 +08:00 |
|
joylink_cuiweidong
|
1aa597fa39
|
宁波一号线 区故解指令代码调整 计轴预复位报错调整
|
2021-02-18 18:23:33 +08:00 |
|
joylink_cuiweidong
|
8bd93ba1d7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-18 17:03:25 +08:00 |
|
joylink_cuiweidong
|
0e9454f890
|
宁波一号线 现地 设置进路报错提示调整
|
2021-02-18 17:03:08 +08:00 |
|
fan
|
b30ffd5635
|
宁波一 设置/取消全站自动通过进路
|
2021-02-18 16:58:35 +08:00 |
|
fan
|
c7e63a3d22
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-18 16:22:23 +08:00 |
|
fan
|
e2a36fdf92
|
宁波一 设置/取消全站自动通过进路
|
2021-02-18 16:22:15 +08:00 |
|
joylink_cuiweidong
|
c0c5356f8a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-18 15:50:32 +08:00 |
|
joylink_cuiweidong
|
5762399c6b
|
宁波一号线 菜单样式调整
|
2021-02-18 15:50:14 +08:00 |
|
fan
|
3e5f101a3a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-18 15:38:35 +08:00 |
|
fan
|
731c8e7fc3
|
宁波一 设置/取消强制点灯
|
2021-02-18 15:38:20 +08:00 |
|
lVAL
|
22101f30c0
|
添加 baseUrl配置
|
2021-02-18 14:15:44 +08:00 |
|
lVAL
|
d85bf0424d
|
更新 .gitignore
|
2021-02-18 14:10:56 +08:00 |
|
lVAL
|
78fc1ca5e9
|
修改 gitignore配置
|
2021-02-18 13:39:43 +08:00 |
|