zyy
|
2e6d45baab
|
调整宁波三号线配置
|
2020-08-19 15:50:33 +08:00 |
|
zyy
|
280b766d91
|
增加宁波三号线配置
|
2020-08-19 14:06:01 +08:00 |
|
zyy
|
70945cbbc1
|
调整区段配置
|
2020-08-19 13:43:13 +08:00 |
|
zyy
|
e383ab201d
|
调整哈尔滨线路延续保护计时，增加配置项
|
2020-08-17 16:48:19 +08:00 |
|
joylink_cuiweidong
|
1f0aaffe6f
|
佛山有轨电车信号机优化（全线信号机设置成图样类型）
|
2020-08-12 10:02:56 +08:00 |
|
zyy
|
fda63a7ca6
|
调整多余注释
|
2020-08-10 13:01:59 +08:00 |
|
fan
|
8e73c01b3f
|
成都一列车样式调整
|
2020-08-07 10:15:39 +08:00 |
|
fan
|
e3e62f85f9
|
佛山目的地码显示长度调整&联锁配置添加参数generateFls
|
2020-08-06 15:02:22 +08:00 |
|
joylink_cuiweidong
|
96f6d5030b
|
哈尔滨一号线 自动触发进路 绘图代码调整
|
2020-08-05 13:03:53 +08:00 |
|
zyy
|
6dbac54d1f
|
调整地图绘制相关流程
|
2020-08-04 17:31:07 +08:00 |
|
zyy
|
70114a0014
|
调整宁波线路操作
|
2020-07-31 16:22:29 +08:00 |
|
zyy
|
33969bd5e8
|
调整哈尔滨站台操作
|
2020-07-30 10:03:00 +08:00 |
|
zyy
|
eec51e7cfd
|
调整哈尔滨车站操作
|
2020-07-28 16:41:21 +08:00 |
|
fan
|
a5a55af5ef
|
加载仿真计划失表取消loading状态&暂撤销宁波一计轴故障修改
|
2020-07-27 10:00:08 +08:00 |
|
fan
|
95d754d57c
|
调整宁波线计轴故障为粉色光带
|
2020-07-27 09:12:08 +08:00 |
|
joylink_cuiweidong
|
f06a025792
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 15:24:45 +08:00 |
|
joylink_cuiweidong
|
d5215a3c1c
|
哈尔滨线路 停站时间状态绘图调整
|
2020-07-24 15:23:55 +08:00 |
|
fan
|
d4da17ae09
|
调整哈尔滨成都一故障样式&哈尔滨现地切换显示
|
2020-07-24 14:20:38 +08:00 |
|
joylink_cuiweidong
|
6210df54de
|
代码调整
|
2020-07-23 16:42:39 +08:00 |
|
joylink_cuiweidong
|
478a8f0ba4
|
宁波线的列车，RM模式的时候，前面的箭头设置为灰色
|
2020-07-23 13:38:31 +08:00 |
|
fan
|
c97291e225
|
北京皮肤调整
|
2020-07-21 11:20:05 +08:00 |
|
fan
|
bbadc59bf1
|
宁波皮肤调整
|
2020-07-21 11:19:06 +08:00 |
|
zyy
|
172623c0f1
|
调整宁波线路道岔失表显示
|
2020-07-14 18:14:39 +08:00 |
|
joylink_cuiweidong
|
92da104ad0
|
zc故障灯状态修改
|
2020-07-07 10:00:55 +08:00 |
|
joylink_cuiweidong
|
ec1c5a9bbb
|
信号机故障 绘图代码调整
|
2020-07-03 11:27:01 +08:00 |
|
zyy
|
e3ee44aae7
|
调整道岔失表状态，成都3号线实操定义
|
2020-06-28 13:27:10 +08:00 |
|
fan
|
2399be67d0
|
宁波道岔失表增加表示红色矩形
|
2020-06-24 16:19:47 +08:00 |
|
fan
|
0ae6ec9237
|
调整登录状态检测&删除冗余配置
|
2020-06-23 16:21:54 +08:00 |
|
zyy
|
58ab773ec9
|
删除多余配置
|
2020-06-22 13:49:42 +08:00 |
|
joylink_cuiweidong
|
4b7c7f3f84
|
绘图代码调整
|
2020-06-18 16:58:21 +08:00 |
|
fan
|
89ae6e8c0f
|
列车整理
|
2020-06-17 13:35:21 +08:00 |
|
fan
|
6cc44b5528
|
合并代码
|
2020-06-16 18:38:21 +08:00 |
|
fan
|
3b171130f9
|
福州列车显示调整&表单组件button增加loading
|
2020-06-16 18:36:18 +08:00 |
|
zyy
|
7f242ba443
|
调整综合监控绘图元素， 调整按图折返配置
|
2020-06-16 16:39:07 +08:00 |
|
zyy
|
f62de1971f
|
增加宁波线路 站后折返皮肤配置
|
2020-06-16 15:01:29 +08:00 |
|
zyy
|
10502988a4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-16 14:45:50 +08:00 |
|
zyy
|
dfdbddad2b
|
调整综合监控数据，调整地图绘制功能按钮显示状态逻辑判断
|
2020-06-16 14:45:34 +08:00 |
|
fan
|
5292afe4dd
|
宁波一号线人工车头码车显示&哈尔滨title+V1.0&福州道岔操作调整（未完）
|
2020-06-16 13:56:33 +08:00 |
|
fan
|
f60e69f8ff
|
福州车站站台操作&西安车站站台操作调整
|
2020-06-15 18:00:24 +08:00 |
|
fan
|
2f51f2362b
|
调整西安列车车头三角宽度
|
2020-06-15 10:41:27 +08:00 |
|
fan
|
71a99f225c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 14:34:29 +08:00 |
|
fan
|
2e44c69429
|
老版本福州列车目的地码调整
|
2020-06-12 14:34:18 +08:00 |
|
zyy
|
656cbb3b7b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 13:19:39 +08:00 |
|
zyy
|
e01277ba64
|
调整车站 控制模式配置
|
2020-06-12 13:19:26 +08:00 |
|
fan
|
429fe6d6a7
|
跳停上下行取值调整&列车识别号显示调整
|
2020-06-12 10:51:06 +08:00 |
|
zyy
|
3e9835ff15
|
调整字段显示
|
2020-06-11 17:06:29 +08:00 |
|
zyy
|
0a58b253e1
|
调整绘图元素皮肤，调整大屏高度
|
2020-06-11 11:11:47 +08:00 |
|
zyy
|
75e9db45fa
|
调整右键菜单
|
2020-06-10 17:02:39 +08:00 |
|
joylink_cuiweidong
|
63c3d785dd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-08 10:46:23 +08:00 |
|
joylink_cuiweidong
|
eecc022ae5
|
佛山线路 菜单栏 增加显示功能
列车提示代码调整
|
2020-06-08 10:46:01 +08:00 |
|
fan
|
fc0772a11c
|
iscs调整&站后折返显示调整
|
2020-06-05 18:59:35 +08:00 |
|
fan
|
ec6ebe78e5
|
列车显示调整
|
2020-06-05 10:50:05 +08:00 |
|
zyy
|
9be9c9a313
|
增加西安 三号线设置折返策略元素
|
2020-06-04 17:29:18 +08:00 |
|
zyy
|
631fba04bb
|
调整道岔佛山线路显示， 综合监控元素添加
|
2020-06-03 10:12:36 +08:00 |
|
fan
|
eff6615407
|
西安一三号线道岔失表表示灯状态&裁判分数展示调整
|
2020-05-29 17:55:22 +08:00 |
|
fan
|
95e4f4c938
|
西安一三号线道岔失表调整&iscs调整
|
2020-05-29 16:57:21 +08:00 |
|
fan
|
97f2b84741
|
调整小交路颜色
|
2020-05-29 09:19:59 +08:00 |
|
zyy
|
df4dc3eea9
|
调整供电线路保存，福州皮肤配置文件调整
|
2020-05-28 14:39:06 +08:00 |
|
fan
|
f27c766b9b
|
列车调整
|
2020-05-26 09:21:48 +08:00 |
|
zyy
|
1ae2793221
|
调整绘图界面字体皮肤配置
|
2020-05-25 15:06:34 +08:00 |
|
fan
|
c74eaaaab6
|
人工车头码车显示调整
|
2020-05-25 11:00:10 +08:00 |
|
fan
|
32eb7faada
|
西安线路调整
|
2020-05-22 14:47:19 +08:00 |
|
fan
|
f875cd69c3
|
大小交路回库颜色
|
2020-05-22 13:05:08 +08:00 |
|
fan
|
e4bdd9c829
|
调整西安一ats人工控显示调整
|
2020-05-21 16:34:05 +08:00 |
|
fan
|
650b0c00ee
|
调整列车早晚点显示
|
2020-05-21 09:31:16 +08:00 |
|
fan
|
9e8f4a48f4
|
调整站台扣车显示
|
2020-05-20 18:11:39 +08:00 |
|
fan
|
ddee6156f7
|
竞赛管理显示地址
|
2020-05-20 17:44:47 +08:00 |
|
fan
|
f93f432d7e
|
ARB故障状态&哈尔滨列车早晚点时间
|
2020-05-20 17:08:21 +08:00 |
|
joylink_cuiweidong
|
3e64c6da02
|
西安三号线 仿真系统车次与实际车次显示不符 修改
|
2020-05-18 11:32:46 +08:00 |
|
fan
|
71682d00a5
|
区段计轴调整
|
2020-05-14 18:54:53 +08:00 |
|
zyy
|
42402f6223
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 16:44:11 +08:00 |
|
zyy
|
b735cd5b06
|
调整区段回车问题
|
2020-05-14 16:43:55 +08:00 |
|
fan
|
b3743326bc
|
西安二号线信号机调整逻辑点灯
|
2020-05-14 16:04:23 +08:00 |
|
fan
|
f8a6908d8c
|
西安二号线调整
|
2020-05-14 15:37:18 +08:00 |
|
zyy
|
ba1365b951
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 11:00:27 +08:00 |
|
zyy
|
2de0a0fc5b
|
调整区段鼠标移入元素绘制
|
2020-05-14 11:00:09 +08:00 |
|
joylink_cuiweidong
|
352becd47b
|
西安二号线 列车占用的光带显示为红光带
|
2020-05-14 10:55:20 +08:00 |
|
joylink_cuiweidong
|
8fd1014203
|
西安二号线 车次窗显示车次号颜色为黑色
列车车次号线显示为五位
实际列车到站开门的过程中列车方向图标不消失 调整
|
2020-05-14 10:22:13 +08:00 |
|
zyy
|
52cbb7fd1e
|
调整大屏系统列车缩放
|
2020-05-12 18:23:56 +08:00 |
|
zyy
|
ecec0ec1e0
|
调整西安一号鼠标移入样式
|
2020-05-12 16:45:45 +08:00 |
|
joylink_zyy
|
942510398a
|
调整西安三号线导入
|
2020-05-10 22:36:31 +08:00 |
|
joylink_zyy
|
da08f98218
|
增加西安三号线皮肤
|
2020-05-10 22:27:35 +08:00 |
|
joylink_fanyuhong
|
14fa56f768
|
列车调整
|
2020-05-10 17:04:49 +08:00 |
|
joylink_fanyuhong
|
292d6d1327
|
列车调整
|
2020-05-10 16:51:28 +08:00 |
|
zyy
|
515880d1c9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-06 13:11:52 +08:00 |
|
zyy
|
adf2627fec
|
调整西安二号线鼠标移入
|
2020-05-06 13:11:37 +08:00 |
|
fan
|
276620a25e
|
西安二信号机调整
|
2020-04-30 17:40:25 +08:00 |
|
fan
|
15104970bc
|
西安二信号机调整&线路配置添加参数
|
2020-04-30 16:19:33 +08:00 |
|
fan
|
f3ab2337e8
|
西安二号线信号封锁调整（未完）
|
2020-04-30 08:54:17 +08:00 |
|
fan
|
1c8929cb08
|
绘图区段添加firstTurnBack&线路配置添加generateCycle&西安二操作调整
|
2020-04-29 17:25:30 +08:00 |
|
fan
|
7e790a3bdb
|
鼠标样式调整
|
2020-04-29 14:05:50 +08:00 |
|
fan
|
7d3a6ddafa
|
西安二号线信号机操作调整
|
2020-04-29 11:36:16 +08:00 |
|
fan
|
e39a7eadb9
|
西安二号线操作调整&&绘图数据调整
|
2020-04-27 19:02:07 +08:00 |
|
fan
|
a1d0c3e7d0
|
西安二号线绘图调整
|
2020-04-26 17:16:20 +08:00 |
|
fan
|
f1fac79770
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-26 16:24:49 +08:00 |
|
fan
|
695ea67e27
|
西安二号线绘图调整&西安二号线站台操作调整&派班计划冲突显示调整
|
2020-04-26 16:24:34 +08:00 |
|
joylink_cuiweidong
|
7d5605d170
|
西安二号线 绘图 站台添加模式筛选标识
|
2020-04-24 18:23:17 +08:00 |
|
zyy
|
4d288556b0
|
调整绘图界面，调整实训平台鼠标隐藏bug
|
2020-04-23 17:11:51 +08:00 |
|
fan
|
06b9fda264
|
西安一三按计划折返
|
2020-04-22 18:24:28 +08:00 |
|
fan
|
8c122f93d4
|
运行图加载调整&绘图设备道岔故障&佛山区段颜色
|
2020-04-22 17:12:29 +08:00 |
|
fan
|
e51824dc80
|
紧急停车位置调整&绘图站间分隔&车站批量调整
|
2020-04-22 14:30:37 +08:00 |
|
fan
|
c8c7f8bded
|
佛山调整
|
2020-04-21 17:05:18 +08:00 |
|
fan
|
d60c2881d0
|
添加列车配置
|
2020-04-21 16:00:10 +08:00 |
|
zyy
|
b31ef6bc2d
|
调整西安一 三号线运行图导入
|
2020-04-21 14:14:33 +08:00 |
|
fan
|
7c55c19933
|
交路区段区别显示&故障状态组调整
|
2020-04-20 17:10:50 +08:00 |
|
zyy
|
85189c240f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-20 15:12:14 +08:00 |
|
zyy
|
a49a3bfaaf
|
调整西安二号线数据及皮肤配置
|
2020-04-20 15:12:01 +08:00 |
|
joylink_cuiweidong
|
074f6d647a
|
西安二号线站台 紧急停车状态 绘图调整
|
2020-04-20 10:12:17 +08:00 |
|
joylink_cuiweidong
|
3a0fd87a79
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-17 18:43:16 +08:00 |
|
joylink_cuiweidong
|
de0b7ae931
|
西安二号线 绘图紧急停车状态代码调整
|
2020-04-17 18:42:58 +08:00 |
|
zyy
|
4fe805e02f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-17 16:42:12 +08:00 |
|
zyy
|
f0610f8a0a
|
调整代码，处理线路皮肤默认配置
|
2020-04-17 16:41:59 +08:00 |
|
joylink_cuiweidong
|
70a8ec07f6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-17 16:39:55 +08:00 |
|
joylink_cuiweidong
|
211db36aca
|
西安二号线绘图 站台 扣车 代码调整
|
2020-04-17 16:39:42 +08:00 |
|
fan
|
c13624b60a
|
西安二号线调整
|
2020-04-17 15:59:50 +08:00 |
|
fan
|
2100144656
|
西安二号线调整&宁波一号线vue告警调整&仿真鼠标样式调整
|
2020-04-17 15:02:35 +08:00 |
|
fan
|
a4097e1f32
|
西安二号线调整
|
2020-04-17 13:30:59 +08:00 |
|
fan
|
8e5a79626a
|
西安二号线调整
|
2020-04-16 09:01:52 +08:00 |
|
fan
|
8cd740402f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-15 14:14:32 +08:00 |
|
fan
|
a1869a531f
|
集中站分隔调整&线路管理配置调整
|
2020-04-15 14:13:08 +08:00 |
|
joylink_cuiweidong
|
9ddafdedf5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-15 13:07:34 +08:00 |
|
joylink_cuiweidong
|
47e2ca8d76
|
北京一号线 地图配置文件调整
|
2020-04-15 13:06:58 +08:00 |
|
zyy
|
6cb2939631
|
调整西安二号线道岔状态显示
|
2020-04-15 11:17:19 +08:00 |
|
zyy
|
87ca3e5556
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/config/deviceStyle.js
# src/jmapNew/theme/factory.js
|
2020-04-15 10:08:47 +08:00 |
|
zyy
|
7ea8fd7add
|
调整佛山线路全线取消扣车操作， 增加西安二号线皮肤
|
2020-04-15 10:06:26 +08:00 |
|
fan
|
8a7de3c22c
|
佛山皮肤调整
|
2020-04-15 09:44:44 +08:00 |
|
fan
|
e9ee5112d4
|
佛山皮肤调整
|
2020-04-15 09:33:21 +08:00 |
|
fan
|
b833ac1acd
|
佛山皮肤调整
|
2020-04-15 09:19:47 +08:00 |
|
fan
|
2613b68413
|
佛山列车显示调整&西安二号线集中站分割符
|
2020-04-14 18:51:09 +08:00 |
|
fan
|
61c2260d93
|
西安二号线调整
|
2020-04-14 15:45:13 +08:00 |
|
fan
|
b7e6b9a8c1
|
佛山运行图导入上行时间调整&西安二号线车站调整
|
2020-04-13 18:30:21 +08:00 |
|
fan
|
20491dac81
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-13 17:13:52 +08:00 |
|
fan
|
f91c8e37d2
|
佛山运行图导入参数调整&西安二号线车站调整
|
2020-04-13 17:12:33 +08:00 |
|
joylink_cuiweidong
|
ccf028e5bb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-13 13:08:30 +08:00 |
|
joylink_cuiweidong
|
e083015580
|
西安二号线 屏蔽门和站台的状态代码调整
|
2020-04-13 13:08:17 +08:00 |
|
fan
|
472dd1b62a
|
佛山运行图导入校验调整&西安二号线车站调整
|
2020-04-13 10:43:02 +08:00 |
|
fan
|
b0797644f9
|
实训课程编辑调整&线二号线调整
|
2020-04-10 17:50:26 +08:00 |
|
fan
|
11586aef30
|
哈尔滨现地显示BUG调整&西安二号线皮肤调整
|
2020-04-10 16:45:41 +08:00 |
|
joylink_cuiweidong
|
45e6a12825
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-09 16:32:15 +08:00 |
|
joylink_cuiweidong
|
5a8f4e0fe6
|
西安二号线 屏蔽门绘图代码调整
|
2020-04-09 16:31:53 +08:00 |
|
fan
|
f2ba430cc5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-09 14:49:06 +08:00 |
|
fan
|
50579656eb
|
进路控制信号机按消息批次处理&西安二计轴调整&&实训管理老地图处理（未完）
|
2020-04-09 14:47:44 +08:00 |
|
joylink_cuiweidong
|
1f4d8ae061
|
西安二号线 站台绘图调整
|
2020-04-09 13:01:48 +08:00 |
|
fan
|
2e1b356da9
|
调整区段限速判断
|
2020-04-08 16:21:08 +08:00 |
|
joylink_cuiweidong
|
053648e0a3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-08 15:29:16 +08:00 |
|
joylink_cuiweidong
|
4c2ef28572
|
西安二号线 线路配置文件调整
|
2020-04-08 15:29:03 +08:00 |
|
fan
|
f495a2d560
|
实训占位符调整&皮肤调整
|
2020-04-08 14:06:45 +08:00 |
|
fan
|
b089aa6651
|
实训占位符调整&皮肤调整
|
2020-04-08 13:23:19 +08:00 |
|
fan
|
4bce310d4f
|
福州皮肤调整
|
2020-04-02 11:10:27 +08:00 |
|
zyy
|
1599b82719
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-02 10:52:17 +08:00 |
|
zyy
|
8117a31c80
|
调整代码
|
2020-04-02 10:51:47 +08:00 |
|
fan
|
1017058855
|
站台状态显示位置调整
|
2020-04-02 09:48:55 +08:00 |
|
fan
|
ebd90d2485
|
本地项目调整&elementUI升版本至2.12.0
|
2020-04-01 15:32:06 +08:00 |
|
fan
|
848875bd57
|
关闭gzip
|
2020-04-01 14:39:29 +08:00 |
|
fan
|
e344e63469
|
宁波停站时间调整
|
2020-04-01 14:30:11 +08:00 |
|
zyy
|
4ef3c69f9f
|
调整显示内容 判断
|
2020-03-31 15:34:55 +08:00 |
|
fan
|
643c12335c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_stand
# Conflicts:
# src/utils/baseUrl.js
|
2020-03-30 14:26:27 +08:00 |
|
fan
|
e82e77a507
|
站台调整
|
2020-03-30 14:22:57 +08:00 |
|
fan
|
8f69177fe1
|
暂存
|
2020-03-30 09:47:26 +08:00 |
|
zyy
|
c5dbd2b141
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/utils/baseUrl.js
|
2020-03-27 18:20:28 +08:00 |
|
zyy
|
47519b7040
|
调整道岔生成默认状态，调整道岔皮肤配置
|
2020-03-27 18:19:40 +08:00 |
|
fan
|
19b945962b
|
站台调整
|
2020-03-27 17:26:17 +08:00 |
|
fan
|
5c7394454d
|
调整
|
2020-03-27 11:35:46 +08:00 |
|
fan
|
723f8ff3e8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-27 10:18:58 +08:00 |
|
fan
|
1adc50b2d1
|
站台调整
|
2020-03-27 10:17:24 +08:00 |
|
zyy
|
d92813ed72
|
调整道岔定位绘图
|
2020-03-27 10:02:41 +08:00 |
|
fan
|
ead5bd01e6
|
站台调整
|
2020-03-26 15:04:52 +08:00 |
|
fan
|
aadbe543a5
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-26 09:44:27 +08:00 |
|
joylink_cuiweidong
|
8c01b4129f
|
列车绘图代码调整
|
2020-03-25 18:34:43 +08:00 |
|
zyy
|
a2875baa19
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-25 18:26:30 +08:00 |
|
zyy
|
41100ac9bf
|
调整宁波线路 道岔 封锁 单锁状态
|
2020-03-25 18:26:19 +08:00 |
|
fan
|
5bcb42e0f2
|
宁波调整
|
2020-03-25 17:32:57 +08:00 |
|
joylink_cuiweidong
|
ad4de2cd45
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-25 17:16:16 +08:00 |
|
joylink_cuiweidong
|
ef33f0f628
|
宁波一号线 增加列车移入显示边框
|
2020-03-25 17:15:16 +08:00 |
|
fan
|
1210496ecb
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-25 15:24:08 +08:00 |
|
fan
|
9d38968751
|
佛山样式调整&&宁波显示调整
|
2020-03-25 15:22:52 +08:00 |
|
joylink_cuiweidong
|
81b2e420d8
|
宁波线
添加信号机人解进路功能
信号机右键菜单 设置进路改为排列进路
列车鼠标悬停显示信息去掉
佛山线 现地
信号机操作调整
|
2020-03-25 15:19:39 +08:00 |
|
joylink_cuiweidong
|
7604e276e1
|
宁波一号线 列车样式调整
|
2020-03-25 10:43:32 +08:00 |
|
fan
|
652aa43a2a
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-24 16:37:26 +08:00 |
|
fan
|
1e72a8cff3
|
状态灯调整
|
2020-03-24 16:35:09 +08:00 |
|
zyy
|
a22ec53e39
|
调整佛山线路信号机，站台状态
|
2020-03-24 15:09:25 +08:00 |
|
fan
|
5c7c27d2f3
|
状态灯调整
|
2020-03-24 15:02:14 +08:00 |
|
zyy
|
bd48b2844c
|
佛山线路道岔状态调整，修改道岔绘图元素逻辑
|
2020-03-24 13:39:20 +08:00 |
|
zyy
|
688aa7310b
|
增加佛山有轨线路文件，调整区段显示状态
|
2020-03-23 14:27:57 +08:00 |
|
zyy
|
ad6b8f8dba
|
调整区段流程逻辑，站台流程
|
2020-03-23 13:48:35 +08:00 |
|
zyy
|
21c453f68d
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-20 17:17:32 +08:00 |
|
zyy
|
7a15c07782
|
调整哈尔滨信号机状态
|
2020-03-20 17:17:23 +08:00 |
|
fan
|
80fda91dba
|
自动折返&引导总锁调整
|
2020-03-20 14:12:02 +08:00 |
|
zyy
|
2f654975d5
|
调整哈尔滨信号机状态
|
2020-03-19 18:39:20 +08:00 |
|
fan
|
7de2c38af4
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-19 16:17:53 +08:00 |
|
fan
|
36b7d7309a
|
增加绘图表示灯&&线条颜色
|
2020-03-19 16:17:34 +08:00 |
|
zyy
|
1d46deb12a
|
调整区段绘画逻辑
|
2020-03-19 14:03:54 +08:00 |
|
zyy
|
6570028b95
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-19 10:52:54 +08:00 |
|
zyy
|
6e3dcf6b65
|
调整哈尔滨线路 区段，信号机操作 处理信号机点击高亮
|
2020-03-19 10:52:42 +08:00 |
|
fan
|
acc05f770e
|
调整进路状态影响自动进路功能按钮
|
2020-03-19 10:23:24 +08:00 |
|
fan
|
838f2311f8
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-18 19:05:12 +08:00 |
|
fan
|
a9c19cf1ea
|
现地操作调整
|
2020-03-18 19:05:02 +08:00 |
|
zyy
|
4203c30e30
|
调整宁波线路自动折返 计轴复位操作
|
2020-03-18 11:18:52 +08:00 |
|
zyy
|
12f283cbae
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue
# src/views/newMap/newMapdraft/mapoperate/index.vue
|
2020-03-18 09:12:18 +08:00 |
|
zyy
|
0ceb0c2c65
|
调整自动折返 type 类型 增加自动折返菜单流程
|
2020-03-18 09:10:57 +08:00 |
|