Commit Graph

3679 Commits

Author SHA1 Message Date
joylink_cuiweidong
f51bad9c3a 代码调整 2020-03-27 18:45:48 +08:00
joylink_cuiweidong
93dc9a6983 新版剧本编制接口调整 2020-03-27 17:29:01 +08:00
fan
c30eae5b1e Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-27 17:26:39 +08:00
fan
19b945962b 站台调整 2020-03-27 17:26:17 +08:00
zyy
a95e940255 调整实训步骤校验 2020-03-27 14:37:28 +08:00
fan
3a8a3b87d8 调整左边弹框显示 2020-03-27 14:01:57 +08:00
fan
fb8d0b6615 Merge remote-tracking branch 'origin/dev_training' into dev_n
# Conflicts:
#	src/views/designPlatform/demonList.vue
2020-03-27 13:55:00 +08:00
fan
a697ab21d5 调整实训 2020-03-27 13:52:14 +08:00
zyy
7380953642 增加宁波线路实训操作 2020-03-27 13:45:36 +08:00
fan
5c7394454d 调整 2020-03-27 11:35:46 +08:00
joylink_cuiweidong
d4279dd03a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-27 11:31:53 +08:00
joylink_cuiweidong
966bed109b 新版剧本代码调整 2020-03-27 11:31:40 +08:00
zyy
97e9c8ca47 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-27 11:25:08 +08:00
zyy
faf772712c 调整增加自动生成实训操作步骤 2020-03-27 11:24:47 +08:00
fan
3c1d038a81 实训仿真调整 2020-03-27 10:51:49 +08:00
fan
723f8ff3e8 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-27 10:18:58 +08:00
fan
1adc50b2d1 站台调整 2020-03-27 10:17:24 +08:00
zyy
d92813ed72 调整道岔定位绘图 2020-03-27 10:02:41 +08:00
fan
f34de4f001 实训调整 2020-03-26 18:42:01 +08:00
zyy
aba49d9ee4 增加联锁表配置查询条件 2020-03-26 17:23:19 +08:00
fan
ead5bd01e6 站台调整 2020-03-26 15:04:52 +08:00
fan
8a90e2389b Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-26 10:42:20 +08:00
joylink_cuiweidong
9a9716e5a9 佛山有轨电车操作代码调整 2020-03-26 09:56:46 +08:00
fan
aadbe543a5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-26 09:44:27 +08:00
joylink_cuiweidong
8c01b4129f 列车绘图代码调整 2020-03-25 18:34:43 +08:00
zyy
a2875baa19 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-25 18:26:30 +08:00
zyy
41100ac9bf 调整宁波线路 道岔 封锁 单锁状态 2020-03-25 18:26:19 +08:00
fan
5bcb42e0f2 宁波调整 2020-03-25 17:32:57 +08:00
joylink_cuiweidong
ad4de2cd45 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-25 17:16:16 +08:00
joylink_cuiweidong
ef33f0f628 宁波一号线 增加列车移入显示边框 2020-03-25 17:15:16 +08:00
fan
1210496ecb Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-25 15:24:08 +08:00
fan
9d38968751 佛山样式调整&&宁波显示调整 2020-03-25 15:22:52 +08:00
joylink_cuiweidong
81b2e420d8 宁波线
添加信号机人解进路功能
信号机右键菜单 设置进路改为排列进路
列车鼠标悬停显示信息去掉
佛山线 现地
信号机操作调整
2020-03-25 15:19:39 +08:00
zyy
f96c8a11ef Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-25 13:46:14 +08:00
zyy
d5c9799189 删除路径单元模块 新增设置站间运行等级 2020-03-25 13:45:58 +08:00
joylink_cuiweidong
d3b4c090a9 佛山有轨电车 现地操作调整 2020-03-25 13:20:31 +08:00
joylink_cuiweidong
cffbc1b985 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-25 10:43:49 +08:00
joylink_cuiweidong
7604e276e1 宁波一号线 列车样式调整 2020-03-25 10:43:32 +08:00
fan
d08de3c87c Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-24 18:43:59 +08:00
fan
df70024740 代码调整 2020-03-24 18:42:18 +08:00
joylink_cuiweidong
c31c09e88b 佛山有轨电车 现地操作调整 2020-03-24 18:18:01 +08:00
joylink_cuiweidong
089b8960b9 佛山线路现地界面调整 2020-03-24 18:01:10 +08:00
zyy
fd63b2cfa0 替换小程序图标 2020-03-24 17:40:36 +08:00
fan
a0b9974040 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-24 16:51:16 +08:00
fan
70b75e354c 状态灯调整 2020-03-24 16:50:09 +08:00
joylink_cuiweidong
fabd5f1025 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-24 16:40:37 +08:00
joylink_cuiweidong
f83753102e 北京线宁波线操作代码调整 2020-03-24 16:40:17 +08:00
fan
652aa43a2a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-24 16:37:26 +08:00
fan
1e72a8cff3 状态灯调整 2020-03-24 16:35:09 +08:00
zyy
98158fdb86 删除默认状态 2020-03-24 15:10:31 +08:00