diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 76ba54596..ef9ca4e1b 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -482,14 +482,27 @@ export default {
                                 projectDevice: this.$route.query.projectDevice,
                                 type: this.$route.query.type} });
                         } else if (this.$route.query.type == 'CCTV') {
-                            this.$router.push({ path: `/jlmap3d/passengerflow`, query:{
-                                mapid:resp.data.map.id,
-                                group:res.data.group,
-                                lineCode: resp.data.map.lineCode,
-                                project: getSessionStorage('project'),
-                                projectDevice: this.$route.query.projectDevice,
-                                type: this.$route.query.type
-                            } });
+                            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,
+                                    lineCode: resp.data.map.lineCode,
+                                    project: getSessionStorage('project'),
+                                    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,
@@ -567,12 +580,11 @@ export default {
                         });
                     }
                 });
-            }else if(this.project === 'zzwwtest'){
-              this.$router.push({ path: '/design/jlmap3d/lesson3dplayer', query: {lessonId:'31'} });
-            }
-            else if(this.project === 'richorlesson3d'){
-              this.$router.push({ path: '/jlmap3d/lesson3dselect', query: {} });
-            }else {
+            } else if (this.project === 'zzwwtest') {
+                this.$router.push({ path: '/design/jlmap3d/lesson3dplayer', query: {lessonId:'31'} });
+            } else if (this.project === 'richorlesson3d') {
+                this.$router.push({ path: '/jlmap3d/lesson3dselect', query: {} });
+            } else {
                 if (this.teacherLogin) {
                     this.$router.push({ path: '/info/organization/classManage?enter=teacher' });
                 } else {
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 5238edfa4..b7cd67993 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -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');
-            }
+            this.$emit('passflow');
         },
         jumpjl3dtrafficplan() {
             const routeData = this.$router.resolve({