From 37e0779d238432de6a2ffac3a3b65cb1e558105e Mon Sep 17 00:00:00 2001
From: joylink_fanyuhong <18706759286@163.com>
Date: Tue, 4 Jun 2024 11:42:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E9=83=BD=E5=B7=A5=E4=B8=9A=E5=AD=A6?=
 =?UTF-8?q?=E9=99=A2=E7=AC=AC=E4=B8=89=E6=96=B9=E6=96=B0=E5=BC=80=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=85=B3=E9=97=AD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/display/simulationMenu/simulationMenu.vue | 4 +++-
 src/views/thirdLogin/cgyLogin.vue                          | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

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/thirdLogin/cgyLogin.vue b/src/views/thirdLogin/cgyLogin.vue
index d2cca5a8a..a85e4cd28 100644
--- a/src/views/thirdLogin/cgyLogin.vue
+++ b/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;