Commit Graph

56 Commits

Author SHA1 Message Date
sunzhenyu
1cd2fd370b 复原三维沙盘行车逻辑 2020-04-22 13:22:54 +08:00
sunzhenyu
0ea6430617 修改三维驾驶操作面板,整合实用按钮,修改背景 2020-04-21 18:31:33 +08:00
sunzhenyu
47a8c63c5d 修改三维新版轨道结构,新版地图数据三维轨道编辑功能修改 2020-04-17 16:09:37 +08:00
sunzhenyu
2b0ee65a67 新数据三维区段模型自动生成修改,哈尔滨背景模型修改 2020-04-10 18:55:06 +08:00
sunzhenyu
76d17b380e 修改三维车站屏蔽门动画 2020-04-03 15:08:17 +08:00
sunzhenyu
50eb7c2315 修改三维驾驶和仿真模型,增加隧道背景 2020-04-02 18:48:04 +08:00
sunzhenyu
d7fd261c07 修改三维客流视图画面 2020-04-01 16:03:09 +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
ab4928d924 差异化打包调整&哈尔滨登录页 2020-03-30 13:07:11 +08:00
sunzhenyu
9de8b430ee 修改三维沙盘和三维驾驶行车逻辑,设备动画逻辑,通信逻辑 2020-03-25 18:47:14 +08:00
sunzhenyu
0b6415b162 修改三维设备视图,修改站台模型贴图,修改客流量加载页面 2020-03-20 17:00:12 +08:00
sunzhenyu
2e0b0913d6 修改设计平台三维数据发布 2020-03-16 18:47:55 +08:00
sunzhenyu
098c997912 新数据三维驾驶读取场景 2020-03-11 18:39:20 +08:00
sunzhenyu
e80a864018 新数据三维仿真行车优化通车 2020-03-11 14:33:46 +08:00
sunzhenyu
d3d1909a82 新数据三维仿真优化 2020-03-10 18:57:13 +08:00
sunleking
a87d551751 修改三维仿真停车点 2020-03-08 23:10:57 +08:00
sunleking
674674bf86 修改三维仿真通信结构优化代码 2020-03-08 19:40:46 +08:00
sunzhenyu
ceb9b06c2f 修改重复创建三维行车bug,去除继电器网格,新数据测试 2020-01-19 18:09:34 +08:00
sunzhenyu
e19e44835f 修改背景自适应,修改三维地图编辑逻辑存读以及三维沙盘加载 2020-01-14 16:09:08 +08:00
sunzhenyu
c387c3836f 修改数字沙盘行车逻辑bug,逻辑改为目的地link判断是否行使,修正初始列车坐标赋值 2019-12-27 18:10:14 +08:00
sunzhenyu
76379f12cc 继电器通信,修改继电器逻辑,继电器模型动画更替,修改设备信号灯逻辑,修改设备道岔初始化bug 2019-12-26 10:41:07 +08:00
sunzhenyu
536cbb4e60 剔除三维无用静态模型,修改模型配置 2019-12-19 09:40:29 +08:00
sunzhenyu
a6c9db1904 修改仿真驾驶添加模型错误,修改沙盘漫游动画轨迹,修改沙盘图标显示,清除不使用的天空盒文件 2019-12-06 18:04:15 +08:00
sunzhenyu
e97dc7b8c0 注释 2019-12-05 16:26:47 +08:00
sunzhenyu
7831bce219 添加仿真设备视图 2019-12-05 16:04:36 +08:00
sunzhenyu
c35a5af565 修改沙盘渲染方式,修改图标名称 2019-12-03 14:19:22 +08:00
sunzhenyu
6f081ca234 修改沙盘行车逻辑,增加站台模型,修改webworker通信,优化通信判断 2019-12-03 13:48:15 +08:00
ival
966dc20c3d Merge branch 'test' of https://git.qcloud.com/joylink/jl-nclient into test 2019-11-19 11:01:54 +08:00
ival
0186f25a2b Merge branch 'dev' into test
# Conflicts:
#	src/api/jlmap3d/load3ddata.js
#	src/jlmap3d/jl3ddrive/moveupdate/DrivingConnect.js
2019-11-19 11:00:13 +08:00
ival
50e9a242e7 修改代码 2019-11-18 14:44:01 +08:00
sunzhenyu
e2405eba15 修改信号机判断逻辑 2019-11-15 18:40:45 +08:00
sunzhenyu
03c97eefef 修改三维订阅接口 2019-11-15 17:34:07 +08:00
sunzhenyu
f7b909f85d 修改连接 2019-11-15 17:24:13 +08:00
sunzhenyu
495cecb06c Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test 2019-11-15 16:47:47 +08:00
sunzhenyu
3138187c07 减少合并三维行车判断逻辑,分拆三维行车数据对象 2019-11-15 16:47:34 +08:00
fan
1c75c8f0ef Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
#	src/jlmap3d/jl3ddrive/moveupdate/DrivingConnect.js
#	src/jlmap3d/jl3dsimulation/connect/TrainingConnect.js
2019-11-15 16:42:32 +08:00
ival
c5c813753c 修改代码 2019-11-14 13:59:33 +08:00
ival
8eb4ac80a6 修改刷新问题 2019-11-12 17:27:30 +08:00
sunzhenyu
4532446048 修改路劲判断函数,区分仿真和沙盘加载显示内容,测试站台模型 2019-11-04 18:57:35 +08:00
sunzhenyu
2a39905de3 修改仿真渲染设置 2019-10-31 13:57:29 +08:00
sunzhenyu
26f0b6dde0 修改行车逻辑,减少画面渲染 2019-10-31 13:06:56 +08:00
sunzhenyu
a7e7988754 修复路径判断 2019-10-18 15:29:17 +08:00
sunzhenyu
f847629b92 修改文字显示,行车路径,行车计算 2019-10-17 18:48:36 +08:00
sunzhenyu
1ddb55091a 修改行车逻辑 2019-10-14 18:18:11 +08:00
sunzhenyu
8b71f08de0 修改行车逻辑 2019-10-12 19:03:21 +08:00
sunzhenyu
b32b03bc81 修改link为主轨迹运行 2019-10-12 16:36:51 +08:00
sunzhenyu
2defa3c89d 仿真载入新数据 2019-10-09 14:31:11 +08:00
sunzhenyu
71a33b5042 merge 2019-09-19 09:25:04 +08:00
sunzhenyu
fd8f3e4dd0 修改过去不标准贴图,修改代码生成的不标准材质 2019-09-09 10:22:10 +08:00
ival
3bb449080f Merge remote-tracking branch 'remotes/origin/master' into dev
# Conflicts:
#	src/i18n/langs/zh/tip.js
#	src/jlmap3d/jl3ddrive/jl3ddrive.js
#	src/views/components/pay/index.vue
#	src/views/demonstration/detail/index.vue
#	src/views/display/index.vue
#	src/views/exam/detail/courseDetail.vue
#	src/views/exam/detail/examDetail.vue
#	src/views/exam/detail/questionDetail.vue
#	src/views/jlmap3d/drive/jl3ddrive.vue
#	src/views/jlmap3d/simulation/jl3dsimulation.vue
#	src/views/jointTraining/index.vue
#	src/views/map/mapdraft/mapedit/automaticoperate/preview.vue
#	src/views/map/mapdraft/mapedit/mapoperate/link.vue
#	src/views/map/mapdraft/mapedit/mapoperate/section.vue
#	src/views/map/mapdraft/mapedit/mapoperate/signal.vue
#	src/views/map/mapdraft/mapedit/mapoperate/station.vue
#	src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
#	src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
#	src/views/map/mapdraft/mapedit/mapoperate/stoppoint.vue
#	src/views/map/mapdraft/mapedit/mapoperate/switch.vue
#	src/views/map/mapdraft/mapedit/pathoperate/pathRoute.vue
#	src/views/map/mapdraft/mapedit/routeoperate/detail.vue
#	src/views/map/mapdraft/mapedit/routeoperate/preview.vue
#	src/views/map/mapdraft/mapedit/routeoperate/related.vue
#	src/views/map/mapdraft/mapedit/routeoperate/route.vue
#	src/views/map/mapdraft/mapmanage/operateMenu.vue
#	src/views/map/product/draft.vue
#	src/views/map/product/list.vue
#	src/views/map/skinStyle/draft.vue
#	src/views/map/skinStyle/index.vue
#	src/views/planMonitor/detail.vue
#	src/views/planMonitor/editTool/index.vue
#	src/views/planMonitor/editTool/menus/modifyingStationIntervalTime.vue
#	src/views/planMonitor/editTool/schedule.vue
#	src/views/teach/detail/index.vue
#	src/views/teach/practical/index.vue
2019-08-14 15:57:52 +08:00