Commit Graph

113 Commits

Author SHA1 Message Date
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
3a5804c578 调整宁波一号线道岔,区段封锁 单锁状态,调整zc模块与站台的关系 2020-03-04 18:03:50 +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
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
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_fanyuhong
81c81e5ac1 添加属性 2020-03-02 17:17:07 +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
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_zyy
c32b986cea 调整区段颜色 2020-02-28 15:36:03 +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_cuiweidong
dbb24a1793 宁波一号线 道岔 封锁 显示状态代码调整 2020-02-19 17:26:15 +08:00
joylink_fanyuhong
680d87e623 列车状态显示 2020-02-19 16:33:59 +08:00
joylink_fanyuhong
4efea9cfc2 列车状态显示 2020-02-19 16:01:18 +08:00
joylink_fanyuhong
00dd268918 列车调整 2020-02-19 11:47:38 +08:00
joylink_cuiweidong
daa7486ecf 宁波一号线 北京一号线 道岔 站台 状态调整 2020-02-18 19:04:03 +08:00
joylink_cuiweidong
7c3a7b800e 宁波线的配置文件调整 2020-02-18 17:47:01 +08:00
joylink_cuiweidong
f27c3ce3f4 宁波线 北京一号线新版 信号机状态调整 人工控 自动控代码调整 2020-02-17 19:23:26 +08:00
zyy
3976925669 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-17 17:51:03 +08:00
zyy
73b51bd385 调整站台显示问题 2020-02-17 17:50:15 +08:00
joylink_fanyuhong
c173ce8d6c 状态调整 2020-02-17 15:31:08 +08:00
joylink_fanyuhong
cd8a4c3a2e 状态调整 2020-02-17 14:40:59 +08:00
joylink_fanyuhong
07b5e172dd 状态调整 2020-02-14 10:58:57 +08:00
joylink_fanyuhong
b448cad3c9 道岔状态调整 2020-02-11 15:24:17 +08:00
joylink_fanyuhong
56d93a2f73 区段信号机调整 2020-02-11 11:02:35 +08:00
joylink_zyy
732c80ca6d 调整道岔绘画方式,兼容哈尔滨线路道岔绘制方法 2020-02-04 14:28:18 +08:00
joylink_zyy
f11865385b 调整哈尔滨线路车站包围框显示 2020-02-03 17:26:17 +08:00
joylink_zyy
1ef8788c3c 调整绘图逻辑,增加哈尔滨线路 站台 信号机绘图逻辑 2020-02-03 17:17:56 +08:00
zyy
5217a334d5 调整宁波一号线站台状态显示 2020-01-13 16:52:00 +08:00
zyy
786a37ee2c 增加宁波一号线控制权转移 2020-01-08 14:59:27 +08:00
zyy
e0e9bfc6a6 增加成都一号线运行图导入,增加成都一号线配置,删除成都四号线配置 2019-12-26 15:39:29 +08:00
zyy
3101af9948 增加线路皮肤配置,调整联锁站台显示列表 2019-12-19 18:04:28 +08:00
zyy
c295f97819 调整车站显示坐标,信号机批量操作,调整逻辑代码 2019-12-18 16:20:30 +08:00
joylink_cuiweidong
b4ea83eabc zc 集中站设置 2019-12-17 19:03:38 +08:00
fan
c501445800 折线偏移量调整 2019-12-17 14:26:56 +08:00
zyy
7ef051733a 调整缩放,站台显示,坐标 2019-12-12 18:15:25 +08:00
zyy
640b38285a 调整车站默认字体大小,皮肤调整 2019-12-10 15:44:46 +08:00
zyy
dc381e2a63 desc: 新增屏蔽门绘制以及紧急停车按钮生成流程 2019-12-06 18:03:13 +08:00
zyy
c192deb2ca 修改代码 2019-12-06 10:31:19 +08:00
joylink_cuiweidong
09590e7657 删除stationControl 2019-12-05 10:52:45 +08:00
zyy
8bbd5e2600 desc: 修改代码 2019-12-05 10:25:07 +08:00
zyy
22bc27293f 修改代码 2019-12-04 18:39:28 +08:00
fan
5ca78f0ba7 调整绘图相关-(信号机调整,草稿地图列表接口调整) 2019-12-03 13:36:02 +08:00
fan
39edfbe760 调整绘图相关配置 2019-12-03 09:26:55 +08:00
fan
aef74d32da 调整绘图相关 2019-12-03 09:24:44 +08:00
joylink_cuiweidong
cee4a7a396 代码调整 2019-12-02 16:19:40 +08:00
zyy
11b327984e 新增新版地图绘制文件 2019-11-29 12:51:58 +08:00