Commit Graph

27 Commits

Author SHA1 Message Date
zyy
67f0712eaa Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-19 17:19:01 +08:00
zyy
f78d9e80fe 调整哈尔滨道岔现地操作 2020-03-19 17:18:46 +08:00
fan
36b7d7309a 增加绘图表示灯&&线条颜色 2020-03-19 16:17:34 +08:00
zyy
0ceb0c2c65 调整自动折返 type 类型 增加自动折返菜单流程 2020-03-18 09:10:57 +08:00
zyy
2e7e25dd06 增加功能按钮绘图方式 2020-03-17 16:12:15 +08:00
fan
ef60af34c0 绘图预览切换现地行调显示 2020-03-11 15:10:08 +08:00
fan
5d39b8e84e 绘图显示调整 2020-03-11 10:53:09 +08:00
joylink_fanyuhong
03ce32b977 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-06 11:27:07 +08:00
joylink_fanyuhong
56a5d0f018 调整显示条件 2020-03-06 11:26:52 +08:00
zyy
6d0849f5b3 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/jmapNew/utils/parser.js
2020-03-06 10:23:14 +08:00
zyy
a1f752fe59 调整地图绘制矩形框保存字段 2020-03-06 10:21:41 +08:00
joylink_fanyuhong
c9e8827c3a 合并代码 2020-03-05 16:43:53 +08:00
joylink_fanyuhong
8d58125e1f 自动进路和引导总锁 2020-03-05 16:39:49 +08:00
zyy
30c672026f 增加矩形包围框 2020-03-05 15:48:51 +08:00
zyy
8e7fc5104a 调整lc模块保存,自动折返绘图状态配置,流程完善 2020-03-05 12:21:28 +08:00
zyy
af5c108610 创建自动折返模块 2020-03-04 20:59:16 +08:00
zyy
5eb56d0a96 调整旧版地图右键菜单操作 2020-01-07 10:52:44 +08:00
zyy
0330e08f89 调整车站状态显示,调整右键菜单显示,设置默认状态 2020-01-07 09:23:04 +08:00
joylink_cuiweidong
6d959b816b 修改imagecontrol 为 resource 2019-12-23 10:53:25 +08:00
zyy
ee4078e5c9 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-18 09:49:49 +08:00
zyy
399093bc72 调整站台计算坐标 2019-12-18 09:49:44 +08:00
joylink_cuiweidong
b4ea83eabc zc 集中站设置 2019-12-17 19:03:38 +08:00
zyy
dc381e2a63 desc: 新增屏蔽门绘制以及紧急停车按钮生成流程 2019-12-06 18:03:13 +08:00
zyy
8bbd5e2600 desc: 修改代码 2019-12-05 10:25:07 +08:00
zyy
22bc27293f 修改代码 2019-12-04 18:39:28 +08:00
zyy
68d0f374aa desc: 调整道岔生成逻辑 2019-12-03 14:42:00 +08:00
zyy
11b327984e 新增新版地图绘制文件 2019-11-29 12:51:58 +08:00