diff --git a/src/views/newMap/display/simulationMenu/simulationMenu.vue b/src/views/newMap/display/simulationMenu/simulationMenu.vue index 1f1704596..6b706615d 100644 --- a/src/views/newMap/display/simulationMenu/simulationMenu.vue +++ b/src/views/newMap/display/simulationMenu/simulationMenu.vue @@ -227,7 +227,9 @@ export default { this.logout(); // }); } else if (this.$route.query.third) { - if (this.$route.query.project === 'cgy' || this.$route.query.project === 'drts') { + if (this.$route.query.thirdOpen) { + window.close(); + } else if (this.$route.query.project === 'cgy' || this.$route.query.project === 'drts') { window.parent.postMessage('back', '*'); } else { window.close(); diff --git a/src/views/newMap/newMapdraft/mapoperate/terminals/terminals.vue b/src/views/newMap/newMapdraft/mapoperate/terminals/terminals.vue index 3a02cb045..6e8022e90 100644 --- a/src/views/newMap/newMapdraft/mapoperate/terminals/terminals.vue +++ b/src/views/newMap/newMapdraft/mapoperate/terminals/terminals.vue @@ -369,6 +369,11 @@ export default { name: '列车PIS', code: 'pisTrain', isShow: () => type === 'METRO' + }, + { + name: '运行图测试', + code: 'testRunplan', + isShow: () => type === 'METRO' } ]; const terminalList = commonTerminals(type); diff --git a/src/views/thirdLogin/cgyLogin.vue b/src/views/thirdLogin/cgyLogin.vue index 69f83fdf6..a85e4cd28 100644 --- a/src/views/thirdLogin/cgyLogin.vue +++ b/src/views/thirdLogin/cgyLogin.vue @@ -27,13 +27,13 @@ export default { } }, mounted() { - const appId = this.$route.query.appId; - const sessionId = this.$route.query.sessionId; + const appId = this.$route.query.app_id; + const sessionId = this.$route.query.session_id; const timeStamp = this.$route.query.timeStamp; - const account = this.$route.query.account; - const name = this.$route.query.name; + const account = this.$route.query.user_name; + const name = this.$route.query.nick_name; const parentAccount = this.$route.query.parentAccount; - const functionId = this.$route.query.functionId; + const functionId = this.$route.query.systemId; if (appId && account && name) { const data = { appId, @@ -63,7 +63,8 @@ export default { async enterSimulation() { const query = { third: true, - query: 'cgy' + project: 'cgy', + thirdOpen: true }; const resp = await getMapFunctioById(this.$route.query.systemId); query.mapId = resp.data.mapId;