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

1652 Commits

Author SHA1 Message Date
fan
438aef2764 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-20 10:20:38 +08:00
fan
2a517c8aa5 进路调整 延续保护生成线路道岔可为空，创建延续保护必须有解锁区段，时间，线路，更新是若无解锁区段和线路则删除延续保护 2019-12-20 10:20:03 +08:00
zyy
b5cc83a0e0 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-19 18:04:35 +08:00
zyy
3101af9948 增加线路皮肤配置，调整联锁站台显示列表 2019-12-19 18:04:28 +08:00
fan
9cd46588a9 自动信号参数名和默认值调整--0003 2019-12-19 16:43:56 +08:00
fan
6ce29006e5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-19 16:21:15 +08:00
fan
143f35a222 进路物理区段列表连续高亮 2019-12-19 16:21:00 +08:00
joylink_cuiweidong
882bb44fb2 根据设备code高亮 地图对应的设备 2019-12-19 15:52:36 +08:00
fan
30fc3132d3 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-19 14:05:30 +08:00
fan
fbbee9324a 延续保护预览 2019-12-19 14:05:16 +08:00
joylink_cuiweidong
fb7618c8ee Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-19 13:14:40 +08:00
joylink_cuiweidong
27196e9c54 站台创建的时候绑定集中站 2019-12-19 13:14:29 +08:00
zyy
3abc93cbb8 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-19 13:12:43 +08:00
zyy
c0c5d620cd 调整站台紧急停车创建逻辑 2019-12-19 13:12:34 +08:00
fan
e300164580 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
 2019-12-19 10:12:54 +08:00
fan
524df9c5e9 进路-延续保护调整 2019-12-19 10:08:12 +08:00
zyy
511701b116 调整数据显示字段，调整创建站台区段属性设置 2019-12-19 10:00:29 +08:00
zyy
1e1f9a598d 修改高级数据字段显示 2019-12-18 17:52:50 +08:00
zyy
c295f97819 调整车站显示坐标，信号机批量操作，调整逻辑代码 2019-12-18 16:20:30 +08:00
joylink_cuiweidong
38c2bc4c55 zc控制代码调整 2019-12-18 15:34:51 +08:00
joylink_cuiweidong
d994ed3d7e 代码调整 2019-12-18 15:00:53 +08:00
zyy
0bb46ab432 高级数据调整顺序 2019-12-18 13:21:07 +08:00
fan
2d068a93ce Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-18 13:06:00 +08:00
fan
7cf546efe6 参数调整 2019-12-18 13:05:29 +08:00
zyy
0a8b0e3264 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-18 11:18:08 +08:00
zyy
436db38200 调整区段字段保存获取 2019-12-18 11:17:57 +08:00
joylink_cuiweidong
d196383a06 批量设置集中站 数据过滤 2019-12-18 10:18:55 +08:00
joylink_cuiweidong
9c54da44f3 站台创建关联集中站 2019-12-18 10:01:58 +08:00
joylink_cuiweidong
e3fb06591c 代码修改 2019-12-17 19:22:07 +08:00
joylink_cuiweidong
b864c717fb Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/station.vue
 2019-12-17 19:05:19 +08:00
joylink_cuiweidong
b4ea83eabc zc 集中站设置 2019-12-17 19:03:38 +08:00
zyy
33f140d71c 修改小站台位置 2019-12-17 18:17:33 +08:00
fan
97202631ea Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-17 17:27:54 +08:00
fan
88eeaff1e2 区段站台问题调整 2019-12-17 17:27:35 +08:00
zyy
ea4de2d11d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-17 17:09:13 +08:00
zyy
88b1d10430 调整生成道岔 区段修改字段 2019-12-17 17:09:04 +08:00
fan
6195338947 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-17 16:41:40 +08:00
fan
3723c8696e 区段关系校验 2019-12-17 16:41:18 +08:00
joylink_cuiweidong
cd549d57fc Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/station.vue
 2019-12-17 16:24:24 +08:00
joylink_cuiweidong
b8448aaff8 道岔设置集中站过滤 
区段设置集中站过滤
车站设置集中站和管理车站列表代码调整
 2019-12-17 16:22:07 +08:00
