Commit Graph

3616 Commits

Author SHA1 Message Date
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
joylink_fanyuhong
78c3af254f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-03 18:47:44 +08:00
joylink_fanyuhong
09278e4b1e 排序操作 2020-03-03 18:47:32 +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_fanyuhong
09c0637c93 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-03 14:24:33 +08:00
joylink_fanyuhong
e60fde1a5a 地图排序 2020-03-03 14:24:25 +08:00
joylink_cuiweidong
030470eec4 代码调整 2020-03-03 14:09:27 +08:00
zyy
ef0af739a9 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-03 12:57:41 +08:00
zyy
8729905299 调整临时限速绘图逻辑,调整宁波线车次窗流程操作 2020-03-03 12:57:26 +08:00
joylink_fanyuhong
a853439255 地图排序 2020-03-03 11:08:41 +08:00
joylink_fanyuhong
22d1262cd5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-03 09:46:58 +08:00
joylink_fanyuhong
ce2d67ed2c 车身计算包围框调整 2020-03-03 09:46:50 +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
9ce5cd4a34 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-02 17:19:06 +08:00
joylink_fanyuhong
81c81e5ac1 添加属性 2020-03-02 17:17:07 +08:00
joylink_cuiweidong
cd970436f9 北京一号线成都三号线站台操作代码调整 2020-03-02 17:16:59 +08:00
zyy
75d9f1b3bb Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-02 16:54:49 +08:00
zyy
915d1372e5 调整哈尔滨车站 显示 2020-03-02 16:54:36 +08:00
joylink_fanyuhong
af7488c27f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/jmapNew/config/skinCode/ningbo_01.js
2020-03-02 16:32:33 +08:00
joylink_fanyuhong
82c418681d 列车调整 2020-03-02 16:29:09 +08:00
zyy
e46239c8b9 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/jmapNew/config/skinCode/ningbo_01.js
#	src/store/modules/socket.js
2020-03-02 16:18:23 +08:00
zyy
79820a9725 调整宁波线显示数据,哈尔滨道岔逻辑判断显示 2020-03-02 16:16:17 +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_zyy
e7a247ab4d 调整哈尔滨曲线封锁绘图 2020-03-01 12:26:55 +08:00
joylink_zyy
2c09aa0e84 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-29 00:04:29 +08:00
joylink_zyy
446593fded 调整哈尔滨道岔显示问题 2020-02-29 00:04:24 +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_zyy
ff640adf39 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-28 18:10:26 +08:00
joylink_zyy
448523cf88 调整哈尔滨线路道岔显示问题 2020-02-28 18:10:20 +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_zyy
c32b986cea 调整区段颜色 2020-02-28 15:36:03 +08:00
joylink_zyy
a9d40c7af6 哈尔滨区段颜色 2020-02-28 15:30:40 +08:00
joylink_zyy
9887627fd8 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-28 15:20:31 +08:00
joylink_zyy
870a68a476 调整区段,道岔显示样式 2020-02-28 15:20:26 +08:00