Commit Graph

2147 Commits

Author SHA1 Message Date
zyy
5dbd676ccf 调整代码 2020-03-13 19:04:28 +08:00
zyy
ce21ff9d91 调整接口 2020-03-13 19:01:59 +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
a7b81a3383 调整车次窗初始显示 2020-03-13 16:35:03 +08:00
fan
6c52c3b56f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-13 13:25:54 +08:00
zyy
31d50d95e2 增加仿真系统 iscs工作站 2020-03-13 13:23:04 +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
zyy
cb4c615345 调整哈尔滨综合监控绘图宽度,高度显示, 综合监控名称动态显示 2020-03-12 18:36:05 +08:00
joylink_cuiweidong
56126bdbf3 列车精确定位代码调整
列车的状态信息调整
去掉仿真里的拖动鼠标生成包围框
2020-03-12 14:41:53 +08:00
zyy
b7ee3e5f6e 增加批量调整区段名称位置 2020-03-12 13:13:00 +08:00
fan
8ad0544dc2 创建小站台时,不设置区段为站台轨 2020-03-11 18:00:45 +08:00
fan
939360917e 调整信号机接近区段颜色变化 2020-03-11 16:58:14 +08:00
fan
3273724484 调整自动折返非空校验 2020-03-11 15:50:47 +08:00
fan
ef60af34c0 绘图预览切换现地行调显示 2020-03-11 15:10:08 +08:00
fan
5d39b8e84e 绘图显示调整 2020-03-11 10:53:09 +08:00
fan
50bb1ad59e 绘图高级数据调整 2020-03-10 18:56:03 +08:00
fan
ee53da67bc 调整点击设备中组成元素的数据处理 2020-03-10 13:05:20 +08:00
fan
a4e5bf3d81 现地行调显示区分 2020-03-10 09:49:05 +08:00
fan
d45950fa68 自动折返调整 2020-03-09 18:35:01 +08:00
fan
7f4e6fb13c 初始化按计划行车状态and其他调整 2020-03-09 17:38:15 +08:00
fan
2b971cdf12 初始化按计划行车状态and其他调整 2020-03-09 14:23:44 +08:00
joylink_fanyuhong
7f53be45b1 进路调整,绘图相关调整
(cherry picked from commit e9749da)
2020-03-06 20:42:04 +08:00
zyy
93be0b7ff6 调整车站引导总锁在地图绘制中不显示,增加字体的默认状态 2020-03-06 12:18:04 +08:00
zyy
b2a154a3a4 增加车站 站台 屏蔽门批量设置功能 2020-03-06 12:04:00 +08:00
zyy
6d0849f5b3 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/jmapNew/utils/parser.js
2020-03-06 10:23:14 +08:00
zyy
a1f752fe59 调整地图绘制矩形框保存字段 2020-03-06 10:21:41 +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
joylink_cuiweidong
dc12bd3f88 成都一号线 信号机 信号自动通过 代码调整
自动通过模式,自动触发模式 状态参数调整
2020-03-05 13:40:50 +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
joylink_fanyuhong
09278e4b1e 排序操作 2020-03-03 18:47:32 +08:00
joylink_fanyuhong
e60fde1a5a 地图排序 2020-03-03 14:24:25 +08:00
joylink_fanyuhong
a853439255 地图排序 2020-03-03 11:08:41 +08:00
joylink_fanyuhong
692f30fd9f 运行图导入和列车调整 2020-03-02 14:46:59 +08:00
joylink_fanyuhong
92f4f2f1ca 按计划行车接口报错提示 2020-02-28 16:47:26 +08:00
joylink_fanyuhong
d5539a986b 按计划行车接口报错提示
(cherry picked from commit 1abad25)
2020-02-28 11:28:13 +08:00
joylink_fanyuhong
41bc739eab 运行图预览 2020-02-27 22:09:51 +08:00
joylink_fanyuhong
40c8ee9c0c 调整运行图预览尺寸 2020-02-27 16:57:51 +08:00
joylink_fanyuhong
040636e2ce 调整运行图预览尺寸 2020-02-27 16:52:48 +08:00
joylink_fanyuhong
d85f8ea5a8 仿真调整 2020-02-27 16:30:48 +08:00
joylink_fanyuhong
c3ca956bd5 仿真调整 2020-02-26 11:34:50 +08:00
joylink_cuiweidong
b221e8e6b9 车站添加 是否车辆段/停车场 是否折返车站字段 2020-02-25 10:52:13 +08:00
joylink_fanyuhong
aa0f770630 仿真调整 2020-02-24 17:04:39 +08:00