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

Merge remote-tracking branch 'origin/develop'
All checks were successful
master分支构建发布到公网服务器 / Build-Publish (push) Successful in 7m6s
Details

Browse Source
This commit is contained in:
joylink_fanyuhong 2024-06-18 15:56:31 +08:00
commit 0147f270f2
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/newMap/display/simulationMenu/simulationMenu.vue
View File

@ -227,7 +227,9 @@ export default {
this.logout(); this.logout();
// }); // });
} else if (this.$route.query.third) { } 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', '*'); window.parent.postMessage('back', '*');
} else { } else {
window.close(); window.close();

5
src/views/newMap/newMapdraft/mapoperate/terminals/terminals.vue
View File

@ -369,6 +369,11 @@ export default {
name: '列车PIS', name: '列车PIS',
code: 'pisTrain', code: 'pisTrain',
isShow: () => type === 'METRO' isShow: () => type === 'METRO'
},
{
name: '运行图测试',
code: 'testRunplan',
isShow: () => type === 'METRO'
} }
]; ];
const terminalList = commonTerminals(type); const terminalList = commonTerminals(type);

13
src/views/thirdLogin/cgyLogin.vue
View File

@ -27,13 +27,13 @@ export default {
} }
}, },
mounted() { mounted() {
const appId = this.$route.query.appId; const appId = this.$route.query.app_id;
const sessionId = this.$route.query.sessionId; const sessionId = this.$route.query.session_id;
const timeStamp = this.$route.query.timeStamp; const timeStamp = this.$route.query.timeStamp;
const account = this.$route.query.account; const account = this.$route.query.user_name;
const name = this.$route.query.name; const name = this.$route.query.nick_name;
const parentAccount = this.$route.query.parentAccount; const parentAccount = this.$route.query.parentAccount;
const functionId = this.$route.query.functionId; const functionId = this.$route.query.systemId;
if (appId && account && name) { if (appId && account && name) {
const data = { const data = {
appId, appId,
@ -63,7 +63,8 @@ export default {
async enterSimulation() { async enterSimulation() {
const query = { const query = {
third: true, third: true,
query: 'cgy' project: 'cgy',
thirdOpen: true
}; };
const resp = await getMapFunctioById(this.$route.query.systemId); const resp = await getMapFunctioById(this.$route.query.systemId);
query.mapId = resp.data.mapId; query.mapId = resp.data.mapId;