Commit Graph

477 Commits

Author SHA1 Message Date
joylink_cuiweidong
56126bdbf3 列车精确定位代码调整
列车的状态信息调整
去掉仿真里的拖动鼠标生成包围框
2020-03-12 14:41:53 +08:00
zyy
b7ee3e5f6e 增加批量调整区段名称位置 2020-03-12 13:13:00 +08:00
fan
939360917e 调整信号机接近区段颜色变化 2020-03-11 16:58:14 +08:00
fan
95e2832cec 删除打印日志 2020-03-11 15:14:38 +08:00
fan
036fa8811e Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-11 15:10:26 +08:00
fan
ef60af34c0 绘图预览切换现地行调显示 2020-03-11 15:10:08 +08:00
fan
5d39b8e84e 绘图显示调整 2020-03-11 10:53:09 +08:00
joylink_cuiweidong
c0819a4745 北京一号线新版指令操作代码调整 2020-03-11 10:36:45 +08:00
joylink_cuiweidong
0db45c3956 代码调整 2020-03-10 20:24:24 +08:00
joylink_cuiweidong
27c8b0204e 成都一号线 列车精确位置三角代码修改 2020-03-10 20:15:47 +08:00
zyy
8c71459ac1 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/jmapNew/shape/Automactic/index.js
2020-03-10 14:47:13 +08:00
zyy
c51302638f 调整区段分隔符 2020-03-10 14:45:30 +08:00
fan
394b80e0e9 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-10 13:05:36 +08:00
fan
ee53da67bc 调整点击设备中组成元素的数据处理 2020-03-10 13:05:20 +08:00
joylink_cuiweidong
a65ad91129 站台绘图代码调整 2020-03-10 11:16:53 +08:00
fan
6980bb099f 调整公共绘图元素显示条件 2020-03-10 10:21:33 +08:00
fan
91531c7521 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-10 10:08:40 +08:00
fan
a4e5bf3d81 现地行调显示区分 2020-03-10 09:49:05 +08:00
joylink_cuiweidong
259f688ef5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-09 19:42:29 +08:00
joylink_cuiweidong
6c39080e7c 成都一号线 列车小三角添加 2020-03-09 19:41:51 +08:00
fan
75218e87ce 自动折返按钮调整 2020-03-09 18:47:50 +08:00
fan
96a9c73c29 列车位置调整 2020-03-09 18:25:25 +08:00
fan
1148ea5ad8 Merge branches 'dev' and 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-09 17:38:28 +08:00
fan
7f4e6fb13c 初始化按计划行车状态and其他调整 2020-03-09 17:38:15 +08:00
zyy
751a8e792c Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/jmapNew/config/skinCode/haerbin_01.js
2020-03-09 17:03:08 +08:00
zyy
103afa9f05 调整哈尔滨线路道岔显示问题 2020-03-09 17:02:13 +08:00
fan
2b971cdf12 初始化按计划行车状态and其他调整 2020-03-09 14:23:44 +08:00
fan
815e4446d4 哈尔滨列车调整 2020-03-09 09:58:49 +08:00
zyy
482df0de33 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-07 19:12:45 +08:00
zyy
6acbf78688 哈尔滨站台状态调整 2020-03-07 19:12:19 +08:00
joylink_fanyuhong
26a5c0bf41 哈尔滨车调整 2020-03-07 18:57:01 +08:00
zyy
a1416b9a23 调整哈尔滨线路扣车状态 2020-03-07 11:05:38 +08:00
joylink_cuiweidong
157a505e72 代码调整 2020-03-06 21:31:07 +08:00
joylink_cuiweidong
f3d152bdfc 代码调整 2020-03-06 21:26:58 +08:00
joylink_cuiweidong
e1fccdeb2a 代码调整 2020-03-06 20:57:24 +08:00
joylink_cuiweidong
bb204dd72a 列车 跳停 扣车 车门 状态代码调整 2020-03-06 20:47:39 +08:00
zyy
b92b2ff786 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-06 19:02:34 +08:00
zyy
84c379410f 调整站台状态 2020-03-06 19:02:20 +08:00
joylink_cuiweidong
f8cadc33b8 自动折返绘图数据添加是否显示边框字段 2020-03-06 17:45:20 +08:00
zyy
2f96f68e46 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-06 16:16:20 +08:00
zyy
6c797c50e6 调整地图绘制,公共地图车站 ,站台显示逻辑判断 2020-03-06 16:16:04 +08:00
joylink_cuiweidong
4c02e416bc 成都一号线 列车所在区段位置代码调整(部分) 2020-03-06 15:27:31 +08:00
zyy
93be0b7ff6 调整车站引导总锁在地图绘制中不显示,增加字体的默认状态 2020-03-06 12:18:04 +08:00
zyy
a5543cb1b4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-06 12:04:21 +08:00
zyy
b2a154a3a4 增加车站 站台 屏蔽门批量设置功能 2020-03-06 12:04:00 +08:00
joylink_fanyuhong
56a5d0f018 调整显示条件 2020-03-06 11:26:52 +08:00
joylink_fanyuhong
217864dbd4 站台功能按钮 2020-03-06 10:05:21 +08:00
joylink_fanyuhong
9200cb99f7 站台增加功能按钮,未完 2020-03-05 18:17:47 +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
3510548b7b 调整集中站指示灯状态,绘图显示 2020-03-05 14:33:08 +08:00
zyy
8e7fc5104a 调整lc模块保存,自动折返绘图状态配置,流程完善 2020-03-05 12:21:28 +08:00
zyy
af5c108610 创建自动折返模块 2020-03-04 20:59:16 +08:00
zyy
6101a0d28a 删除多于设置状态信息 2020-03-04 18:04:43 +08:00
zyy
3a5804c578 调整宁波一号线道岔,区段封锁 单锁状态,调整zc模块与站台的关系 2020-03-04 18:03:50 +08:00
zyy
3a5d7af0ff 删除多于注释状态 2020-03-04 14:19:29 +08:00
zyy
467a9cf982 调整宁波线路现地操作 2020-03-04 14:14:59 +08:00
zyy
ef0af739a9 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-03 12:57:41 +08:00
zyy
8729905299 调整临时限速绘图逻辑,调整宁波线车次窗流程操作 2020-03-03 12:57:26 +08:00
joylink_fanyuhong
ce2d67ed2c 车身计算包围框调整 2020-03-03 09:46:50 +08:00
zyy
75d9f1b3bb Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-02 16:54:49 +08:00
zyy
915d1372e5 调整哈尔滨车站 显示 2020-03-02 16:54:36 +08:00
joylink_fanyuhong
af7488c27f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/jmapNew/config/skinCode/ningbo_01.js
2020-03-02 16:32:33 +08:00
joylink_fanyuhong
82c418681d 列车调整 2020-03-02 16:29:09 +08:00
zyy
e46239c8b9 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/jmapNew/config/skinCode/ningbo_01.js
#	src/store/modules/socket.js
2020-03-02 16:18:23 +08:00
zyy
79820a9725 调整宁波线显示数据,哈尔滨道岔逻辑判断显示 2020-03-02 16:16:17 +08:00
joylink_fanyuhong
c1c624dfff Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-02 14:47:08 +08:00
joylink_fanyuhong
692f30fd9f 运行图导入和列车调整 2020-03-02 14:46:59 +08:00
joylink_zyy
e7a247ab4d 调整哈尔滨曲线封锁绘图 2020-03-01 12:26:55 +08:00
joylink_zyy
446593fded 调整哈尔滨道岔显示问题 2020-02-29 00:04:24 +08:00
joylink_zyy
448523cf88 调整哈尔滨线路道岔显示问题 2020-02-28 18:10:20 +08:00
joylink_zyy
a9d40c7af6 哈尔滨区段颜色 2020-02-28 15:30:40 +08:00
joylink_zyy
870a68a476 调整区段,道岔显示样式 2020-02-28 15:20:26 +08:00
joylink_zyy
d9e7900f44 调整道岔绘图图形 2020-02-26 22:10:48 +08:00
joylink_fanyuhong
a33a9bbe42 道岔转动调整 2020-02-21 15:49:30 +08:00
joylink_cuiweidong
dbb24a1793 宁波一号线 道岔 封锁 显示状态代码调整 2020-02-19 17:26:15 +08:00
zyy
8118e151ba 调整状态显示 2020-02-19 16:46:34 +08:00
zyy
cc717f86e6 调整开门状态 2020-02-19 16:19:37 +08:00
zyy
8234c8b817 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-19 14:07:00 +08:00
zyy
847aa2d794 添加屏蔽门状态 2020-02-19 14:06:43 +08:00
joylink_fanyuhong
00dd268918 列车调整 2020-02-19 11:47:38 +08:00
joylink_fanyuhong
412e6bd582 列车调整 2020-02-18 19:24:52 +08:00
zyy
5d123115b6 删除数据赋值 2020-02-18 18:40:02 +08:00
zyy
11e03c4fe3 调整道岔绘图 2020-02-18 18:39:12 +08:00
joylink_fanyuhong
c14043f93b 自动进路调整 2020-02-18 14:45:32 +08:00
joylink_cuiweidong
f27c3ce3f4 宁波线 北京一号线新版 信号机状态调整 人工控 自动控代码调整 2020-02-17 19:23:26 +08:00
zyy
3976925669 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-17 17:51:03 +08:00
zyy
73b51bd385 调整站台显示问题 2020-02-17 17:50:15 +08:00
joylink_cuiweidong
6df1ddf2f6 代码合并 2020-02-17 16:15:05 +08:00
joylink_fanyuhong
c173ce8d6c 状态调整 2020-02-17 15:31:08 +08:00
joylink_fanyuhong
cd8a4c3a2e 状态调整 2020-02-17 14:40:59 +08:00
joylink_fanyuhong
22522a8d33 状态调整 2020-02-17 13:40:20 +08:00
joylink_fanyuhong
2cd2f93c20 状态调整 2020-02-14 18:07:54 +08:00
joylink_fanyuhong
97df29eb8c 状态调整 2020-02-13 17:16:55 +08:00
joylink_fanyuhong
62c9f31d63 状态调整 2020-02-13 16:20:02 +08:00
joylink_fanyuhong
720125cfa5 列车调整 2020-02-13 13:12:22 +08:00
joylink_fanyuhong
b448cad3c9 道岔状态调整 2020-02-11 15:24:17 +08:00
joylink_fanyuhong
abffb7c63a 道岔状态调整 2020-02-11 11:32:19 +08:00
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