From f6fd9a5edf9e4c9c4f983b7cab54f4ed00b601b1 Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Wed, 12 Jul 2023 15:29:17 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=B7=BB=E5=8A=A0=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/pages/manage.vue          | 5 +++--
 resources/assets/js/pages/manage/microapp.vue | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index c4996c004..1cb9895e1 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -781,10 +781,11 @@ export default {
                     return;
                 case 'okrManage':
                 case 'okrAnalyze':
+                    let query = { url: import.meta.env.VITE_OKR_WEB_URL || "/manage/microapp/okr/" } 
                     if(path=='okrManage'){
-                        this.goForward({path: '/manage/microapp/' });
+                        this.goForward({  path: '/manage/microapp/', query });
                     }else{
-                        this.goForward({path: '/manage/microapp/#/main' });
+                        this.goForward({ path: '/manage/microapp/#/main', query });
                     }
                     return;
                 case 'logout':
diff --git a/resources/assets/js/pages/manage/microapp.vue b/resources/assets/js/pages/manage/microapp.vue
index 1a3c624e5..2f126f5dd 100644
--- a/resources/assets/js/pages/manage/microapp.vue
+++ b/resources/assets/js/pages/manage/microapp.vue
@@ -7,7 +7,6 @@
         </transition>
         <micro-app name='micro-app' v-if="microAppUrl && !loading"
             :url='microAppUrl' 
-            baseRoute="/main" 
             inline 
             destroy
             disableSandbox 
@@ -34,7 +33,7 @@ export default {
     data() {
         return {
             loading: false,
-            microAppUrl: 'http://localhost:5567/manage/microapp/#/main',
+            microAppUrl: '',
             microAppData: {}
         }
     },
@@ -50,6 +49,7 @@ export default {
                     this.loading = true;
                     this.$nextTick(()=>{
                         this.loading = false;
+                        this.microAppUrl = this.$route.query.url
                         window.eventCenterForAppNameVite = new EventCenterForMicroApp("micro-app")
                     })
                 }