diff --git a/src/views/newMap/display/index.vue b/src/views/newMap/display/index.vue index a1221ea17..c029d4408 100644 --- a/src/views/newMap/display/index.vue +++ b/src/views/newMap/display/index.vue @@ -89,7 +89,6 @@ export default { const resp = await getSimulationInfoNew(this.group); if (resp && resp.code == 200 && resp.data) { if (!resp.data.dataError) { - debugger; // this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause); // 是否暂停判断 // this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(resp.data.systemTime)}`)); if (resp.data.prodType === '03') { diff --git a/src/views/newMap/display/simulationMenu.vue b/src/views/newMap/display/simulationMenu.vue index 43e2a746c..390394427 100644 --- a/src/views/newMap/display/simulationMenu.vue +++ b/src/views/newMap/display/simulationMenu.vue @@ -70,7 +70,7 @@ export default { {label:'初始化', name:'initialize', click:this.initialize, isShow:true} ]}, {label:'设备操作', name:'deviceOprate', isShow:true, children:[ - {label:'数字沙盘', name:'noEvent', click:this.noEvent, isShow:true}, + {label:'数字沙盘', name:'digitalStand ', click:this.digitalStand, isShow:true}, {label:'cctv视图', name:'cctvView', click:this.cctvView, isShow:false}, {label:'故障设备', name:'jlmap3dFault', click:this.jlmap3dFault, isShow:false}, {label:'司机视角', name:'jlmap3dDriver', click:this.jlmap3dDriver, isShow:true}, @@ -220,9 +220,10 @@ export default { 'contectUs':this.judgeContectUs(), 'jlmap3dmodel':this.judgeJlmap3dmodel(), 'modifySysTime':this.judgeModifySysTime(), - 'cctvView':this.judgeCctvView() + 'cctvView':this.judgeCctvView(), + 'digitalStand':this.judgeDigitalStand() }; - const list = ['messageBoard', 'contectUs', 'jlmap3dmodel', 'modifySysTime', 'cctvView']; + const list = ['messageBoard', 'contectUs', 'jlmap3dmodel', 'modifySysTime', 'cctvView', 'digitalStand']; this.menuList = this.menuMap[this.mode]; this.menuList.map(each=>{ each.children && each.children.map(menu=>{ @@ -247,6 +248,13 @@ export default { judgeModifySysTime() { return this.datie; }, + judgeDigitalStand() { + // demon + const ignoreProject = ['bjd', 'teaching', 'drts']; + const includejlmap3dmodel = ['demon', 'joint']; + return includejlmap3dmodel.includes(this.mode) && !ignoreProject.includes(this.project) && + this.lineCode != '16' && !this.isShowScheduling && !this.isDrive; + }, // cctv 视图 judgeCctvView() { // demon @@ -331,6 +339,21 @@ export default { } }, + // 数字沙盘 + digitalStand() { + this.hideMenuList(); + const routeData = this.$router.resolve({ + path:'/jlmap3d/sandbox', + query:{ + mapid:this.mapId, + group:this.group, + token:getToken(), + project: this.project, + noPreLogout: true + } + }); + window.open(routeData.href, '_blank'); + }, // 联系我们弹窗 contectUs() { this.hideMenuList();