joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
4,805 Commits 20 Branches 0 Tags 448 MiB
03bfdd76f2
Commit Graph

4704 Commits

Author SHA1 Message Date
zyy
1c12b88d6d 调整大屏预览显示过滤 2020-05-07 13:35:25 +08:00
joylink_cuiweidong
260bc0a69e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-07 11:21:16 +08:00
joylink_cuiweidong
135e9bddb7 iscs 机电传感器页面布局 2020-05-07 11:20:52 +08:00
fan
06a0eaf285 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-07 10:16:41 +08:00
fan
ed3f1cee82 iscs调整&新版考试实训类型匹配 2020-05-07 10:16:15 +08:00
joylink_cuiweidong
a2470debf2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-07 09:42:44 +08:00
joylink_cuiweidong
ea138e7f3c iscs系统 添加机电下的菜单 2020-05-07 09:42:26 +08:00
zyy
4b53a2a1c5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-07 09:04:41 +08:00
zyy
ca4a4689fc 调整大屏偏移 2020-05-07 09:04:28 +08:00
fan
30e794ddb8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-07 09:03:27 +08:00
fan
81c6b76485 大屏调整 2020-05-07 09:03:10 +08:00
joylink_cuiweidong
bc9cd67681 代码调整 2020-05-06 18:29:08 +08:00
fan
faa2b72003 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-06 17:18:16 +08:00
fan
997b962851 大屏禁用拖拽 2020-05-06 17:18:06 +08:00
fan
15d88d2f7f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-06 16:57:18 +08:00
fan
22fffd340f 大屏测试 2020-05-06 16:57:07 +08:00
joylink_cuiweidong
de1a37f199 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-06 16:56:56 +08:00
joylink_cuiweidong
4a32fddddb 绘图 交路代码调整 
iscs 系统代码调整
考试保存规则代码调整
 2020-05-06 16:56:30 +08:00
zyy
515880d1c9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-06 13:11:52 +08:00
zyy
adf2627fec 调整西安二号线鼠标移入 2020-05-06 13:11:37 +08:00
joylink_cuiweidong
b15bae51cf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-30 18:48:27 +08:00
joylink_cuiweidong
fbd0baba41 代码调整 2020-04-30 18:48:07 +08:00
fan
ddd707c38a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-30 18:25:32 +08:00
fan
6eb648199e 西安二信号机操作问题修改 2020-04-30 18:25:21 +08:00
sunzhenyu
3f429baad2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-30 18:19:44 +08:00
sunzhenyu
3d6612cfbd 升级三维继电器动画模块 2020-04-30 18:19:32 +08:00
joylink_cuiweidong
c89c18fb21 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-30 18:06:16 +08:00
joylink_cuiweidong
101e58118a 新版地图 绘图 交路代码调整 2020-04-30 18:04:59 +08:00
fan
b6105f015d 绘图高亮显影调整 2020-04-30 17:52:37 +08:00
fan
4b50306981 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-30 17:40:44 +08:00
fan
276620a25e 西安二信号机调整 2020-04-30 17:40:25 +08:00
joylink_cuiweidong
7460abd1f1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-30 17:30:56 +08:00
joylink_cuiweidong
d189513501 新版绘图 交路代码调整 2020-04-30 17:30:10 +08:00
zyy
94ca9bce69 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-30 17:22:25 +08:00
zyy
327eb81aa7 调整绘图更新坐标 2020-04-30 17:22:10 +08:00
joylink_cuiweidong
268d3f939e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-30 16:34:08 +08:00
joylink_cuiweidong
81f05de40c 添加 根据地图交路一键生成生成所有站间运行等级 接口 
修改  根据地图交路区段生成站间运行等级 接口
 2020-04-30 16:33:26 +08:00
