Commit Graph

312 Commits

Author SHA1 Message Date
joylink_cuiweidong
467e8671fd 西安二号线屏蔽门绘图调整 2020-04-17 13:30:18 +08:00
joylink_cuiweidong
126d9f2309 代码调整 2020-04-17 11:29:50 +08:00
fan
1168f6fd8a veu 告警调整 2020-04-17 10:54:02 +08:00
fan
8e5a79626a 西安二号线调整 2020-04-16 09:01:52 +08:00
fan
a1869a531f 集中站分隔调整&线路管理配置调整 2020-04-15 14:13:08 +08:00
joylink_cuiweidong
900b727fc4 新版地图数据校验文字调整 2020-04-15 09:37:42 +08:00
fan
2f6f75ff3c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-14 18:52:19 +08:00
fan
2613b68413 佛山列车显示调整&西安二号线集中站分割符 2020-04-14 18:51:09 +08:00
joylink_cuiweidong
c6f532be4e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-14 18:45:33 +08:00
joylink_cuiweidong
9ea5d7fdfb 新版地图信号机 区段前端校验 2020-04-14 18:45:14 +08:00
fan
61c2260d93 西安二号线调整 2020-04-14 15:45:13 +08:00
fan
b7e6b9a8c1 佛山运行图导入上行时间调整&西安二号线车站调整 2020-04-13 18:30:21 +08:00
fan
f91c8e37d2 佛山运行图导入参数调整&西安二号线车站调整 2020-04-13 17:12:33 +08:00
zyy
2d70c294f8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 17:24:12 +08:00
zyy
3bfb74d55b 调整绘图隐藏元素 2020-04-10 17:23:53 +08:00
fan
26e9c33736 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-10 16:47:20 +08:00
fan
11586aef30 哈尔滨现地显示BUG调整&西安二号线皮肤调整 2020-04-10 16:45:41 +08:00
zyy
74942486fd Merge branch 'master' into test
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/section/index.vue
#	src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue
2020-04-10 16:43:40 +08:00
zyy
11eedc59ad 调整区段计算实际长度出现问题 2020-04-10 16:41:48 +08:00
zyy
057b627c0d 调整区段计算 2020-04-10 16:19:37 +08:00
zyy
6c7cfe4648 调整逻辑区段重新生成及修改逻辑调整 2020-04-10 11:19:48 +08:00
zyy
76851cdff2 调整区段字段显隐控制条件 2020-04-10 10:17:34 +08:00
zyy
9b68feaba5 调整区段字段显隐判断 2020-04-09 18:39:27 +08:00
zyy
ee10377b04 调整区段字段显示逻辑,道岔计轴区段显示道岔菜单 2020-04-09 15:21:44 +08:00
zyy
b6d03d24a8 调整区段绘制方式 2020-04-09 13:45:01 +08:00
zyy
14e4c2c785 调整 框选设置元素 设备集中站流程 2020-04-08 15:20:29 +08:00
zyy
425b7d3869 Merge branch 'master' into test 2020-04-08 14:12:58 +08:00
zyy
402a383bf6 删除多余打印,调整名称 2020-04-07 16:19:24 +08:00
zyy
aa06844b18 地图绘制信号机增加偏移量字段 2020-04-07 13:37:17 +08:00
zyy
747595e8e8 Merge branch 'test' 2020-04-02 11:25:57 +08:00
zyy
8117a31c80 调整代码 2020-04-02 10:51:47 +08:00
fan
9d02306fda Merge remote-tracking branch 'origin/test'
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/section/index.vue
2020-04-01 18:00:58 +08:00
zyy
3ab182f3c4 调整逻辑区段显示,过滤框选逻辑区段 2020-03-31 17:52:53 +08:00
zyy
1873898adc 调整回车内容不修改 2020-03-31 14:41:17 +08:00
zyy
9412fd0740 计算区段实际长度保留小数点3位 2020-03-30 17:59:23 +08:00
zyy
1e2a015955 调整区段实际长度逻辑 2020-03-30 17:07:51 +08:00
zyy
47519b7040 调整道岔生成默认状态,调整道岔皮肤配置 2020-03-27 18:19:40 +08:00
fan
df70024740 代码调整 2020-03-24 18:42:18 +08:00
fan
1e72a8cff3 状态灯调整 2020-03-24 16:35:09 +08:00
fan
5c7c27d2f3 状态灯调整 2020-03-24 15:02:14 +08:00
fan
e9aad944ae 绘图线条调整 2020-03-24 10:05:51 +08:00
zyy
ad6b8f8dba 调整区段流程逻辑,站台流程 2020-03-23 13:48:35 +08:00
fan
404d867767 绘图&成三现地调整 2020-03-20 11:09:06 +08:00
fan
36b7d7309a 增加绘图表示灯&&线条颜色 2020-03-19 16:17:34 +08:00
joylink_cuiweidong
ce02703a5a 自动折返和自动进路按钮绘图代码调整 2020-03-18 10:53:42 +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
d8d143ae38 删除地图绘制中,车站里面的引导总锁 2020-03-17 17:59:47 +08:00