Commit Graph

141 Commits

Author SHA1 Message Date
zyy
b92b2ff786 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-06 19:02:34 +08:00
zyy
84c379410f 调整站台状态 2020-03-06 19:02:20 +08:00
joylink_cuiweidong
f8cadc33b8 自动折返绘图数据添加是否显示边框字段 2020-03-06 17:45:20 +08:00
zyy
2f96f68e46 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-06 16:16:20 +08:00
zyy
6c797c50e6 调整地图绘制,公共地图车站 ,站台显示逻辑判断 2020-03-06 16:16:04 +08:00
joylink_cuiweidong
4c02e416bc 成都一号线 列车所在区段位置代码调整(部分) 2020-03-06 15:27:31 +08:00
zyy
93be0b7ff6 调整车站引导总锁在地图绘制中不显示,增加字体的默认状态 2020-03-06 12:18:04 +08:00
zyy
a5543cb1b4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-06 12:04:21 +08:00
zyy
b2a154a3a4 增加车站 站台 屏蔽门批量设置功能 2020-03-06 12:04:00 +08:00
joylink_fanyuhong
56a5d0f018 调整显示条件 2020-03-06 11:26:52 +08:00
joylink_fanyuhong
217864dbd4 站台功能按钮 2020-03-06 10:05:21 +08:00
joylink_fanyuhong
9200cb99f7 站台增加功能按钮,未完 2020-03-05 18:17:47 +08:00
joylink_fanyuhong
c9e8827c3a 合并代码 2020-03-05 16:43:53 +08:00
joylink_fanyuhong
8d58125e1f 自动进路和引导总锁 2020-03-05 16:39:49 +08:00
zyy
30c672026f 增加矩形包围框 2020-03-05 15:48:51 +08:00
zyy
3510548b7b 调整集中站指示灯状态,绘图显示 2020-03-05 14:33:08 +08:00
zyy
8e7fc5104a 调整lc模块保存,自动折返绘图状态配置,流程完善 2020-03-05 12:21:28 +08:00
zyy
af5c108610 创建自动折返模块 2020-03-04 20:59:16 +08:00
zyy
6101a0d28a 删除多于设置状态信息 2020-03-04 18:04:43 +08:00
zyy
3a5804c578 调整宁波一号线道岔,区段封锁 单锁状态,调整zc模块与站台的关系 2020-03-04 18:03:50 +08:00
zyy
3a5d7af0ff 删除多于注释状态 2020-03-04 14:19:29 +08:00
zyy
467a9cf982 调整宁波线路现地操作 2020-03-04 14:14:59 +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
ce2d67ed2c 车身计算包围框调整 2020-03-03 09:46:50 +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_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_zyy
e7a247ab4d 调整哈尔滨曲线封锁绘图 2020-03-01 12:26:55 +08:00
joylink_zyy
446593fded 调整哈尔滨道岔显示问题 2020-02-29 00:04:24 +08:00
joylink_zyy
448523cf88 调整哈尔滨线路道岔显示问题 2020-02-28 18:10:20 +08:00
joylink_zyy
a9d40c7af6 哈尔滨区段颜色 2020-02-28 15:30:40 +08:00
joylink_zyy
870a68a476 调整区段,道岔显示样式 2020-02-28 15:20:26 +08:00
joylink_zyy
d9e7900f44 调整道岔绘图图形 2020-02-26 22:10:48 +08:00
joylink_fanyuhong
a33a9bbe42 道岔转动调整 2020-02-21 15:49:30 +08:00
joylink_cuiweidong
dbb24a1793 宁波一号线 道岔 封锁 显示状态代码调整 2020-02-19 17:26:15 +08:00
zyy
8118e151ba 调整状态显示 2020-02-19 16:46:34 +08:00
zyy
cc717f86e6 调整开门状态 2020-02-19 16:19:37 +08:00
zyy
8234c8b817 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-19 14:07:00 +08:00
zyy
847aa2d794 添加屏蔽门状态 2020-02-19 14:06:43 +08:00
joylink_fanyuhong
00dd268918 列车调整 2020-02-19 11:47:38 +08:00
joylink_fanyuhong
412e6bd582 列车调整 2020-02-18 19:24:52 +08:00
zyy
5d123115b6 删除数据赋值 2020-02-18 18:40:02 +08:00
zyy
11e03c4fe3 调整道岔绘图 2020-02-18 18:39:12 +08:00
joylink_fanyuhong
c14043f93b 自动进路调整 2020-02-18 14:45:32 +08:00