Commit Graph

3269 Commits

Author SHA1 Message Date
joylink_fanyuhong
247e7e1e19 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-21 15:49:45 +08:00
joylink_fanyuhong
a33a9bbe42 道岔转动调整 2020-02-21 15:49:30 +08:00
joylink_cuiweidong
3362c906cc 成都一号线 新建列车代码调整 2020-02-20 14:19:44 +08:00
joylink_cuiweidong
70f95654b9 北京一号线 新建列车代码修改 2020-02-20 14:01:12 +08:00
zyy
a225253d25 调整列车操作 2020-02-20 12:24:37 +08:00
joylink_fanyuhong
181997bfb8 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-20 10:19:59 +08:00
joylink_fanyuhong
10d3bb3e49 新建列车调整 2020-02-20 10:19:49 +08:00
joylink_cuiweidong
dbb24a1793 宁波一号线 道岔 封锁 显示状态代码调整 2020-02-19 17:26:15 +08:00
zyy
0a772ed834 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-19 16:46:53 +08:00
zyy
8118e151ba 调整状态显示 2020-02-19 16:46:34 +08:00
joylink_fanyuhong
0d54414943 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-19 16:34:10 +08:00
joylink_fanyuhong
680d87e623 列车状态显示 2020-02-19 16:33:59 +08:00
zyy
86e9d08e49 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-19 16:19:55 +08:00
zyy
cc717f86e6 调整开门状态 2020-02-19 16:19:37 +08:00
joylink_fanyuhong
a0a41e97c8 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-19 16:01:28 +08:00
joylink_fanyuhong
4efea9cfc2 列车状态显示 2020-02-19 16:01:18 +08:00
zyy
8234c8b817 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-19 14:07:00 +08:00
zyy
847aa2d794 添加屏蔽门状态 2020-02-19 14:06:43 +08:00
joylink_fanyuhong
00dd268918 列车调整 2020-02-19 11:47:38 +08:00
joylink_fanyuhong
412e6bd582 列车调整 2020-02-18 19:24:52 +08:00
joylink_cuiweidong
daa7486ecf 宁波一号线 北京一号线 道岔 站台 状态调整 2020-02-18 19:04:03 +08:00
zyy
5d123115b6 删除数据赋值 2020-02-18 18:40:02 +08:00
zyy
11e03c4fe3 调整道岔绘图 2020-02-18 18:39:12 +08:00
zyy
79140c7e42 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-18 17:49:51 +08:00
zyy
0a5c2e7a5b 修改代码 2020-02-18 17:49:35 +08:00
joylink_cuiweidong
7c3a7b800e 宁波线的配置文件调整 2020-02-18 17:47:01 +08:00
joylink_cuiweidong
12198f0c35 北京线 指令代码调整 2020-02-18 16:55:30 +08:00
joylink_fanyuhong
7cc0246adf Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-18 14:45:42 +08:00
joylink_fanyuhong
c14043f93b 自动进路调整 2020-02-18 14:45:32 +08:00
joylink_cuiweidong
50de519124 北京线 指令operation 代码调整 2020-02-18 14:26:16 +08:00
joylink_cuiweidong
f27c3ce3f4 宁波线 北京一号线新版 信号机状态调整 人工控 自动控代码调整 2020-02-17 19:23:26 +08:00
zyy
3976925669 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-17 17:51:03 +08:00
zyy
73b51bd385 调整站台显示问题 2020-02-17 17:50:15 +08:00
joylink_cuiweidong
6df1ddf2f6 代码合并 2020-02-17 16:15:05 +08:00
joylink_fanyuhong
d6e94b0526 状态调整 2020-02-17 15:44:15 +08:00
joylink_fanyuhong
c173ce8d6c 状态调整 2020-02-17 15:31:08 +08:00
joylink_fanyuhong
cd8a4c3a2e 状态调整 2020-02-17 14:40:59 +08:00
joylink_fanyuhong
ef74bbd5de Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-17 13:40:29 +08:00
joylink_fanyuhong
22522a8d33 状态调整 2020-02-17 13:40:20 +08:00
joylink_cuiweidong
9b8079a7ea 北京一号线 新版 指令调整 2020-02-17 10:55:44 +08:00
joylink_cuiweidong
2b5ac01556 北京一号线新版 人工控 自动控 代码调整 2020-02-14 18:51:02 +08:00
joylink_fanyuhong
5451cdce48 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-14 18:38:09 +08:00
joylink_fanyuhong
c6a69e9009 状态调整 2020-02-14 18:37:48 +08:00
joylink_cuiweidong
36c775dacb Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/jmapNew/theme/beijing_01/menus/dialog/routeHandControl.vue
2020-02-14 18:17:06 +08:00
joylink_cuiweidong
5191a122d1 北京一号线新版 人工控 自动控代码调整 2020-02-14 18:14:57 +08:00
joylink_fanyuhong
a42f1368ae Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-14 18:08:10 +08:00
joylink_fanyuhong
2cd2f93c20 状态调整 2020-02-14 18:07:54 +08:00
joylink_cuiweidong
9b24a72858 北京一号线新版 进路交人工控 进路交自动控代码调整 2020-02-14 15:58:43 +08:00
zyy
bf2b5180e3 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-14 11:22:59 +08:00
zyy
3f5d74426e 更新数据 2020-02-14 11:22:35 +08:00