Commit Graph

211 Commits

Author SHA1 Message Date
fan
acc05f770e 调整进路状态影响自动进路功能按钮 2020-03-19 10:23:24 +08:00
fan
aa7b0071ca 现地操作调整 2020-03-19 09:12:46 +08:00
fan
838f2311f8 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-18 19:05:12 +08:00
fan
a9c19cf1ea 现地操作调整 2020-03-18 19:05:02 +08:00
joylink_cuiweidong
68571fff18 北京一号线现地 自动折返设置和取消操作代码添加 2020-03-18 15:31:59 +08:00
zyy
a925c568e5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-18 11:19:10 +08:00
zyy
4203c30e30 调整宁波线路自动折返 计轴复位操作 2020-03-18 11:18:52 +08:00
fan
aa97a242b1 绘图问题调整 2020-03-18 10:31:23 +08:00
zyy
11b2ee8130 调整代码 2020-03-18 10:20:49 +08:00
zyy
12f283cbae Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue
#	src/views/newMap/newMapdraft/mapoperate/index.vue
2020-03-18 09:12:18 +08:00
zyy
0ceb0c2c65 调整自动折返 type 类型 增加自动折返菜单流程 2020-03-18 09:10:57 +08:00
joylink_cuiweidong
3beb346ce1 功能按钮代码调整 2020-03-17 18:59:51 +08:00
joylink_cuiweidong
c01b261638 引导总锁绘制代码调整 2020-03-17 18:25:03 +08:00
zyy
2fb74f520d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-17 18:02:16 +08:00
zyy
e2930da073 调整信号机状态 2020-03-17 18:02:02 +08:00
joylink_cuiweidong
d8d143ae38 删除地图绘制中,车站里面的引导总锁 2020-03-17 17:59:47 +08:00
zyy
a89b4d5f1d 调整宁波线路引导信号显示 2020-03-17 16:57:09 +08:00
zyy
2e7e25dd06 增加功能按钮绘图方式 2020-03-17 16:12:15 +08:00
zyy
96ed68cf65 调整宁波线路现地操作 2020-03-17 11:29:34 +08:00
zyy
154b252fd6 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-16 19:08:31 +08:00
zyy
9e150eed8d 调整控制权转移请求参数,调整宁波区段显示逻辑 2020-03-16 19:08:18 +08:00
joylink_cuiweidong
f437f18f63 北京线现地进路建立代码调整 2020-03-16 18:53:36 +08:00
joylink_cuiweidong
c695309b9f 代码修改 2020-03-16 17:56:10 +08:00
joylink_cuiweidong
1a8b37f2b4 北京一号线 现地 排列进路操作代码调整 2020-03-16 16:28:53 +08:00
zyy
c39ec3301b Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-16 11:02:46 +08:00
zyy
1c78d52fed 调整ibp文件配置路径 2020-03-16 11:02:33 +08:00
joylink_cuiweidong
a7193c5424 代码调整 2020-03-16 10:36:01 +08:00
joylink_cuiweidong
fb9fcc30a3 代码调整 2020-03-13 20:02:40 +08:00
joylink_cuiweidong
6576f3c559 代码调整 2020-03-13 19:39:36 +08:00
fan
264310f28e 调整成都三显示 2020-03-13 15:06:14 +08:00
fan
7753c53ee0 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/jmapNew/shape/Train/index.js
2020-03-13 13:08:18 +08:00
fan
4a2c539553 哈尔滨现地显示 2020-03-13 13:01:58 +08:00
joylink_cuiweidong
9e1e329644 列车状态代码调整 2020-03-13 11:25:43 +08:00
joylink_cuiweidong
6c7bb150fb 代码调整 2020-03-12 15:13:18 +08:00
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