Commit Graph

2367 Commits

Author SHA1 Message Date
zyy
d295fb72a5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-13 13:45:50 +08:00
zyy
6feb0ec9c0 新版地图: 调整默认状态,站台状态配置完成。其他元素暂未配置 2020-01-13 13:45:39 +08:00
joylink_cuiweidong
50ad3bb036 新版绘图道岔代码拆分 2020-01-13 11:25:51 +08:00
fan
d22008a6f7 成都一号线样式调整 2020-01-13 10:15:28 +08:00
fan
67ea835805 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-10 18:52:36 +08:00
fan
4e136ca8b3 成都一号线样式调整 2020-01-10 18:51:57 +08:00
zyy
d3d64c7c91 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-10 17:11:41 +08:00
zyy
5d6a994cbc 删除宁波批量扣车反向操作 2020-01-10 17:11:35 +08:00
fan
d77559211c 成都一、三号线z站台参数调整 2020-01-10 15:15:00 +08:00
fan
9f14f4bbda 成都一号线菜单调整 2020-01-10 14:51:55 +08:00
fan
1254ba912c 成都一号线菜单调整 2020-01-10 14:50:04 +08:00
zyy
a7b97dd7cc 调整宁波一号线请求参数 2020-01-10 14:41:20 +08:00
zyy
19edd695be 删除多余输出 2020-01-10 11:28:43 +08:00
zyy
fa643db9db 调整成都一号线 请求堆栈 取消请求流程 2020-01-10 11:27:43 +08:00
zyy
2b56d3f636 修改样式 2020-01-10 10:29:52 +08:00
zyy
021f3bc148 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-10 09:32:38 +08:00
zyy
bd0518acc7 调整成都一号线操作堆样式流程 2020-01-10 09:32:32 +08:00
fan
06c6ec66e5 成都一号线菜单样式调整 2020-01-09 18:49:58 +08:00
fan
e8b616b705 成都一号线菜单调整 2020-01-09 18:21:04 +08:00
fan
68180d0c83 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-09 17:48:46 +08:00
fan
a4ebf22bab 成都一号线菜单调整 2020-01-09 17:48:25 +08:00
zyy
41329739dc Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-09 16:24:10 +08:00
zyy
a4e3e30c78 增加成都一号线请求堆栈 2020-01-09 16:24:01 +08:00
fan
7f54b99883 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-09 13:03:02 +08:00
fan
ab64e6858e 成都一号线marbar菜单调整 2020-01-09 13:02:40 +08:00
zyy
ed3df55457 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-09 09:54:40 +08:00
zyy
197d75342c 调整宁波一号线批量扣车逻辑 2020-01-09 09:54:34 +08:00
fan
6e90989ece 成都一号线右键菜单调整 2020-01-09 09:28:20 +08:00
fan
09b27a8d62 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-09 09:02:22 +08:00
fan
2b4aa891eb 成都一号线右键菜单调整 2020-01-09 09:02:02 +08:00
joylink_cuiweidong
54a5ff38a1 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-08 18:26:20 +08:00
joylink_cuiweidong
82bef6ed4d 北京一号线新版 右键菜单指令调整 2020-01-08 18:26:07 +08:00
zyy
2e042b9fee Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-08 17:50:22 +08:00
zyy
fa513a1e8f 调整宁波一号线控制权右键条件 2020-01-08 17:50:16 +08:00
joylink_cuiweidong
88d4ccf8d9 北京一号线新版 区段道岔指令调整 2020-01-08 17:42:28 +08:00
joylink_cuiweidong
c29033177d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-08 16:24:24 +08:00
joylink_cuiweidong
4dde67b582 北京一号线新版信号机操作调整 2020-01-08 16:23:45 +08:00
zyy
b345594605 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-08 14:59:33 +08:00
zyy
786a37ee2c 增加宁波一号线控制权转移 2020-01-08 14:59:27 +08:00
joylink_cuiweidong
387746a69b 北京一号线新版 站台指令操作调整 2020-01-08 14:49:20 +08:00
fan
bf49c52c3e Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-08 09:56:44 +08:00
fan
83a37a1b28 成都一号线右键菜单调整 2020-01-08 09:41:55 +08:00
zyy
02af288233 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-07 18:03:56 +08:00
zyy
2310fec6ef 兼容老板地图状态,调整宁波线批量扣车数据 2020-01-07 18:03:49 +08:00
joylink_cuiweidong
91d1f98f69 北京一号线新版站台区段车站右键菜单调整 2020-01-07 17:40:24 +08:00
joylink_cuiweidong
7fd885a1c2 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/jmapNew/theme/beijing_01/planConvert.js
2020-01-07 15:22:50 +08:00
joylink_cuiweidong
ce98244b44 北京一号线新版 道岔和信号机的右键菜单代码调整 2020-01-07 15:19:18 +08:00
zyy
473b289692 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-07 14:49:58 +08:00
zyy
5a3b415202 删除运行图工具栏 2020-01-07 14:49:51 +08:00
fan
5dc3eb83f8 设备管理-配置编辑 信号机配置调整 2020-01-07 13:05:06 +08:00
zyy
5eb56d0a96 调整旧版地图右键菜单操作 2020-01-07 10:52:44 +08:00
zyy
ea528dacef Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-07 09:23:11 +08:00
zyy
0330e08f89 调整车站状态显示,调整右键菜单显示,设置默认状态 2020-01-07 09:23:04 +08:00
fan
f2b62f281e 指令调整,公共地图宽度调整 2020-01-06 18:39:44 +08:00
zyy
3d8fcd305a 调整宁波一号线右键菜单流程 2020-01-06 14:42:28 +08:00
zyy
ad9d14e842 调整站台右键显示 2020-01-03 16:17:40 +08:00
zyy
28e0617c87 删除注释,信号机流程完成 2020-01-03 16:01:57 +08:00
zyy
4f2fb97477 调整宁波线右键菜单显示 2020-01-03 15:50:26 +08:00
zyy
59e5c5fef7 调整相关用户的列表 名称变昵称显示 2020-01-02 18:40:30 +08:00
zyy
0b3e3311f0 删除控制模式 2020-01-02 14:57:13 +08:00
zyy
e750406484 Merge branch 'dev_cmd' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_cmd 2020-01-02 10:46:17 +08:00
zyy
7c5352ce7c 调整宁波一号线站台操作 2020-01-02 10:46:09 +08:00
fan
8466bcb059 成都三指令调整 2020-01-02 09:49:41 +08:00
fan
57e38a37a5 成都三指令调整 2020-01-02 09:29:23 +08:00
zyy
cf370249eb 调整指令 2019-12-31 18:10:49 +08:00
zyy
760225549e 兼容新旧两种发送机制 2019-12-31 17:20:04 +08:00
zyy
00a7517e52 修改指令发送流程及配置文件 2019-12-31 17:10:52 +08:00
zyy
e03a4d12e0 调整宁波一号线 2019-12-31 16:24:22 +08:00
zyy
3044da2ea4 调整福州使用新版指令方式发送 2019-12-31 16:11:09 +08:00
fan
0504a2a2a6 迁移cmd分支 2019-12-31 14:32:04 +08:00
zyy
b336e1844b 调整宁波一号线右键菜单操作及显示流程 2019-12-30 18:13:38 +08:00
zyy
ce44ec4429 调整宁波线 样式,显示宁波线右键操作 2019-12-30 13:24:40 +08:00
fan
15f7aa656e 新版地图包加载仿真 2019-12-30 09:57:54 +08:00
fan
c7078dcdb9 新版地图包加载仿真 2019-12-30 09:00:16 +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
zyy
e0e9bfc6a6 增加成都一号线运行图导入,增加成都一号线配置,删除成都四号线配置 2019-12-26 15:39:29 +08:00
zyy
45f0a5a1c6 调整成都三,宁波一运行图显示备用车问题 2019-12-26 14:48:11 +08:00
zyy
74f0b12e3c 修改运行图显示,调整进路列表展示 2019-12-25 18:45:48 +08:00
fan
c31a9aff46 增加:进路始终端信号机为黄色 2019-12-24 14:26:07 +08:00
fan
f7ff7f7f81 增加:信号机接近区段红色高亮 2019-12-24 13:52:06 +08:00
zyy
0f2b7f18fe 增加宁波一号线运行图目的码导入 2019-12-23 16:01:09 +08:00
zyy
a31e358b41 desc: 修改宁波一号线运行图导入数据修改 2019-12-23 14:49:57 +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
zyy
0826c93362 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-23 09:15:31 +08:00
zyy
6ec990a1b2 解析宁波一号线运行图 2019-12-23 09:15:25 +08:00
fan
0207e54914 进路延续保护区段选中红色 2019-12-20 15:44:12 +08:00
zyy
6a82d745d9 调整高级数据生成code规范 2019-12-20 13:48:37 +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
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
joylink_cuiweidong
710f572e12 代码调整 2019-12-18 14:47:20 +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
9686f69c1f 删除多余代码 2019-12-18 10:12: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
fan
c501445800 折线偏移量调整 2019-12-17 14:26:56 +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
zyy
de30f91aed 修改代码 2019-12-13 18:50:01 +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
640b38285a 调整车站默认字体大小,皮肤调整 2019-12-10 15:44:46 +08:00
zyy
5114f848b3 调整道岔计轴区段生成逻辑 2019-12-09 17:48:46 +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
fan
d09b418bba 绘图相关调整_(添加快捷键修改) 2019-12-06 15:12:22 +08:00
fan
7cc2b68d13 绘图相关调整_(区段快捷删除调整) 2019-12-06 14:36:18 +08:00
zyy
c0c580ec1d 修改生成名字规则 2019-12-06 13:56:18 +08:00
zyy
824b4ca414 修改命名规则 2019-12-06 13:03:45 +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
4f824b83ac 绘图相关调整_(调整快捷键代码) 2019-12-06 10:05:14 +08:00
fan
4f2fc22ee8 绘图相关调整_(撤销恢复快捷键调整) 2019-12-06 09:13:56 +08:00
fan
75f400a1c7 绘图相关调整_(添加快捷删除) 2019-12-05 18:53:06 +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
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
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
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
4526204f03 修改显示层级 2019-12-03 18:44:46 +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
39edfbe760 调整绘图相关配置 2019-12-03 09:26:55 +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