Commit Graph

270 Commits

Author SHA1 Message Date
joylink_cuiweidong
02a2336731 宁波一号线行调操作调整 2020-03-05 20:36:27 +08:00
joylink_cuiweidong
420c97f88e 宁波一号线信号机站台操作代码调整(行调) 2020-03-05 16:28:08 +08:00
zyy
2df1803ca5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-05 14:33:20 +08:00
zyy
3510548b7b 调整集中站指示灯状态,绘图显示 2020-03-05 14:33:08 +08:00
joylink_cuiweidong
dc12bd3f88 成都一号线 信号机 信号自动通过 代码调整
自动通过模式,自动触发模式 状态参数调整
2020-03-05 13:40:50 +08:00
joylink_cuiweidong
8d022403c3 北京一号现地道岔 单锁解封操作代码调整 2020-03-05 09:53:42 +08:00
joylink_cuiweidong
e6eb7994fb 北京一号线 现地道岔操作代码调整 2020-03-04 19:53:50 +08:00
zyy
d342c249ab Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-04 14:15:17 +08:00
zyy
467a9cf982 调整宁波线路现地操作 2020-03-04 14:14:59 +08:00
joylink_cuiweidong
78939de116 成都三号线 行调信号机站台代码调整 2020-03-04 11:29:57 +08:00
joylink_cuiweidong
33d711cf49 北京一号线 信号机站台代码调整 2020-03-04 09:17:06 +08:00
joylink_cuiweidong
9c1c48b968 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-03 21:01:44 +08:00
joylink_cuiweidong
d4f3f42cdf 成都一号线 信号机代码调整 2020-03-03 21:00:10 +08:00
zyy
af960cc011 调整状态 2020-03-03 18:09:05 +08:00
joylink_cuiweidong
88a4b01802 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-03 18:01:43 +08:00
joylink_cuiweidong
231c6fda52 代码调整 2020-03-03 17:54:08 +08:00
zyy
c90a37f10d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-03 17:53:04 +08:00
zyy
aa80b8e74f 调整宁波一信号机现地操作 2020-03-03 17:52:37 +08:00
joylink_fanyuhong
28db37a54f 成都三现地操作调整 2020-03-03 17:34:50 +08:00
joylink_cuiweidong
030470eec4 代码调整 2020-03-03 14:09:27 +08:00
zyy
8729905299 调整临时限速绘图逻辑,调整宁波线车次窗流程操作 2020-03-03 12:57:26 +08:00
zyy
79734147e8 调整错误信息返回 2020-03-02 21:49:19 +08:00
zyy
6a306af8c4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-02 19:42:29 +08:00
zyy
4f1a72bb76 调整宁波菜单显示,错误提示 2020-03-02 19:42:10 +08:00
joylink_cuiweidong
9ae9688868 北京一号线 成都三号线 宁波一号线 站台跳停取消跳停代码调整 2020-03-02 19:07:28 +08:00
joylink_cuiweidong
cd970436f9 北京一号线成都三号线站台操作代码调整 2020-03-02 17:16:59 +08:00
joylink_cuiweidong
c1e39574c8 成都三号线 站台操作代码调整 2020-03-02 15:37:02 +08:00
joylink_fanyuhong
c1c624dfff Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-02 14:47:08 +08:00
joylink_fanyuhong
692f30fd9f 运行图导入和列车调整 2020-03-02 14:46:59 +08:00
joylink_cuiweidong
ab89966902 北京一号线哈尔滨 站台操作代码调整 2020-03-02 09:21:29 +08:00
joylink_cuiweidong
167ca0e2a9 北京一号线信号机操作代码调整 2020-02-28 20:30:46 +08:00
joylink_cuiweidong
4ee98785c4 宁波一号线 成都三号线站台信号机操作代码调整 2020-02-28 18:50:03 +08:00
joylink_fanyuhong
d73f084fd5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-28 16:47:35 +08:00
joylink_fanyuhong
92f4f2f1ca 按计划行车接口报错提示 2020-02-28 16:47:26 +08:00
joylink_cuiweidong
d5ac3f37a2 成都三号线 信号机 操作代码调整 2020-02-28 15:50:20 +08:00
joylink_cuiweidong
32b16077f3 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-28 13:10:48 +08:00
joylink_cuiweidong
7038ec12a8 哈尔滨线路信号机操作代码调整 2020-02-28 13:07:49 +08:00
joylink_fanyuhong
d5539a986b 按计划行车接口报错提示
(cherry picked from commit 1abad25)
2020-02-28 11:28:13 +08:00
joylink_cuiweidong
04878f54ba 哈尔滨线路 信号机操作代码调整 2020-02-28 10:41:36 +08:00
joylink_fanyuhong
b880101a46 运行图预览 2020-02-27 22:17:33 +08:00
joylink_fanyuhong
543b3c1259 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-27 22:10:08 +08:00
joylink_fanyuhong
41bc739eab 运行图预览 2020-02-27 22:09:51 +08:00
zyy
c7ece4aa60 调整速度 2020-02-27 21:37:58 +08:00
joylink_cuiweidong
4d4c10f2d5 哈尔滨线路 信号机操作代码调整 2020-02-27 20:37:35 +08:00
zyy
632a3275e4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-27 18:22:11 +08:00
zyy
07330bf054 调整道岔,区段操作 2020-02-27 18:21:39 +08:00
joylink_cuiweidong
4dab35a61e 哈尔滨线路 右键操作 代码调整 2020-02-27 17:31:29 +08:00
zyy
4e6f107896 调整宁波一道岔操作 2020-02-27 15:44:51 +08:00
joylink_cuiweidong
9f5f30cd14 成都一号线 北京一号线 新建计划车代码调整 2020-02-27 13:05:02 +08:00
joylink_zyy
aa1de4372f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-27 11:35:45 +08:00
joylink_zyy
05abf3049a 增加宁波线新建列车查询 2020-02-27 11:35:41 +08:00
joylink_fanyuhong
1948083c42 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-27 11:30:30 +08:00
joylink_fanyuhong
56d32ca088 仿真调整 2020-02-27 11:30:22 +08:00
joylink_cuiweidong
5e3d3d86f6 宁波一号线 站台操作调整 (北京一号线,成都一号线站台参数修改) 2020-02-26 18:59:19 +08:00
joylink_cuiweidong
d17195e524 北京一号线 宁波一号线 信号机 操作代码调整 2020-02-26 14:37:52 +08:00
joylink_cuiweidong
076cbeb23b 北京一号线 成都三号线 信号机操作代码调整 2020-02-25 19:39:30 +08:00
joylink_cuiweidong
2978438390 北京一号线 信号机操作代码调整 2020-02-25 15:08:48 +08:00
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