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 = [ }, }, { - 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(() => {