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 |
|
joylink_cuiweidong
|
bfe23bf70b
|
综合演练仿真 聊天 发送语音消息 消息推送代码调整
|
2020-04-27 18:50:15 +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 |
|
joylink_cuiweidong
|
1bbbc567ad
|
绘图 设置运行等级代码调整
|
2020-04-27 14:25:40 +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
|
1d63ad4b36
|
代码调整
|
2020-04-26 18:49:22 +08:00 |
|
joylink_cuiweidong
|
c3e76998d3
|
新版地图绘制 设置交路 代码调整
|
2020-04-26 18:33:26 +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 |
|
joylink_cuiweidong
|
a0e3546b15
|
新版地图绘图 设置运行等级代码调整
|
2020-04-26 14:44:46 +08:00 |
|
joylink_cuiweidong
|
4d1f6a6a9d
|
新版绘图 高级数据 交路 生成站间运行时间 接口调整
|
2020-04-26 13:18:25 +08:00 |
|
joylink_cuiweidong
|
7234f95b7d
|
新版地图 绘图 交路接口调整
|
2020-04-26 10:25:35 +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
|
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 |
|
joylink_cuiweidong
|
72f78751ce
|
综合演练仿真 聊天 创建对话，以及对话切换
|
2020-04-23 14:41:52 +08:00 |
|
zyy
|
306e9f4954
|
调整区段绘图显隐问题
|
2020-04-22 18:53:20 +08:00 |
|
joylink_cuiweidong
|
511d5e48d4
|
综合演练仿真 聊天 socket 订阅
|
2020-04-22 18:17:27 +08:00 |
|
zyy
|
33e105ce88
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-22 18:02:58 +08:00 |
|
zyy
|
415d762294
|
调整地图绘制区段显隐关系
|
2020-04-22 18:02:43 +08:00 |
|
fan
|
a5f56bae2d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-22 17:26:46 +08:00 |
|
fan
|
1afcd2ec4a
|
仅哈尔滨线路显示客流量视图
|
2020-04-22 17:24:45 +08:00 |
|
joylink_cuiweidong
|
d9c7874a65
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-22 17:21:54 +08:00 |
|
joylink_cuiweidong
|
1a393e41b6
|
代码调整
|
2020-04-22 17:21:36 +08:00 |
|
fan
|
b898042b96
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-22 17:13:37 +08:00 |
|
fan
|
8c122f93d4
|
运行图加载调整&绘图设备道岔故障&佛山区段颜色
|
2020-04-22 17:12:29 +08:00 |
|
zyy
|
45e10ef066
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-22 16:42:09 +08:00 |
|
zyy
|
00936b36ac
|
调整地图绘制区段关系显隐
|
2020-04-22 16:41:55 +08:00 |
|
joylink_cuiweidong
|
a0589d52dd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-22 15:34:08 +08:00 |
|
joylink_cuiweidong
|
f9ca0138c8
|
综合演练仿真添加聊天窗口调整(未完成)
|
2020-04-22 15:33:31 +08:00 |
|
fan
|
c3ca6de6d8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-22 14:32:00 +08:00 |
|
fan
|
e51824dc80
|
紧急停车位置调整&绘图站间分隔&车站批量调整
|
2020-04-22 14:30:37 +08:00 |
|
joylink_cuiweidong
|
d436041233
|
代码调整
|
2020-04-22 11:31:09 +08:00 |
|
fan
|
adfe7f0f05
|
派班工作站&运行图加载调整
|
2020-04-22 09:42:46 +08:00 |
|
fan
|
b87a2f5ce2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-21 18:46:41 +08:00 |
|
fan
|
5f4a211bf2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-21 18:45:05 +08:00 |
|