Commit Graph

139 Commits

Author SHA1 Message Date
fan
80109bb349 区段新建台调整 2019-12-12 12:23:25 +08:00
zyy
159a2b4890 调整点击道岔计轴显示道岔区段 2019-12-11 17:22:01 +08:00
zyy
b2dd3d7285 调整站台生成逻辑,调整uid检测方式 2019-12-11 17:07:29 +08:00
zyy
640b38285a 调整车站默认字体大小,皮肤调整 2019-12-10 15:44:46 +08:00
joylink_cuiweidong
00552b6494 区段批量创建代码调整 2019-12-10 11:02:13 +08:00
zyy
18ebc91da2 调整批量创建区段 逻辑 2019-12-10 10:12:46 +08:00
zyy
ae36dc3542 新增区段创建方式 2019-12-10 09:25:13 +08:00
zyy
5114f848b3 调整道岔计轴区段生成逻辑 2019-12-09 17:48:46 +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
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