diff --git a/service-web/client/src/pages/overview/Yarn.tsx b/service-web/client/src/pages/overview/Yarn.tsx
index 9c54aac..3776fb2 100644
--- a/service-web/client/src/pages/overview/Yarn.tsx
+++ b/service-web/client/src/pages/overview/Yarn.tsx
@@ -1,16 +1,16 @@
import React from 'react'
import {useLocation, useParams} from 'react-router'
import {
- amisRender,
- commonInfo,
- crudCommonOptions,
- paginationCommonOptions,
- yarnCrudColumns,
- yarnQueueCrud,
+ amisRender,
+ commonInfo,
+ crudCommonOptions,
+ paginationCommonOptions,
+ yarnCrudColumns,
+ yarnQueueCrud,
} from '../../util/amis.tsx'
const Yarn: React.FC = () => {
- const {clusters, queue, search} = useParams()
+ const {clusters, queues, search} = useParams()
const location = useLocation()
return (
@@ -27,7 +27,7 @@ const Yarn: React.FC = () => {
type: 'tpl',
tpl: '集群资源',
},
- yarnQueueCrud(clusters, queue),
+ yarnQueueCrud(clusters, queues),
{
type: 'tpl',
tpl: '集群任务',
diff --git a/service-web/client/src/route.tsx b/service-web/client/src/route.tsx
index 2f59422..bec51f4 100644
--- a/service-web/client/src/route.tsx
+++ b/service-web/client/src/route.tsx
@@ -31,6 +31,7 @@ import YarnCluster from './pages/overview/YarnCluster.tsx'
import {commonInfo} from './util/amis.tsx'
import Test from './pages/Test.tsx'
import Feedback from './pages/ai/feedback/Feedback.tsx'
+import {values} from 'licia'
export const routes: RouteObject[] = [
{
@@ -58,7 +59,7 @@ export const routes: RouteObject[] = [
Component: Version,
},
{
- path: 'yarn/:clusters/:queue/:search?',
+ path: 'yarn/:clusters/:queues/:search?',
Component: Yarn,
},
{
@@ -146,12 +147,12 @@ export const menus = {
icon: ,
},
{
- path: `/yarn/${commonInfo.clusters.sync_names()}/root/Sync`,
+ path: `/yarn/${commonInfo.clusters.sync_names()}/default/Sync`,
name: '同步集群',
icon: ,
},
{
- path: `/yarn/${commonInfo.clusters.compaction_names()}/default/Compaction`,
+ path: `/yarn/${commonInfo.clusters.compaction_names()}/${values(commonInfo.clusters.compaction).join(",")}/Compaction`,
name: '压缩集群',
icon: ,
},