joylink_cuiweidong
|
48a671c5e2
|
新版地图绘图 交路 区段高亮
|
2020-04-30 15:48:08 +08:00 |
|
joylink_cuiweidong
|
395d15d959
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 15:16:38 +08:00 |
|
joylink_cuiweidong
|
2f8832be83
|
新版绘图 交路代码调整
|
2020-04-30 15:16:20 +08:00 |
|
fan
|
26487c0dd8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 14:50:42 +08:00 |
|
fan
|
744ea986c0
|
绘图调整
|
2020-04-30 14:50:27 +08:00 |
|
joylink_cuiweidong
|
3f942518f1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 14:39:56 +08:00 |
|
joylink_cuiweidong
|
91b377f975
|
交路 列表拖拽问题调整
|
2020-04-30 14:38:46 +08:00 |
|
fan
|
c101ee8f92
|
绘图tab-pane延时渲染
|
2020-04-30 13:40:32 +08:00 |
|
fan
|
e348262118
|
西安二号线信号机操作调整
|
2020-04-30 13:19:33 +08:00 |
|
fan
|
5682ab67b0
|
信号机批量设置联锁站&区段添加所属车站属性
|
2020-04-30 10:54:06 +08:00 |
|
fan
|
60fc5e27d0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 10:12:30 +08:00 |
|
fan
|
77124d842e
|
设备联锁关系数据校验&生成联锁功能
|
2020-04-30 10:12:11 +08:00 |
|
joylink_cuiweidong
|
44108db3bc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-30 10:08:53 +08:00 |
|
joylink_cuiweidong
|
7961c2c5f9
|
绘图 交路添加 生成交路区段数据的接口
交路和运行等级代码调整
|
2020-04-30 10:07:44 +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
|
057aee45fc
|
信号添加属性
|
2020-04-29 16:02:26 +08:00 |
|
fan
|
7e790a3bdb
|
鼠标样式调整
|
2020-04-29 14:05:50 +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
|
e10e0368e6
|
线路管理配置项样式调整
|
2020-04-28 17:03:23 +08:00 |
|
fan
|
f6dd06843f
|
线路管理配置项样式调整
|
2020-04-28 16:59:47 +08:00 |
|
zyy
|
56fa896b6d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-28 14:49:57 +08:00 |
|
zyy
|
7fa5a12e8c
|
调整设置app/height 执行顺序问题
|
2020-04-28 14:49:42 +08:00 |
|
joylink_cuiweidong
|
ef20f2024f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-28 14:04:39 +08:00 |
|
joylink_cuiweidong
|
056b9ffe9e
|
综合演练仿真 聊天 切换聊天 聊天布局 语音播放代码调整
|
2020-04-28 14:04:22 +08:00 |
|
fan
|
e77f5a3be6
|
线路配置管理
|
2020-04-28 09:56:03 +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 |
|
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
|
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 |
|
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
|
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
|
5f526a4497
|
西安二号线运行图导入调整
|
2020-04-23 13:36:34 +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 |
|
zyy
|
7baea26e4d
|
拦截错误并提示
|
2020-04-22 13:57:19 +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 |
|
fan
|
0e1d3dc811
|
运行图加载调整
|
2020-04-21 18:43:54 +08:00 |
|
joylink_cuiweidong
|
158cad6b73
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-21 18:43:26 +08:00 |
|
joylink_cuiweidong
|
c550466f60
|
综合演练仿真添加聊天窗口调整
|
2020-04-21 18:42:57 +08:00 |
|
sunzhenyu
|
7ca5fd07dc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-21 18:32:51 +08:00 |
|
sunzhenyu
|
0ea6430617
|
修改三维驾驶操作面板，整合实用按钮，修改背景
|
2020-04-21 18:31:33 +08:00 |
|
joylink_cuiweidong
|
b10c801550
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-21 17:28:44 +08:00 |
|
joylink_cuiweidong
|
98fc24ab24
|
综合演练仿真添加聊天窗口(未完成)
|
2020-04-21 17:28:13 +08:00 |
|
fan
|
46113e89a7
|
运行图加载
|
2020-04-21 17:08:43 +08:00 |
|
fan
|
d44faf55ea
|
调整西安地铁登录页面
|
2020-04-21 15:47:25 +08:00 |
|