Commit Graph

3641 Commits

Author SHA1 Message Date
fan
457b78bd7e 操作调整 2020-03-20 15:00:31 +08:00
joylink_cuiweidong
2c4848f4db 北京一号线指令操作调整 2020-03-20 14:48:22 +08:00
fan
80fda91dba 自动折返&引导总锁调整 2020-03-20 14:12:02 +08:00
joylink_cuiweidong
d50f096b0a 北京一号线站台操作代码调整 2020-03-20 13:30:57 +08:00
zyy
402d161e73 调整格式 2020-03-20 13:07:31 +08:00
zyy
4a44a71d72 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-20 11:24:21 +08:00
zyy
7f419b5bac Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/views/iscs/iscsSystem/config/broadcast/centerHome.vue
2020-03-20 11:24:00 +08:00
joylink_cuiweidong
61d54b2209 北京一号线道岔操作代码调整 2020-03-20 11:23:46 +08:00
zyy
3e14220cfc 调整综合监控站台数据,及样式 2020-03-20 11:20:13 +08:00
fan
cc21437843 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-20 11:09:16 +08:00
fan
404d867767 绘图&成三现地调整 2020-03-20 11:09:06 +08:00
joylink_cuiweidong
59f5336f8a 北京一号线信号机区段操作代码调整 2020-03-20 10:31:19 +08:00
fan
361f28c905 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-19 18:43:43 +08:00
fan
352215f142 代码调整 2020-03-19 18:43:31 +08:00
zyy
912f0f206f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-19 18:39:32 +08:00
zyy
2f654975d5 调整哈尔滨信号机状态 2020-03-19 18:39:20 +08:00
fan
85e7fea0ae 代码调整 2020-03-19 18:13:26 +08:00
zyy
67f0712eaa Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-19 17:19:01 +08:00
zyy
f78d9e80fe 调整哈尔滨道岔现地操作 2020-03-19 17:18:46 +08:00
fan
5173c4e8d9 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-19 17:11:46 +08:00
fan
5e2beb6d05 代码调整 2020-03-19 17:11:35 +08:00
joylink_cuiweidong
753534c42a 北京一号线区段操作代码封装 2020-03-19 17:04:53 +08:00
fan
7de2c38af4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-19 16:17:53 +08:00
fan
36b7d7309a 增加绘图表示灯&&线条颜色 2020-03-19 16:17:34 +08:00
joylink_cuiweidong
d2bc0f0ac1 顶部菜单显示调整 2020-03-19 15:49:28 +08:00
zyy
1df8f5cac4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-19 14:43:39 +08:00
zyy
056076c682 调整宁波线 引导办理 引导取消 2020-03-19 14:43:27 +08:00
joylink_cuiweidong
79813f7641 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-19 14:34:11 +08:00
joylink_cuiweidong
99893786a4 设计平台普通用户iscs不可见 2020-03-19 14:33:54 +08:00
zyy
1a20248a0d 调整区段逻辑 2020-03-19 14:09:50 +08:00
zyy
e4c2cf03b1 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-19 14:04:11 +08:00
zyy
1d46deb12a 调整区段绘画逻辑 2020-03-19 14:03:54 +08:00
joylink_cuiweidong
65566a1438 添加 贵州装备制造职业学院 案例展示
北京一号线操作代码调整
2020-03-19 13:06:48 +08:00
fan
16caa26336 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-19 10:56:02 +08:00
fan
46520ac118 代码调整 2020-03-19 10:55:43 +08:00
zyy
6570028b95 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-19 10:52:54 +08:00
zyy
6e3dcf6b65 调整哈尔滨线路 区段,信号机操作 处理信号机点击高亮 2020-03-19 10:52:42 +08:00
joylink_cuiweidong
e1b411965b 北京一号线操作代码调整 2020-03-19 10:49:21 +08:00
fan
ad858543d8 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-19 10:23:43 +08:00
fan
acc05f770e 调整进路状态影响自动进路功能按钮 2020-03-19 10:23:24 +08:00
joylink_cuiweidong
85e587f844 北京一号线操作代码调整 2020-03-19 10:02:25 +08:00
fan
8ba124ab6f 参数调整 2020-03-19 09:25:51 +08:00
fan
aa7b0071ca 现地操作调整 2020-03-19 09:12:46 +08:00
zyy
4243d62ab1 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-18 19:08:12 +08:00
zyy
2ffdf1de32 调整代码 2020-03-18 19:07:58 +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
zyy
4537080346 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-18 18:47:48 +08:00
zyy
3afa12711e 新增哈尔滨线路底部栏 操作 2020-03-18 18:47:37 +08:00
joylink_cuiweidong
7c02daebeb 代码调整 2020-03-18 18:45:27 +08:00