Commit Graph

163 Commits

Author SHA1 Message Date
joylink_cuiweidong
b221e8e6b9 车站添加 是否车辆段/停车场 是否折返车站字段 2020-02-25 10:52:13 +08:00
joylink_fanyuhong
e17569978f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-25 10:36:25 +08:00
joylink_fanyuhong
3197641b97 仿真调整 2020-02-25 10:36:18 +08:00
zyy
b5c8a1f2af Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-24 18:12:41 +08:00
zyy
12e708028e 区段道岔操作调整 2020-02-24 18:12:05 +08:00
joylink_fanyuhong
03843cf217 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-24 17:06:58 +08:00
joylink_fanyuhong
aa0f770630 仿真调整 2020-02-24 17:04:39 +08:00
joylink_cuiweidong
56e49f0561 成都一号线 道岔操作代码调整 2020-02-24 15:59:51 +08:00
joylink_cuiweidong
a177ce9d0d 成都一号线 信号机 站台操作代码调整 2020-02-24 15:48:37 +08:00
zyy
92ce8c08be 调整成都一操作 2020-02-24 14:03:07 +08:00
joylink_cuiweidong
ae1eeb5ef3 成都一号线 区段操作代码调整 2020-02-24 11:38:23 +08:00
zyy
bd03e773c7 调整区段,道岔操作菜单 2020-02-24 11:32:24 +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
10d3bb3e49 新建列车调整 2020-02-20 10:19:49 +08:00
joylink_fanyuhong
00dd268918 列车调整 2020-02-19 11:47:38 +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
12198f0c35 北京线 指令代码调整 2020-02-18 16:55:30 +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
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
joylink_cuiweidong
7af244dcda 北京一号线新版指令调整 2020-02-14 10:58:00 +08:00
joylink_cuiweidong
2d73e96da7 成都一号线 新建列车代码修改 2020-02-13 16:47:10 +08:00
joylink_cuiweidong
42668b6086 宁波一号线 新建列车代码调整 2020-02-13 14:14:21 +08:00
joylink_cuiweidong
9115155865 新版北京一号线 新建计划车指令代码修改 2020-02-13 12:33:54 +08:00
joylink_fanyuhong
a9c16c3c74 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-13 11:19:17 +08:00
joylink_fanyuhong
147796dca1 操作调整 2020-02-13 11:19:06 +08:00
joylink_cuiweidong
5721f17cf9 北京线 车次窗 新建列车代码调整 2020-02-12 18:57:02 +08:00
joylink_fanyuhong
fa233a7031 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-12 18:37:32 +08:00
joylink_fanyuhong
4c1b03e3d7 操作调整 2020-02-12 18:37:24 +08:00
joylink_cuiweidong
926f82b04c 北京一号线车次窗新建计划车 2020-02-12 18:19:21 +08:00
joylink_fanyuhong
b1ecd2c733 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-12 18:08:39 +08:00
joylink_fanyuhong
a147530248 操作调整 2020-02-12 18:08:31 +08:00
zyy
b81f6fc967 宁波一号线右键操作 2020-02-12 18:06:30 +08:00
joylink_fanyuhong
4314698849 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-12 17:48:42 +08:00
joylink_fanyuhong
dcb1779297 操作调整 2020-02-12 17:48:30 +08:00
zyy
d22f2582c3 增加车次窗右键操作 2020-02-12 17:43:18 +08:00
joylink_fanyuhong
5141c18446 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-12 15:46:58 +08:00
joylink_fanyuhong
5050392b2b 操作调整 2020-02-12 15:46:50 +08:00
joylink_cuiweidong
eb6e12d72c 成都一号线 操作代码调整 2020-02-12 15:41:46 +08:00