Commit Graph

58 Commits

Author SHA1 Message Date
sunzhenyu
364c0afcef Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-12 18:34:18 +08:00
joylink_cuiweidong
841afe35a1 剧本代码调整 2020-05-11 16:27:58 +08:00
sunzhenyu
c8544909f7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-11 10:14:04 +08:00
sunzhenyu
275e4bab27 修改三维设备页面道岔转辙机 2020-05-11 10:13:54 +08:00
fan
1601b655d1 地图数据维护中提示调整 2020-05-09 20:24:59 +08:00
fan
c5f63c9e52 添加地图数据维护中提示&存在仿真管理添加类型 2020-05-09 19:35:56 +08:00
fan
29881aab0b 添加地图数据维护中提示&存在仿真管理添加类型 2020-05-09 19:24:12 +08:00
fan
81c6b76485 大屏调整 2020-05-07 09:03:10 +08:00
fan
7e790a3bdb 鼠标样式调整 2020-04-29 14:05:50 +08:00
zyy
be9b8f8432 调整右键操作 2020-04-29 11:22:54 +08:00
zyy
7fa5a12e8c 调整设置app/height 执行顺序问题 2020-04-28 14:49:42 +08:00
zyy
9427cc5759 调整西安二号线右键菜单显示 2020-04-27 18:33:29 +08:00
sunzhenyu
fd14da2cee merge menudemon 2020-04-24 18:01:03 +08:00
sunzhenyu
8f15f049f1 修改三维动画播放器重复更新bug,增加宁波线路三维背景,修改三维仿真行车逻辑改为后台数据控制 2020-04-24 18:00:12 +08:00
zyy
4d288556b0 调整绘图界面,调整实训平台鼠标隐藏bug 2020-04-23 17:11:51 +08:00
fan
2100144656 西安二号线调整&宁波一号线vue告警调整&仿真鼠标样式调整 2020-04-17 15:02:35 +08:00
joylink_cuiweidong
ba666eb334 实训平台教学 代码调整 2020-04-14 14:51:14 +08:00
joylink_cuiweidong
8475870cf8 哈尔滨/宁波 现地 实训设置当前所在集中站 代码调整 2020-04-13 14:54:35 +08:00
zyy
289f1dbff0 调整现地列车显示 2020-04-09 17:37:27 +08:00
fan
6667adca07 实训调整 2020-04-07 14:40:24 +08:00
joylink_cuiweidong
38a05e530d 北京一号线现地操作步骤代码调整 2020-04-03 16:31:57 +08:00
fan
e45ec364a5 宁波实训跳转集中站 2020-04-02 16:52:59 +08:00
fan
e49f32d6b2 宁波实训跳转集中站 2020-04-02 16:28:07 +08:00
fan
523a1f9cd6 宁波实训跳转集中站 2020-04-02 16:22:53 +08:00
fan
75df1f7d2d 宁波考试&教学添加切换集中站 2020-04-02 14:46:21 +08:00
fan
8f30d436ee 调整绘图&三维跳转页面icon 2020-04-01 16:24:03 +08:00
fan
c1abbaed49 关闭gzip 2020-04-01 15:01:08 +08:00
joylink_cuiweidong
995460afdf 仿真界面添加列车详情 2020-04-01 12:53:58 +08:00
joylink_cuiweidong
955ddacbe0 Merge branch 'dev' into test 2020-03-31 19:09:06 +08:00
joylink_cuiweidong
bc6940f80b 仿真界面添加列车详情(未完成) 2020-03-31 19:06:23 +08:00
fan
63c73ab78c Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
#	src/views/jlmap3d/simulation/jl3dsimulation.vue
2020-03-31 11:14:33 +08:00
fan
e43ad1fa99 调整哈尔滨显示 2020-03-31 09:27:02 +08:00
zyy
0c56d049ec 调整哈尔滨现地实训操作步骤 2020-03-30 16:15:35 +08:00
zyy
a95e940255 调整实训步骤校验 2020-03-27 14:37:28 +08:00
fan
3a8a3b87d8 调整左边弹框显示 2020-03-27 14:01:57 +08:00
fan
a697ab21d5 调整实训 2020-03-27 13:52:14 +08:00
fan
f34de4f001 实训调整 2020-03-26 18:42:01 +08:00
fan
9d38968751 佛山样式调整&&宁波显示调整 2020-03-25 15:22:52 +08:00
fan
88ca3a568e Merge remote-tracking branch 'origin/dev' into test 2020-03-20 18:51:36 +08:00
zyy
788737369a 调整哈尔滨线路 现地 行调 菜单高度 2020-03-20 17:56:20 +08:00
zyy
e59fe1cae5 Merge branch 'dev' into test 2020-03-09 17:05:43 +08:00
fan
2b971cdf12 初始化按计划行车状态and其他调整 2020-03-09 14:23:44 +08:00
joylink_fanyuhong
ee33dec8a1 Merge remote-tracking branch 'origin/dev' into test 2020-02-27 22:18:42 +08:00
joylink_fanyuhong
aa0f770630 仿真调整 2020-02-24 17:04:39 +08:00
9f43749e8c Merge remote-tracking branch 'origin/dev' into test 2020-02-18 23:29:04 +08:00
sunleking
9babb6e9a2 添加新数据显示客流量模拟 2020-02-17 09:41:18 +08:00
sunleking
61394c4b39 增加三维客流量模块,目前完成了基础的行走状态控制流程 2020-02-14 18:22:11 +08:00
zyy
fbcaacce01 修改代码添加中间状态转换层 2020-02-11 14:50:56 +08:00
fan
269cef7673 仿真接口调整 2020-01-17 11:31:53 +08:00
fan
fbc0e5b28a 哈尔滨盈达调整 2020-01-14 16:19:36 +08:00