sunzhenyu
|
ac0efbd97b
|
修改三维编辑器模型配置，修改三维的沙盘,驾驶,cctv,单体设备,通号维修模型加载，贴图加载的问题
|
2020-07-20 17:32:16 +08:00 |
|
sunzhenyu
|
e95d97136a
|
三维编辑器存读数据测试
|
2020-07-10 18:13:09 +08:00 |
|
sunzhenyu
|
ccd14e903d
|
三维编辑器修改
|
2020-07-10 09:17:00 +08:00 |
|
sunzhenyu
|
27d4c93775
|
修改三维编辑器
|
2020-07-09 15:46:12 +08:00 |
|
sunzhenyu
|
eff2657d08
|
修改综合演练屏蔽门直接显示
|
2020-07-08 17:24:38 +08:00 |
|
sunzhenyu
|
9c0df60188
|
三维编辑器修改，三维cctv仿真结束登出
|
2020-07-08 10:21:14 +08:00 |
|
sunzhenyu
|
0b08bfae9f
|
综合演练三维通号增加设备间，三维编辑器资源管理链接配置
|
2020-07-03 13:49:05 +08:00 |
|
sunzhenyu
|
c34aa9d223
|
增加三维资源模型上传页面
|
2020-07-02 15:33:35 +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
|
2e0b0913d6
|
修改设计平台三维数据发布
|
2020-03-16 18:47:55 +08:00 |
|
sunzhenyu
|
e19e44835f
|
修改背景自适应，修改三维地图编辑逻辑存读以及三维沙盘加载
|
2020-01-14 16:09:08 +08:00 |
|
sunzhenyu
|
76379f12cc
|
继电器通信，修改继电器逻辑，继电器模型动画更替，修改设备信号灯逻辑，修改设备道岔初始化bug
|
2019-12-26 10:41:07 +08:00 |
|
sunzhenyu
|
3138187c07
|
减少合并三维行车判断逻辑，分拆三维行车数据对象
|
2019-11-15 16:47:34 +08:00 |
|
sunzhenyu
|
af17dbece4
|
新数据存读
|
2019-09-25 14:49:25 +08:00 |
|
sunzhenyu
|
3d977cc124
|
pull
|
2019-09-03 16:50:15 +08:00 |
|
zyy
|
b84b6ea500
|
desc: 修改地图编辑页面逻辑
|
2019-08-16 15:12:03 +08:00 |
|
ival
|
87e35cb38d
|
同步master代码以及修改交路的问题
|
2019-08-14 16:37:17 +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 |
|
ival
|
6343a79f81
|
修改接口
|
2019-08-14 14:01:28 +08:00 |
|
ival
|
78a805cd2f
|
修改皮肤skinStyle为skinCode
|
2019-08-14 09:35:38 +08:00 |
|
sunzhenyu
|
39002937e1
|
调整文件结构
|
2019-08-13 16:23:46 +08:00 |
|
sunzhenyu
|
74527e79fe
|
修改三维view文件结构
|
2019-08-12 18:37:43 +08:00 |
|
ival
|
9f5130a4f2
|
代码移植
|
2019-07-26 13:32:43 +08:00 |
|