diff --git a/web/components/common.js b/web/components/common.js index 03c9968..bd50dc1 100644 --- a/web/components/common.js +++ b/web/components/common.js @@ -691,7 +691,7 @@ function flinkJobDialog() { type: 'action', label: '打开同步详情', actionType: 'dialog', - dialog: simpleYarnDialog('b5-sync', '同步详情', 'syncJobName') + dialog: simpleYarnDialog('b12', '同步详情', 'syncJobName') }, {type: 'divider'}, { @@ -1124,14 +1124,14 @@ function tableMetaDialog() { type: 'button', icon: 'fa fa-arrows-rotate', actionType: 'dialog', - dialog: simpleYarnDialog('b5-sync', '同步详情', 'syncJobName') + dialog: simpleYarnDialog('b12', '同步详情', 'syncJobName') }, { label: '压缩情况', type: 'action', icon: 'fa fa-minimize', actionType: 'dialog', - dialog: simpleYarnDialog('b1', '压缩详情', 'compactionJobName') + dialog: simpleYarnDialog('b12,b1,b5,a4', '压缩详情', 'compactionJobName') }, { label: '历史压缩', diff --git a/web/components/overview-tab.js b/web/components/overview-tab.js index 62fedc6..273eb3f 100644 --- a/web/components/overview-tab.js +++ b/web/components/overview-tab.js @@ -165,7 +165,7 @@ function overviewYarnJob(cluster, search, queue, yarnQueue) { '(', { type: 'tpl', - tpl: "${PADSTART(total, 4)}", + tpl: "${PADSTART(total, 5)}", }, ',', { @@ -180,7 +180,7 @@ function overviewYarnJob(cluster, search, queue, yarnQueue) { ',', { type: 'tpl', - tpl: '${PADSTART(failure, 3)}', + tpl: '${PADSTART(failure, 4)}', }, ')', ] @@ -230,7 +230,7 @@ function overviewTab() { ] }, {type: 'divider'}, - '集群 (集群总资源使用,队列资源使用)(总压缩任务数,调度中任务数,运行中任务数,失败任务数)', + '集群 (集群总资源使用,队列资源使用)(总任务数,调度中任务数,运行中任务数,失败任务数)', overviewYarnJob('b5-sync', 'Sync', undefined, 'default'), overviewYarnJob('b12', 'Sync', undefined, 'default'), {type: 'divider'}, @@ -247,11 +247,11 @@ function overviewTab() { } ] }, - '集群 压缩队列任务数(集群总资源使用,队列资源使用)(总压缩任务数,调度中任务数,运行中任务数,失败任务数)', + '集群 压缩队列任务数(集群总资源使用,队列资源使用)(总任务数,调度中任务数,运行中任务数,失败任务数)', + overviewYarnJob('b12', 'Compaction', 'compaction-queue-b12', 'default'), overviewYarnJob('b1', 'Compaction', 'compaction-queue-b1', 'datalake'), overviewYarnJob('b5', 'Compaction', 'compaction-queue-b5', 'ten_iap.datalake'), overviewYarnJob('a4', 'Compaction', 'compaction-queue-a4', 'ten_iap.datalake'), - overviewYarnJob('b12', 'Compaction', 'compaction-queue-b12', 'default'), {type: 'divider'}, { type: 'service', diff --git a/web/components/queue-tab.js b/web/components/queue-tab.js index d9d287c..9a0874e 100644 --- a/web/components/queue-tab.js +++ b/web/components/queue-tab.js @@ -66,6 +66,8 @@ function queueTab() { title: '压缩队列', tab: [ queueCrud('compaction-queue-pre'), + yarnQueueCrud('b12', 'default'), + queueCrud('compaction-queue-b12'), yarnQueueCrud('b1', 'datalake'), queueCrud('compaction-queue-b1'), yarnQueueCrud('b5', 'ten_iap.datalake'), diff --git a/web/index.html b/web/index.html index 7a99595..9009997 100644 --- a/web/index.html +++ b/web/index.html @@ -68,9 +68,8 @@ tableTab(), queueTab(), versionTab(), - yarnTab('b5-sync', '同步 b5', undefined, 'Sync'), - yarnTab('b12', '同步 b12', undefined, 'Sync'), - yarnTab('b1,b5,a4,b12', '压缩 b1 b5 a4 b12', 'datalake,ten_iap.datalake,default', 'Compaction'), + yarnTab('b12', '同步', undefined, 'Sync'), + yarnTab('b12,b1,b5,a4', '压缩', 'datalake,ten_iap.datalake,default', 'Compaction'), cloudTab(), yarnClusterTab(), toolTab(),