fan
f650e6f29e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-30 16:19:46 +08:00
fan
15104970bc 西安二信号机调整&线路配置添加参数 2020-04-30 16:19:33 +08:00
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
4797aa046f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-30 13:19:46 +08:00
fan
e348262118 西安二号线信号机操作调整 2020-04-30 13:19:33 +08:00
zyy
ba2aff1532 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-30 11:29:16 +08:00
zyy
eb6cd7ce2d 调整道岔使能发送流程，及绘图 2020-04-30 11:28:56 +08:00
fan
545b481532 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-30 10:54:20 +08:00
fan
5682ab67b0 信号机批量设置联锁站&区段添加所属车站属性 2020-04-30 10:54:06 +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
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
ec7be523ba 西安二信号机操作调整 2020-04-29 15:24:17 +08:00
fan
7e790a3bdb 鼠标样式调整 2020-04-29 14:05:50 +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
e10e0368e6 线路管理配置项样式调整 2020-04-28 17:03:23 +08:00
fan
f6dd06843f 线路管理配置项样式调整 2020-04-28 16:59:47 +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
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
af5567d598 西安二操作问题调整 2020-04-28 10:27:07 +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
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
zyy
61c385f570 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-23 10:06:58 +08:00
zyy
0e166416ba 调整catch 监听 2020-04-23 10:06:46 +08:00
fan
1e03ee1a3b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-23 10:05:15 +08:00
fan
97a9ae9f5c 接口报错调整 2020-04-23 10:03:07 +08:00
zyy
c5673fa6cb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-23 09:38:12 +08:00
zyy
e5206c8589 调整西安一号线运行图导入 2020-04-23 09:37:46 +08:00
fan
69574ccb0d 接口报错调整 2020-04-23 09:34:54 +08:00
zyy
306e9f4954 调整区段绘图显隐问题 2020-04-22 18:53:20 +08:00
zyy
d2eee7fca8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-22 18:37:23 +08:00
zyy
8882f716e4 调整运行图导入 2020-04-22 18:37:09 +08:00
fan
43378ad6f6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-22 18:26:26 +08:00
fan
06b9fda264 西安一三按计划折返 2020-04-22 18:24:28 +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
967e77042b 调整西安一号线导入时间格式化 2020-04-22 17:08:11 +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
9523f6e4cc 新版地图 绘图 公里标显示 代码调整 2020-04-22 16:17:35 +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
6d8d27a931 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-22 13:57:36 +08:00
zyy
7baea26e4d 拦截错误并提示 2020-04-22 13:57:19 +08:00
sunzhenyu
10949ddfbb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-22 13:23:09 +08:00
sunzhenyu
1cd2fd370b 复原三维沙盘行车逻辑 2020-04-22 13:22:54 +08:00
joylink_cuiweidong
d436041233 代码调整 2020-04-22 11:31:09 +08:00
fan
adfe7f0f05 派班工作站&运行图加载调整 2020-04-22 09:42:46 +08:00
fan
05c857aeb6 西安二号线运行图导入过滤TBKE&TWQN 2020-04-22 09:07:58 +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
zyy
19e0eeae6b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-21 17:54:00 +08:00
zyy
75c1cffa11 调整佛山线路行调下道岔操作 2020-04-21 17:53:46 +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
f229bc9231 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-21 17:10:15 +08:00
fan
46113e89a7 运行图加载 2020-04-21 17:08:43 +08:00
fan
c8c7f8bded 佛山调整 2020-04-21 17:05:18 +08:00
zyy
4610882f5f 调整列车方向显示 2020-04-21 17:00:19 +08:00
fan
d60c2881d0 添加列车配置 2020-04-21 16:00:10 +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
zyy
778c2059df Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-21 14:14:44 +08:00
zyy
b31ef6bc2d 调整西安一 三号线运行图导入 2020-04-21 14:14:33 +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
sunzhenyu
ff5bae2b8c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-20 17:31:50 +08:00
sunzhenyu
b8eec513ae 修改三维编辑轨道bug 2020-04-20 17:31:42 +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
joylink_cuiweidong
074f6d647a 西安二号线站台 紧急停车状态 绘图调整 2020-04-20 10:12:17 +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
8af97b4aa2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-17 18:44:33 +08:00
zyy
308c33e6bc 调整区段及道岔绘图方式 2020-04-17 18:44:14 +08:00
joylink_cuiweidong
3a0fd87a79 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-17 18:43:16 +08:00
joylink_cuiweidong
de0b7ae931 西安二号线 绘图紧急停车状态代码调整 2020-04-17 18:42:58 +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
sunzhenyu
47a8c63c5d 修改三维新版轨道结构，新版地图数据三维轨道编辑功能修改 2020-04-17 16:09:37 +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
9e048bb56e 删除sock测试和日志 2020-04-17 09:23:11 +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
de84df1cf2 菜单操作切换 2020-04-16 17:26:01 +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
zyy
6826089595 调整新版地图字段显示 2020-04-15 14:27:39 +08:00
zyy
83f63b5c70 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-15 14:19:37 +08:00
zyy
0091a593e5 调整福州线路顶部栏显示名称字段 2020-04-15 14:19:22 +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
e9d0ee83ad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-15 13:21:57 +08:00
joylink_cuiweidong
518fc37db6 设计平台 公共地图 已发布地图列表 代码调整 2020-04-15 13:21:29 +08:00
zyy
39d32b8f5c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-15 13:18:42 +08:00
zyy
45267f6e24 删除旧版地图不用的配置 2020-04-15 13:18:25 +08:00
joylink_cuiweidong
9ddafdedf5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-15 13:07:34 +08:00
joylink_cuiweidong
47e2ca8d76 北京一号线 地图配置文件调整 2020-04-15 13:06:58 +08:00
zyy
c2f8eeb250 调整佛山线路站台方向显示 2020-04-15 13:06:32 +08:00
zyy
25272e4fdd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-15 11:17:33 +08:00
zyy
6cb2939631 调整西安二号线道岔状态显示 2020-04-15 11:17:19 +08:00
joylink_cuiweidong
2a50ce7287 设计平台 加载计划运行图管理 创建通用运行图 地图过滤 2020-04-15 10:34:33 +08:00
zyy
87ca3e5556 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/config/deviceStyle.js
#	src/jmapNew/theme/factory.js
 2020-04-15 10:08:47 +08:00
