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
|
09f3c4b969
|
调整西安二号线配置
|
2020-04-15 09:07:23 +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
|
630ccfd016
|
信号机调整
|
2020-04-08 18:38:08 +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 |
|
joylink_cuiweidong
|
c01b261638
|
引导总锁绘制代码调整
|
2020-03-17 18:25:03 +08:00 |
|
joylink_cuiweidong
|
d8d143ae38
|
删除地图绘制中，车站里面的引导总锁
|
2020-03-17 17:59:47 +08:00 |
|
zyy
|
a89b4d5f1d
|
调整宁波线路引导信号显示
|
2020-03-17 16:57:09 +08:00 |
|
zyy
|
2e7e25dd06
|
增加功能按钮绘图方式
|
2020-03-17 16:12:15 +08:00 |
|
zyy
|
96ed68cf65
|
调整宁波线路现地操作
|
2020-03-17 11:29:34 +08:00 |
|
joylink_cuiweidong
|
1a8b37f2b4
|
北京一号线 现地 排列进路操作代码调整
|
2020-03-16 16:28:53 +08:00 |
|
zyy
|
1c78d52fed
|
调整ibp文件配置路径
|
2020-03-16 11:02:33 +08:00 |
|
fan
|
264310f28e
|
调整成都三显示
|
2020-03-13 15:06:14 +08:00 |
|
fan
|
939360917e
|
调整信号机接近区段颜色变化
|
2020-03-11 16:58:14 +08:00 |
|
fan
|
ef60af34c0
|
绘图预览切换现地行调显示
|
2020-03-11 15:10:08 +08:00 |
|
fan
|
96a9c73c29
|
列车位置调整
|
2020-03-09 18:25:25 +08:00 |
|
fan
|
1148ea5ad8
|
Merge branches 'dev' and 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-09 17:38:28 +08:00 |
|
fan
|
7f4e6fb13c
|
初始化按计划行车状态and其他调整
|
2020-03-09 17:38:15 +08:00 |
|
zyy
|
751a8e792c
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
# src/jmapNew/config/skinCode/haerbin_01.js
|
2020-03-09 17:03:08 +08:00 |
|
zyy
|
103afa9f05
|
调整哈尔滨线路道岔显示问题
|
2020-03-09 17:02:13 +08:00 |
|
fan
|
815e4446d4
|
哈尔滨列车调整
|
2020-03-09 09:58:49 +08:00 |
|
zyy
|
482df0de33
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-07 19:12:45 +08:00 |
|
zyy
|
6acbf78688
|
哈尔滨站台状态调整
|
2020-03-07 19:12:19 +08:00 |
|
joylink_fanyuhong
|
26a5c0bf41
|
哈尔滨车调整
|
2020-03-07 18:57:01 +08:00 |
|
joylink_fanyuhong
|
357265d905
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-07 18:32:59 +08:00 |
|
zyy
|
a1416b9a23
|
调整哈尔滨线路扣车状态
|
2020-03-07 11:05:38 +08:00 |
|
joylink_cuiweidong
|
bb204dd72a
|
列车 跳停 扣车 车门 状态代码调整
|
2020-03-06 20:47:39 +08:00 |
|
joylink_fanyuhong
|
3745815a5b
|
代码调整
(cherry picked from commit 14e054b)
|
2020-03-06 20:42:40 +08:00 |
|
joylink_fanyuhong
|
9d56738ddc
|
成都一显示调整
(cherry picked from commit c5701cd)
|
2020-03-06 20:42:17 +08:00 |
|
zyy
|
b92b2ff786
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-06 19:02:34 +08:00 |
|
zyy
|
84c379410f
|
调整站台状态
|
2020-03-06 19:02:20 +08:00 |
|
joylink_cuiweidong
|
f8cadc33b8
|
自动折返绘图数据添加是否显示边框字段
|
2020-03-06 17:45:20 +08:00 |
|
zyy
|
2f96f68e46
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-03-06 16:16:20 +08:00 |
|
zyy
|
6c797c50e6
|
调整地图绘制，公共地图车站 ，站台显示逻辑判断
|
2020-03-06 16:16:04 +08:00 |
|
joylink_cuiweidong
|
4c02e416bc
|
成都一号线 列车所在区段位置代码调整（部分）
|
2020-03-06 15:27:31 +08:00 |
|
joylink_fanyuhong
|
56a5d0f018
|
调整显示条件
|
2020-03-06 11:26:52 +08:00 |
|
joylink_fanyuhong
|
8c53f0fe5d
|
配置调整
|
2020-03-06 10:20:04 +08:00 |
|
joylink_fanyuhong
|
217864dbd4
|
站台功能按钮
|
2020-03-06 10:05:21 +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 |
|
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 |
|