zyy
b05d71667e 调整列车创建 2019-12-17 15:37:11 +08:00
zyy
fce5242e06 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-17 14:34:18 +08:00
zyy
24fd0890dd 调整进路保存 2019-12-17 14:34:09 +08:00
fan
c501445800 折线偏移量调整 2019-12-17 14:26:56 +08:00
fan
e419fd9241 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-17 10:31:24 +08:00
fan
4cecc2d630 逻辑区段增加偏移量参数 2019-12-17 10:31:12 +08:00
zyy
0bb01b4e4c 调整信号机字段 2019-12-17 10:30:27 +08:00
fan
a1be3cf879 逻辑区段增加偏移量参数 2019-12-17 10:26:38 +08:00
zyy
c0e953ceeb Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/signal/index.vue
#	src/views/newMap/newMapdraft/mapoperate/stationstand.vue
 2019-12-17 09:16:55 +08:00
zyy
9fe6c9739d 调整代码 2019-12-17 09:13:57 +08:00
fan
1877b05cce 信号机方向属性调整 2019-12-16 18:17:43 +08:00
fan
28c57c1228 站台方向属性调整 2019-12-16 14:51:30 +08:00
fan
c79465b31a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-16 10:57:53 +08:00
fan
7d2d6fb580 站台方向属性调整 2019-12-16 10:57:40 +08:00
zyy
de30f91aed 修改代码 2019-12-13 18:50:01 +08:00
zyy
a6e8f1376f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/section.vue
 2019-12-13 18:01:48 +08:00
zyy
70ae531eff 增加信号机构建偏移量关联关系逻辑， 调整车次窗批量修改 2019-12-13 18:00:12 +08:00
fan
b2c9e34a25 站台方向属性初始值调整 2019-12-13 17:53:34 +08:00
fan
62300d327f 站台方向属性调整 2019-12-13 17:51:00 +08:00
fan
852ac4e601 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/section.vue
 2019-12-13 17:12:10 +08:00
fan
ea3217891a 逻辑区段偏移量 2019-12-13 17:06:17 +08:00
fan
bd1cbf4e40 站台调整 2019-12-13 16:28:34 +08:00
joylink_cuiweidong
36c1b6ceec 车站添加副标题 2019-12-13 16:13:10 +08:00
joylink_cuiweidong
284f7bcc7b 区段删除站台轨对应站台编码 2019-12-13 15:24:51 +08:00
joylink_cuiweidong
6715c48642 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-13 14:58:39 +08:00
joylink_cuiweidong
9123dc050a 车站添加车站编号 2019-12-13 14:58:28 +08:00
fan
13f608a2ff 高级高亮调整 2019-12-13 14:46:38 +08:00
fan
8f6a7c1253 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-13 14:19:49 +08:00
fan
fc3ab4cc21 站台屏蔽门调整 2019-12-13 14:19:38 +08:00
joylink_cuiweidong
eb3b803462 信号机所属集中站数据筛选 
进路所属联锁站数据筛选
 2019-12-13 14:02:15 +08:00
joylink_cuiweidong
0a2e5567a2 代码调整 2019-12-13 13:23:07 +08:00
joylink_cuiweidong
b2b9c5819b 车站增加: 是否连锁站 
区段删除关联站台字段
 2019-12-13 13:19:09 +08:00
fan
083e70dc02 站台屏蔽门调整 2019-12-13 13:10:11 +08:00
zyy
2f639cce5e Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-12 18:15:32 +08:00
zyy
7ef051733a 调整缩放，站台显示，坐标 2019-12-12 18:15:25 +08:00
fan
4af61e8615 drawWay参数调整 2019-12-12 16:10:44 +08:00
fan
811a430ec1 Revert "drawWay参数调整" 
This reverts commit 54be69b
 2019-12-12 16:07:32 +08:00