zyy
7ea8fd7add 调整佛山线路全线取消扣车操作， 增加西安二号线皮肤 2020-04-15 10:06:26 +08:00
fan
7f9953323a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-15 09:49:31 +08:00
fan
8a7de3c22c 佛山皮肤调整 2020-04-15 09:44:44 +08:00
joylink_cuiweidong
900b727fc4 新版地图数据校验文字调整 2020-04-15 09:37:42 +08:00
fan
e9ee5112d4 佛山皮肤调整 2020-04-15 09:33:21 +08:00
fan
b833ac1acd 佛山皮肤调整 2020-04-15 09:19:47 +08:00
fan
09f3c4b969 调整西安二号线配置 2020-04-15 09:07:23 +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
c8a500c5dd 佛山运行图添加目的地码 2020-04-14 11:34:13 +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
joylink_cuiweidong
7f7318814c 北京一号线 现地 取消进路 信号重开步骤代码调整 2020-04-13 18:43:50 +08:00
fan
319d458ca0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-13 18:31:38 +08:00
fan
b7e6b9a8c1 佛山运行图导入上行时间调整&西安二号线车站调整 2020-04-13 18:30:21 +08:00
joylink_cuiweidong
be187cf1b3 北京一号线 操作定义 代码调整 2020-04-13 17:57:10 +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
db93886f7e 哈尔滨线路 实训操作代码调整 2020-04-13 16:29:39 +08:00
joylink_cuiweidong
8475870cf8 哈尔滨/宁波 现地 实训设置当前所在集中站 代码调整 2020-04-13 14:54:35 +08:00
joylink_cuiweidong
ccf028e5bb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-13 13:08:30 +08:00
joylink_cuiweidong
e083015580 西安二号线 屏蔽门和站台的状态代码调整 2020-04-13 13:08:17 +08:00
fan
626e7f701f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-13 10:44:16 +08:00
fan
472dd1b62a 佛山运行图导入校验调整&西安二号线车站调整 2020-04-13 10:43:02 +08:00
joylink_cuiweidong
fe41d48a73 旧版课程 实训定义 代码调整 2020-04-13 10:37:47 +08:00
joylink_cuiweidong
4cc24e3cd2 课程章节分页代码调整 2020-04-13 10:05:09 +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
fan
bcee763b85 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 19:21:19 +08:00
fan
528aa24bd0 实训添加页面调整 2020-04-10 19:19:55 +08:00
joylink_cuiweidong
98c6736c17 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 19:14:36 +08:00
joylink_cuiweidong
43c7f2c094 哈尔滨一号线 现地 自排开关 信号重开 信号关灯操作处理 2020-04-10 18:59:50 +08:00
sunzhenyu
2b0ee65a67 新数据三维区段模型自动生成修改，哈尔滨背景模型修改 2020-04-10 18:55:06 +08:00
fan
78d2271d2d 实训课程编辑路由调整 2020-04-10 17:54:24 +08:00
fan
08d02e9563 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 17:51:36 +08:00
fan
b0797644f9 实训课程编辑调整&线二号线调整 2020-04-10 17:50:26 +08:00
zyy
2d70c294f8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 17:24:12 +08:00
zyy
3bfb74d55b 调整绘图隐藏元素 2020-04-10 17:23:53 +08:00
sunzhenyu
8c3dd94cc1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 16:55:00 +08:00
sunzhenyu
e51356c4aa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 16:54:40 +08:00
joylink_cuiweidong
f0fc3712f9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 16:54:34 +08:00
sunzhenyu
01842a7605 修改三维轨迹线显示 2020-04-10 16:54:32 +08:00
joylink_cuiweidong
c9f7a72d0b 代码调整 2020-04-10 16:54:17 +08:00
fan
26e9c33736 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 16:47:20 +08:00
fan
11586aef30 哈尔滨现地显示BUG调整&西安二号线皮肤调整 2020-04-10 16:45:41 +08:00
joylink_cuiweidong
8cc854e9db Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 16:44:28 +08:00
joylink_cuiweidong
22d587a7a8 哈尔滨 行调 道岔操作 实训操作定义修改 2020-04-10 16:44:07 +08:00
zyy
74942486fd Merge branch 'master' into test 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/section/index.vue
#	src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue
 2020-04-10 16:43:40 +08:00
