From 8fa31fe0c21bb44177df940b12e15496250c7265 Mon Sep 17 00:00:00 2001
From: feng <1304903146@qq.com>
Date: Mon, 26 Feb 2024 16:24:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B7=B3=E8=BD=AC=E5=88=B0=20luna=20?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/NavHeader/WebTerminal.vue | 3 ++-
 src/views/myassets/index.vue                    | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/layout/components/NavHeader/WebTerminal.vue b/src/layout/components/NavHeader/WebTerminal.vue
index 7af627978..3ecfb72f1 100644
--- a/src/layout/components/NavHeader/WebTerminal.vue
+++ b/src/layout/components/NavHeader/WebTerminal.vue
@@ -11,7 +11,8 @@ export default {
   name: 'WebTerminal',
   computed: {
     webTerminalUrl() {
-      let url = `${BASE_URL}/luna/?_=${Date.now()}`
+      const oid = this.$store.getters.currentOrg ? this.$store.getters.currentOrg.id : ''
+      let url = `${BASE_URL}/luna/?_=${Date.now()}${oid ? `&oid=${oid}` : ''}`
       if (process.env.NODE_ENV !== 'production') {
         url = url.replace('9528', '4200')
       }
diff --git a/src/views/myassets/index.vue b/src/views/myassets/index.vue
index d07e69d0d..046b043b9 100644
--- a/src/views/myassets/index.vue
+++ b/src/views/myassets/index.vue
@@ -138,7 +138,9 @@ export default {
                   type: 'primary',
                   can: ({ row }) => row.is_active,
                   callback: ({ row }) => {
-                    window.open(`/luna/?login_to=${row.id}`, '_blank')
+                    const oid = this.$store.getters.currentOrg ? this.$store.getters.currentOrg.id : ''
+                    const url = `/luna/?login_to=${row.id}${oid ? `&oid=${oid}` : ''}`
+                    window.open(url, '_blank')
                   }
                 },
                 {