Commit Graph

663 Commits

Author SHA1 Message Date
zyy
98ce2d5890 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-23 17:12:06 +08:00
zyy
4d288556b0 调整绘图界面,调整实训平台鼠标隐藏bug 2020-04-23 17:11:51 +08:00
joylink_cuiweidong
72f78751ce 综合演练仿真 聊天 创建对话,以及对话切换 2020-04-23 14:41:52 +08:00
zyy
306e9f4954 调整区段绘图显隐问题 2020-04-22 18:53:20 +08:00
joylink_cuiweidong
511d5e48d4 综合演练仿真 聊天 socket 订阅 2020-04-22 18:17:27 +08:00
zyy
33e105ce88 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-22 18:02:58 +08:00
zyy
415d762294 调整地图绘制区段显隐关系 2020-04-22 18:02:43 +08:00
fan
a5f56bae2d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-22 17:26:46 +08:00
fan
1afcd2ec4a 仅哈尔滨线路显示客流量视图 2020-04-22 17:24:45 +08:00
joylink_cuiweidong
d9c7874a65 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-22 17:21:54 +08:00
joylink_cuiweidong
1a393e41b6 代码调整 2020-04-22 17:21:36 +08:00
fan
b898042b96 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-22 17:13:37 +08:00
fan
8c122f93d4 运行图加载调整&绘图设备道岔故障&佛山区段颜色 2020-04-22 17:12:29 +08:00
zyy
45e10ef066 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-22 16:42:09 +08:00
zyy
00936b36ac 调整地图绘制区段关系显隐 2020-04-22 16:41:55 +08:00
joylink_cuiweidong
a0589d52dd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-22 15:34:08 +08:00
joylink_cuiweidong
f9ca0138c8 综合演练仿真添加聊天窗口调整(未完成) 2020-04-22 15:33:31 +08:00
fan
c3ca6de6d8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-22 14:32:00 +08:00
fan
e51824dc80 紧急停车位置调整&绘图站间分隔&车站批量调整 2020-04-22 14:30:37 +08:00
joylink_cuiweidong
d436041233 代码调整 2020-04-22 11:31:09 +08:00
fan
adfe7f0f05 派班工作站&运行图加载调整 2020-04-22 09:42:46 +08:00
fan
b87a2f5ce2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-21 18:46:41 +08:00
fan
5f4a211bf2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-21 18:45:05 +08:00
fan
0e1d3dc811 运行图加载调整 2020-04-21 18:43:54 +08:00
joylink_cuiweidong
c550466f60 综合演练仿真添加聊天窗口调整 2020-04-21 18:42:57 +08:00
joylink_cuiweidong
98fc24ab24 综合演练仿真添加聊天窗口(未完成) 2020-04-21 17:28:13 +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
joylink_cuiweidong
9b0ce027bf 代码调整 2020-04-21 11:26:07 +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
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
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
308c33e6bc 调整区段及道岔绘图方式 2020-04-17 18:44:14 +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
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
zyy
b628df2d85 调整对象拷贝方式 2020-04-17 13:30:58 +08:00
joylink_cuiweidong
467e8671fd 西安二号线屏蔽门绘图调整 2020-04-17 13:30:18 +08:00
joylink_cuiweidong
126d9f2309 代码调整 2020-04-17 11:29:50 +08:00