From d7536a951247ccebcf717cb7a3cf63a08e7a15a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=8D=9A=E6=96=87?= <1179111926@qq.com> Date: Thu, 7 Aug 2025 17:56:57 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/projects/vgpu/views/node/admin/Detail.vue | 12 ++++++------ .../web/projects/vgpu/views/node/admin/index.vue | 8 ++++---- .../web/projects/vgpu/views/poll/admin/Detail.vue | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/web/projects/vgpu/views/node/admin/Detail.vue b/packages/web/projects/vgpu/views/node/admin/Detail.vue index f3e7bd3..6a617cd 100644 --- a/packages/web/projects/vgpu/views/node/admin/Detail.vue +++ b/packages/web/projects/vgpu/views/node/admin/Detail.vue @@ -342,19 +342,19 @@ const detailColumns = [ }, { label: 'CPU大小', - value: 'coreTotal', - render: ({ coreTotal }) => ( + value: 'cpuCores', + render: ({ cpuCores }) => ( - {`${coreTotal}核`} + {`${cpuCores}核`} ), }, { label: '内存大小', - value: 'memoryTotal', - render: ({ memoryTotal }) => ( + value: 'totalMemory', + render: ({ totalMemory }) => ( - {`${bytesToGB(memoryTotal)}GiB`} + {`${bytesToGB(totalMemory)}GiB`} ), }, diff --git a/packages/web/projects/vgpu/views/node/admin/index.vue b/packages/web/projects/vgpu/views/node/admin/index.vue index b2bab7d..5992769 100644 --- a/packages/web/projects/vgpu/views/node/admin/index.vue +++ b/packages/web/projects/vgpu/views/node/admin/index.vue @@ -158,13 +158,13 @@ const columns = [ }, { title: 'CPU', - dataIndex: 'coreTotal', - render: ({ coreTotal }) => `${coreTotal}核`, + dataIndex: 'cpuCores', + render: ({ cpuCores }) => `${cpuCores}核`, }, { title: '内存', - dataIndex: 'memoryTotal', - render: ({ memoryTotal }) => `${bytesToGB(memoryTotal)}GiB`, + dataIndex: 'totalMemory', + render: ({ totalMemory }) => `${bytesToGB(totalMemory)}GiB`, }, { title: '磁盘', diff --git a/packages/web/projects/vgpu/views/poll/admin/Detail.vue b/packages/web/projects/vgpu/views/poll/admin/Detail.vue index eca3d3a..04abb37 100644 --- a/packages/web/projects/vgpu/views/poll/admin/Detail.vue +++ b/packages/web/projects/vgpu/views/poll/admin/Detail.vue @@ -81,13 +81,13 @@ const columns = [ }, { title: 'CPU', - dataIndex: 'coreTotal', - render: ({ coreTotal }) => `${coreTotal}核`, + dataIndex: 'cpuCores', + render: ({ cpuCores }) => `${cpuCores}核`, }, { title: '内存', - dataIndex: 'memoryTotal', - render: ({ memoryTotal }) => `${bytesToGB(memoryTotal)}GiB`, + dataIndex: 'totalMemory', + render: ({ totalMemory }) => `${bytesToGB(totalMemory)}GiB`, }, { title: '磁盘', From aa659d93871e581db94dd155b47b875428856984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=8D=9A=E6=96=87?= <1179111926@qq.com> Date: Thu, 7 Aug 2025 18:02:50 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=A4=9A=E4=B8=AA=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/web/src/components/TimePicker.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/web/src/components/TimePicker.vue b/packages/web/src/components/TimePicker.vue index 9289cc0..5fe5fb8 100644 --- a/packages/web/src/components/TimePicker.vue +++ b/packages/web/src/components/TimePicker.vue @@ -7,6 +7,7 @@ start-placeholder="开始时间" end-placeholder="结束时间" unlink-panels + :teleported="false" :shortcuts="type.includes('range') && shortcuts" class="date-picker" :disabled-date="disabledDate" From 4f4972c0d02309313c99336418a9059cb1c1801a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=8D=9A=E6=96=87?= <1179111926@qq.com> Date: Thu, 7 Aug 2025 18:15:05 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projects/vgpu/components/previewBar.vue | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/web/projects/vgpu/components/previewBar.vue b/packages/web/projects/vgpu/components/previewBar.vue index 797f031..cb5bf41 100644 --- a/packages/web/projects/vgpu/components/previewBar.vue +++ b/packages/web/projects/vgpu/components/previewBar.vue @@ -57,20 +57,20 @@ const echartsRef = ref(); const totalTop = { title: `${props.title}资源分配率 Top5`, config: [ - props.type === 'node' && { - tab: 'CPU', - key: 'cpu', - nameKey: 'instance', - data: [], - query: `topk(5, sum(hami_container_vcore_allocated) by (instance) / sum(hami_core_size) by (instance) * 100)`, - }, - props.type === 'node' && { - tab: '内存', - key: 'internal', - nameKey: 'instance', - data: [], - query: `topk(5, sum(hami_container_vmemory_allocated) by (instance) / sum(hami_memory_size) by (instance) * 100)`, - }, + // props.type === 'node' && { + // tab: 'CPU', + // key: 'cpu', + // nameKey: 'instance', + // data: [], + // query: `topk(5, sum(hami_container_vcore_allocated) by (instance) / sum(hami_core_size) by (instance) * 100)`, + // }, + // props.type === 'node' && { + // tab: '内存', + // key: 'internal', + // nameKey: 'instance', + // data: [], + // query: `topk(5, sum(hami_container_vmemory_allocated) by (instance) / sum(hami_memory_size) by (instance) * 100)`, + // }, { tab: 'vGPU', key: 'vgpu', From c7c8f36b2f9e93582ea23be1d0e1f95b249ad295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=8D=9A=E6=96=87?= <1179111926@qq.com> Date: Thu, 7 Aug 2025 18:19:44 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=A4=9A=E4=B8=AA=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vgpu/views/monitor/overview/index.vue | 2 +- packages/web/src/components/TimePicker.vue | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/packages/web/projects/vgpu/views/monitor/overview/index.vue b/packages/web/projects/vgpu/views/monitor/overview/index.vue index a5661ec..e41d2ea 100644 --- a/packages/web/projects/vgpu/views/monitor/overview/index.vue +++ b/packages/web/projects/vgpu/views/monitor/overview/index.vue @@ -44,7 +44,7 @@ diff --git a/packages/web/src/components/TimePicker.vue b/packages/web/src/components/TimePicker.vue index 5fe5fb8..71fafaf 100644 --- a/packages/web/src/components/TimePicker.vue +++ b/packages/web/src/components/TimePicker.vue @@ -7,8 +7,9 @@ start-placeholder="开始时间" end-placeholder="结束时间" unlink-panels - :teleported="false" :shortcuts="type.includes('range') && shortcuts" + :teleported="false" + :append-to-body="false" class="date-picker" :disabled-date="disabledDate" @visible-change="onVisibleChange" @@ -19,7 +20,7 @@