Commit Graph

489 Commits

Author SHA1 Message Date
joylink_cuiweidong
e1b411965b 北京一号线操作代码调整 2020-03-19 10:49:21 +08:00
joylink_cuiweidong
85e587f844 北京一号线操作代码调整 2020-03-19 10:02:25 +08:00
fan
8ba124ab6f 参数调整 2020-03-19 09:25:51 +08:00
zyy
4243d62ab1 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-18 19:08:12 +08:00
zyy
2ffdf1de32 调整代码 2020-03-18 19:07:58 +08:00
fan
838f2311f8 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-18 19:05:12 +08:00
fan
a9c19cf1ea 现地操作调整 2020-03-18 19:05:02 +08:00
zyy
4537080346 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-18 18:47:48 +08:00
zyy
3afa12711e 新增哈尔滨线路底部栏 操作 2020-03-18 18:47:37 +08:00
joylink_cuiweidong
7c02daebeb 代码调整 2020-03-18 18:45:27 +08:00
joylink_cuiweidong
d0107db4f1 北京一号线 现地操作总取消操作代码调整 2020-03-18 17:18:43 +08:00
joylink_cuiweidong
07af51b757 对返回的信号机接近区段数据处理 2020-03-18 17:02:07 +08:00
joylink_cuiweidong
68571fff18 北京一号线现地 自动折返设置和取消操作代码添加 2020-03-18 15:31:59 +08:00
joylink_cuiweidong
a126ddad02 北京一号线现地区故解操作代码调整 2020-03-18 14:09:38 +08:00
joylink_cuiweidong
96b5cfa3a9 北京一号线现地引导总锁操作代码修改 2020-03-18 13:34:13 +08:00
zyy
4203c30e30 调整宁波线路自动折返 计轴复位操作 2020-03-18 11:18:52 +08:00
zyy
11b2ee8130 调整代码 2020-03-18 10:20:49 +08:00
zyy
0ceb0c2c65 调整自动折返 type 类型 增加自动折返菜单流程 2020-03-18 09:10:57 +08:00
joylink_cuiweidong
d8d143ae38 删除地图绘制中,车站里面的引导总锁 2020-03-17 17:59:47 +08:00
joylink_cuiweidong
03d85d705c 哈尔滨一号线现地界面样式调整 2020-03-17 17:05:43 +08:00
fan
b94c2b47de 综合演练调整 2020-03-17 14:54:03 +08:00
joylink_cuiweidong
9dc0124da2 哈尔滨线路 现地行调切换代码调整 2020-03-17 14:28:23 +08:00
zyy
d3b9b718b3 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-17 11:29:47 +08:00
zyy
96ed68cf65 调整宁波线路现地操作 2020-03-17 11:29:34 +08:00
joylink_cuiweidong
09e452143d 北京一号线 现地 道岔操作代码调整 2020-03-17 11:09:09 +08:00
joylink_cuiweidong
81c88dd63c Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-17 09:55:04 +08:00
joylink_cuiweidong
b088287b6c 北京一号线 现地 站台总取消 站台扣车操作代码操作 2020-03-17 09:54:49 +08:00
fan
36026fc4ed 删除日志 2020-03-17 09:29:41 +08:00
fan
1598e77215 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-17 09:26:02 +08:00
fan
b06b2b58e2 调整现地操作 2020-03-17 09:25:40 +08:00
zyy
154b252fd6 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-16 19:08:31 +08:00
zyy
9e150eed8d 调整控制权转移请求参数,调整宁波区段显示逻辑 2020-03-16 19:08:18 +08:00
joylink_cuiweidong
f437f18f63 北京线现地进路建立代码调整 2020-03-16 18:53:36 +08:00
fan
7fce0afd5a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-16 17:57:53 +08:00
joylink_cuiweidong
c695309b9f 代码修改 2020-03-16 17:56:10 +08:00
fan
18f69e3429 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-16 17:54:42 +08:00
fan
aa93cfc250 调整现地操作 2020-03-16 17:54:30 +08:00
joylink_cuiweidong
9bac0200be 代码调整 2020-03-16 17:46:34 +08:00
fan
9c3a61a747 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-16 17:17:18 +08:00
fan
0377ef014b 合并代码 2020-03-16 17:16:59 +08:00
joylink_cuiweidong
1a8b37f2b4 北京一号线 现地 排列进路操作代码调整 2020-03-16 16:28:53 +08:00
zyy
933f0c1bba 调整综合演练ibp获取数据 2020-03-16 16:06:50 +08:00
fan
00b1b13542 调整哈尔滨显示 2020-03-16 10:16:17 +08:00
fan
6a77d68c8d 调整哈尔滨显示 2020-03-16 10:15:58 +08:00
zyy
19f64034fb Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/jmapNew/theme/chengdu_01/model.js
#	src/utils/baseUrl.js
2020-03-13 18:20:02 +08:00
fan
553900df47 调整成都三操作 2020-03-13 18:19:27 +08:00
zyy
e156bac9ca 增加公共地图ibp配置绘图 逻辑 2020-03-13 18:19:04 +08:00
fan
5733101b2b Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-13 16:35:13 +08:00
fan
a7b81a3383 调整车次窗初始显示 2020-03-13 16:35:03 +08:00
joylink_cuiweidong
494e1fc815 北京一号线 现地 设置进路操作代码调整 2020-03-13 15:36:26 +08:00
fan
264310f28e 调整成都三显示 2020-03-13 15:06:14 +08:00
fan
7753c53ee0 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/jmapNew/shape/Train/index.js
2020-03-13 13:08:18 +08:00
fan
4a2c539553 哈尔滨现地显示 2020-03-13 13:01:58 +08:00
joylink_cuiweidong
2ea2c297a3 北京一号线 现地 信号重开(进路锁闭情况) 区故解 操作代码调整 2020-03-12 17:15:18 +08:00
joylink_cuiweidong
6031ca59eb 代码调整 2020-03-12 15:54:30 +08:00
joylink_cuiweidong
56126bdbf3 列车精确定位代码调整
列车的状态信息调整
去掉仿真里的拖动鼠标生成包围框
2020-03-12 14:41:53 +08:00
zyy
6045f6dba6 删除多余log 2020-03-12 10:33:10 +08:00
zyy
0cc556fa8d 调整成都一号线信号机排列进路 2020-03-12 10:32:30 +08:00
joylink_cuiweidong
4ceaba9c59 北京一号线新版指令代码调整 2020-03-11 10:52:36 +08:00
joylink_cuiweidong
c0819a4745 北京一号线新版指令操作代码调整 2020-03-11 10:36:45 +08:00
joylink_cuiweidong
27c8b0204e 成都一号线 列车精确位置三角代码修改 2020-03-10 20:15:47 +08:00
fan
36ae4e001e 成都三现地调整 2020-03-10 13:22:41 +08:00
fan
394b80e0e9 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-10 13:05:36 +08:00
fan
ee53da67bc 调整点击设备中组成元素的数据处理 2020-03-10 13:05:20 +08:00
joylink_cuiweidong
ed3adcab6b 北京一号线 现地 自动进路操作代码调整 2020-03-10 11:11:18 +08:00
fan
f6a43ed6aa 宁波一调整道岔正反操为联动操作 2020-03-10 10:08:28 +08:00
joylink_fanyuhong
2ca260d502 哈尔滨创建计划车 2020-03-07 18:32:51 +08:00
joylink_fanyuhong
f685279c6d 代码调整
(cherry picked from commit 709b9ec)
2020-03-06 20:42:29 +08:00
joylink_cuiweidong
4c02e416bc 成都一号线 列车所在区段位置代码调整(部分) 2020-03-06 15:27:31 +08:00
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
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