Commit Graph

110 Commits

Author SHA1 Message Date
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