fan
|
ba7233d1c8
|
Revert "Revert "Revert "显示配置调整"""
This reverts commit 15cfbd02
|
2021-09-13 10:00:03 +08:00 |
|
joylink_cuiweidong
|
ad40b827c9
|
修改 道岔位置定位、反位 为pos字段
|
2021-09-13 09:29:40 +08:00 |
|
yuan
|
ee26677046
|
TODO
|
2021-09-10 18:10:59 +08:00 |
|
yuan
|
8f3835ad32
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_ElmImport
|
2021-09-10 18:06:45 +08:00 |
|
yuan
|
eaed1afd1b
|
commit
|
2021-09-10 18:03:17 +08:00 |
|
yuan
|
04dc6f3e1b
|
commit
|
2021-09-10 18:03:11 +08:00 |
|
fan
|
7dfa74857c
|
Revert "显示配置调整"
This reverts commit ab38588a
|
2021-09-08 14:42:44 +08:00 |
|
fan
|
7ed9e882cc
|
Revert "显示配置调整"
This reverts commit ab38588a
|
2021-09-08 14:41:31 +08:00 |
|
fan
|
249e9f1a3d
|
Revert "地图绘制添加属性ctcSetOverlap"
This reverts commit 9ed4b26a
|
2021-09-08 14:40:58 +08:00 |
|
fan
|
9bad0d61a7
|
Revert "显示配置调整"
This reverts commit 5e5474ae
|
2021-09-08 14:40:35 +08:00 |
|
fan
|
5e5474aee9
|
显示配置调整
|
2021-09-06 17:49:44 +08:00 |
|
fan
|
9ed4b26a57
|
地图绘制添加属性ctcSetOverlap
|
2021-09-06 15:41:38 +08:00 |
|
fan
|
ab38588aaa
|
显示配置调整
|
2021-09-06 15:17:58 +08:00 |
|
joylink_cuiweidong
|
197f560437
|
地图绘制 区段绘制 添加 向左延伸方式
|
2021-09-01 10:56:04 +08:00 |
|
joylink_cuiweidong
|
88c327698f
|
地图绘制 添加 信号机设备里 信号机型号(signalModel) 字段
更改 进路编辑里 信号是否开放绿灯字段 为 信号显示(aspect) 字段
|
2021-08-27 10:17:13 +08:00 |
|
fan
|
486c3afd8c
|
调整应答器 IB 保存数据 signalCode
|
2021-08-06 10:24:28 +08:00 |
|
fan
|
cb128f6f21
|
超限区段数据 调整
|
2021-08-05 18:25:58 +08:00 |
|
fan
|
8d0edf3e52
|
关联超限区段 显示调整
|
2021-08-05 18:25:43 +08:00 |
|
fan
|
9e6cb0788d
|
IB 应答器 放开关联信号机
|
2021-08-05 18:25:30 +08:00 |
|
fan
|
693a60d72c
|
关联超限区段调整
|
2021-08-05 18:25:01 +08:00 |
|
fan
|
c321020325
|
超限区段 rules 调整
|
2021-08-05 18:24:34 +08:00 |
|
fan
|
b55f0cc583
|
进路关联超限区段
|
2021-08-05 18:24:21 +08:00 |
|
fan
|
ed42c57f36
|
添加超限区段调整
|
2021-08-05 18:17:29 +08:00 |
|
fan
|
5656e77cb2
|
添加超限区段
|
2021-08-05 18:17:14 +08:00 |
|
fan
|
69e0e54c6c
|
保存延续保护和进路
|
2021-08-03 14:58:13 +08:00 |
|
joylink_cuiweidong
|
ab96efb1c6
|
地图绘制 现地配置 增加 可切换显示的车站 字段
|
2021-07-29 11:08:36 +08:00 |
|
fan
|
c9ce97534a
|
进路添加批量操作
|
2021-07-20 13:48:21 +08:00 |
|
fan
|
cdfe2a9a65
|
添加联锁配置项 =》 进路联锁不包含站台扣车 routeInterlockDoNotIncludeStandHoldTrain
|
2021-07-19 13:19:56 +08:00 |
|
fan
|
d2357e0797
|
一键生成集中站现地配置
|
2021-07-15 10:50:29 +08:00 |
|
fan
|
3bb9c2a8d4
|
调整集中站设备显示
|
2021-07-14 09:32:12 +08:00 |
|
fan
|
53041725ac
|
更换折返方式枚举
|
2021-06-29 13:53:39 +08:00 |
|
yuan
|
65d84a98a8
|
信号机距离计算方式修改
|
2021-06-24 18:14:36 +08:00 |
|
fan
|
e1b5c43fb7
|
zc设备数据添加noService属性
|
2021-06-24 13:54:44 +08:00 |
|
joylink_cuiweidong
|
3d4ba98297
|
zc 代码调整
|
2021-06-23 15:55:04 +08:00 |
|
joylink_cuiweidong
|
8f9ab98fb2
|
zc 绘图 添加 集中站列表
|
2021-06-23 15:36:23 +08:00 |
|
joylink_cuiweidong
|
b841022401
|
zc 绘图 代码调整
|
2021-06-23 13:52:22 +08:00 |
|
yuan
|
55ae33c204
|
移除无用代码
|
2021-06-22 18:03:29 +08:00 |
|
yuan
|
f032e3f1ee
|
地图编辑-应答器增加一键关联到信号机功能
|
2021-06-22 17:18:49 +08:00 |
|
yuan
|
1523ab6f51
|
应答器关联区段显示bug修复,增加选中高亮
|
2021-06-22 14:40:21 +08:00 |
|
joylink_cuiweidong
|
eeb75b6a6d
|
Merge remote-tracking branch 'remotes/origin/test_thirdLogin' into test
|
2021-06-15 15:34:42 +08:00 |
|
joylink_cuiweidong
|
a0861633f2
|
zc 添加管理的区段列表(计轴区段)
|
2021-06-15 15:33:50 +08:00 |
|
joylink_cuiweidong
|
6b7827bd91
|
zc 代码调整
|
2021-06-11 18:17:48 +08:00 |
|
yuan
|
a4e6119c4b
|
应答器批量创建增加区段偏移值
|
2021-06-10 15:46:20 +08:00 |
|
yuan
|
4bd21b30c5
|
地图编辑-应答器-批量创建 页面修改
|
2021-06-10 10:01:34 +08:00 |
|
fan
|
8004071e6f
|
绘图添加出站信号机进站信号机
|
2021-06-03 17:40:44 +08:00 |
|
zyy
|
137b427ebe
|
调整新路预览配置
|
2021-05-31 15:52:46 +08:00 |
|
zyy
|
224bbc0177
|
调整进路更新延续保护配置
|
2021-05-28 18:12:35 +08:00 |
|
zyy
|
5678498fa6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-28 17:20:33 +08:00 |
|
zyy
|
d86566be12
|
调整延续保护字段
|
2021-05-28 17:20:16 +08:00 |
|
fan
|
d11b0c6d47
|
增加列车故障操作-换端&联锁配置项-CTC列车进路延续保护仅折返站处锁闭
|
2021-05-28 17:18:51 +08:00 |
|
zyy
|
f9835862ce
|
调整侧防流程
|
2021-05-28 13:08:02 +08:00 |
|
zyy
|
b2806165ef
|
调整信号机接近区段更新流程
|
2021-05-27 16:40:28 +08:00 |
|
zyy
|
672c95c6c6
|
调整信号接近区段
|
2021-05-27 16:10:58 +08:00 |
|
zyy
|
529839b3ac
|
调整进路更新,延续保护更新
|
2021-05-27 15:15:58 +08:00 |
|
zyy
|
e150fda807
|
调整延续保护
|
2021-05-27 14:19:28 +08:00 |
|
zyy
|
2b338ba0de
|
调整进路预览
|
2021-05-26 17:03:38 +08:00 |
|
joylink_cuiweidong
|
e17104f537
|
地图绘制 停站时间/运行等级 代码调整
|
2021-05-21 15:12:40 +08:00 |
|
joylink_cuiweidong
|
13af28467c
|
地图绘制 停站时间/运行等级 界面与接口代码调整
生成联锁配置 删除 延续保护构建是否只考虑一个道岔计轴
生成联锁配置 新增 延续保护最小长度
|
2021-05-21 15:02:28 +08:00 |
|
joylink_cuiweidong
|
4cefb0cfbe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-05-21 11:34:28 +08:00 |
|
joylink_cuiweidong
|
bf8d0eb574
|
地图绘制 停站时间 界面与接口代码调整
|
2021-05-21 11:33:37 +08:00 |
|
fan
|
2438b9f0a0
|
删除仿真、绘图、运行图编制的心跳检测
|
2021-05-21 10:01:45 +08:00 |
|
fan
|
bc2fa1fbae
|
代码调整
|
2021-05-17 13:35:49 +08:00 |
|
joylink_cuiweidong
|
02241f455a
|
地图绘图 高级数据 代码调整
|
2021-05-13 14:19:58 +08:00 |
|
fan
|
0585502691
|
大铁线路操作调整
|
2021-04-29 15:50:15 +08:00 |
|
fan
|
ae5df5de5b
|
大铁线路操作调整
|
2021-04-29 13:25:48 +08:00 |
|
fan
|
edbd6d55cf
|
信号机坐标编辑显示
|
2021-04-28 17:14:48 +08:00 |
|
fan
|
83eddd42d3
|
大铁仿真操作调整
|
2021-04-27 15:52:39 +08:00 |
|
fan
|
d917ccce3d
|
大铁线路操作调整
|
2021-04-25 18:13:47 +08:00 |
|
joylink_cuiweidong
|
54ec91a835
|
添加 修改检查配置接口
|
2021-04-21 15:46:37 +08:00 |
|
joylink_cuiweidong
|
70e9ab6a87
|
代码调整
|
2021-04-21 15:25:08 +08:00 |
|
joylink_cuiweidong
|
62698088d8
|
代码调整
|
2021-04-21 15:19:32 +08:00 |
|
joylink_cuiweidong
|
97a07bb70e
|
大铁 进路删除 代码调整
|
2021-04-21 15:17:27 +08:00 |
|
joylink_cuiweidong
|
6fe2bf0aca
|
大铁 进路预览代码调整
|
2021-04-21 14:40:44 +08:00 |
|
joylink_cuiweidong
|
d13292b8f1
|
大铁线路 进路预览代码调整
|
2021-04-21 13:40:37 +08:00 |
|
joylink_cuiweidong
|
af13800539
|
大铁线路 进路添加代码调整
|
2021-04-21 09:20:48 +08:00 |
|
fan
|
3ba2f8ac5b
|
merge
|
2021-04-20 17:29:32 +08:00 |
|
fan
|
0226042942
|
宁波三Bug调整
|
2021-04-20 17:25:27 +08:00 |
|
joylink_cuiweidong
|
d1a177827d
|
大铁项目 添加进路 代码调整
|
2021-04-16 17:21:15 +08:00 |
|
joylink_cuiweidong
|
e554ff45b7
|
代码调整
|
2021-04-16 16:36:17 +08:00 |
|
joylink_cuiweidong
|
388f85c3db
|
代码调整
|
2021-04-16 16:26:58 +08:00 |
|
joylink_cuiweidong
|
a3dff96e73
|
大铁 项目 添加进路 代码调整
|
2021-04-16 15:59:08 +08:00 |
|
joylink_cuiweidong
|
84169141ab
|
大铁 指示灯 代码调整
|
2021-04-16 14:22:29 +08:00 |
|
ival
|
14f718ec1a
|
增加指示器显示
|
2021-04-15 18:15:12 +08:00 |
|
joylink_cuiweidong
|
16294b6373
|
代码调整
|
2021-04-15 17:12:41 +08:00 |
|
joylink_cuiweidong
|
d3b240989b
|
代码调整
|
2021-04-15 16:15:18 +08:00 |
|
joylink_cuiweidong
|
bb928cb37b
|
代码调整
|
2021-04-15 15:55:30 +08:00 |
|
joylink_cuiweidong
|
4050ddf937
|
大铁进路添加 代码调整
|
2021-04-15 15:53:34 +08:00 |
|
fan
|
0b5cc8e15d
|
信号按钮调整
|
2021-04-13 18:09:37 +08:00 |
|
fan
|
8a363c068a
|
大铁调整
|
2021-04-13 14:10:20 +08:00 |
|
joylink_cuiweidong
|
b383815100
|
地图绘制 交路预览 显示代码调整
|
2021-03-22 16:04:33 +08:00 |
|
joylink_cuiweidong
|
26b72f9228
|
代码调整
|
2021-03-22 13:20:51 +08:00 |
|
ival
|
d7e068c79d
|
修改引入文件路径问题
|
2021-03-19 11:02:40 +08:00 |
|
ival
|
1b2abcffb3
|
Merge branch 'test-ival' into test
# Conflicts:
# src/permission.js
# src/views/demo/index.vue
# src/views/newMap/displayNew/demoTraining/index.vue
# src/views/newMap/displayNew/lesson/index.vue
|
2021-03-19 10:15:43 +08:00 |
|
ival
|
e183f40611
|
提交代码
|
2021-03-17 13:35:15 +08:00 |
|
joylink_cuiweidong
|
f21d270cf5
|
地图数据 交路预览页面调整
|
2021-03-17 09:33:19 +08:00 |
|
fan
|
659054f1fa
|
岔芯添加parentCode
|
2021-03-10 19:03:04 +08:00 |
|
fan
|
605d60b06c
|
岔芯添加parentCode
|
2021-03-10 18:14:12 +08:00 |
|
fan
|
b05ab63bc6
|
关联岔芯参数可删除
|
2021-03-10 17:28:09 +08:00 |
|
fan
|
d9d2e9b6cd
|
道岔计轴添加关联岔芯参数&宁波三排列进路到
|
2021-03-10 17:18:35 +08:00 |
|
fan
|
0bf5e348a0
|
岔芯不生成车次窗
|
2021-03-10 13:19:17 +08:00 |
|
joylink_cuiweidong
|
ed791a0a2f
|
地图绘图 目的地码 添加起始区段的字段
|
2021-03-03 13:21:41 +08:00 |
|
joylink_cuiweidong
|
92cc3d60c0
|
地图绘图 信号机添加 不生成进路 字段
|
2021-03-01 14:18:49 +08:00 |
|
joylink_cuiweidong
|
40b2dceaf9
|
代码调整
|
2021-02-25 16:16:43 +08:00 |
|
joylink_cuiweidong
|
279cbc7133
|
地图绘图数据 目的地码 代码调整
|
2021-02-25 15:19:22 +08:00 |
|
fan
|
f0cd6ff07c
|
问题调整
|
2021-02-23 18:17:15 +08:00 |
|
joylink_cuiweidong
|
858c7dd7a7
|
宁波三号线(泰雷兹线路) 系统扣车设置/取消 操作添加
|
2021-02-20 15:03:44 +08:00 |
|
joylink_cuiweidong
|
414aa1a3ca
|
地图绘制 列车数据模型更改
|
2021-02-19 13:28:19 +08:00 |
|
fan
|
f3ec3a1476
|
南京二号线折行显示调整
|
2021-02-05 15:12:57 +08:00 |
|
fan
|
88683b3763
|
代码调整
|
2021-02-05 09:19:18 +08:00 |
|
joylink_cuiweidong
|
2e3d576614
|
生成联锁添加配置项:信号机接近区段不跨过前方同向信号机
|
2021-01-29 11:23:01 +08:00 |
|
joylink_cuiweidong
|
8f82b0fdd5
|
北交大客流 车站人数代码调整
地图绘图代码调整
|
2021-01-27 15:39:53 +08:00 |
|
fan
|
76f0fa96ab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-25 17:21:40 +08:00 |
|
fan
|
4fb1cd1bed
|
南京二号线行值折行显示
|
2021-01-25 17:21:24 +08:00 |
|
joylink_cuiweidong
|
d3546c5de2
|
岔心鼠标事件 绘图代码调整
|
2021-01-25 13:48:37 +08:00 |
|
joylink_cuiweidong
|
8eee00f454
|
代码调整
|
2021-01-22 19:18:16 +08:00 |
|
fan
|
c80e08292c
|
调整实际长度 小数计算
|
2021-01-22 14:51:37 +08:00 |
|
fan
|
420163ec07
|
逻辑区段实际长度设置调整&实训平台二级主页
|
2021-01-22 14:47:49 +08:00 |
|
fan
|
4a0c7e1e95
|
逻辑区段实际长度设置调整
|
2021-01-22 13:59:32 +08:00 |
|
fan
|
258796555e
|
车队进路调整
|
2021-01-21 19:11:50 +08:00 |
|
fan
|
49405666df
|
传输信号机参数调整
|
2021-01-19 11:18:24 +08:00 |
|
fan
|
145259d3b5
|
传输信号机 && 佛山进路预览调整
|
2021-01-19 11:09:53 +08:00 |
|
lVAL
|
198602923c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-18 15:49:00 +08:00 |
|
lVAL
|
7d61451fa9
|
修改 应答器 创建的几个优化问题,以及南京线路中心左键弹窗,右键不弹
|
2021-01-18 15:48:05 +08:00 |
|
fan
|
5f3300e889
|
信号机添加所属车站&批量设置
|
2021-01-18 15:41:28 +08:00 |
|
lVAL
|
dd7f4d2aeb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 17:23:37 +08:00 |
|
lVAL
|
0ee148437b
|
增加应答器 创建时必须选择信号机以及校验
|
2021-01-15 17:23:27 +08:00 |
|
joylink_cuiweidong
|
f61df9b1e8
|
岔心状态 绘图代码调整
|
2021-01-15 17:17:17 +08:00 |
|
joylink_cuiweidong
|
39da2a712d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 16:44:55 +08:00 |
|
joylink_cuiweidong
|
9aef723b3f
|
bug修改:
逻辑区段修改 导致逻辑区段起终点坐标出现错误问题
逻辑区段修改坐标 导致相邻物理区段坐标出现问题
功能:
增加线路配置:信号封锁下进路是否可以办理
|
2021-01-15 16:44:22 +08:00 |
|
lVAL
|
c63d475d57
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 15:11:24 +08:00 |
|
lVAL
|
3c37037558
|
增加应答器关联信号机,以及绘图信号机,区段激活选择
|
2021-01-15 15:11:13 +08:00 |
|
joylink_cuiweidong
|
0f4f6ef5f2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 13:27:09 +08:00 |
|
joylink_cuiweidong
|
53b51a7b63
|
道岔 生成逻辑代码调整
|
2021-01-15 13:26:42 +08:00 |
|
lVAL
|
ec30635c02
|
修改应答器图层以及回车修改属性的问题
|
2021-01-15 10:59:58 +08:00 |
|
joylink_cuiweidong
|
4e28468ad9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 10:33:15 +08:00 |
|
joylink_cuiweidong
|
a86c76422f
|
岔心绘图代码调整
区段绘图(左右关联区段 关系)调整
|
2021-01-15 10:32:57 +08:00 |
|
lVAL
|
48955258ea
|
修改应答器 绘制card css
|
2021-01-15 09:54:56 +08:00 |
|
lVAL
|
c6c59f48b7
|
修改代码
|
2021-01-15 09:53:37 +08:00 |
|
joylink_cuiweidong
|
cadda00719
|
区段 物理区段 实际长度修改 bug调整
|
2021-01-14 14:58:42 +08:00 |
|
joylink_cuiweidong
|
845f10caf6
|
岔心绘图代码调整
bug调整:新建完一个信号机 三个状态不发生改变
|
2021-01-14 13:04:04 +08:00 |
|
joylink_cuiweidong
|
becb6a03df
|
岔心代码调整
|
2021-01-13 18:33:07 +08:00 |
|
lVAL
|
9f4155b70d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-13 17:45:49 +08:00 |
|
lVAL
|
15f94a7d1d
|
优化 应答器创建 选择关联区段类型 以及优化绘制显示位置
|
2021-01-13 17:45:38 +08:00 |
|
joylink_cuiweidong
|
752b4e9a26
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/config/skinCode/nanjing_02.js
# src/jmapNew/utils/parser.js
|
2021-01-13 17:43:15 +08:00 |
|
joylink_cuiweidong
|
99644039d3
|
新建车站以后 无法点击其他的东西 bug 调整
|
2021-01-13 17:34:57 +08:00 |
|
joylink_cuiweidong
|
7599458c8f
|
岔心 元素绘图代码调整
|
2021-01-13 17:01:53 +08:00 |
|
lVAL
|
006d784178
|
修改应答器bug
|
2021-01-13 10:26:52 +08:00 |
|
joylink_cuiweidong
|
1e2e8c2609
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/config/skinCode/nanjing_02.js
# src/jmapNew/shape/Responder/index.js
|
2021-01-12 17:27:25 +08:00 |
|
joylink_cuiweidong
|
85a88a9431
|
岔心 绘图代码调整
|
2021-01-12 17:25:32 +08:00 |
|
lVAL
|
64df012fc3
|
设置应答器 绘图显示 仿真不显示
|
2021-01-12 11:32:39 +08:00 |
|