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 |
|
fan
|
dcf7b951ab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-21 15:15:03 +08:00 |
|
fan
|
2f4b765d97
|
运行图加载调整&交路数据调整
|
2020-04-21 15:08:27 +08:00 |
|
joylink_cuiweidong
|
9b0ce027bf
|
代码调整
|
2020-04-21 11:26:07 +08:00 |
|
joylink_cuiweidong
|
d4a621d049
|
代码调整
|
2020-04-21 10:48:09 +08:00 |
|
joylink_cuiweidong
|
3da6d9c538
|
删除没有用的接口
|
2020-04-21 10:07:26 +08:00 |
|
zyy
|
7a25c0b536
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-20 18:30:13 +08:00 |
|
zyy
|
dd4c575062
|
调整站间运行等级逻辑
|
2020-04-20 18:29:50 +08:00 |
|
joylink_cuiweidong
|
9f6fe40894
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-20 18:13:50 +08:00 |
|
joylink_cuiweidong
|
ad583bf418
|
综合演练 发送语音功能代码调整
|
2020-04-20 18:12:16 +08:00 |
|
fan
|
7c55c19933
|
交路区段区别显示&故障状态组调整
|
2020-04-20 17:10:50 +08:00 |
|
fan
|
8fee613083
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-20 15:39:52 +08:00 |
|
fan
|
f375b97631
|
派班工作站调整
|
2020-04-20 15:38:30 +08:00 |
|
zyy
|
85189c240f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-20 15:12:14 +08:00 |
|
zyy
|
a49a3bfaaf
|
调整西安二号线数据及皮肤配置
|
2020-04-20 15:12:01 +08:00 |
|
fan
|
53d94cee59
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-20 09:58:12 +08:00 |
|
fan
|
ed26ff34d9
|
地图高级数据停站时间
|
2020-04-20 09:57:00 +08:00 |
|
zyy
|
308c33e6bc
|
调整区段及道岔绘图方式
|
2020-04-17 18:44:14 +08:00 |
|
zyy
|
4fe805e02f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-17 16:42:12 +08:00 |
|
zyy
|
f0610f8a0a
|
调整代码，处理线路皮肤默认配置
|
2020-04-17 16:41:59 +08:00 |
|
joylink_cuiweidong
|
70a8ec07f6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-17 16:39:55 +08:00 |
|
joylink_cuiweidong
|
211db36aca
|
西安二号线绘图 站台 扣车 代码调整
|
2020-04-17 16:39:42 +08:00 |
|
sunzhenyu
|
e21a9db907
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-17 16:09:51 +08:00 |
|
fan
|
c13624b60a
|
西安二号线调整
|
2020-04-17 15:59:50 +08:00 |
|
fan
|
2100144656
|
西安二号线调整&宁波一号线vue告警调整&仿真鼠标样式调整
|
2020-04-17 15:02:35 +08:00 |
|
fan
|
795ad48e32
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-17 13:34:36 +08:00 |
|
fan
|
07711a5bda
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-17 13:32:18 +08:00 |
|
zyy
|
4bd05891be
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-17 13:31:12 +08:00 |
|
fan
|
a4097e1f32
|
西安二号线调整
|
2020-04-17 13:30:59 +08:00 |
|
zyy
|
b628df2d85
|
调整对象拷贝方式
|
2020-04-17 13:30:58 +08:00 |
|
joylink_cuiweidong
|
467e8671fd
|
西安二号线屏蔽门绘图调整
|
2020-04-17 13:30:18 +08:00 |
|
joylink_cuiweidong
|
126d9f2309
|
代码调整
|
2020-04-17 11:29:50 +08:00 |
|
fan
|
1168f6fd8a
|
veu 告警调整
|
2020-04-17 10:54:02 +08:00 |
|
fan
|
59ac3bee94
|
发布地图管理归属项目调整
|
2020-04-17 10:16:56 +08:00 |
|
fan
|
c268ee7d3c
|
项目获取房间列表添加项目code参数
|
2020-04-17 09:56:41 +08:00 |
|
fan
|
9d37ecd035
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-17 09:15:04 +08:00 |
|
fan
|
4231966cac
|
取消cdn加载&调整快速入口进入房间
|
2020-04-17 09:13:40 +08:00 |
|
zyy
|
aa8ae83299
|
自动计算站间距离
|
2020-04-16 18:06:36 +08:00 |
|
zyy
|
68340271f1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 17:59:15 +08:00 |
|
zyy
|
66b8c03fef
|
调整站间运行时间计算
|
2020-04-16 17:58:59 +08:00 |
|
fan
|
46d95bf715
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 17:30:07 +08:00 |
|
fan
|
64c5e743e5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 17:27:49 +08:00 |
|
joylink_cuiweidong
|
5fe37ec4e2
|
北京一号线 区段实训操作代码调整
|
2020-04-16 17:26:07 +08:00 |
|
fan
|
ee209d5dbf
|
综合演练二维码下添加房间号
|
2020-04-16 17:23:43 +08:00 |
|
fan
|
09abc2fbe1
|
项目配置全部提出到ProjectConfig
|
2020-04-16 17:11:46 +08:00 |
|
zyy
|
bbe8dfabee
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 17:09:36 +08:00 |
|
zyy
|
ceabc43f7d
|
增加站间距离字段
|
2020-04-16 17:09:23 +08:00 |
|
fan
|
d1e9fc1a11
|
西安地铁子系统生成定制添加
|
2020-04-16 16:25:49 +08:00 |
|
fan
|
6ab7bda6b6
|
西安地图项目路径调整
|
2020-04-16 16:14:28 +08:00 |
|
fan
|
3871ec173c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 15:54:11 +08:00 |
|
fan
|
d69e155e91
|
贵州装备添加联锁角色&&项目配置规整（未完）
|
2020-04-16 15:52:56 +08:00 |
|
joylink_cuiweidong
|
1c7a0461fe
|
北京一号线 站台实训操作代码调整
|
2020-04-16 15:50:04 +08:00 |
|
zyy
|
e027be4976
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 15:27:20 +08:00 |
|
zyy
|
9ea21f4b7a
|
调整侧防接口字段
|
2020-04-16 15:27:06 +08:00 |
|
joylink_cuiweidong
|
e88bdf8e0f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 14:51:52 +08:00 |
|
joylink_cuiweidong
|
fc2d9c1ff7
|
草稿地图的导入和导出代码调整
北京一号线站台实训操作代码调整
|
2020-04-16 14:50:40 +08:00 |
|
fan
|
d8291e62a4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 13:49:05 +08:00 |
|
fan
|
1bfe76c291
|
添加西安地铁页面&&项目配置规整（未完）
|
2020-04-16 13:47:40 +08:00 |
|
zyy
|
06c29aaced
|
Merge branch 'master' into test
# Conflicts:
# src/views/newMap/newMapdraft/dataRelation/flankProtectOperate/route.vue
|
2020-04-16 12:08:07 +08:00 |
|
zyy
|
a9e991f061
|
调整侧防流程
|
2020-04-16 12:06:36 +08:00 |
|
zyy
|
40021e34f4
|
调整侧防流程
|
2020-04-16 10:52:11 +08:00 |
|
zyy
|
35e6f6846e
|
调整侧防流程
|
2020-04-16 10:51:29 +08:00 |
|
fan
|
aae2a734ed
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-16 09:03:22 +08:00 |
|
fan
|
8e5a79626a
|
西安二号线调整
|
2020-04-16 09:01:52 +08:00 |
|
joylink_cuiweidong
|
eadcf233b1
|
设计平台 地图列表样式调整
|
2020-04-15 15:42:47 +08:00 |
|
joylink_cuiweidong
|
fec4e33719
|
实训平台和设计平台 地图列表代码调整
|
2020-04-15 15:06:51 +08:00 |
|
fan
|
8cd740402f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-15 14:14:32 +08:00 |
|
fan
|
a1869a531f
|
集中站分隔调整&线路管理配置调整
|
2020-04-15 14:13:08 +08:00 |
|
joylink_cuiweidong
|
518fc37db6
|
设计平台 公共地图 已发布地图列表 代码调整
|
2020-04-15 13:21:29 +08:00 |
|
joylink_cuiweidong
|
2a50ce7287
|
设计平台 加载计划运行图管理 创建通用运行图 地图过滤
|
2020-04-15 10:34:33 +08:00 |
|
joylink_cuiweidong
|
900b727fc4
|
新版地图数据校验文字调整
|
2020-04-15 09:37:42 +08:00 |
|
fan
|
2f6f75ff3c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-14 18:52:19 +08:00 |
|
fan
|
2613b68413
|
佛山列车显示调整&西安二号线集中站分割符
|
2020-04-14 18:51:09 +08:00 |
|
joylink_cuiweidong
|
c6f532be4e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-14 18:45:33 +08:00 |
|
joylink_cuiweidong
|
9ea5d7fdfb
|
新版地图信号机 区段前端校验
|
2020-04-14 18:45:14 +08:00 |
|
fan
|
4bbc0d648f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-14 15:46:36 +08:00 |
|
fan
|
61c2260d93
|
西安二号线调整
|
2020-04-14 15:45:13 +08:00 |
|
joylink_cuiweidong
|
ba666eb334
|
实训平台教学 代码调整
|
2020-04-14 14:51:14 +08:00 |
|
fan
|
7c9d9ef4c7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-14 11:29:18 +08:00 |
|
fan
|
7086fb1db6
|
考试实训类型调整
|
2020-04-14 11:26:41 +08:00 |
|
zyy
|
cc984c8eb0
|
调整佛山线路，成都一号线运行图 方向信息
|
2020-04-14 10:27:33 +08:00 |
|
zyy
|
feca56f94b
|
调整字段名称显示，调整佛山线路标注字段
|
2020-04-14 09:48:54 +08:00 |
|
zyy
|
bd8c631d45
|
调整进路保存侧防列表字段
|
2020-04-13 19:13:52 +08:00 |
|
zyy
|
64279ed484
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-13 18:59:19 +08:00 |
|
zyy
|
b7edbc8697
|
侧防列表更新
|
2020-04-13 18:59:01 +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 |
|
zyy
|
2dc975ef7a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-04-13 17:04:01 +08:00 |
|
zyy
|
df92090509
|
增加配置中侧防数据，调整接口
|
2020-04-13 17:03:48 +08:00 |
|
joylink_cuiweidong
|
8475870cf8
|
哈尔滨/宁波 现地 实训设置当前所在集中站 代码调整
|
2020-04-13 14:54:35 +08:00 |
|
joylink_cuiweidong
|
fe41d48a73
|
旧版课程 实训定义 代码调整
|
2020-04-13 10:37:47 +08:00 |
|
joylink_zyy
|
826504d9c7
|
调整考试系统哈尔滨 现地不能操作
|
2020-04-11 11:20:22 +08:00 |
|
joylink_zyy
|
5296521a9c
|
调整实训平台哈尔滨现地操作不能触发
|
2020-04-10 21:46:23 +08:00 |
|
joylink_fanyuhong
|
f6be5ef329
|
试卷规则调整
|
2020-04-10 20:46:17 +08:00 |
|