Commit Graph

3730 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
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
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
b356187e44 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-13 13:23:11 +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
joylink_cuiweidong
9e1e329644 列车状态代码调整 2020-03-13 11:25:43 +08:00
joylink_cuiweidong
bf0e44d512 绘图右键代码调整 2020-03-12 18:42:38 +08:00
zyy
61ad60c365 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-12 18:36:13 +08:00
zyy
cb4c615345 调整哈尔滨综合监控绘图宽度,高度显示, 综合监控名称动态显示 2020-03-12 18:36:05 +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
6c7bb150fb 代码调整 2020-03-12 15:13:18 +08:00
joylink_cuiweidong
56126bdbf3 列车精确定位代码调整
列车的状态信息调整
去掉仿真里的拖动鼠标生成包围框
2020-03-12 14:41:53 +08:00
zyy
b7ee3e5f6e 增加批量调整区段名称位置 2020-03-12 13:13:00 +08:00
zyy
6045f6dba6 删除多余log 2020-03-12 10:33:10 +08:00
zyy
0cc556fa8d 调整成都一号线信号机排列进路 2020-03-12 10:32:30 +08:00
joylink_fanyuhong
cf456057c3 调整老版本地图报错 2020-03-11 19:54:48 +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
95e2832cec 删除打印日志 2020-03-11 15:14:38 +08:00
fan
036fa8811e Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-11 15:10:26 +08:00
fan
ef60af34c0 绘图预览切换现地行调显示 2020-03-11 15:10:08 +08:00
fan
5d39b8e84e 绘图显示调整 2020-03-11 10:53:09 +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
0db45c3956 代码调整 2020-03-10 20:24:24 +08:00
joylink_cuiweidong
27c8b0204e 成都一号线 列车精确位置三角代码修改 2020-03-10 20:15:47 +08:00
fan
3ef47d146d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-10 18:56:12 +08:00
fan
50bb1ad59e 绘图高级数据调整 2020-03-10 18:56:03 +08:00
zyy
8c71459ac1 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/jmapNew/shape/Automactic/index.js
2020-03-10 14:47:13 +08:00
zyy
c51302638f 调整区段分隔符 2020-03-10 14:45:30 +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
a65ad91129 站台绘图代码调整 2020-03-10 11:16:53 +08:00
joylink_cuiweidong
ed3adcab6b 北京一号线 现地 自动进路操作代码调整 2020-03-10 11:11:18 +08:00
fan
6980bb099f 调整公共绘图元素显示条件 2020-03-10 10:21:33 +08:00
fan
91531c7521 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-10 10:08:40 +08:00
fan
f6a43ed6aa 宁波一调整道岔正反操为联动操作 2020-03-10 10:08:28 +08:00
fan
a4e5bf3d81 现地行调显示区分 2020-03-10 09:49:05 +08:00