Commit Graph

4266 Commits

Author SHA1 Message Date
joylink_cuiweidong
c550466f60 综合演练仿真添加聊天窗口调整 2020-04-21 18:42:57 +08:00
sunzhenyu
7ca5fd07dc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-21 18:32:51 +08:00
sunzhenyu
0ea6430617 修改三维驾驶操作面板,整合实用按钮,修改背景 2020-04-21 18:31:33 +08:00
zyy
19e0eeae6b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-21 17:54:00 +08:00
zyy
75c1cffa11 调整佛山线路行调下道岔操作 2020-04-21 17:53:46 +08:00
joylink_cuiweidong
b10c801550 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-21 17:28:44 +08:00
joylink_cuiweidong
98fc24ab24 综合演练仿真添加聊天窗口(未完成) 2020-04-21 17:28:13 +08:00
fan
f229bc9231 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-21 17:10:15 +08:00
fan
46113e89a7 运行图加载 2020-04-21 17:08:43 +08:00
fan
c8c7f8bded 佛山调整 2020-04-21 17:05:18 +08:00
zyy
4610882f5f 调整列车方向显示 2020-04-21 17:00:19 +08:00
fan
d60c2881d0 添加列车配置 2020-04-21 16:00:10 +08:00
fan
d44faf55ea 调整西安地铁登录页面 2020-04-21 15:47:25 +08:00
fan
dcf7b951ab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-21 15:15:03 +08:00
fan
2f4b765d97 运行图加载调整&交路数据调整 2020-04-21 15:08:27 +08:00
zyy
778c2059df Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-21 14:14:44 +08:00
zyy
b31ef6bc2d 调整西安一 三号线运行图导入 2020-04-21 14:14:33 +08:00
joylink_cuiweidong
9b0ce027bf 代码调整 2020-04-21 11:26:07 +08:00
joylink_cuiweidong
d4a621d049 代码调整 2020-04-21 10:48:09 +08:00
joylink_cuiweidong
3da6d9c538 删除没有用的接口 2020-04-21 10:07:26 +08:00
zyy
7a25c0b536 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-20 18:30:13 +08:00
zyy
dd4c575062 调整站间运行等级逻辑 2020-04-20 18:29:50 +08:00
joylink_cuiweidong
9f6fe40894 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-20 18:13:50 +08:00
joylink_cuiweidong
ad583bf418 综合演练 发送语音功能代码调整 2020-04-20 18:12:16 +08:00
sunzhenyu
ff5bae2b8c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-20 17:31:50 +08:00
sunzhenyu
b8eec513ae 修改三维编辑轨道bug 2020-04-20 17:31:42 +08:00
fan
7c55c19933 交路区段区别显示&故障状态组调整 2020-04-20 17:10:50 +08:00
fan
8fee613083 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-20 15:39:52 +08:00
fan
f375b97631 派班工作站调整 2020-04-20 15:38:30 +08:00
zyy
85189c240f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-20 15:12:14 +08:00
zyy
a49a3bfaaf 调整西安二号线数据及皮肤配置 2020-04-20 15:12:01 +08:00
joylink_cuiweidong
074f6d647a 西安二号线站台 紧急停车状态 绘图调整 2020-04-20 10:12:17 +08:00
fan
53d94cee59 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-20 09:58:12 +08:00
fan
ed26ff34d9 地图高级数据停站时间 2020-04-20 09:57:00 +08:00
zyy
8af97b4aa2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-17 18:44:33 +08:00
zyy
308c33e6bc 调整区段及道岔绘图方式 2020-04-17 18:44:14 +08:00
joylink_cuiweidong
3a0fd87a79 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-17 18:43:16 +08:00
joylink_cuiweidong
de0b7ae931 西安二号线 绘图紧急停车状态代码调整 2020-04-17 18:42:58 +08:00
zyy
4fe805e02f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-17 16:42:12 +08:00
zyy
f0610f8a0a 调整代码,处理线路皮肤默认配置 2020-04-17 16:41:59 +08:00
joylink_cuiweidong
70a8ec07f6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-17 16:39:55 +08:00
joylink_cuiweidong
211db36aca 西安二号线绘图 站台 扣车 代码调整 2020-04-17 16:39:42 +08:00
sunzhenyu
e21a9db907 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-17 16:09:51 +08:00
sunzhenyu
47a8c63c5d 修改三维新版轨道结构,新版地图数据三维轨道编辑功能修改 2020-04-17 16:09:37 +08:00
fan
c13624b60a 西安二号线调整 2020-04-17 15:59:50 +08:00
fan
2100144656 西安二号线调整&宁波一号线vue告警调整&仿真鼠标样式调整 2020-04-17 15:02:35 +08:00
fan
795ad48e32 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-17 13:34:36 +08:00
fan
07711a5bda Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-17 13:32:18 +08:00
zyy
4bd05891be Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-17 13:31:12 +08:00
fan
a4097e1f32 西安二号线调整 2020-04-17 13:30:59 +08:00