Commit Graph

687 Commits

Author SHA1 Message Date
zyy
30d76e763e 调整折返按钮 状态返回处理 2020-06-05 10:14:12 +08:00
zyy
a4df31fcc3 调整字段显示 2020-06-04 18:24:39 +08:00
zyy
4a03d8613b 调整车站折返策略 2020-06-04 17:58:42 +08:00
zyy
9be9c9a313 增加西安 三号线设置折返策略元素 2020-06-04 17:29:18 +08:00
zyy
31fab488c0 调整区段保存流程 2020-06-03 14:47:26 +08:00
zyy
a57ae39ebf 调整区段修改逻辑 2020-06-03 13:18:52 +08:00
joylink_cuiweidong
6fe1a0c22b 新版地图绘图 高级数据交路代码调整 2020-05-29 16:23:38 +08:00
fan
2a1ce3543f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-28 18:29:03 +08:00
zyy
474dcc2d74 新增车站字段 2020-05-28 18:17:15 +08:00
zyy
f1a66f8f73 调整站台轨关联站台也会修改 2020-05-28 18:08:20 +08:00
fan
5e97623b06 逻辑区段始终点偏移量设置调整 2020-05-28 17:47:52 +08:00
zyy
55f57e2135 调整保存字段 2020-05-28 15:02:15 +08:00
zyy
df4dc3eea9 调整供电线路保存,福州皮肤配置文件调整 2020-05-28 14:39:06 +08:00
zyy
1ae2793221 调整绘图界面字体皮肤配置 2020-05-25 15:06:34 +08:00
zyy
39d055ec09 调整车站连锁关系 右键空白处显示连锁关系 2020-05-22 18:28:03 +08:00
zyy
e221ca9b22 调整报名流程字段,调整西安线路非连锁站邮件操作 2020-05-22 17:10:07 +08:00
fan
45422c8cd2 信号机批量设置引导信号&虚拟信号机旋转 2020-05-19 15:44:01 +08:00
fan
6afafc9371 调整绘图批量设置信号机类型&竞赛考试详情 2020-05-19 11:20:09 +08:00
zyy
b8bf51fc82 优化地图绘制 2020-05-18 17:08:21 +08:00
zyy
6fdf3b74aa 调整车次窗撤销操作问题 2020-05-18 13:34:46 +08:00
zyy
9591cbd268 调整竞赛系统登陆权限 2020-05-18 13:08:45 +08:00
zyy
7992a2e11e 调整格式 2020-05-15 16:55:00 +08:00
fan
e4b14d96e5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 15:58:19 +08:00
fan
dff3a090a5 调整右键跳转车站 2020-05-15 15:58:08 +08:00
zyy
322ca86dec Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 14:50:19 +08:00
zyy
ae5916b90a 调整竞赛系统路由配置 2020-05-15 14:50:05 +08:00
joylink_cuiweidong
d3df0afc94 剧本代码调整 2020-05-15 13:16:55 +08:00
fan
396dd0d899 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 18:55:12 +08:00
fan
71682d00a5 区段计轴调整 2020-05-14 18:54:53 +08:00
zyy
43e6b4bca1 保存道岔状态 2020-05-14 18:49:47 +08:00
fan
5ef9b0aaaf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 17:03:45 +08:00
fan
4f8de9cc6a 信号机批量操作调整 2020-05-14 17:03:30 +08:00
zyy
81c8ad5210 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 16:54:59 +08:00
zyy
ccf186e98e 调整区段停车点偏移量 2020-05-14 16:54:31 +08:00
fan
996b71da05 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 16:54:09 +08:00
fan
126278ee01 状态表示道岔故障调整 2020-05-14 16:53:58 +08:00
fan
abec4b2b4c 西安二号线添加是否灭灯显示(CTC级) 2020-05-14 16:45:48 +08:00
zyy
0533ddfcfe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 16:44:39 +08:00
zyy
b735cd5b06 调整区段回车问题 2020-05-14 16:43:55 +08:00
zyy
04aacc3818 调整物理区段创建逻辑区段逻辑 2020-05-14 15:05:19 +08:00
zyy
2de0a0fc5b 调整区段鼠标移入元素绘制 2020-05-14 11:00:09 +08:00
zyy
ecf563e8de 调整大屏系统保存 2020-05-13 16:29:10 +08:00
zyy
cd229f7f81 调整地图大屏编辑,宁波线路道岔操作 2020-05-13 15:31:12 +08:00
zyy
0a09f6a79b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-13 10:07:34 +08:00
zyy
781f96f89c 调整大屏预览,区段字段调整 2020-05-13 10:07:07 +08:00
fan
4d18c4ac2e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-12 19:08:11 +08:00
fan
92eaa38aef 贵州装备班级相关&绘图逻辑区段调整 2020-05-12 19:07:48 +08:00
zyy
52cbb7fd1e 调整大屏系统列车缩放 2020-05-12 18:23:56 +08:00
zyy
dd6030d346 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-12 16:45:59 +08:00
zyy
ecec0ec1e0 调整西安一号鼠标移入样式 2020-05-12 16:45:45 +08:00
fan
a707d142be 逻辑区段生成调整 2020-05-12 13:57:33 +08:00
zyy
18fbae9114 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-11 17:36:39 +08:00
zyy
68e63ee5ef 调整地图绘制报错 2020-05-11 17:36:21 +08:00
fan
e8e63f2976 逻辑区段始终点偏移 2020-05-11 16:54:53 +08:00
fan
a90adb9575 联锁关系生成过渡和结果展示调整 2020-05-11 15:51:33 +08:00
fan
6d38dd5ba3 增加联锁关系生成过渡和结果展示 2020-05-11 15:47:56 +08:00
fan
ac1d5bfdff 配置turefalse改为中文 2020-05-11 14:52:54 +08:00
fan
56ed2a4f8c 调整更新坐标&联锁配置项 2020-05-11 14:45:07 +08:00
fan
115f1da928 批量生成区段逻辑始终端偏移量 2020-05-11 13:25:09 +08:00
joylink_zyy
c65edfc06d 调整区段绘图逻辑 2020-05-10 20:43:37 +08:00
joylink_cuiweidong
b5a3a195f7 代码调整 2020-05-09 20:21:20 +08:00
joylink_cuiweidong
81450fbc9e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 18:24:37 +08:00
fan
f16936d9c3 信号机接近区段 2020-05-09 18:24:35 +08:00
joylink_cuiweidong
13ae9eba9c 代码调整 2020-05-09 18:24:21 +08:00
joylink_cuiweidong
9796280970 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 17:49:40 +08:00
joylink_cuiweidong
de024b9a45 代码调整 2020-05-09 17:49:25 +08:00
fan
d761c287af Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 17:32:29 +08:00
fan
e50edafb0c 校验调整 2020-05-09 17:32:13 +08:00
zyy
17547d31ce Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 17:27:42 +08:00
zyy
8e81a00847 调整区段绘图方式 2020-05-09 17:27:28 +08:00
joylink_cuiweidong
597f5cb990 代码调整 2020-05-09 16:39:33 +08:00
fan
b990150b0f merger 2020-05-09 14:24:55 +08:00
fan
a66f36f293 批量设置调整 2020-05-09 14:23:20 +08:00
zyy
e59ab1400a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-09 14:16:25 +08:00
zyy
bb7556a876 调整宁波线路操作失败提示 2020-05-09 14:16:09 +08:00
fan
c4298fa612 批量设置调整 2020-05-09 13:03:57 +08:00
fan
d8d795c1fb 调整绘图页面菜单 2020-05-09 10:51:13 +08:00
joylink_cuiweidong
eb62d2d641 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-08 18:51:44 +08:00
fan
09e49a2b0a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-08 18:52:59 +08:00
fan
84e212c48b 站台站台轨位置校验&站台属性是否显示不生效修改&站台中站台轨属性不可修改&tab页懒加载导致的数据未展示问题调整 2020-05-08 18:52:46 +08:00
joylink_cuiweidong
285700c10d 代码调整 2020-05-08 18:51:29 +08:00
joylink_cuiweidong
107cc4b73b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-08 18:37:56 +08:00
joylink_cuiweidong
76fd09cf08 iscs 绘图代码调整
新版地图 交路绘图代码调整
2020-05-08 18:37:00 +08:00
fan
5eeac156db 添加批量设置关联站台区段所属车站 2020-05-08 17:39:38 +08:00
zyy
85324dee05 调整西安一号线信号机操作 2020-05-07 16:14:39 +08:00
joylink_cuiweidong
bc9cd67681 代码调整 2020-05-06 18:29:08 +08:00
joylink_cuiweidong
4a32fddddb 绘图 交路代码调整
iscs 系统代码调整
考试保存规则代码调整
2020-05-06 16:56:30 +08:00
joylink_cuiweidong
fbd0baba41 代码调整 2020-04-30 18:48:07 +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
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
81f05de40c 添加 根据地图交路一键生成生成所有站间运行等级 接口
修改  根据地图交路区段生成站间运行等级 接口
2020-04-30 16:33:26 +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
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
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
joylink_cuiweidong
66cdf061c6 新版地图 绘图代码调整 2020-04-28 18:16:04 +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
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
zyy
4d288556b0 调整绘图界面,调整实训平台鼠标隐藏bug 2020-04-23 17:11:51 +08:00
zyy
306e9f4954 调整区段绘图显隐问题 2020-04-22 18:53:20 +08:00
zyy
415d762294 调整地图绘制区段显隐关系 2020-04-22 18:02:43 +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
fan
e51824dc80 紧急停车位置调整&绘图站间分隔&车站批量调整 2020-04-22 14:30:37 +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
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
fan
7c55c19933 交路区段区别显示&故障状态组调整 2020-04-20 17:10:50 +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
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