From ba397c05af528df4522b055a9a5f78647c4d4df4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= <ypgaop@isoftstone.com>
Date: Sat, 3 Aug 2024 00:57:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E9=93=BE=E8=B7=AF:=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=80=80=E5=87=BA=E8=A1=A8=E6=A0=BC=E5=90=8E=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E9=A6=96=E9=A1=B5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/dasadmin/src/layouts/backend/index.vue     |  3 +++
 ui/dasadmin/src/router/static.ts              |  2 +-
 ui/dasadmin/src/views/backend/node/univer.vue | 14 +++++---------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/ui/dasadmin/src/layouts/backend/index.vue b/ui/dasadmin/src/layouts/backend/index.vue
index 4fe4a30e..c4d6e278 100644
--- a/ui/dasadmin/src/layouts/backend/index.vue
+++ b/ui/dasadmin/src/layouts/backend/index.vue
@@ -385,6 +385,9 @@ const init = () => {
             }
         }
 
+        if (router.currentRoute.value.query?.stopToFirstRoute) {
+            return
+        }
         // 跳转到第一个菜单
         let firstRoute = getFirstRoute(navTabs.state.tabsViewRoutes)
         if (firstRoute) routePush(firstRoute.path)
diff --git a/ui/dasadmin/src/router/static.ts b/ui/dasadmin/src/router/static.ts
index 7c075b2e..f42588e8 100644
--- a/ui/dasadmin/src/router/static.ts
+++ b/ui/dasadmin/src/router/static.ts
@@ -66,7 +66,7 @@ const staticRoutes: Array<RouteRecordRaw> = [
         },
     },
     {
-        path: '/univer',
+        path: adminBaseRoutePath + '/univer',
         name: 'univer',
         component: () => import('/@/views/backend/node/univer.vue'),
     },
diff --git a/ui/dasadmin/src/views/backend/node/univer.vue b/ui/dasadmin/src/views/backend/node/univer.vue
index 837abdcd..c88eb312 100644
--- a/ui/dasadmin/src/views/backend/node/univer.vue
+++ b/ui/dasadmin/src/views/backend/node/univer.vue
@@ -365,8 +365,8 @@ const tipsPos = reactive({
 const saveExcelData = () => {
     const data = getData()
     const val = createUpLoadExcelData(data)
-    console.log(val);
-    
+    console.log(val)
+
     saveMappingList(val)
 }
 
@@ -398,8 +398,8 @@ const getMappingList = () => {
         data.forEach((item) => {
             result = { ...result, ...item }
         })
-        console.log(result);
-        
+        console.log(result)
+
         return result
     })
 }
@@ -467,11 +467,7 @@ const resetExcel = () => {
 }
 
 const goToNodePage = () => {
-    router.push({ path: route.query.prevPath as string })
-    
-    // console.log(router.getRoutes());
-    
-    // router.go(-1)
+    router.push({ path: route.query.prevPath as string, query: { stopToFirstRoute: 1 } })
 }
 
 onMounted(() => {