fan
0ef09ed480 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-12 15:58:39 +08:00
fan
54be69b2e6 drawWay参数调整 2019-12-12 15:58:19 +08:00
zyy
7c9d9c6373 调整站台显示样式问题，修改代码 2019-12-12 15:31:01 +08:00
fan
9a342caad7 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-12 12:23:36 +08:00
fan
80109bb349 区段新建台调整 2019-12-12 12:23:25 +08:00
zyy
6fb6ae9867 调整站台，屏蔽门默认样式 2019-12-12 10:05:28 +08:00
fan
6e50f1eddf Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-11 18:25:22 +08:00
fan
cc014d4ccc 自动折返设置优先级 2019-12-11 18:25:03 +08:00
zyy
159a2b4890 调整点击道岔计轴显示道岔区段 2019-12-11 17:22:01 +08:00
zyy
206496609d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-11 17:07:39 +08:00
zyy
b2dd3d7285 调整站台生成逻辑，调整uid检测方式 2019-12-11 17:07:29 +08:00
fan
eafb83a886 自动折返调整 2019-12-11 14:10:51 +08:00
fan
5fdbbe9295 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-11 13:57:06 +08:00
fan
cd15b3737c 自动折返，进路调整 2019-12-11 13:56:46 +08:00
joylink_cuiweidong
a358b9cdd6 代码调整 2019-12-11 09:42:33 +08:00
joylink_cuiweidong
d5eef0c022 信号机接近区段页面调整 2019-12-10 18:11:11 +08:00
joylink_cuiweidong
b6e6e72d17 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-10 18:02:08 +08:00
joylink_cuiweidong
98c7e1105f 自动信号接口修改 2019-12-10 18:01:52 +08:00
fan
214a74a55a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-10 17:56:08 +08:00
fan
0bde17887f 高级延续保护调整 2019-12-10 17:55:43 +08:00
zyy
914af945c8 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-10 16:57:37 +08:00
zyy
9aec1ef099 调整拖拽逻辑 2019-12-10 16:57:31 +08:00
fan
b6719793c9 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-10 16:50:50 +08:00
fan
6afb5f35a8 高级延续保护调整 2019-12-10 16:50:38 +08:00
zyy
18892bed83 移入鼠标显示坐标 2019-12-10 16:09:45 +08:00
zyy
640b38285a 调整车站默认字体大小，皮肤调整 2019-12-10 15:44:46 +08:00
joylink_cuiweidong
00552b6494 区段批量创建代码调整 2019-12-10 11:02:13 +08:00
fan
2c6f19b270 合并代码 2019-12-10 10:20:32 +08:00
fan
45e4aaca8b 延续保护调整 2019-12-10 10:18:25 +08:00
zyy
18ebc91da2 调整批量创建区段 逻辑 2019-12-10 10:12:46 +08:00
zyy
4385e64b03 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-10 09:25:19 +08:00
zyy
ae36dc3542 新增区段创建方式 2019-12-10 09:25:13 +08:00
joylink_cuiweidong
6d26e8e217 进路添加是否先锁闭字段 2019-12-09 18:54:11 +08:00
zyy
bdebbed374 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-09 17:48:52 +08:00
zyy
5114f848b3 调整道岔计轴区段生成逻辑 2019-12-09 17:48:46 +08:00
joylink_cuiweidong
a15cb8d43c 获取发布地图接口修改（添加drawWay参数） 2019-12-09 17:38:08 +08:00
fan
e28595053d Revert "区段列表变更调整" 
This reverts commit 95caf15
 2019-12-09 15:20:59 +08:00
fan
586d7a23e5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-09 15:05:25 +08:00
fan
95caf1509e 区段列表变更调整 2019-12-09 15:05:15 +08:00
zyy
f596016097 增加区段与车次窗关联关系 2019-12-09 14:33:23 +08:00
zyy
6bd0e07e58 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-09 10:50:28 +08:00
zyy
2bac1022b4 修改生成规则，调整新版地图右键操作 2019-12-09 10:50:21 +08:00
fan
d8b0577c77 删除打印日志 2019-12-06 18:13:42 +08:00
fan
0f56e5b7eb Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-06 18:09:40 +08:00
fan
a6872d7e1e 绘图调整-（逻辑区段添加均为0或均不为0校验） 2019-12-06 18:09:31 +08:00
zyy
35688adcd0 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-06 18:03:18 +08:00
zyy
dc381e2a63 desc: 新增屏蔽门绘制以及紧急停车按钮生成流程 2019-12-06 18:03:13 +08:00
joylink_cuiweidong
51498fe4a6 代码调整 2019-12-06 15:53:09 +08:00
fan
d09b418bba 绘图相关调整_(添加快捷键修改) 2019-12-06 15:12:22 +08:00
fan
a4f83d1f38 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-06 14:36:27 +08:00
fan
7cc2b68d13 绘图相关调整_(区段快捷删除调整) 2019-12-06 14:36:18 +08:00
joylink_cuiweidong
ce50945e01 区段代码调整 2019-12-06 14:35:23 +08:00
zyy
c0c580ec1d 修改生成名字规则 2019-12-06 13:56:18 +08:00
zyy
ff177f1f3b Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/section.vue
 2019-12-06 13:04:37 +08:00
