Commit Graph

178 Commits

Author SHA1 Message Date
joylink_fanyuhong
56d93a2f73 区段信号机调整 2020-02-11 11:02:35 +08:00
joylink_fanyuhong
c1dabeae80 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-10 19:10:55 +08:00
joylink_fanyuhong
50a4f8ab0b 成都三号线调整 2020-02-10 19:10:43 +08:00
zyy
f06bab2f1c 增加虚拟信号机显示图形 2020-02-10 16:43:58 +08:00
zyy
1db679509f 调整车站包围框显示 2020-02-04 15:43:58 +08:00
joylink_zyy
732c80ca6d 调整道岔绘画方式,兼容哈尔滨线路道岔绘制方法 2020-02-04 14:28:18 +08:00
joylink_zyy
b7dbb88984 增加双重判断内外站台显示 2020-02-04 11:25:21 +08:00
joylink_zyy
3490c68e83 调整站台属性增加内外站台属性 2020-02-04 11:01:50 +08:00
joylink_zyy
f11865385b 调整哈尔滨线路车站包围框显示 2020-02-03 17:26:17 +08:00
joylink_zyy
1ef8788c3c 调整绘图逻辑,增加哈尔滨线路 站台 信号机绘图逻辑 2020-02-03 17:17:56 +08:00
zyy
5d84791c47 修正道岔显示 2020-01-13 17:44:53 +08:00
zyy
5217a334d5 调整宁波一号线站台状态显示 2020-01-13 16:52:00 +08:00
zyy
6feb0ec9c0 新版地图: 调整默认状态,站台状态配置完成。其他元素暂未配置 2020-01-13 13:45:39 +08:00
zyy
786a37ee2c 增加宁波一号线控制权转移 2020-01-08 14:59:27 +08:00
zyy
5a3b415202 删除运行图工具栏 2020-01-07 14:49:51 +08:00
zyy
0330e08f89 调整车站状态显示,调整右键菜单显示,设置默认状态 2020-01-07 09:23:04 +08:00
fan
dafd6d42cd Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-26 16:54:38 +08:00
fan
2a11b8d697 信号机增加名字旋转标识,区段关联关系增加校验,进路列表增加编码展示列 2019-12-26 16:54:24 +08:00
zyy
6c37fe6bdf 调整点击计轴区段显示高亮,调整区段高亮颜色 2019-12-26 16:38:44 +08:00
fan
c31a9aff46 增加:进路始终端信号机为黄色 2019-12-24 14:26:07 +08:00
joylink_cuiweidong
4ab635e553 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-23 10:54:07 +08:00
joylink_cuiweidong
6d959b816b 修改imagecontrol 为 resource 2019-12-23 10:53:25 +08:00
fan
0207e54914 进路延续保护区段选中红色 2019-12-20 15:44:12 +08:00
fan
143f35a222 进路物理区段列表连续高亮 2019-12-19 16:21:00 +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
c295f97819 调整车站显示坐标,信号机批量操作,调整逻辑代码 2019-12-18 16:20:30 +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
436db38200 调整区段字段保存获取 2019-12-18 11:17:57 +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
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
joylink_cuiweidong
36c1b6ceec 车站添加副标题 2019-12-13 16:13:10 +08:00
joylink_cuiweidong
72ca4c37f9 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-13 15:23:34 +08:00
zyy
3df3e162bd Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-13 15:11:10 +08:00
zyy
c287f8d13b desc: 调整绘图右键包围框起点 2019-12-13 15:11:01 +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
fc3ab4cc21 站台屏蔽门调整 2019-12-13 14:19:38 +08:00
zyy
7ef051733a 调整缩放,站台显示,坐标 2019-12-12 18:15:25 +08:00
zyy
7c9d9c6373 调整站台显示样式问题,修改代码 2019-12-12 15:31:01 +08:00
zyy
6fb6ae9867 调整站台,屏蔽门默认样式 2019-12-12 10:05:28 +08:00
zyy
b2dd3d7285 调整站台生成逻辑,调整uid检测方式 2019-12-11 17:07:29 +08:00
zyy
dc381e2a63 desc: 新增屏蔽门绘制以及紧急停车按钮生成流程 2019-12-06 18:03:13 +08:00
zyy
c192deb2ca 修改代码 2019-12-06 10:31:19 +08:00
fan
a4324e6711 绘图相关调整_(高亮删除虚线描边) 2019-12-05 18:01:31 +08:00
fan
ea76deeb93 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-05 16:39:55 +08:00
fan
1d07789b4f 绘图相关调整_(区段问题调整) 2019-12-05 16:39:44 +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
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
09590e7657 删除stationControl 2019-12-05 10:52:45 +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
zyy
22bc27293f 修改代码 2019-12-04 18:39:28 +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
7e9728a276 代码调整 2019-12-04 14:07:37 +08:00
fan
1ec864986a 绘图相关调整_(设备添加高亮) 2019-12-04 14:02:39 +08:00
fan
a5e4861895 绘图相关调整_(设备添加高亮) 2019-12-04 11:32:30 +08:00
fan
87e2a11011 绘图相关调整_(区段添加高亮) 2019-12-04 09:33:45 +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
aef74d32da 调整绘图相关 2019-12-03 09:24:44 +08:00
joylink_cuiweidong
cee4a7a396 代码调整 2019-12-02 16:19:40 +08:00
joylink_cuiweidong
40cb954be4 控制模式代码调整 2019-12-02 15:25:26 +08:00
fan
a3936c0e5b 调整绘图相关 2019-12-02 13:01:26 +08:00
zyy
11b327984e 新增新版地图绘制文件 2019-11-29 12:51:58 +08:00