joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

中航锐创 实训平台 虚拟cctv页面调整

Browse Source
This commit is contained in:
joylink_cuiweidong 2021-09-10 16:13:15 +08:00
parent 9ce42ff199
commit 76854d925c
2 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/login/index.vue
View File

@ -482,6 +482,18 @@ export default {
projectDevice: this.$route.query.projectDevice,
type: this.$route.query.type} });
} else if (this.$route.query.type == 'CCTV') {
if (this.project == 'richorjoint') {
this.$router.push({
path:'/jointTrainingNewCCTV',
query:{
mapid:resp.data.map.id,
group:res.data.group,
project: getSessionStorage('project'),
projectDevice: this.$route.query.projectDevice,
type: this.$route.query.type
}
});
} else {
this.$router.push({ path: `/jlmap3d/passengerflow`, query:{
mapid:resp.data.map.id,
group:res.data.group,
@ -490,6 +502,7 @@ export default {
projectDevice: this.$route.query.projectDevice,
type: this.$route.query.type
} });
}
} else if (this.$route.query.type === 'DEPOT') {
this.$router.push({ path: `/displayNew/demon`, query: {
group: res.data.group,
@ -569,8 +582,7 @@ export default {
});
} else if (this.project === 'zzwwtest') {
this.$router.push({ path: '/design/jlmap3d/lesson3dplayer', query: {lessonId:'31'} });
}
else if(this.project === 'richorlesson3d'){
} else if (this.project === 'richorlesson3d') {
this.$router.push({ path: '/jlmap3d/lesson3dselect', query: {} });
} else {
if (this.teacherLogin) {

14
src/views/newMap/jointTrainingNew/menuDemon.vue
View File

@ -409,21 +409,7 @@ export default {
this.$emit('hidejl3dcctv');
},
jumpjl3dpassflow() {
if (this.project == 'richorjoint') {
const routeData = this.$router.resolve({
path:'/jointTrainingNewCCTV',
query:{
mapid:this.mapId,
group:this.group,
project: this.project,
noPreLogout: true,
lineCode:this.lineCode
}
});
window.open(routeData.href, '_blank');
} else {
this.$emit('passflow');
}
},
jumpjl3dtrafficplan() {
const routeData = this.$router.resolve({