成都工业跳转调度大赛

src/utils/baseUrl.js

@@ -23,8 +23,8 @@ export function handlerUrl(data) {
     let BASE_SITE;
     if (process.env.NODE_ENV === 'development') {
         // const data = null;
-        // BASE_API = 'https://joylink.club/jlcloud';
+        BASE_API = 'https://joylink.club/jlcloud';
-        BASE_API = 'https://test.joylink.club/jlcloud';
+        // BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.233/rtss-server';
         // BASE_API = 'http://114.116.51.125/jlcloud';
         // BASE_API = 'http://192.168.3.90:9000'; // 周寅
@@ -35,8 +35,8 @@ export function handlerUrl(data) {
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
         // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛
-        // BASE_API = data && data.domainName ? 'https://' + data.domainName : BASE_API;
+        BASE_API = data && data.domainName ? 'https://' + data.domainName : BASE_API;
-        BASE_API = data && data.domainName ? 'http://' + data.domainName : BASE_API;
+        // BASE_API = data && data.domainName ? 'http://' + data.domainName : BASE_API;
         VOICE_API = data && data.resourcesDomainName ? 'https://' + data.resourcesDomainName : 'https://joylink.club/oss/joylink';
         UPLOAD_API = 'http://joylink.club/jlfile';
         BASE_SITE = 'https://test.joylink.club/cbtc';

src/views/login/index.vue

@@ -274,7 +274,11 @@ export default {
         },
         syncLogin() {
             const synchronousLogin = ['VR_IBP', 'LSW', 'CCTV', 'ISCS_LW', 'ISCS_CW', 'VR_PSD', 'SANDBOX', 'ILW', 'PIS_STAND', 'PIS_TRAIN'];
-            return this.$route.query.type ? synchronousLogin.includes(this.$route.query.type) : false;
+            if (this.$route.query.thirdJump && this.$route.query.key && this.$route.query.group) {
+                return true;
+            } else {
+                return this.$route.query.type ? synchronousLogin.includes(this.$route.query.type) : false;
+            }
         },
         loadingText() {
             const textMap = {
@@ -322,7 +326,9 @@ export default {
     },
     mounted() {
         document.title = loginInfo[this.project].browserTitle || loginInfo[this.project].title;
-        if (this.syncLogin || !this.noQrcodeList.includes(this.project)) {
+        if (this.$route.query.thirdJump && this.$route.query.key && this.$route.query.group) {
+            this.thirdJump(this.$route.query.key, this.$route.query.group);
+        } else if (this.syncLogin || !this.noQrcodeList.includes(this.project)) {
             this.loginRefresh();
         }
     },
@@ -377,6 +383,29 @@ export default {
                 }
             });
         },
+        thirdJump(token, group) {
+            debugger;
+            this.$store.dispatch('QrLoginSetting', { key: 'SET_TOKEN', value: token, type: this.modelType }).then(() => {
+                // 清除定时器，设置路由
+                this.clearTimer(this.checkLogin);
+                getLoginInfo(getToken()).then(res => {
+                    getSimulationInfoNew(group).then(resp => {
+                        this.$router.push({ path: `/displayNew/demon`, query: {
+                            lineCode: resp.data.map.lineCode,
+                            group: group,
+                            prdType: resp.data.prodType,
+                            mapId: resp.data.map.id,
+                            goodsId:'',
+                            try:'0',
+                            thirdDrts:1,
+                            project:this.project
+                        }});
+                    });
+                }).catch(() => {
+                    this.$messageBox('获取数据失败！');
+                });
+            });
+        },
         checkLoginStatus() {
             const self = this;
             // 销毁则不再定时

src/views/newMap/displayBaSiDi/index.vue

@@ -87,10 +87,10 @@ export default {
             return getSessionStorage('project');
         },
         isDemon() {
-            return this.mode === 'demon' && !this.project.includes('drts');
+            return this.mode === 'demon' && !(this.project.includes('drts') || this.$route.query.thirdDrts);
         },
         isContest() {
-            return this.mode === 'demon' && this.project.includes('drts');
+            return this.mode === 'demon' && (this.project.includes('drts') || this.$route.query.thirdDrts);
         },
         mapId() {
             return this.$route.query.mapId;

src/views/newMap/displayCity/demonMenu.vue

@@ -116,7 +116,7 @@ export default {
             return getSessionStorage('project');
         },
         isContest() {
-            return this.$route.params.mode === 'demon' && this.project.includes('drts');
+            return this.$route.params.mode === 'demon' && (this.project.includes('drts') || this.$route.query.thirdDrts);
         },
         running() {
             return this.$store.state.training.started;

src/views/newMap/displayCity/index.vue

@@ -57,10 +57,10 @@ export default {
             return getSessionStorage('project');
         },
         isDemon() {
-            return this.mode === 'demon' && !this.project.includes('drts');
+            return this.mode === 'demon' && !(this.project.includes('drts') || this.$route.query.thirdDrts);
         },
         isContest() {
-            return this.mode === 'demon' && this.project.includes('drts');
+            return this.mode === 'demon' && (this.project.includes('drts') || this.$route.query.thirdDrts);
         },
         isExam() {
             return this.mode === 'exam';

src/views/newMap/displayNew/demonMenu.vue

@@ -136,7 +136,7 @@ export default {
             return getSessionStorage('project');
         },
         isContest() {
-            return this.$route.params.mode === 'demon' && this.project.includes('drts');
+            return this.$route.params.mode === 'demon' && (this.project.includes('drts') || this.$route.query.thirdDrts);
         },
         running() {
             return this.$store.state.training.started;
@@ -145,7 +145,7 @@ export default {
             return process.env.VUE_APP_PRO === 'local';
         },
         isCtc() {
-        	return this.$route.query.ctc;
+            return this.$route.query.ctc;
         }
     },
     mounted() {

src/views/newMap/displayNew/dispatherContest/index.vue

@@ -460,9 +460,13 @@ export default {
             clearSimulation(this.group).then(res=>{
                 this.isGoback = true;
                 this.$store.dispatch('training/over').then(() => {
-                    this.$store.dispatch('LogOut').then(() => {
+                    if (this.$route.query.thirdDrts) {
-                        location.reload();
+                        window.close();
-                    });
+                    } else {
+                        this.$store.dispatch('LogOut').then(() => {
+                            location.reload();
+                        });
+                    }
                 });
             }).catch(()=> {
                 this.$message.error('结束仿真失败！');

src/views/newMap/displayNew/index.vue

@@ -71,10 +71,10 @@ export default {
             return getSessionStorage('project');
         },
         isDemon() {
-            return this.mode === 'demon' && !this.project.includes('drts');
+            return this.mode === 'demon' && !(this.project.includes('drts') || this.$route.query.thirdDrts);
         },
         isContest() {
-            return this.mode === 'demon' && this.project.includes('drts');
+            return this.mode === 'demon' && (this.project.includes('drts') || this.$route.query.thirdDrts);
         },
         isExam() {
             return this.mode === 'exam';

src/views/newMap/displayNew/menuSchema.vue

@@ -145,7 +145,7 @@ export default {
             return this.$route.query.lineCode === '16' && this.$store.state.training.prdType === '02';
         },
         isContest() {
-            return this.project.includes('drts');
+            return this.project.includes('drts') || this.$route.query.thirdDrts;
         },
         isAdmin() {
             return this.$store.state.user.roles.includes('04') || this.$store.state.user.roles.includes('05');