Merge remote-tracking branch 'origin/develop' into local-test

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();

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);

src/views/thirdLogin/cgyLogin.vue

@@ -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;