Commit Graph

67 Commits

Author SHA1 Message Date
fan
614aae8be0 国际化调整 2019-08-22 09:06:48 +08:00
ival
ae500285ba 修改实训加载顺序错误的问题 2019-08-19 15:59:04 +08:00
fan
2115c952cc 修改:loading调整 2019-08-19 14:09:37 +08:00
fan
a669d093b1 修改:删除全局loading 2019-08-19 13:27:15 +08:00
ival
068dbdbbde 修改代码 2019-08-19 10:58:14 +08:00
ival
fd2b66e984 Merge remote-tracking branch 'remotes/origin/master' into dev
# Conflicts:
#	src/i18n/langs/zh/rules.js
#	src/views/trainRoom/index.vue
2019-08-14 16:50:50 +08:00
ival
b1fd1f43e9 删除返回主页的错误 2019-08-14 16:46:44 +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
576ac7eacb 修改导航配置 2019-08-14 10:36:55 +08:00
ival
78a805cd2f 修改皮肤skinStyle为skinCode 2019-08-14 09:35:38 +08:00
fan
367edf0118 调整:代码修改 2019-08-09 17:38:20 +08:00
fan
74f7785663 调整:限制仿真多次加载 2019-08-09 15:52:55 +08:00
zyy
0a010eca04 修改格式 2019-08-08 11:11:32 +08:00
zyy
d014007d25 desc: 修改仿真系统,教学系统,考试系统默认首页设置 2019-08-08 10:16:14 +08:00
zyy
98a0533b20 修改代码格式 2019-08-06 10:11:32 +08:00
ival
9f5130a4f2 代码移植 2019-07-26 13:32:43 +08:00