Commit Graph

412 Commits

Author SHA1 Message Date
joylink_cuiweidong
bc6940f80b 仿真界面添加列车详情(未完成) 2020-03-31 19:06:23 +08:00
fan
007c3658c6 调整本地项目 2020-03-31 16:54:04 +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
d6e883e167 考试调整 2020-03-31 10:06:41 +08:00
fan
e43ad1fa99 调整哈尔滨显示 2020-03-31 09:27:02 +08:00
joylink_cuiweidong
68f77a25b6 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 16:16:29 +08:00
joylink_cuiweidong
8f6f033870 剧本仿真切换仿真类型代码调整 2020-03-30 16:16:11 +08:00
zyy
af6eb5917f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-30 16:15:50 +08:00
zyy
0c56d049ec 调整哈尔滨现地实训操作步骤 2020-03-30 16:15:35 +08:00
fan
ab4928d924 差异化打包调整&哈尔滨登录页 2020-03-30 13:07:11 +08:00
fan
6ef1fc2013 实训调整 2020-03-27 18:14:46 +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
3c1d038a81 实训仿真调整 2020-03-27 10:51:49 +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
fan
1e8d304249 Merge remote-tracking branch 'origin/dev_dukang' into dev
# Conflicts:
#	src/scripts/cmdPlugin/CommandEnum.js
#	src/utils/baseUrl.js
2020-03-20 15:16:08 +08:00
joylink_cuiweidong
bd046abd8b Merge remote-tracking branch 'remotes/origin/dev' into test 2020-03-19 13:08:34 +08:00
joylink_cuiweidong
65566a1438 添加 贵州装备制造职业学院 案例展示
北京一号线操作代码调整
2020-03-19 13:06:48 +08:00
fan
73d763b700 Merge remote-tracking branch 'origin/dev' into test 2020-03-18 19:06:23 +08:00
zyy
3afa12711e 新增哈尔滨线路底部栏 操作 2020-03-18 18:47:37 +08:00
fan
b94c2b47de 综合演练调整 2020-03-17 14:54:03 +08:00
fan
47a856e0c1 Merge remote-tracking branch 'origin/dev' into test 2020-03-13 18:24:11 +08:00
zyy
e156bac9ca 增加公共地图ibp配置绘图 逻辑 2020-03-13 18:19:04 +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
8dc726bbe1 Merge remote-tracking branch 'origin/dev' into test 2020-03-01 18:39:35 +08:00
joylink_fanyuhong
92f4f2f1ca 按计划行车接口报错提示 2020-02-28 16:47:26 +08:00
joylink_fanyuhong
d5539a986b 按计划行车接口报错提示
(cherry picked from commit 1abad25)
2020-02-28 11:28:13 +08:00
joylink_fanyuhong
ee33dec8a1 Merge remote-tracking branch 'origin/dev' into test 2020-02-27 22:18:42 +08:00
joylink_fanyuhong
41bc739eab 运行图预览 2020-02-27 22:09:51 +08:00
joylink_fanyuhong
40c8ee9c0c 调整运行图预览尺寸 2020-02-27 16:57:51 +08:00
joylink_fanyuhong
040636e2ce 调整运行图预览尺寸 2020-02-27 16:52:48 +08:00
joylink_fanyuhong
d85f8ea5a8 仿真调整 2020-02-27 16:30:48 +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
338f9a75e8 三维客流视图追加人物模型动画 2020-02-18 17:55:29 +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
02a6954ffd 仿真接口报错提示调整 2020-01-17 13:17:12 +08:00
fan
269cef7673 仿真接口调整 2020-01-17 11:31:53 +08:00
fan
fbc0e5b28a 哈尔滨盈达调整 2020-01-14 16:19:36 +08:00
zyy
5a3b415202 删除运行图工具栏 2020-01-07 14:49:51 +08:00
fan
2554ed1135 代码调整 2020-01-06 14:43:08 +08:00
zyy
28e0617c87 删除注释,信号机流程完成 2020-01-03 16:01:57 +08:00
zyy
c13963f793 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-03 15:50:32 +08:00
zyy
4f2fb97477 调整宁波线右键菜单显示 2020-01-03 15:50:26 +08:00
fan
1695bb1d21 恢复退出仿真 2020-01-03 14:57:26 +08:00
zyy
764f7c479e 调整右键菜单获取 2020-01-02 11:08:01 +08:00
zyy
5db5bb40f8 Merge branch 'dev_cmd' into dev 2020-01-02 10:47:08 +08:00
fan
21c18e8de4 获取每日运行图接口 2020-01-02 09:22:44 +08:00
fan
ce5c87608a 调整考试提交返回再次进入时未获取到mapId的问题&&题目框自动收取的问题 2019-12-31 16:57:35 +08:00
fan
4ce64c614b 问题调整 2019-12-31 14:30:23 +08:00
fan
eb8f64af27 课程系统左侧栏 2019-12-31 13:15:28 +08:00
joylink_cuiweidong
ca6ca0ecc4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-30 18:45:17 +08:00
joylink_cuiweidong
cad56a82e9 Merge branch 'dev_prd' into dev
# Conflicts:
#	src/views/demonstration/detail/index.vue
2019-12-30 18:45:05 +08:00
zyy
4a06c92ea1 修改鼠标静止隐藏移动显示逻辑 2019-12-30 14:06:42 +08:00
fan
c7078dcdb9 新版地图包加载仿真 2019-12-30 09:00:16 +08:00