Commit Graph

42 Commits

Author SHA1 Message Date
joylink_cuiweidong
c0c60e0bb4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 18:39:11 +08:00
joylink_cuiweidong
97320237c3 西安三号线道岔添加 道岔钩锁操作 2020-06-24 18:38:46 +08:00
zyy
c570e418e1 调整佛山操作定义,调整个人信息 2020-06-24 17:37:09 +08:00
zyy
45cac99681 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 14:06:45 +08:00
zyy
3b330a0932 调整佛山线路实训定义,删除区段定义 2020-06-24 14:06:17 +08:00
joylink_cuiweidong
9e3ee28611 车站右键操作代码调整 2020-06-23 17:15:17 +08:00
zyy
4e36c7b456 调整默认配置 2020-06-23 09:26:58 +08:00
zyy
e934860885 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-22 13:49:59 +08:00
zyy
58ab773ec9 删除多余配置 2020-06-22 13:49:42 +08:00
joylink_cuiweidong
717e04c4c5 宁波车站操作添加,哈尔滨右键操作代码调整 2020-06-22 11:00:39 +08:00
joylink_cuiweidong
8c7a5e7796 右键操作代码整理 2020-06-19 17:03:39 +08:00
joylink_cuiweidong
ee12c33025 西安一号线右键操作代码调整 2020-06-19 16:13:21 +08:00
joylink_cuiweidong
dd9959b2f4 右键菜单代码调整 2020-06-19 15:34:20 +08:00
zyy
5934c61b8f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/theme/beijing_01/menus/dialog/cancelAllLimit.vue
2020-06-19 13:32:40 +08:00
zyy
8e409078d9 调整公共文件 2020-06-19 13:31:31 +08:00
joylink_cuiweidong
645e425e2c 宁波北京一号线操作代码调整 2020-06-19 13:28:53 +08:00
zyy
96456b2280 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-19 11:29:30 +08:00
zyy
6236e70494 调整限速配置 2020-06-19 11:29:12 +08:00
fan
5bf46c151c 合并代码 2020-06-19 09:18:50 +08:00
fan
915f1fb959 故障操作和新建计划车迁移&信号机处理添加canSetCi属性(是否可设置联锁触发) 2020-06-19 09:17:03 +08:00
zyy
0da6a64af7 调整临时限速配置 2020-06-18 18:13:28 +08:00
zyy
003bf13395 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-18 17:31:29 +08:00
zyy
47e44c0a76 调整全局组件配置 2020-06-18 17:31:14 +08:00
fan
cf961927db Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-18 17:30:00 +08:00
fan
b8dfa50306 调整西安三号箱操作定义 2020-06-18 17:29:46 +08:00
joylink_cuiweidong
4b7c7f3f84 绘图代码调整 2020-06-18 16:58:21 +08:00
fan
08a3bbaa7c 合并代码 2020-06-18 14:49:14 +08:00
fan
76eed898a5 福州操作定义调整 2020-06-18 14:47:00 +08:00
joylink_cuiweidong
350043c3d2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-18 11:25:01 +08:00
joylink_cuiweidong
acd3b0f87e 信号机进路代码整理 2020-06-18 11:24:42 +08:00
zyy
e439eb6048 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-18 11:01:49 +08:00
zyy
cfa6445b02 调整区段组件 2020-06-18 11:01:33 +08:00
joylink_cuiweidong
f3022a6bf7 信号机操作代码整理 2020-06-18 10:22:07 +08:00
joylink_cuiweidong
b0e5d7a6b6 信号机操作代码整理 2020-06-18 09:46:29 +08:00
zyy
6c272d3a6c 调整组件 2020-06-17 18:29:35 +08:00
zyy
b39f278a5d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-17 17:48:33 +08:00
zyy
c35ceb948c 道岔公共组件提取 2020-06-17 17:48:19 +08:00
joylink_cuiweidong
1886663445 宁波一号线,北京一号线,佛山有轨电车操作代码调整 2020-06-17 17:08:34 +08:00
zyy
ba8f138de3 提取信号机通用组件 2020-06-17 15:24:16 +08:00
fan
2e44c69429 老版本福州列车目的地码调整 2020-06-12 14:34:18 +08:00
fan
429fe6d6a7 跳停上下行取值调整&列车识别号显示调整 2020-06-12 10:51:06 +08:00
joylink_cuiweidong
dda8f39adf 新版地图右键操作 弹窗代码调整 2020-06-11 13:29:06 +08:00