zyy
824b4ca414 修改命名规则 2019-12-06 13:03:45 +08:00
joylink_cuiweidong
7deb870fba Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/section.vue
 2019-12-06 11:29:05 +08:00
joylink_cuiweidong
4313a027ed 逻辑区段代码调整 2019-12-06 11:27:30 +08:00
fan
5f132f3951 绘图相关调整_(区段删除调整) 2019-12-06 11:02:42 +08:00
zyy
3c4f803df2 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-06 10:31:26 +08:00
zyy
c192deb2ca 修改代码 2019-12-06 10:31:19 +08:00
fan
ab661e0961 绘图相关调整_(暂仅绘图注册键盘事件) 2019-12-06 10:11:29 +08:00
fan
4f824b83ac 绘图相关调整_(调整快捷键代码) 2019-12-06 10:05:14 +08:00
joylink_cuiweidong
47c39878b7 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-06 09:01:58 +08:00
joylink_cuiweidong
e87a592b9a 代码调整 2019-12-06 09:01:05 +08:00
fan
75f400a1c7 绘图相关调整_(添加快捷删除) 2019-12-05 18:53:06 +08:00
fan
b88693c772 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-05 18:12:46 +08:00
fan
fe33008621 绘图相关调整_(区段问题调整) 2019-12-05 18:12:33 +08:00
zyy
22825baf03 增加车站创建方式 2019-12-05 18:01:09 +08:00
zyy
0656f04dd5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-05 16:43:41 +08:00
zyy
baa7273288 修改区段 2019-12-05 16:43:35 +08:00
joylink_cuiweidong
7aeed15baa Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-05 16:35:43 +08:00
joylink_cuiweidong
118e825c0f 代码调整 2019-12-05 16:35:31 +08:00
zyy
f5ae986443 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-05 16:18:02 +08:00
zyy
b66aecff7e 调整区段名字生成规则 2019-12-05 16:17:54 +08:00
joylink_cuiweidong
902e92de1f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/section.vue
 2019-12-05 15:52:29 +08:00
joylink_cuiweidong
2805a4219c 区段代码调整 2019-12-05 15:48:01 +08:00
zyy
ea5f2a30b2 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-05 15:39:21 +08:00
zyy
a03c797c60 修改道岔计轴区段生成逻辑 2019-12-05 15:39:15 +08:00
fan
dcdd9aeee0 绘图相关调整_(区段问题调整) 2019-12-05 15:36:42 +08:00
fan
22f9332ea3 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-05 14:55:33 +08:00
fan
a83b2cd2cd 绘图相关调整_(问题调整) 2019-12-05 14:54:33 +08:00
joylink_cuiweidong
6f31e57e64 代码调整 2019-12-05 14:31:39 +08:00
joylink_cuiweidong
2a0702cd61 代码调整 2019-12-05 13:25:15 +08:00
joylink_cuiweidong
78101563ba 信号机代码调整 2019-12-05 13:15:19 +08:00
zyy
0a51aa1e23 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/jmapNew/shape/Station/index.js
#	src/views/newMap/newMapdraft/mapoperate/station.vue
 2019-12-05 10:27:06 +08:00
