diff --git a/src/jlmap3d/lesson3d/lesson3dplayer.js b/src/jlmap3d/lesson3d/lesson3dplayer.js index 46fc4ac81..c9f2fc98b 100644 --- a/src/jlmap3d/lesson3d/lesson3dplayer.js +++ b/src/jlmap3d/lesson3d/lesson3dplayer.js @@ -18,6 +18,7 @@ import { AnimateManager } from '@/jlmap3d/lesson3d/manager/animatemanager.js'; import { Fire } from '@/jlmap3d/lesson3d/utils/fire.js'; +import { Loading } from 'element-ui'; // import { AnimationManager } from '@/jlmap3d/lesson3d/manager/assetmodelmanager.js'; @@ -58,6 +59,7 @@ export function Lesson3dPlayer(dom,lessonData,lessonIndex) { let controlManager = new ControlManager( dom,scene,lessonData,lessonIndex); + let loadingInstance = Loading.service({ fullscreen: true }); let assetModelManager = new AssetModelManager(scope,scene,controlManager); assetModelManager.lessonAssetsLoader(lessonData).then((result) => { scope.nowSceneType = lessonData.lessonProgress[0].progressScene; @@ -68,6 +70,7 @@ export function Lesson3dPlayer(dom,lessonData,lessonIndex) { startLesson(); animate(); + loadingInstance.close(); resolve("loadeend"); //['成功了', 'success'] }).catch((error) => { //console.log(error); diff --git a/src/jlmap3d/lesson3d/manager/controlmanager.js b/src/jlmap3d/lesson3d/manager/controlmanager.js index a1aec78ee..ba58aba26 100644 --- a/src/jlmap3d/lesson3d/manager/controlmanager.js +++ b/src/jlmap3d/lesson3d/manager/controlmanager.js @@ -235,7 +235,7 @@ export function ControlManager(dom,scene,lessonData,lessonIndex) { this.init = function(actions,assetModelManager,trainDeviceData){ // worldOctree.fromGraphNode( standstationPZ ); actionList = actions; - console.log(actionList); + // console.log(actionList); modelManager = assetModelManager; if(trainDeviceData){ trainDeviceMode = true; @@ -351,7 +351,7 @@ export function ControlManager(dom,scene,lessonData,lessonIndex) { if(raycasterBoxs.length>0){ let isOverEvent = false; let overEvent = ""; - console.log(raycasterBoxs); + // console.log(raycasterBoxs); for(let i=0;i - 考试模式: + 课程模式选择: + active-text="考试模式" + inactive-text="教学模式">
单对屏蔽门无法开启
+ style="left:20%;top:40%;" @click="enterPlayer(38)">单个屏蔽门无法开启
单对屏蔽门无法关闭
+ style="left:60%;top:40%;" @click="enterPlayer(39)">单个屏蔽门无法关闭
整列屏蔽门无法开启
+ style="left:20%;top:70%;" @click="enterPlayer(36)">整侧屏蔽门无法开启
整列屏蔽门无法关闭
+ style="left:60%;top:70%;" @click="enterPlayer(37)">整侧屏蔽门无法关闭 @@ -70,12 +70,12 @@ export default { }, methods: { - enterPlayer:function ( ) { + enterPlayer:function (lessonid) { let examcode = 0; if(this.examMode == true){ examcode = 1; } - this.$router.push({ path: '/design/jlmap3d/lesson3dplayer', query: {lessonId:'34',examMode:examcode} }); + this.$router.push({ path: '/design/jlmap3d/lesson3dplayer', query: {lessonId:lessonid,examMode:examcode} }); }, } diff --git a/src/views/jlmap3d/lesson3dplayer/tools/jobpane.vue b/src/views/jlmap3d/lesson3dplayer/tools/jobpane.vue index ce0ef3457..de1093bc4 100644 --- a/src/views/jlmap3d/lesson3dplayer/tools/jobpane.vue +++ b/src/views/jlmap3d/lesson3dplayer/tools/jobpane.vue @@ -95,10 +95,10 @@ }, selsectJobTool(selectTool){ - console.log(selectTool); + // console.log(selectTool); let nowProgress = this.lessonData.lessonData.lessonProgress[this.lessonPlayIndex]; - console.log(nowProgress.id); - console.log(this.lessonData.lessonData.lessonProgress[this.lessonPlayIndex]); + // console.log(nowProgress.id); + // console.log(this.lessonData.lessonData.lessonProgress[this.lessonPlayIndex]); if(selectTool.sceneId == nowProgress.id && this.lessonData.lessonData.lessonProgress[this.lessonPlayIndex].roleName == this.nowRole){ jumpEvent("tools",selectTool); } diff --git a/src/views/jlmap3d/lesson3dplayer/tools/resulttips.vue b/src/views/jlmap3d/lesson3dplayer/tools/resulttips.vue index d63f361fb..2602f73d5 100644 --- a/src/views/jlmap3d/lesson3dplayer/tools/resulttips.vue +++ b/src/views/jlmap3d/lesson3dplayer/tools/resulttips.vue @@ -56,7 +56,7 @@ methods: { showdiv(){ this.divshow = true; - console.log(this.divshow); + // console.log(this.divshow); }, closediv(){ this.divshow = false;