fan
|
c02f42fba1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-27 14:01:37 +08:00 |
|
fan
|
fa60706b66
|
西安二号线操作调整
|
2020-04-27 14:01:23 +08:00 |
|
joylink_cuiweidong
|
edc17912af
|
新版地图 绘图 交路代码调整
|
2020-04-27 13:56:08 +08:00 |
|
joylink_cuiweidong
|
2cbef52398
|
新版绘图 交路代码调整
|
2020-04-27 11:33:17 +08:00 |
|
joylink_cuiweidong
|
0fb3536fff
|
新版地图绘制 交路 停站时间 设置运行等级代码调整
|
2020-04-27 10:54:42 +08:00 |
|
joylink_cuiweidong
|
f318854de7
|
新版绘图 交路代码调整
|
2020-04-27 10:06:17 +08:00 |
|
joylink_cuiweidong
|
2caeb88bfa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-26 18:49:39 +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 |
|
joylink_cuiweidong
|
1d63ad4b36
|
代码调整
|
2020-04-26 18:49:22 +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 |
|
joylink_cuiweidong
|
c3e76998d3
|
新版地图绘制 设置交路 代码调整
|
2020-04-26 18:33:26 +08:00 |
|
fan
|
ddce743683
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-26 17:16:30 +08:00 |
|
fan
|
a1d0c3e7d0
|
西安二号线绘图调整
|
2020-04-26 17:16:20 +08:00 |
|
joylink_cuiweidong
|
a3d86a4136
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-26 16:35:05 +08:00 |
|
joylink_cuiweidong
|
208ff362e0
|
新版地图绘制 设置运行等级 代码调整
|
2020-04-26 16:34:46 +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
|
a0e3546b15
|
新版地图绘图 设置运行等级代码调整
|
2020-04-26 14:44:46 +08:00 |
|
joylink_cuiweidong
|
f1ddb0c86a
|
实训地图列表 代码调整
|
2020-04-26 13:39:09 +08:00 |
|
joylink_cuiweidong
|
4d1f6a6a9d
|
新版绘图 高级数据 交路 生成站间运行时间 接口调整
|
2020-04-26 13:18:25 +08:00 |
|
joylink_cuiweidong
|
7234f95b7d
|
新版地图 绘图 交路接口调整
|
2020-04-26 10:25:35 +08:00 |
|
joylink_cuiweidong
|
7d5605d170
|
西安二号线 绘图 站台添加模式筛选标识
|
2020-04-24 18:23:17 +08:00 |
|
sunzhenyu
|
a190aedb62
|
增加三维站台按钮
|
2020-04-24 18:03:39 +08:00 |
|
sunzhenyu
|
fd14da2cee
|
merge menudemon
|
2020-04-24 18:01:03 +08:00 |
|
sunzhenyu
|
8f15f049f1
|
修改三维动画播放器重复更新bug，增加宁波线路三维背景，修改三维仿真行车逻辑改为后台数据控制
|
2020-04-24 18:00:12 +08:00 |
|
joylink_cuiweidong
|
d0abd7fb56
|
socket 断线重连修改
解决被登出 socket 一直请求的问题
|
2020-04-24 15:34:09 +08:00 |
|
zyy
|
2210965709
|
调整系统关于vue报错误
|
2020-04-24 14:17:15 +08:00 |
|
zyy
|
7536022d33
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-24 11:25:41 +08:00 |
|
zyy
|
7997ac6fe0
|
调整发布地图接口流程
|
2020-04-24 11:25:30 +08:00 |
|
fan
|
c07660b3d1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-24 10:45:19 +08:00 |
|
fan
|
b40c497361
|
发布地图管理调整&西安二号线站台操作调整
|
2020-04-24 10:39:26 +08:00 |
|
joylink_cuiweidong
|
545dc4a62e
|
综合演练仿真 聊天 发送语音消息
|
2020-04-23 18:47:43 +08:00 |
|
fan
|
26f59a4e4e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-23 18:36:47 +08:00 |
|
fan
|
9c07e3968d
|
代码调整
|
2020-04-23 18:35:27 +08:00 |
|
joylink_cuiweidong
|
203a24a6d0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-23 17:13:33 +08:00 |
|
joylink_cuiweidong
|
cdae58efbe
|
新版地图绘制 删除地图页面跳转问题
综合演练仿真 聊天 发送语音消息
|
2020-04-23 17:13:11 +08:00 |
|
zyy
|
98ce2d5890
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-23 17:12:06 +08:00 |
|
zyy
|
4d288556b0
|
调整绘图界面，调整实训平台鼠标隐藏bug
|
2020-04-23 17:11:51 +08:00 |
|
fan
|
747c56cac1
|
西安二运行图显示name不包含方向
|
2020-04-23 15:43:47 +08:00 |
|
fan
|
3c4682249c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-23 15:19:45 +08:00 |
|
fan
|
ca4dc2e2cf
|
撤销拦截错误，仅拦截500
|
2020-04-23 15:18:33 +08:00 |
|
joylink_cuiweidong
|
72f78751ce
|
综合演练仿真 聊天 创建对话，以及对话切换
|
2020-04-23 14:41:52 +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 |
|