Commit Graph

1118 Commits

Author SHA1 Message Date
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
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
joylink_fanyuhong
1b0654a3b8 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-12 15:14:23 +08:00
joylink_fanyuhong
4275b4dc4a 操作调整 2020-02-12 15:14:14 +08:00
joylink_cuiweidong
e04e7a2f32 代码合并 2020-02-12 10:58:40 +08:00
joylink_fanyuhong
244b30d1c8 成都三调整 2020-02-12 10:29:48 +08:00
joylink_fanyuhong
a95e0176ac Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-11 18:27:07 +08:00
joylink_fanyuhong
97320cc8ca 成都三调整 2020-02-11 18:26:45 +08:00
zyy
b50aa876bb 调整代码 2020-02-11 18:10:15 +08:00
zyy
8ad4316816 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-11 17:33:47 +08:00
zyy
d348c640f9 添加宁波,北京线路进路获取 2020-02-11 17:33:33 +08:00
joylink_fanyuhong
b529b0ad94 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-11 17:29:42 +08:00
joylink_fanyuhong
e7a9c09e50 成都三调整 2020-02-11 17:29:25 +08:00
joylink_cuiweidong
4e9510f535 成都一号线指令操作代码调整 2020-02-11 17:02:49 +08:00
joylink_fanyuhong
3692668b35 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-11 15:59:18 +08:00
joylink_fanyuhong
86c6ac4a57 进路选中切除状态调整 2020-02-11 15:58:54 +08:00
joylink_cuiweidong
fd960d2155 宁波一号线,成都三号线 道岔 定操和反操代码调整 2020-02-11 15:32:48 +08:00
joylink_cuiweidong
fff6930df8 宁波线 道岔代码调整 2020-02-11 10:57:13 +08:00
joylink_cuiweidong
91a5bb6b7a 代码调整 2020-02-11 10:04:14 +08:00
joylink_cuiweidong
9af8a70242 代码调整 2020-02-11 10:03:59 +08:00
joylink_fanyuhong
c1dabeae80 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-10 19:10:55 +08:00
joylink_fanyuhong
50a4f8ab0b 成都三号线调整 2020-02-10 19:10:43 +08:00
joylink_cuiweidong
ce909e6e24 成都一号线指令操作代码调整 2020-02-10 17:44:01 +08:00
joylink_cuiweidong
56ab4a63d0 新版北京一号线指令代码调整 2020-02-10 17:17:33 +08:00
joylink_cuiweidong
5b2f27ab86 新版北京一号线指令操作代码修改 2020-02-10 17:04:20 +08:00
zyy
f82dfa53ff 调整宁波一号线传参字段 2020-02-10 17:02:00 +08:00
joylink_zyy
1ef8788c3c 调整绘图逻辑,增加哈尔滨线路 站台 信号机绘图逻辑 2020-02-03 17:17:56 +08:00
zyy
5771905881 增加机电控制模式 2020-01-20 18:29:06 +08:00
zyy
323eda0e07 调整iscs样式 2020-01-19 14:21:22 +08:00
zyy
2d5074d6d1 增加进路数据状态维护 2020-01-19 11:22:48 +08:00
zyy
e4b20395c4 增加iscs系统,调整成都一号线运行图导入 2020-01-17 15:31:58 +08:00
zyy
1fab892047 新增扣车请求参数 2020-01-13 17:07:06 +08:00
zyy
dcead8d707 增加点击事件取消选中状态为全局混入,删除多余线路utils配置 2020-01-13 14:40:24 +08:00
zyy
d295fb72a5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-13 13:45:50 +08:00
zyy
6feb0ec9c0 新版地图: 调整默认状态,站台状态配置完成。其他元素暂未配置 2020-01-13 13:45:39 +08:00
joylink_cuiweidong
50ad3bb036 新版绘图道岔代码拆分 2020-01-13 11:25:51 +08:00
fan
d22008a6f7 成都一号线样式调整 2020-01-13 10:15:28 +08:00
fan
67ea835805 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-10 18:52:36 +08:00
fan
4e136ca8b3 成都一号线样式调整 2020-01-10 18:51:57 +08:00
zyy
d3d64c7c91 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-10 17:11:41 +08:00
zyy
5d6a994cbc 删除宁波批量扣车反向操作 2020-01-10 17:11:35 +08:00
fan
d77559211c 成都一、三号线z站台参数调整 2020-01-10 15:15:00 +08:00
fan
9f14f4bbda 成都一号线菜单调整 2020-01-10 14:51:55 +08:00
fan
1254ba912c 成都一号线菜单调整 2020-01-10 14:50:04 +08:00
zyy
a7b97dd7cc 调整宁波一号线请求参数 2020-01-10 14:41:20 +08:00
zyy
19edd695be 删除多余输出 2020-01-10 11:28:43 +08:00
zyy
fa643db9db 调整成都一号线 请求堆栈 取消请求流程 2020-01-10 11:27:43 +08:00
zyy
2b56d3f636 修改样式 2020-01-10 10:29:52 +08:00
zyy
021f3bc148 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-10 09:32:38 +08:00
zyy
bd0518acc7 调整成都一号线操作堆样式流程 2020-01-10 09:32:32 +08:00
fan
06c6ec66e5 成都一号线菜单样式调整 2020-01-09 18:49:58 +08:00
fan
e8b616b705 成都一号线菜单调整 2020-01-09 18:21:04 +08:00
fan
68180d0c83 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-09 17:48:46 +08:00
fan
a4ebf22bab 成都一号线菜单调整 2020-01-09 17:48:25 +08:00
zyy
41329739dc Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-09 16:24:10 +08:00
zyy
a4e3e30c78 增加成都一号线请求堆栈 2020-01-09 16:24:01 +08:00
fan
7f54b99883 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-09 13:03:02 +08:00
fan
ab64e6858e 成都一号线marbar菜单调整 2020-01-09 13:02:40 +08:00
zyy
ed3df55457 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-09 09:54:40 +08:00
zyy
197d75342c 调整宁波一号线批量扣车逻辑 2020-01-09 09:54:34 +08:00
fan
6e90989ece 成都一号线右键菜单调整 2020-01-09 09:28:20 +08:00
fan
09b27a8d62 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-09 09:02:22 +08:00
fan
2b4aa891eb 成都一号线右键菜单调整 2020-01-09 09:02:02 +08:00
joylink_cuiweidong
54a5ff38a1 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-08 18:26:20 +08:00
joylink_cuiweidong
82bef6ed4d 北京一号线新版 右键菜单指令调整 2020-01-08 18:26:07 +08:00
zyy
2e042b9fee Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-08 17:50:22 +08:00
zyy
fa513a1e8f 调整宁波一号线控制权右键条件 2020-01-08 17:50:16 +08:00
joylink_cuiweidong
88d4ccf8d9 北京一号线新版 区段道岔指令调整 2020-01-08 17:42:28 +08:00
joylink_cuiweidong
c29033177d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-08 16:24:24 +08:00
joylink_cuiweidong
4dde67b582 北京一号线新版信号机操作调整 2020-01-08 16:23:45 +08:00
zyy
b345594605 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-08 14:59:33 +08:00
zyy
786a37ee2c 增加宁波一号线控制权转移 2020-01-08 14:59:27 +08:00
joylink_cuiweidong
387746a69b 北京一号线新版 站台指令操作调整 2020-01-08 14:49:20 +08:00
fan
bf49c52c3e Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-08 09:56:44 +08:00
fan
83a37a1b28 成都一号线右键菜单调整 2020-01-08 09:41:55 +08:00
zyy
02af288233 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-07 18:03:56 +08:00
zyy
2310fec6ef 兼容老板地图状态,调整宁波线批量扣车数据 2020-01-07 18:03:49 +08:00
joylink_cuiweidong
91d1f98f69 北京一号线新版站台区段车站右键菜单调整 2020-01-07 17:40:24 +08:00
joylink_cuiweidong
7fd885a1c2 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/jmapNew/theme/beijing_01/planConvert.js
2020-01-07 15:22:50 +08:00
joylink_cuiweidong
ce98244b44 北京一号线新版 道岔和信号机的右键菜单代码调整 2020-01-07 15:19:18 +08:00
zyy
473b289692 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-07 14:49:58 +08:00
zyy
5a3b415202 删除运行图工具栏 2020-01-07 14:49:51 +08:00
fan
5dc3eb83f8 设备管理-配置编辑 信号机配置调整 2020-01-07 13:05:06 +08:00
zyy
ea528dacef Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-07 09:23:11 +08:00
zyy
0330e08f89 调整车站状态显示,调整右键菜单显示,设置默认状态 2020-01-07 09:23:04 +08:00
fan
f2b62f281e 指令调整,公共地图宽度调整 2020-01-06 18:39:44 +08:00
zyy
3d8fcd305a 调整宁波一号线右键菜单流程 2020-01-06 14:42:28 +08:00
zyy
ad9d14e842 调整站台右键显示 2020-01-03 16:17:40 +08:00
zyy
28e0617c87 删除注释,信号机流程完成 2020-01-03 16:01:57 +08:00
zyy
4f2fb97477 调整宁波线右键菜单显示 2020-01-03 15:50:26 +08:00
zyy
59e5c5fef7 调整相关用户的列表 名称变昵称显示 2020-01-02 18:40:30 +08:00
zyy
0b3e3311f0 删除控制模式 2020-01-02 14:57:13 +08:00
zyy
e750406484 Merge branch 'dev_cmd' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_cmd 2020-01-02 10:46:17 +08:00
zyy
7c5352ce7c 调整宁波一号线站台操作 2020-01-02 10:46:09 +08:00
fan
8466bcb059 成都三指令调整 2020-01-02 09:49:41 +08:00
fan
57e38a37a5 成都三指令调整 2020-01-02 09:29:23 +08:00
zyy
cf370249eb 调整指令 2019-12-31 18:10:49 +08:00
zyy
760225549e 兼容新旧两种发送机制 2019-12-31 17:20:04 +08:00
zyy
00a7517e52 修改指令发送流程及配置文件 2019-12-31 17:10:52 +08:00
zyy
e03a4d12e0 调整宁波一号线 2019-12-31 16:24:22 +08:00
zyy
3044da2ea4 调整福州使用新版指令方式发送 2019-12-31 16:11:09 +08:00
fan
0504a2a2a6 迁移cmd分支 2019-12-31 14:32:04 +08:00
zyy
b336e1844b 调整宁波一号线右键菜单操作及显示流程 2019-12-30 18:13:38 +08:00
zyy
ce44ec4429 调整宁波线 样式,显示宁波线右键操作 2019-12-30 13:24:40 +08:00
fan
15f7aa656e 新版地图包加载仿真 2019-12-30 09:57:54 +08:00
fan
c7078dcdb9 新版地图包加载仿真 2019-12-30 09:00:16 +08:00
zyy
e0e9bfc6a6 增加成都一号线运行图导入,增加成都一号线配置,删除成都四号线配置 2019-12-26 15:39:29 +08:00
zyy
45f0a5a1c6 调整成都三,宁波一运行图显示备用车问题 2019-12-26 14:48:11 +08:00
zyy
74f0b12e3c 修改运行图显示,调整进路列表展示 2019-12-25 18:45:48 +08:00
zyy
0f2b7f18fe 增加宁波一号线运行图目的码导入 2019-12-23 16:01:09 +08:00
zyy
a31e358b41 desc: 修改宁波一号线运行图导入数据修改 2019-12-23 14:49:57 +08:00
zyy
6ec990a1b2 解析宁波一号线运行图 2019-12-23 09:15:25 +08:00
zyy
3101af9948 增加线路皮肤配置,调整联锁站台显示列表 2019-12-19 18:04:28 +08:00
zyy
c192deb2ca 修改代码 2019-12-06 10:31:19 +08:00
zyy
11b327984e 新增新版地图绘制文件 2019-11-29 12:51:58 +08:00