fan
|
6eb648199e
|
西安二信号机操作问题修改
|
2020-04-30 18:25:21 +08:00 |
|
fan
|
276620a25e
|
西安二信号机调整
|
2020-04-30 17:40:25 +08:00 |
|
fan
|
15104970bc
|
西安二信号机调整&线路配置添加参数
|
2020-04-30 16:19:33 +08:00 |
|
zyy
|
eb6cd7ce2d
|
调整道岔使能发送流程，及绘图
|
2020-04-30 11:28:56 +08:00 |
|
zyy
|
a3213c49f8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 10:32:27 +08:00 |
|
zyy
|
18334b2f43
|
调整弹窗名称，右键菜单操作
|
2020-04-30 10:32:14 +08:00 |
|
fan
|
f3ab2337e8
|
西安二号线信号封锁调整（未完）
|
2020-04-30 08:54:17 +08:00 |
|
fan
|
35d13ae529
|
区段绘图数据调整roadType不为''
|
2020-04-29 17:53:35 +08:00 |
|
fan
|
1c8929cb08
|
绘图区段添加firstTurnBack&线路配置添加generateCycle&西安二操作调整
|
2020-04-29 17:25:30 +08:00 |
|
fan
|
ec7be523ba
|
西安二信号机操作调整
|
2020-04-29 15:24:17 +08:00 |
|
fan
|
d65c5c2922
|
合并代码
|
2020-04-29 13:00:41 +08:00 |
|
fan
|
7d3a6ddafa
|
西安二号线信号机操作调整
|
2020-04-29 11:36:16 +08:00 |
|
zyy
|
c9e3920461
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-29 11:23:08 +08:00 |
|
zyy
|
be9b8f8432
|
调整右键操作
|
2020-04-29 11:22:54 +08:00 |
|
joylink_cuiweidong
|
70c26426b0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-28 18:16:24 +08:00 |
|
joylink_cuiweidong
|
66cdf061c6
|
新版地图 绘图代码调整
|
2020-04-28 18:16:04 +08:00 |
|
fan
|
ce8d6244f1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-28 16:17:55 +08:00 |
|
fan
|
1457492257
|
西安二操作调整
|
2020-04-28 16:17:42 +08:00 |
|
joylink_cuiweidong
|
493529d9bb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-28 15:59:58 +08:00 |
|
joylink_cuiweidong
|
fe9251120c
|
西安二号线 列车右键菜单 代码调整
|
2020-04-28 15:59:44 +08:00 |
|
zyy
|
4a1c36bfd0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/xian_02/menus/menuSignal.vue
|
2020-04-28 15:44:35 +08:00 |
|
zyy
|
96bf9c7f7d
|
调整右键菜单
|
2020-04-28 15:43:19 +08:00 |
|
joylink_cuiweidong
|
5c8d9cce44
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-28 14:56:16 +08:00 |
|
joylink_cuiweidong
|
1ee3ea61c7
|
西安二号线 操作 背景样式调整
|
2020-04-28 14:55:57 +08:00 |
|
zyy
|
7fa5a12e8c
|
调整设置app/height 执行顺序问题
|
2020-04-28 14:49:42 +08:00 |
|
fan
|
af5567d598
|
西安二操作问题调整
|
2020-04-28 10:27:07 +08:00 |
|
fan
|
5d2fff66a8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-27 19:02:20 +08:00 |
|
fan
|
e39a7eadb9
|
西安二号线操作调整&&绘图数据调整
|
2020-04-27 19:02:07 +08:00 |
|
zyy
|
9ea5cefdc0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/xian_02/menus/index.vue
|
2020-04-27 18:35:44 +08:00 |
|
zyy
|
9427cc5759
|
调整西安二号线右键菜单显示
|
2020-04-27 18:33:29 +08:00 |
|
fan
|
fa60706b66
|
西安二号线操作调整
|
2020-04-27 14:01:23 +08:00 |
|
fan
|
e748a8113c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-26 18:49:30 +08:00 |
|
fan
|
4378cc56cb
|
西安二号线站台操作调整
|
2020-04-26 18:49:20 +08:00 |
|
zyy
|
479df7c2b3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-26 18:38:47 +08:00 |
|
zyy
|
cc6c7f92ec
|
调整西安二号线右键样式
|
2020-04-26 18:38:27 +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 |
|
zyy
|
745f867cb8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/xian_02/menus/dialog/turnBackControl.vue
|
2020-04-26 14:48:48 +08:00 |
|
zyy
|
ecd361ddbe
|
调整西安二号线车站操作
|
2020-04-26 14:47:43 +08:00 |
|
joylink_cuiweidong
|
7d5605d170
|
西安二号线 绘图 站台添加模式筛选标识
|
2020-04-24 18:23:17 +08:00 |
|
fan
|
b40c497361
|
发布地图管理调整&西安二号线站台操作调整
|
2020-04-24 10:39:26 +08:00 |
|
fan
|
9c07e3968d
|
代码调整
|
2020-04-23 18:35:27 +08:00 |
|
fan
|
747c56cac1
|
西安二运行图显示name不包含方向
|
2020-04-23 15:43:47 +08:00 |
|
fan
|
9dcb650a48
|
西安二运行图导入
|
2020-04-23 14:17:43 +08:00 |
|
fan
|
880e837285
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-23 13:37:59 +08:00 |
|
fan
|
5f526a4497
|
西安二号线运行图导入调整
|
2020-04-23 13:36:34 +08:00 |
|
zyy
|
56f713a02b
|
调整报错提示信息
|
2020-04-23 10:29:41 +08:00 |
|
joylink_cuiweidong
|
9523f6e4cc
|
新版地图 绘图 公里标显示 代码调整
|
2020-04-22 16:17:35 +08:00 |
|
fan
|
05c857aeb6
|
西安二号线运行图导入过滤TBKE&TWQN
|
2020-04-22 09:07:58 +08:00 |
|
fan
|
0e1d3dc811
|
运行图加载调整
|
2020-04-21 18:43:54 +08:00 |
|