zyy
8bbd5e2600 desc: 修改代码 2019-12-05 10:25:07 +08:00
joylink_cuiweidong
ba084b23d8 代码调整 2019-12-05 10:19:41 +08:00
fan
117d3a3d0b Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-04 18:41:55 +08:00
fan
60b4d6a060 绘图相关调整_(高亮问题调整) 2019-12-04 18:40:45 +08:00
zyy
23f93194e6 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/station.vue
 2019-12-04 18:40:19 +08:00
zyy
22bc27293f 修改代码 2019-12-04 18:39:28 +08:00
joylink_cuiweidong
585d403e7d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-04 15:49:33 +08:00
joylink_cuiweidong
c971cf32f8 代码调整 2019-12-04 15:49:24 +08:00
fan
cd18f40939 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-04 15:33:18 +08:00
fan
f5a5d20ebb 绘图相关调整_(批量创建车站，区段添加激活) 2019-12-04 15:33:08 +08:00
zyy
d5bb00b924 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/station.vue
 2019-12-04 15:00:46 +08:00
zyy
5b6e30f01b 增加按图折返 2019-12-04 14:59:04 +08:00
joylink_cuiweidong
aadc6b1856 代码调整 2019-12-04 14:43:47 +08:00
joylink_cuiweidong
7a9db12402 代码调整 2019-12-04 14:41:08 +08:00
zyy
30bab42bbf Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/index.vue
 2019-12-04 14:09:29 +08:00
zyy
69e73b2195 修改代码 2019-12-04 14:08:55 +08:00
fan
98248904e4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-04 14:02:59 +08:00
fan
1ec864986a 绘图相关调整_(设备添加高亮) 2019-12-04 14:02:39 +08:00
joylink_cuiweidong
eb9873e6e5 代码调整 2019-12-04 13:38:32 +08:00
joylink_cuiweidong
f97bd74c39 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-04 13:01:22 +08:00
joylink_cuiweidong
6f58a39b30 代码调整 2019-12-04 13:01:12 +08:00
joylink_cuiweidong
d94bbff72f 代码调整 2019-12-04 13:00:24 +08:00
fan
a5e4861895 绘图相关调整_(设备添加高亮) 2019-12-04 11:32:30 +08:00
zyy
aab4e4ad82 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-04 11:32:20 +08:00
zyy
1f73a54c32 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-04 11:32:06 +08:00
zyy
632d8c5c1b desc: 调整数据保存格式处理逻辑 2019-12-04 11:31:59 +08:00
fan
4ef0c259c5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-04 09:34:05 +08:00
fan
87e2a11011 绘图相关调整_(区段添加高亮) 2019-12-04 09:33:45 +08:00
zyy
2640a5546f 修改区段创建 2019-12-03 18:54:20 +08:00
zyy
252b0c4cc6 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-03 18:44:52 +08:00
zyy
4526204f03 修改显示层级 2019-12-03 18:44:46 +08:00
fan
e6893b8cb7 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-03 18:15:52 +08:00
fan
72746ba261 绘图相关调整_(国际化调整&列车所在方向非必传) 2019-12-03 18:15:30 +08:00
zyy
4428a968ee Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-03 18:13:49 +08:00
zyy
c99a4dfd3a 调整接口字段 2019-12-03 18:13:44 +08:00
joylink_cuiweidong
c818577e48 代码调整 2019-12-03 17:52:39 +08:00
fan
bb10c4c234 绘图相关调整_(国际化调整) 2019-12-03 17:45:38 +08:00
fan
886c94f50d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-03 17:34:49 +08:00
fan
635cc24b8f 绘图相关调整_(区段拆分合并问题调整) 2019-12-03 17:34:32 +08:00
joylink_cuiweidong
6426a70bd6 代码调整 2019-12-03 15:30:41 +08:00
joylink_cuiweidong
625075df8a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-03 15:22:28 +08:00
joylink_cuiweidong
967d7ddaad 代码调整 2019-12-03 15:22:16 +08:00
zyy
193f9267a1 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-03 15:21:59 +08:00
zyy
8eb6aca36c 道岔逻辑修改 2019-12-03 15:21:52 +08:00
fan
dcd87596f1 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-03 15:21:45 +08:00
fan
2b01902c96 调整绘图相关调整_(删除打印) 2019-12-03 15:21:29 +08:00
fan
f00a560327 调整绘图相关调整_(控制模式多个创建) 2019-12-03 15:20:23 +08:00
joylink_cuiweidong
9f1167b8fe 车站站台代码调整 2019-12-03 14:56:18 +08:00
fan
7d262fc7c9 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-03 14:46:24 +08:00
fan
1743a0a26d 调整绘图相关调整 2019-12-03 14:46:06 +08:00
zyy
c089ce1187 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-03 14:42:07 +08:00
zyy
68d0f374aa desc: 调整道岔生成逻辑 2019-12-03 14:42:00 +08:00
fan
676d93d1bd Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-03 13:36:30 +08:00
fan
5ca78f0ba7 调整绘图相关-(信号机调整，草稿地图列表接口调整) 2019-12-03 13:36:02 +08:00
joylink_cuiweidong
23f8f8646a 车站代码调整 2019-12-03 13:24:22 +08:00
fan
342bb86585 调整绘图相关-(信号机设备集中站非必填) 2019-12-03 09:30:40 +08:00
fan
aef74d32da 调整绘图相关 2019-12-03 09:24:44 +08:00
fan
97af268212 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-02 16:21:40 +08:00
fan
52142977f2 调整保存绘图数据调整入参 2019-12-02 16:21:27 +08:00
joylink_cuiweidong
40cb954be4 控制模式代码调整 2019-12-02 15:25:26 +08:00
zyy
27436f8582 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-02 14:50:54 +08:00
zyy
999357c520 desc: 修改接口 2019-12-02 14:50:48 +08:00
fan
aee552cb43 调整保存绘图数据调整入参 2019-12-02 14:41:39 +08:00
fan
10036210b7 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-02 14:12:19 +08:00
fan
2a851dc51f 关联关系select添加可清除功能 2019-12-02 14:12:10 +08:00
zyy
949b265e6b Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-02 14:09:57 +08:00
zyy
d0a986e8bf 新版地图保存 2019-12-02 14:09:50 +08:00
joylink_cuiweidong
b4bfdd55b2 站台代码调整 2019-12-02 13:57:25 +08:00
fan
4da5ce2e52 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-02 13:50:22 +08:00
fan
3d192fe447 调整绘图区段关联关系校验 2019-12-02 13:50:13 +08:00
joylink_cuiweidong
ae3258203e 代码调整 2019-12-02 13:17:41 +08:00
zyy
829d1b7e0c Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/section.vue
 2019-12-02 13:09:09 +08:00