zyy
11eedc59ad 调整区段计算实际长度出现问题 2020-04-10 16:41:48 +08:00
zyy
f058795597 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 16:19:54 +08:00
zyy
057b627c0d 调整区段计算 2020-04-10 16:19:37 +08:00
sunzhenyu
8a1746e13f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 16:13:42 +08:00
sunzhenyu
ee0b0ba391 添加三维驾驶界面mmi站台，安全距离，行车登记，驾驶模式显示视图 2020-04-10 16:13:36 +08:00
joylink_cuiweidong
e3f5d5210b 代码调整 2020-04-10 16:00:38 +08:00
joylink_cuiweidong
4be8b2dd87 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 15:22:08 +08:00
joylink_cuiweidong
0133b3b5d9 代码调整 2020-04-10 15:21:46 +08:00
fan
165bde34ef Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 14:08:26 +08:00
fan
bb69f81e99 哈尔滨指令调整 2020-04-10 14:07:05 +08:00
joylink_cuiweidong
f0a4491cb8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 14:05:37 +08:00
joylink_cuiweidong
e05057bf3f 宁波一号线 自动折返代码调整 2020-04-10 14:05:20 +08:00
fan
ec160a8df3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 13:27:58 +08:00
fan
c294e00d46 实训定义调整 2020-04-10 13:26:37 +08:00
zyy
48ca2388cb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 11:20:04 +08:00
zyy
6c7cfe4648 调整逻辑区段重新生成及修改逻辑调整 2020-04-10 11:19:48 +08:00
fan
c1f6803fa5 宁波一号线:现地站台实训集中站显示切换切换问题 2020-04-10 11:05:20 +08:00
joylink_cuiweidong
9e45a0d342 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 10:42:19 +08:00
joylink_cuiweidong
888ae6e936 宁波一号线 自动折返按钮实训操作代码调整 2020-04-10 10:41:41 +08:00
zyy
b4a2e19d77 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 10:19:15 +08:00
fan
cf2d8f479d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 10:18:14 +08:00
zyy
bacb6a9484 Merge branch 'master' into test 2020-04-10 10:18:13 +08:00
zyy
76851cdff2 调整区段字段显隐控制条件 2020-04-10 10:17:34 +08:00
fan
162bd4c9f2 宁波一号线:实训问题调整 2020-04-10 10:16:58 +08:00
zyy
db7acfd6c7 调整区段字段显隐 2020-04-10 10:10:44 +08:00
fan
e6ad580824 宁波一号线： 查看站台信息=》站台详细信息，道岔单解/解封 2020-04-10 09:24:21 +08:00
fan
5c55261f55 本地导入调整 2020-04-10 09:09:06 +08:00
fan
9f5644ccc6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 18:57:03 +08:00
fan
1e4b7bbfd9 本地导入 2020-04-09 18:54:22 +08:00
joylink_cuiweidong
25fcebdc75 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 18:52:09 +08:00
joylink_cuiweidong
4e9ccad9e5 代码调整 2020-04-09 18:51:51 +08:00
zyy
e519aee3e6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 18:39:42 +08:00
zyy
9b68feaba5 调整区段字段显隐判断 2020-04-09 18:39:27 +08:00
fan
991fa86ede Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 18:23:35 +08:00
fan
7e0834b13a 代码哈尔滨实训数据&本地导入导出 2020-04-09 18:22:10 +08:00
zyy
ced7cb91b6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 17:37:41 +08:00
zyy
289f1dbff0 调整现地列车显示 2020-04-09 17:37:27 +08:00
joylink_cuiweidong
1897a79a72 西安二号线 屏蔽门绘图代码调整 2020-04-09 17:27:10 +08:00
zyy
da62178c72 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 17:03:35 +08:00
zyy
8026e14da8 调整道岔重置，调整宁波定义 2020-04-09 17:03:22 +08:00
fan
47e692d3a4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 16:52:19 +08:00
fan
5036229c47 操作定义老地图处理 2020-04-09 16:51:17 +08:00
joylink_cuiweidong
3db904a75e 代码调整 2020-04-09 16:45:34 +08:00
joylink_cuiweidong
45e6a12825 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 16:32:15 +08:00
joylink_cuiweidong
5a8f4e0fe6 西安二号线 屏蔽门绘图代码调整 2020-04-09 16:31:53 +08:00
fan
0adcf6dac1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 16:14:29 +08:00
fan
79f473ad8b 实训管理老地图处理（未完） 2020-04-09 16:11:36 +08:00
zyy
184ff9d1e2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 15:21:57 +08:00
zyy
ee10377b04 调整区段字段显示逻辑，道岔计轴区段显示道岔菜单 2020-04-09 15:21:44 +08:00
fan
bcb9251f9e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 14:51:25 +08:00
fan
f2ba430cc5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 14:49:06 +08:00
joylink_cuiweidong
52e26e4d30 宁波一号线 查询进路状态步骤操作调整 2020-04-09 14:48:25 +08:00
fan
50579656eb 进路控制信号机按消息批次处理&西安二计轴调整&&实训管理老地图处理（未完） 2020-04-09 14:47:44 +08:00
joylink_cuiweidong
d9a8eb1c7d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 14:37:52 +08:00
joylink_cuiweidong
4f416e355d 宁波一号线现地 请求站控代码调整 2020-04-09 14:37:37 +08:00
zyy
15df2687c3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 13:45:18 +08:00
zyy
b6d03d24a8 调整区段绘制方式 2020-04-09 13:45:01 +08:00
joylink_cuiweidong
1f4d8ae061 西安二号线 站台绘图调整 2020-04-09 13:01:48 +08:00
joylink_cuiweidong
bcca3c5858 一键生成实训代码调整 2020-04-09 09:42:35 +08:00
zyy
78995be06f 调整右键点击道岔区段获取道岔菜单列表 2020-04-09 09:39:14 +08:00
joylink_cuiweidong
2ddd132327 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-09 09:23:25 +08:00
joylink_cuiweidong
c942d4e840 实训一键生成代码调整 2020-04-09 09:23:09 +08:00
fan
88bb30c413 实训管理调整（tabel 实训类型和操作不显示） 2020-04-08 18:47:48 +08:00
fan
9ea9d56309 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-08 18:39:31 +08:00
fan
630ccfd016 信号机调整 2020-04-08 18:38:08 +08:00
joylink_cuiweidong
c736edf9cc 代码调整 2020-04-08 16:45:51 +08:00
joylink_cuiweidong
132f7bad3c 代码调整 2020-04-08 16:27:55 +08:00
joylink_cuiweidong
78a8581152 宁波一号线 实训请求站控 操作调整 2020-04-08 16:24:44 +08:00
fan
2e1b356da9 调整区段限速判断 2020-04-08 16:21:08 +08:00
joylink_cuiweidong
4154b4ce20 系统指令字典添加 产品类型 参数 2020-04-08 15:59:49 +08:00
joylink_cuiweidong
dd2d572409 道岔的 确认计轴有效的指令参数修改 2020-04-08 15:43:09 +08:00
joylink_cuiweidong
9c4c447dee 宁波一号线操作代码调整 2020-04-08 15:37:05 +08:00
fan
b723628d80 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-08 15:33:45 +08:00
fan
5bd90ea0d1 实训操作类型筛选调整 2020-04-08 15:32:35 +08:00
joylink_cuiweidong
053648e0a3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-08 15:29:16 +08:00
joylink_cuiweidong
4c2ef28572 西安二号线 线路配置文件调整 2020-04-08 15:29:03 +08:00
joylink_cuiweidong
1554803dd4 代码调整 2020-04-08 15:27:55 +08:00
zyy
14e4c2c785 调整 框选设置元素 设备集中站流程 2020-04-08 15:20:29 +08:00
fan
df0d560df8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-08 14:25:27 +08:00
fan
02d4b8f71f 进路复制 2020-04-08 14:24:11 +08:00
zyy
85eef4b8f9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-08 14:14:04 +08:00
zyy
425b7d3869 Merge branch 'master' into test 2020-04-08 14:12:58 +08:00
fan
f495a2d560 实训占位符调整&皮肤调整 2020-04-08 14:06:45 +08:00
fan
013360534b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-08 13:29:30 +08:00
fan
507e28adde Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-08 13:25:45 +08:00
joylink_cuiweidong
23aa213778 指令字典参数调整 2020-04-08 13:25:10 +08:00
fan
b089aa6651 实训占位符调整&皮肤调整 2020-04-08 13:23:19 +08:00
joylink_cuiweidong
08a3480dad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/scripts/OperationConfig.js
 2020-04-08 13:10:31 +08:00
joylink_cuiweidong
613a88ca90 实训操作步骤文件拆分 2020-04-08 11:26:55 +08:00
zyy
f3951c05e1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-08 10:42:21 +08:00
zyy
a27ee1e859 调整一键生成实训延迟显示 2020-04-08 10:42:06 +08:00
fan
d82b89b57e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 18:32:00 +08:00
fan
a1c4a901af 实训步骤生成 2020-04-07 18:30:46 +08:00
joylink_cuiweidong
3de6121cbf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 18:25:08 +08:00
joylink_cuiweidong
90351b37c2 北京线路步骤操作代码调整 2020-04-07 18:24:45 +08:00
zyy
635b593b56 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 18:23:48 +08:00
zyy
f12f84f97b 调整实训一键生成，调整宁波线路实训定义 2020-04-07 18:22:26 +08:00
joylink_cuiweidong
778d74ecd5 北京一号线现地 道岔 站台实训操作步骤代码调整 2020-04-07 17:19:28 +08:00
fan
0079b698e3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 16:45:48 +08:00
fan
88b4bcf2bb 指令接口调整 2020-04-07 16:44:36 +08:00
fan
d3bd167c70 实训管理调整 2020-04-07 16:41:08 +08:00