zyy
5793355e20 修改道岔生成逻辑 2019-12-02 13:05:25 +08:00
fan
438e633ec4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-02 13:01:36 +08:00
fan
a3936c0e5b 调整绘图相关 2019-12-02 13:01:26 +08:00
joylink_cuiweidong
4b7683248c 代码调整 2019-12-02 11:12:45 +08:00
joylink_cuiweidong
52816d6397 删除link相关字段 2019-12-02 09:49:44 +08:00
fan
e8cfe647b5 调整区段关联关系 2019-11-29 18:49:16 +08:00
fan
35fceeec08 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-11-29 18:33:09 +08:00
fan
0afb9666fc 添加区段关联关系 2019-11-29 18:32:34 +08:00
joylink_cuiweidong
9a6647f256 新建区段代码调整 2019-11-29 18:16:21 +08:00
joylink_cuiweidong
c203ede054 区段添加代码调整 2019-11-29 18:06:47 +08:00
zyy
103e8c9c49 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-11-29 17:53:12 +08:00
zyy
fb17f2eb61 desc: 修改区段创建 2019-11-29 17:53:01 +08:00
fan
15eed0ddf1 删除 2019-11-29 17:01:51 +08:00
fan
476615957f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-11-29 17:00:31 +08:00
fan
16fc5d7aa3 区段调整 2019-11-29 17:00:06 +08:00
joylink_cuiweidong
46713bf074 删除页面link设置 2019-11-29 13:27:17 +08:00
joylink_cuiweidong
34272d7644 新版地图绘制调整 2019-11-29 13:10:18 +08:00
zyy
11b327984e 新增新版地图绘制文件 2019-11-29 12:51:58 +08:00