From 22f3d1bb8f282f7deaee7ba30b0f5528dcd406a5 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 19:10:17 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/web/projects/vgpu/views/card/admin/Detail.vue | 1 +
 packages/web/projects/vgpu/views/card/admin/index.vue  | 4 ++++
 packages/web/projects/vgpu/views/node/admin/Detail.vue | 1 +
 packages/web/projects/vgpu/views/node/admin/index.vue  | 2 ++
 packages/web/projects/vgpu/views/poll/admin/Detail.vue | 1 +
 packages/web/projects/vgpu/views/task/admin/index.vue  | 8 +++++++-
 6 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/packages/web/projects/vgpu/views/card/admin/Detail.vue b/packages/web/projects/vgpu/views/card/admin/Detail.vue
index 1f9ee21..e05fa0e 100644
--- a/packages/web/projects/vgpu/views/card/admin/Detail.vue
+++ b/packages/web/projects/vgpu/views/card/admin/Detail.vue
@@ -198,6 +198,7 @@ const columns = [
   },
   {
     label: '使用模式',
+    width: 120,
     value: 'mode',
     render: ({ mode, type }) => (
         <el-tag disable-transitions>
diff --git a/packages/web/projects/vgpu/views/card/admin/index.vue b/packages/web/projects/vgpu/views/card/admin/index.vue
index 7d09183..3536425 100644
--- a/packages/web/projects/vgpu/views/card/admin/index.vue
+++ b/packages/web/projects/vgpu/views/card/admin/index.vue
@@ -66,6 +66,7 @@ const columns = [
   },
   {
     title: '使用模式',
+    width: 120,
     dataIndex: 'mode',
     render: ({ mode, type }) => (
         <el-tag disable-transitions>
@@ -79,6 +80,7 @@ const columns = [
   },
   {
     title: '所属资源池',
+    width: 100,
     dataIndex: 'resourcePools',
     render: ({ resourcePools }) => `${resourcePools.join('、')}`,
   },
@@ -97,6 +99,7 @@ const columns = [
   },
   {
     title: '算力(已分配/总量)',
+    width: 120,
     dataIndex: 'used',
     render: ({ coreTotal, coreUsed, isExternal }) => (
         <span>
@@ -107,6 +110,7 @@ const columns = [
   {
     title: '显存(已分配/总量)',
     dataIndex: 'w',
+    width: 120,
     render: ({ memoryTotal, memoryUsed, isExternal }) => (
         <span>
       {isExternal ? '--' : roundToDecimal(memoryUsed / 1024, 1)}/
diff --git a/packages/web/projects/vgpu/views/node/admin/Detail.vue b/packages/web/projects/vgpu/views/node/admin/Detail.vue
index 6a617cd..82df738 100644
--- a/packages/web/projects/vgpu/views/node/admin/Detail.vue
+++ b/packages/web/projects/vgpu/views/node/admin/Detail.vue
@@ -264,6 +264,7 @@ const detailColumns = [
   {
     label: '节点状态',
     value: 'status',
+    width: 100,
     render: ({ isSchedulable, isExternal }) => {
       if (detail.value && detail.value.isSchedulable !== undefined) {
         return (
diff --git a/packages/web/projects/vgpu/views/node/admin/index.vue b/packages/web/projects/vgpu/views/node/admin/index.vue
index 5992769..89cf6ab 100644
--- a/packages/web/projects/vgpu/views/node/admin/index.vue
+++ b/packages/web/projects/vgpu/views/node/admin/index.vue
@@ -128,6 +128,7 @@ const columns = [
   },
   {
     title: '节点状态',
+    width: 100,
     dataIndex: 'isSchedulable',
     render: ({ isSchedulable, isExternal }) => (
       <el-tag disable-transitions type={isExternal ? 'warning' : (isSchedulable ? 'success' : 'danger')}>
@@ -173,6 +174,7 @@ const columns = [
   },
   {
     title: '所属资源池',
+    width: 100,
     dataIndex: 'resourcePools',
     render: ({ resourcePools }) => `${resourcePools.join('、')}`,
   },
diff --git a/packages/web/projects/vgpu/views/poll/admin/Detail.vue b/packages/web/projects/vgpu/views/poll/admin/Detail.vue
index 04abb37..b28996f 100644
--- a/packages/web/projects/vgpu/views/poll/admin/Detail.vue
+++ b/packages/web/projects/vgpu/views/poll/admin/Detail.vue
@@ -68,6 +68,7 @@ const columns = [
   },
   {
     title: '节点状态',
+    width: 100,
     dataIndex: 'isSchedulable',
     render: ({ isSchedulable, isExternal }) => (
       <el-tag disable-transitions type={isExternal ? 'warning' : (isSchedulable ? 'success' : 'danger')}>
diff --git a/packages/web/projects/vgpu/views/task/admin/index.vue b/packages/web/projects/vgpu/views/task/admin/index.vue
index 860e977..90cd28a 100644
--- a/packages/web/projects/vgpu/views/task/admin/index.vue
+++ b/packages/web/projects/vgpu/views/task/admin/index.vue
@@ -58,6 +58,7 @@ const columns = [
     title: '任务状态',
     dataIndex: 'status',
     render: ({ status, deviceIds }) => {
+      if (!status) return '/';
       const enums = {
         closed: { text: '已完成', color: '#999' },
         success: { text: '运行中', color: '#2563eb' },
@@ -119,12 +120,15 @@ const columns = [
   },
   {
     title: '所属资源池',
+    width: 100,
     dataIndex: 'resourcePools',
-    render: ({ resourcePools }) => `${resourcePools.join('、')}`,
+    render: ({ resourcePools }) => `${resourcePools?.length ? resourcePools.join('、') : '/'}`,
   },
   {
     title: '所属节点',
     dataIndex: 'nodeName',
+    render: ({ nodeName }) => nodeName || '/',
+
   },
   {
     title: 'CPU',
@@ -138,6 +142,7 @@ const columns = [
   },
   {
     title: '分配 vGPU',
+    width: 100,
     dataIndex: 'deviceIds',
     render: ({ deviceIds }) => {
       return (
@@ -178,6 +183,7 @@ const columns = [
 
   {
     title: '任务创建时间',
+    width: 140,
     dataIndex: 'createTime',
     render: ({ createTime }) => timeParse(createTime),
   },

From 7436647b00ff417be92e9d85846d49c40b1c52f9 Mon Sep 17 00:00:00 2001
From: chenbowen <1179111926@qq.com>
Date: Thu, 7 Aug 2025 21:26:08 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E5=9B=9E=E9=80=80=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=BA=93=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/web/package.json                     |   2 +-
 .../vgpu/views/monitor/overview/index.vue     |   2 +-
 packages/web/src/components/TimePicker.vue    | 136 ++++++++++++------
 3 files changed, 94 insertions(+), 46 deletions(-)

diff --git a/packages/web/package.json b/packages/web/package.json
index ba80ebc..80894bd 100644
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -26,7 +26,7 @@
     "core-js": "^3.8.3",
     "crypto-browserify": "^3.12.0",
     "echarts": "5.4.3",
-    "element-plus": "^2.4.1",
+    "element-plus": "2.10.4",
     "generate-avatar": "1.4.10",
     "js-cookie": "3.0.5",
     "lodash": "^4.17.21",
diff --git a/packages/web/projects/vgpu/views/monitor/overview/index.vue b/packages/web/projects/vgpu/views/monitor/overview/index.vue
index e41d2ea..a5661ec 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 @@
 
       <Block v-for="{ title, dataSource } in rangeConfig" :title="title" :key="title">
         <template #extra>
-          <time-picker v-model="times" type="datetimerange" size="small" :key="`time-picker-${title}`" />
+          <time-picker v-model="times" type="datetimerange" size="small" />
         </template>
         <echarts-plus :options="getRangeOptions(dataSource)" style="height: 250px" />
       </Block>
diff --git a/packages/web/src/components/TimePicker.vue b/packages/web/src/components/TimePicker.vue
index 71fafaf..4a16171 100644
--- a/packages/web/src/components/TimePicker.vue
+++ b/packages/web/src/components/TimePicker.vue
@@ -1,6 +1,5 @@
 <template>
   <el-date-picker
-    ref="pickerRef"
     v-model="value"
     :type="type"
     range-separator="至"
@@ -8,36 +7,24 @@
     end-placeholder="结束时间"
     unlink-panels
     :shortcuts="type.includes('range') && shortcuts"
-    :teleported="false" 
-    :append-to-body="false"
     class="date-picker"
     :disabled-date="disabledDate"
-    @visible-change="onVisibleChange"
     v-bind="$attrs"
-  />
+  ></el-date-picker>
 </template>
 
 <script setup lang="jsx">
-import { computed, defineProps, defineEmits, ref } from 'vue';
+import { computed, defineProps, defineEmits } from 'vue';
+import { ElDatePicker } from 'element-plus';
 
-// props 和 emits
 const props = defineProps({
   modelValue: {},
   type: { type: String, default: 'date' },
   parse: { type: Function, default: (times) => times },
 });
-const emits = defineEmits(['update:modelValue']);
-
-// 本组件自己的 ref 和显示状态
-const pickerRef = ref();
-const visible = ref(false);
 
-// 监听是否显示
-const onVisibleChange = (val) => {
-  visible.value = val;
-};
+const emits = defineEmits(['update:modelValue']);
 
-// 双向绑定
 const value = computed({
   get() {
     return props.modelValue;
@@ -47,44 +34,105 @@ const value = computed({
   },
 });
 
-// 快捷选项生成器
-function genShortcut(text, hoursAgo) {
-  return {
-    text,
+const shortcuts = [
+  {
+    text: '前 1 小时',
     value: () => {
       const end = new Date();
-      const start = new Date(end.getTime() - hoursAgo * 3600 * 1000);
-
-      // 只关闭当前面板
-      setTimeout(() => {
-        if (visible.value) {
-          pickerRef.value?.handleClose?.();
-        }
-      }, 0);
-
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 1);
       return [start, end];
     },
-  };
-}
-
-// 快捷选项
-const shortcuts = [
-  genShortcut('前 1 小时', 1),
-  genShortcut('前 6 小时', 6),
-  genShortcut('前 12 小时', 12),
-  genShortcut('前 1 天', 24),
-  genShortcut('前 2 天', 48),
-  genShortcut('前 3 天', 72),
-  genShortcut('前 1 周', 168),
+  },
+  {
+    text: '前 6 小时',
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 6);
+      return [start, end];
+    },
+  },
+  {
+    text: '前 12 小时',
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 12);
+      return [start, end];
+    },
+  },
+  {
+    text: '前 1 天',
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24);
+      return [start, end];
+    },
+  },
+  {
+    text: '前 2 天',
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 2);
+      return [start, end];
+    },
+  },
+  {
+    text: '前 3 天',
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 3);
+      return [start, end];
+    },
+  },
+  {
+    text: '前 1 周',
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+      return [start, end];
+    },
+  },
+  // {
+  //   text: '前两周',
+  //   value: () => {
+  //     const end = new Date();
+  //     const start = new Date();
+  //     start.setTime(start.getTime() - 3600 * 1000 * 24 * 14);
+  //     return [start, end];
+  //   },
+  // },
+  // {
+  //   text: '前一个月',
+  //   value: () => {
+  //     const end = new Date();
+  //     const start = new Date();
+  //     start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+  //     return [start, end];
+  //   },
+  // },
+  // {
+  //   text: '前三个月',
+  //   value: () => {
+  //     const end = new Date();
+  //     const start = new Date();
+  //     start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+  //     return [start, end];
+  //   },
+  // },
 ];
 
-// 禁止选择未来时间
 const disabledDate = (time) => {
   return time.getTime() >= Date.now();
 };
 </script>
 
-<style scoped>
+<style>
 .date-picker {
   max-width: 450px;
 }

From eb8a914eb6e3b19f719e9145ea44eec162fa0afd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=8D=9A=E6=96=87?= <1179111926@qq.com>
Date: Fri, 8 Aug 2025 10:00:20 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projects/vgpu/views/task/admin/Detail.vue | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/packages/web/projects/vgpu/views/task/admin/Detail.vue b/packages/web/projects/vgpu/views/task/admin/Detail.vue
index 808e81e..4022290 100644
--- a/packages/web/projects/vgpu/views/task/admin/Detail.vue
+++ b/packages/web/projects/vgpu/views/task/admin/Detail.vue
@@ -41,19 +41,21 @@
     </div>
   </block-box>
 
-  <block-box v-for="{ title, data } in lineConfig" :key="title" :title="title">
-    <template #extra v-if="detail.type && detail.type.startsWith('NVIDIA')">
-      <time-picker v-model="times" type="datetimerange" size="small" />
-    </template>
-    <div style="height: 200px">
-      <template v-if="detail.type && !detail.type.startsWith('NVIDIA')">
-        <el-empty description="该设备厂商暂不支持任务维度监控" :image-size="60" />
+  <template v-for="({ title, data }, index) in lineConfig">
+    <block-box v-if="detail.deviceIds?.length || [2, 3].includes(index)" :key="title + index" :title="title">
+      <template #extra v-if="detail.type && detail.type.startsWith('NVIDIA')">
+        <time-picker v-model="times" type="datetimerange" size="small" />
       </template>
-      <template v-else>
-        <echarts-plus :options="getLineOptions({ data })" />
-      </template>
-    </div>
-  </block-box>
+      <div style="height: 200px">
+        <template v-if="detail.type && !detail.type.startsWith('NVIDIA')">
+          <el-empty description="该设备厂商暂不支持任务维度监控" :image-size="60" />
+        </template>
+        <template v-else>
+          <echarts-plus :options="getLineOptions({ data })" />
+        </template>
+      </div>
+    </block-box>
+  </template>
 </template>
 
 <script setup lang="jsx">
@@ -298,9 +300,9 @@ onMounted(async () => {
   if (foundCard) {
     detail.value.type = foundCard.type;
   }
-  if (!detail.value.deviceIds?.length) {
-    lineConfig.value.splice(0, 2);
-  }
+  // if (!detail.value.deviceIds?.length) {
+  //   lineConfig.value.splice(0, 2);
+  // }
 
   // const start = new Date();
   // start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);

From 1bbfacbdfe98430e4ab4628f855a34b5186dc74f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=8D=9A=E6=96=87?= <1179111926@qq.com>
Date: Fri, 8 Aug 2025 10:50:21 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/projects/vgpu/components/TabTop.vue     |  2 +-
 .../vgpu/views/monitor/overview/style.scss      | 17 +++++++++--------
 .../projects/vgpu/views/task/admin/index.vue    |  9 +++++----
 packages/web/src/layout/components/AppMain.vue  | 12 ++++++++++--
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/packages/web/projects/vgpu/components/TabTop.vue b/packages/web/projects/vgpu/components/TabTop.vue
index f12ea06..8db38a7 100644
--- a/packages/web/projects/vgpu/components/TabTop.vue
+++ b/packages/web/projects/vgpu/components/TabTop.vue
@@ -60,6 +60,7 @@ const getTopOptions = () => {
         type: 'shadow',
       },
       formatter: function (params) {
+        // console.log(params, 'params')
         var res = params[0].name + '<br/>';
         for (var i = 0; i < params.length; i++) {
           res +=
@@ -111,7 +112,6 @@ onMounted(async () => {
         query: v.query,
       })
       .then((res) => {
-        console.log(v.query, res, 'res')
         currentConfig.value[i].data = res.data.map((item) => ({
           name: item.metric[v.nameKey],
           value: item.value,
diff --git a/packages/web/projects/vgpu/views/monitor/overview/style.scss b/packages/web/projects/vgpu/views/monitor/overview/style.scss
index 8c01b3a..509c002 100644
--- a/packages/web/projects/vgpu/views/monitor/overview/style.scss
+++ b/packages/web/projects/vgpu/views/monitor/overview/style.scss
@@ -92,21 +92,22 @@
     grid-template-columns: repeat(5, 1fr);
     gap: 12px;
     li {
-      height: 80px;
+      // height: 80px;
       flex-shrink: 0;
       border-radius: 6px;
       background: #f5f7fa;
-      padding: 16px;
+      padding: 14px;
       display: flex;
+      align-items: center;
       //&:hover {
       //  color: var(--el-color-primary);
       //  cursor: pointer;
       //}
       .avatar {
         display: flex;
-        width: 48px;
-        height: 48px;
-        padding: 14px;
+        width: 30px;
+        height: 30px;
+        padding: 6px;
         justify-content: center;
         align-items: center;
         flex-shrink: 0;
@@ -117,16 +118,16 @@
           rgba(255, 255, 255, 0) 0%,
           #fff 100%
         );
-        margin-right: 16px;
+        margin-right: 8px;
       }
 
       .count {
         font-family: Roboto;
-        font-size: 20px;
+        font-size: 14px;
         font-style: normal;
         font-weight: 700;
         line-height: 100%; /* 20px */
-        margin-top: 10px;
+        margin-top: 8px;
       }
     }
   }
diff --git a/packages/web/projects/vgpu/views/task/admin/index.vue b/packages/web/projects/vgpu/views/task/admin/index.vue
index 90cd28a..aa87880 100644
--- a/packages/web/projects/vgpu/views/task/admin/index.vue
+++ b/packages/web/projects/vgpu/views/task/admin/index.vue
@@ -110,13 +110,14 @@ const columns = [
   },
   {
     title: '使用者角色',
-    dataIndex: 'nataskTypeme',
-    render: ({ taskType }) => taskType === 'big_model' ? '大模型' : '实训',
+    width: 100,
+    dataIndex: 'role',
+    render: ({ role }) => role || '/',
   },
   {
     title: '用户名',
-    dataIndex: 'role',
-    render: ({ role }) => role || '/',
+    dataIndex: 'username',
+    render: ({ username }) => username || '/',
   },
   {
     title: '所属资源池',
diff --git a/packages/web/src/layout/components/AppMain.vue b/packages/web/src/layout/components/AppMain.vue
index da29c01..525bdc9 100644
--- a/packages/web/src/layout/components/AppMain.vue
+++ b/packages/web/src/layout/components/AppMain.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="content" :style="{ paddingLeft: hasParentWindow || isHome ? 0 : '20px' }">
+  <div id="content" :class="hasParentWindow && 'impose'">
     <!-- <transition name="fade-transform" mode="out-in"> -->
     <!-- <keep-alive> -->
     <router-view />
@@ -26,7 +26,15 @@ const isHome = computed(() => route.fullPath === '/admin/home');
   margin: 0;
   flex: 1;
   overflow: auto;
-
   height: 100%;
+  padding-left: 20px;
+
+  &.impose {
+    margin: 0 auto;
+    overflow: inherit;
+    max-width: 1200px;
+    padding-left: 0px;
+
+  }
 }
 </style>

From 49d76da34fa6b972719a53b40fe77a0f59a11ee8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=8D=9A=E6=96=87?= <1179111926@qq.com>
Date: Fri, 8 Aug 2025 11:42:42 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B2=BE=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/projects/vgpu/components/TabTop.vue   | 25 ++++++---------
 .../vgpu/views/monitor/overview/index.vue     | 16 +++++-----
 .../projects/vgpu/views/task/admin/top.vue    | 32 +++++++++----------
 packages/web/src/utils/index.js               | 25 +++++++++++++++
 4 files changed, 58 insertions(+), 40 deletions(-)

diff --git a/packages/web/projects/vgpu/components/TabTop.vue b/packages/web/projects/vgpu/components/TabTop.vue
index 8db38a7..ddbeac6 100644
--- a/packages/web/projects/vgpu/components/TabTop.vue
+++ b/packages/web/projects/vgpu/components/TabTop.vue
@@ -2,23 +2,14 @@
   <block-box :title="title">
     <template #extra>
       <el-radio-group v-model="tabActive" size="small" @change="handleTabChange">
-        <el-radio-button
-          v-for="{ tab, key } in config"
-          :label="tab"
-          :value="key"
-        />
+        <el-radio-button v-for="{ tab, key } in config" :label="tab" :value="key" />
       </el-radio-group>
     </template>
 
-    <echarts-plus
-      :options="
-        getTopOptions(
-          currentConfig.find((item) => item.key === tabActive)?.data || [],
-        )
-      "
-      :onClick="handleClick"
-      style="min-height: 250px; height: 100%"
-    />
+    <echarts-plus :options="getTopOptions(
+      currentConfig.find((item) => item.key === tabActive)?.data || [],
+    )
+      " :onClick="handleClick" style="min-height: 250px; height: 100%" />
   </block-box>
 </template>
 
@@ -28,6 +19,7 @@ import { onMounted, ref } from 'vue';
 import EchartsPlus from '@/components/Echarts-plus.vue';
 import cardApi from '~/vgpu/api/card';
 import { cloneDeep } from 'lodash';
+import { formatSmartPercentage } from '@/utils';
 
 const props = defineProps({
   title: String,
@@ -60,13 +52,14 @@ const getTopOptions = () => {
         type: 'shadow',
       },
       formatter: function (params) {
-        // console.log(params, 'params')
         var res = params[0].name + '<br/>';
         for (var i = 0; i < params.length; i++) {
+        console.log(params[i].value, formatSmartPercentage(params[i].value), 'params')
+
           res +=
             params[i].marker +
             params[i].seriesName +
-            (+params[i].value).toFixed(0) +
+            formatSmartPercentage(params[i].value) +
             `${config.unit || '%'}<br/>`;
         }
         return res;
diff --git a/packages/web/projects/vgpu/views/monitor/overview/index.vue b/packages/web/projects/vgpu/views/monitor/overview/index.vue
index a5661ec..dc89dcc 100644
--- a/packages/web/projects/vgpu/views/monitor/overview/index.vue
+++ b/packages/web/projects/vgpu/views/monitor/overview/index.vue
@@ -481,14 +481,14 @@ const fetchRangeData = () => {
   }
 
 
-  cardApi
-    .getRangeVector({
-      ...params,
-      query: `sum({__name__=~"alert:.*:count"})`,
-    })
-    .then((res) => {
-      alarmData.value = res.data[0].values;
-    });
+  // cardApi
+  //   .getRangeVector({
+  //     ...params,
+  //     query: `sum({__name__=~"alert:.*:count"})`,
+  //   })
+  //   .then((res) => {
+  //     alarmData.value = res.data[0].values;
+  //   });
 
 };
 
diff --git a/packages/web/projects/vgpu/views/task/admin/top.vue b/packages/web/projects/vgpu/views/task/admin/top.vue
index 4393d9e..0075770 100644
--- a/packages/web/projects/vgpu/views/task/admin/top.vue
+++ b/packages/web/projects/vgpu/views/task/admin/top.vue
@@ -63,22 +63,22 @@ const topConfig = [
     title: '任务资源申请 Top5',
     key: 'apply',
     config: [
-      {
-        tab: 'CPU',
-        key: 'cpu',
-        data: [],
-        nameKey: 'container_pod_uuid',
-        unit: '核',
-        query: 'topk(5, sum by(container_pod_uuid) (hami_container_vcore_allocated))',
-      },
-      {
-        tab: '内存',
-        key: 'internal',
-        data: [],
-        unit: 'GiB',
-        nameKey: 'container_pod_uuid',
-        query: 'topk(5, sum by(container_pod_uuid) (hami_container_vmemory_allocated))',
-      },
+      // {
+      //   tab: 'CPU',
+      //   key: 'cpu',
+      //   data: [],
+      //   nameKey: 'container_pod_uuid',
+      //   unit: '核',
+      //   query: 'topk(5, sum by(container_pod_uuid) (hami_container_vcore_allocated))',
+      // },
+      // {
+      //   tab: '内存',
+      //   key: 'internal',
+      //   data: [],
+      //   unit: 'GiB',
+      //   nameKey: 'container_pod_uuid',
+      //   query: 'topk(5, sum by(container_pod_uuid) (hami_container_vmemory_allocated))',
+      // },
       {
         tab: '算力',
         key: 'core',
diff --git a/packages/web/src/utils/index.js b/packages/web/src/utils/index.js
index b4d4806..b0d8e5d 100644
--- a/packages/web/src/utils/index.js
+++ b/packages/web/src/utils/index.js
@@ -588,3 +588,28 @@ export function parseUrl(url) {
 
   return { pathname, query };
 }
+
+export function formatSmartPercentage(value) {
+  if (value === 0) return '0';
+
+  // 整数直接返回
+  if (Number.isInteger(value)) return value.toString();
+
+  const str = value.toString();
+  const decimal = str.split('.')[1] || '';
+
+  // 统计前导0的个数
+  let leadingZeros = 0;
+  for (const char of decimal) {
+    if (char === '0') {
+      leadingZeros++;
+    } else {
+      break;
+    }
+  }
+
+  const keep = leadingZeros + 2; // 0 的个数 + 1 位有效数字 + 1 位补充位
+  const rounded = value.toFixed(keep);
+
+  return parseFloat(rounded).toString(); // 去除多余的 0 和小数点
+}

From b01f60e89b12e723949b7758b4c6f37e126125b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=8D=9A=E6=96=87?= <1179111926@qq.com>
Date: Fri, 8 Aug 2025 14:14:27 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E5=8A=A0=E7=A9=BA=E9=9A=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/web/src/layout/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/web/src/layout/index.vue b/packages/web/src/layout/index.vue
index 028cbeb..f970ed1 100644
--- a/packages/web/src/layout/index.vue
+++ b/packages/web/src/layout/index.vue
@@ -1,6 +1,7 @@
 <template>
   <TopBar v-if="!hasParentWindow" />
-  <div class="page" :style="{ padding: hasParentWindow ? '20px 30px' : '76px 20px 20px 20px' }">
+  <div class="page"
+    :style="{ padding: hasParentWindow ? '20px 30px' : '76px 20px 20px 20px', height: hasParentWindow ? 'auto' : '100vh' }">
     <sidebar v-if="!hasParentWindow && !isNoSidebar()" />
     <app-main />
   </div>

From 2d6e041ce982cb36b21971eac3474ecebd56ff68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=8D=9A=E6=96=87?= <1179111926@qq.com>
Date: Fri, 8 Aug 2025 14:40:51 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=89=80=E5=B1=9E=E8=B5=84=E6=BA=90=E6=B1=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/projects/vgpu/views/task/admin/index.vue     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/web/projects/vgpu/views/task/admin/index.vue b/packages/web/projects/vgpu/views/task/admin/index.vue
index aa87880..23d39e5 100644
--- a/packages/web/projects/vgpu/views/task/admin/index.vue
+++ b/packages/web/projects/vgpu/views/task/admin/index.vue
@@ -119,12 +119,12 @@ const columns = [
     dataIndex: 'username',
     render: ({ username }) => username || '/',
   },
-  {
-    title: '所属资源池',
-    width: 100,
-    dataIndex: 'resourcePools',
-    render: ({ resourcePools }) => `${resourcePools?.length ? resourcePools.join('、') : '/'}`,
-  },
+  // {
+  //   title: '所属资源池',
+  //   width: 100,
+  //   dataIndex: 'resourcePools',
+  //   render: ({ resourcePools }) => `${resourcePools?.length ? resourcePools.join('、') : '/'}`,
+  // },
   {
     title: '所属节点',
     dataIndex: 'nodeName',

From 0df4139720e7168f3c4523a46ccd7fe632117a96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=8D=9A=E6=96=87?= <1179111926@qq.com>
Date: Fri, 8 Aug 2025 16:12:43 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/projects/vgpu/components/TabTop.vue   |  2 -
 .../web/projects/vgpu/components/config.js    |  8 ++--
 .../projects/vgpu/views/card/admin/Detail.vue | 40 +++++++++----------
 .../vgpu/views/card/admin/getOptions.js       |  6 +--
 .../vgpu/views/monitor/overview/getOptions.js | 19 +++++----
 .../vgpu/views/node/admin/getOptions.js       |  7 ++--
 .../projects/vgpu/views/poll/admin/Detail.vue |  6 +--
 .../vgpu/views/poll/admin/DetailBox.vue       |  4 --
 .../vgpu/views/poll/admin/getOptions.js       |  7 ++--
 .../projects/vgpu/views/poll/admin/index.vue  |  6 +--
 10 files changed, 46 insertions(+), 59 deletions(-)

diff --git a/packages/web/projects/vgpu/components/TabTop.vue b/packages/web/projects/vgpu/components/TabTop.vue
index ddbeac6..2f8317f 100644
--- a/packages/web/projects/vgpu/components/TabTop.vue
+++ b/packages/web/projects/vgpu/components/TabTop.vue
@@ -54,8 +54,6 @@ const getTopOptions = () => {
       formatter: function (params) {
         var res = params[0].name + '<br/>';
         for (var i = 0; i < params.length; i++) {
-        console.log(params[i].value, formatSmartPercentage(params[i].value), 'params')
-
           res +=
             params[i].marker +
             params[i].seriesName +
diff --git a/packages/web/projects/vgpu/components/config.js b/packages/web/projects/vgpu/components/config.js
index 6da7771..f71ba76 100644
--- a/packages/web/projects/vgpu/components/config.js
+++ b/packages/web/projects/vgpu/components/config.js
@@ -1,4 +1,4 @@
-import { timeParse } from '@/utils';
+import { timeParse, formatSmartPercentage } from '@/utils';
 
 export default ({ percent, title, unit = '%' }) => {
   const value = percent.toFixed(1);
@@ -232,7 +232,7 @@ export const getLineOptions = ({ data = [], unit = '%' }) => {
         var res = params[0].name + '<br/>';
         for (var i = 0; i < params.length; i++) {
           res +=
-            params[i].marker + (+params[i].value).toFixed(0) + ` ${unit}<br/>`;
+            params[i].marker + formatSmartPercentage(params[i].value) + ` ${unit}<br/>`;
         }
         return res;
       },
@@ -240,7 +240,7 @@ export const getLineOptions = ({ data = [], unit = '%' }) => {
     grid: {
       top: 7, // 上边距
       bottom: 20, // 下边距
-      left: '7%', // 左边距
+      left: '10%', // 左边距
       right: 10, // 右边距
     },
     xAxis: {
@@ -258,7 +258,7 @@ export const getLineOptions = ({ data = [], unit = '%' }) => {
     series: [
       {
         data: data.map((item) => {
-          return item.value.toFixed(1);
+          return item.value;
         }),
         type: 'line',
         areaStyle: {
diff --git a/packages/web/projects/vgpu/views/card/admin/Detail.vue b/packages/web/projects/vgpu/views/card/admin/Detail.vue
index e05fa0e..3bb9877 100644
--- a/packages/web/projects/vgpu/views/card/admin/Detail.vue
+++ b/packages/web/projects/vgpu/views/card/admin/Detail.vue
@@ -208,26 +208,26 @@ const columns = [
   }
 ];
 
-const cp = useInstantVector(
-  [
-    {
-      label: 'vGPU超配',
-      count: '0',
-      query: `avg(sum(hami_vgpu_count{node=~"$node"}) by (instance))`,
-    },
-    {
-      label: '算力超配',
-      count: '0',
-      query: `avg(sum(hami_vcore_scaling{node=~"$node"}) by (instance))`,
-    },
-    {
-      label: '显存超配',
-      count: '1.5',
-      query: `avg(sum(hami_vmemory_scaling{node=~"$node"}) by (instance))`,
-    },
-  ],
-  (query) => query.replaceAll('$node', props.detail.name),
-);
+// const cp = useInstantVector(
+//   [
+//     {
+//       label: 'vGPU超配',
+//       count: '0',
+//       query: `avg(sum(hami_vgpu_count{node=~"$node"}) by (instance))`,
+//     },
+//     {
+//       label: '算力超配',
+//       count: '0',
+//       query: `avg(sum(hami_vcore_scaling{node=~"$node"}) by (instance))`,
+//     },
+//     {
+//       label: '显存超配',
+//       count: '1.5',
+//       query: `avg(sum(hami_vmemory_scaling{node=~"$node"}) by (instance))`,
+//     },
+//   ],
+//   (query) => query.replaceAll('$node', props.detail.name),
+// );
 
 const gaugeConfig = useInstantVector(
   [
diff --git a/packages/web/projects/vgpu/views/card/admin/getOptions.js b/packages/web/projects/vgpu/views/card/admin/getOptions.js
index 3044839..e8551ce 100644
--- a/packages/web/projects/vgpu/views/card/admin/getOptions.js
+++ b/packages/web/projects/vgpu/views/card/admin/getOptions.js
@@ -1,4 +1,4 @@
-import { timeParse } from '@/utils';
+import { timeParse, formatSmartPercentage } from '@/utils';
 
 export const getRangeOptions = ({ core = [], memory = [] }) => {
   return {
@@ -17,7 +17,7 @@ export const getRangeOptions = ({ core = [], memory = [] }) => {
             params[i].marker +
             params[i].seriesName +
             ' : ' +
-            (+params[i].value).toFixed(0) +
+            formatSmartPercentage(params[i].value) +
             `%<br/>`;
         }
 
@@ -27,7 +27,7 @@ export const getRangeOptions = ({ core = [], memory = [] }) => {
     grid: {
       top: 37, // 上边距
       bottom: 20, // 下边距
-      left: '7%', // 左边距
+      left: '10%', // 左边距
       right: 10, // 右边距
     },
     xAxis: {
diff --git a/packages/web/projects/vgpu/views/monitor/overview/getOptions.js b/packages/web/projects/vgpu/views/monitor/overview/getOptions.js
index 99289ac..b4f4600 100644
--- a/packages/web/projects/vgpu/views/monitor/overview/getOptions.js
+++ b/packages/web/projects/vgpu/views/monitor/overview/getOptions.js
@@ -1,4 +1,4 @@
-import { timeParse } from '@/utils';
+import { timeParse, formatSmartPercentage } from '@/utils';
 import { cloneDeep } from 'lodash';
 import nodeApi from '~/vgpu/api/node';
 import { ElMessage } from 'element-plus';
@@ -323,16 +323,16 @@ export const getCardOptions = (list, chartWidth) => {
           rich: {
             cnt: {
               fontSize: 10,
-              color: '#999'
-            }
-          }
+              color: '#999',
+            },
+          },
         },
         labelLayout: function (params) {
           const isLeft = params.labelRect.x < chartWidth / 2;
           const points = params.labelLinePoints;
           points[2][0] = isLeft
-              ? params.labelRect.x
-              : params.labelRect.x + params.labelRect.width;
+            ? params.labelRect.x
+            : params.labelRect.x + params.labelRect.width;
           return {
             labelLinePoints: points,
           };
@@ -343,7 +343,6 @@ export const getCardOptions = (list, chartWidth) => {
         })),
       },
     ],
-
   };
 };
 
@@ -385,7 +384,7 @@ export const getLineOptions = ({
     grid: {
       top: 37, // 上边距
       bottom: 20, // 下边距
-      left: '7%', // 左边距
+      left: '10%', // 左边距
       right: 10, // 右边距
     },
     xAxis: {
@@ -496,7 +495,7 @@ export const getRangeOptions = (data) => {
             params[i].marker +
             params[i].seriesName +
             ' : ' +
-            (+params[i].value).toFixed(0) +
+            formatSmartPercentage(params[i].value) +
             `%<br/>`;
         }
 
@@ -506,7 +505,7 @@ export const getRangeOptions = (data) => {
     grid: {
       top: 37, // 上边距
       bottom: 20, // 下边距
-      left: '7%', // 左边距
+      left: '10%', // 左边距
       right: 10, // 右边距
     },
     xAxis: {
diff --git a/packages/web/projects/vgpu/views/node/admin/getOptions.js b/packages/web/projects/vgpu/views/node/admin/getOptions.js
index 50ff8ce..a7cd503 100644
--- a/packages/web/projects/vgpu/views/node/admin/getOptions.js
+++ b/packages/web/projects/vgpu/views/node/admin/getOptions.js
@@ -1,4 +1,4 @@
-import { timeParse } from '@/utils';
+import { timeParse, formatSmartPercentage } from '@/utils';
 
 export const getRangeOptions = ({
   core = [],
@@ -22,7 +22,8 @@ export const getRangeOptions = ({
             params[i].marker +
             params[i].seriesName +
             ' : ' +
-            (+params[i].value).toFixed(0) +
+            // (+params[i].value).toFixed(0) +
+            formatSmartPercentage(params[i].value) +
             `%<br/>`;
         }
 
@@ -32,7 +33,7 @@ export const getRangeOptions = ({
     grid: {
       top: 37, // 上边距
       bottom: 20, // 下边距
-      left: '7%', // 左边距
+      left: '10%', // 左边距
       right: 10, // 右边距
     },
     xAxis: {
diff --git a/packages/web/projects/vgpu/views/poll/admin/Detail.vue b/packages/web/projects/vgpu/views/poll/admin/Detail.vue
index b28996f..7e2f062 100644
--- a/packages/web/projects/vgpu/views/poll/admin/Detail.vue
+++ b/packages/web/projects/vgpu/views/poll/admin/Detail.vue
@@ -1,6 +1,6 @@
 <template>
   <back-header>
-    资源池管理 > {{ route.query?.name || '' }}
+    资源池管理 > {{ route.query?.poolName || '' }}
   </back-header>
   <table-plus v-loading="loading" :dataSource="list" :columns="columns" :rowAction="rowAction" :hasPagination="false"
     style="margin-bottom: 15px; height: auto;" hideTag ref="table" static :hasActionBar="false">
@@ -39,10 +39,6 @@ const data = computed(() => {
   return result;
 })
 
-watchEffect(() => {
-  console.log(data.value, 'data')
-})
-
 const getList = async () => {
   loading.value = true
   const res = await pollApi.getDetailNodeList({ pool_id: route.params.uid })
diff --git a/packages/web/projects/vgpu/views/poll/admin/DetailBox.vue b/packages/web/projects/vgpu/views/poll/admin/DetailBox.vue
index 29eccb0..2464a5a 100644
--- a/packages/web/projects/vgpu/views/poll/admin/DetailBox.vue
+++ b/packages/web/projects/vgpu/views/poll/admin/DetailBox.vue
@@ -65,10 +65,6 @@ import { getRangeOptions } from './getOptions';
 
 const props = defineProps(['data'])
 
-watchEffect(() => {
-  console.log(props.data, 'data2')
-})
-
 const end = new Date();
 const start = new Date();
 start.setTime(start.getTime() - 3600 * 1000);
diff --git a/packages/web/projects/vgpu/views/poll/admin/getOptions.js b/packages/web/projects/vgpu/views/poll/admin/getOptions.js
index 50ff8ce..a7cd503 100644
--- a/packages/web/projects/vgpu/views/poll/admin/getOptions.js
+++ b/packages/web/projects/vgpu/views/poll/admin/getOptions.js
@@ -1,4 +1,4 @@
-import { timeParse } from '@/utils';
+import { timeParse, formatSmartPercentage } from '@/utils';
 
 export const getRangeOptions = ({
   core = [],
@@ -22,7 +22,8 @@ export const getRangeOptions = ({
             params[i].marker +
             params[i].seriesName +
             ' : ' +
-            (+params[i].value).toFixed(0) +
+            // (+params[i].value).toFixed(0) +
+            formatSmartPercentage(params[i].value) +
             `%<br/>`;
         }
 
@@ -32,7 +33,7 @@ export const getRangeOptions = ({
     grid: {
       top: 37, // 上边距
       bottom: 20, // 下边距
-      left: '7%', // 左边距
+      left: '10%', // 左边距
       right: 10, // 右边距
     },
     xAxis: {
diff --git a/packages/web/projects/vgpu/views/poll/admin/index.vue b/packages/web/projects/vgpu/views/poll/admin/index.vue
index 7e34999..a2abdda 100644
--- a/packages/web/projects/vgpu/views/poll/admin/index.vue
+++ b/packages/web/projects/vgpu/views/poll/admin/index.vue
@@ -21,7 +21,7 @@
           </div>
         </div>
         <div class="right">
-          <el-button @click="sendRouteChange(`/admin/vgpu/poll/admin/${poolId}?name=${poolName}`)"
+          <el-button @click="sendRouteChange(`/admin/vgpu/poll/admin/${poolId}?poolName=${poolName}`)"
             type="text">查看详情</el-button>
           <template v-if="index === 0 && currentPage === 1">
             <el-button @click="sendRouteChange(linkUrl, 'open')" type="text">配置</el-button>
@@ -137,10 +137,6 @@ const paginatedList = computed(() => {
   return list.value.slice(start, end)
 })
 
-// watchEffect(()=>{
-//   console.log(currentPage.value, pageSize.value, 88)
-// })
-
 // 分页大小变化
 const handleSizeChange = (val) => {
   pageSize.value = val

From fff3aa5e19bc9181d9e1eaf71886cc6e1ac1fdd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=8D=9A=E6=96=87?= <1179111926@qq.com>
Date: Fri, 8 Aug 2025 16:41:53 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/web/projects/vgpu/views/monitor/overview/config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/web/projects/vgpu/views/monitor/overview/config.js b/packages/web/projects/vgpu/views/monitor/overview/config.js
index 6d292b7..21ecca6 100644
--- a/packages/web/projects/vgpu/views/monitor/overview/config.js
+++ b/packages/web/projects/vgpu/views/monitor/overview/config.js
@@ -106,7 +106,7 @@ export const rangeConfigInit = [
       },
       {
         name: 'CPU',
-        query: `sum(hami_container_vcore_allocated) / sum(hami_core_size) * 100`,
+        query: `sum(hami_core_used) / sum(hami_core_size) * 100`,
         data: [],
         type: 'line',
         areaStyle: {
@@ -140,7 +140,7 @@ export const rangeConfigInit = [
       },
       {
         name: '内存',
-        query: `sum(hami_container_vmemory_allocated) / sum(hami_memory_size) * 100`,
+        query: `sum(hami_memory_used) / sum(hami_memory_size) * 100`,
         data: [],
         type: 'line',
         areaStyle: {

From a5a26bd3157e5ba429ef6bd93eae410827210cd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=8D=9A=E6=96=87?= <1179111926@qq.com>
Date: Fri, 8 Aug 2025 16:50:08 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/projects/vgpu/views/node/admin/getOptions.js   | 10 ++++++++--
 packages/web/projects/vgpu/views/node/admin/index.vue  |  2 +-
 .../web/projects/vgpu/views/poll/admin/getOptions.js   | 10 ++++++++--
 packages/web/src/utils/index.js                        |  9 +++++++++
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/packages/web/projects/vgpu/views/node/admin/getOptions.js b/packages/web/projects/vgpu/views/node/admin/getOptions.js
index a7cd503..2ad1375 100644
--- a/packages/web/projects/vgpu/views/node/admin/getOptions.js
+++ b/packages/web/projects/vgpu/views/node/admin/getOptions.js
@@ -1,4 +1,8 @@
-import { timeParse, formatSmartPercentage } from '@/utils';
+import {
+  timeParse,
+  formatSmartPercentage,
+  getFirstNonEmptyArray,
+} from '@/utils';
 
 export const getRangeOptions = ({
   core = [],
@@ -6,6 +10,8 @@ export const getRangeOptions = ({
   cpu = [],
   internal = [],
 }) => {
+  const xData = getFirstNonEmptyArray([core, memory, cpu, internal]);
+
   return {
     legend: {
       // data: [],
@@ -38,7 +44,7 @@ export const getRangeOptions = ({
     },
     xAxis: {
       type: 'category',
-      data: core.map((item) => timeParse(+item.timestamp)),
+      data: xData.map((item) => timeParse(+item.timestamp)),
       axisLabel: {
         formatter: function (value) {
           return timeParse(value, 'HH:mm');
diff --git a/packages/web/projects/vgpu/views/node/admin/index.vue b/packages/web/projects/vgpu/views/node/admin/index.vue
index 89cf6ab..9944e0d 100644
--- a/packages/web/projects/vgpu/views/node/admin/index.vue
+++ b/packages/web/projects/vgpu/views/node/admin/index.vue
@@ -25,7 +25,7 @@
         </div>
       </template>
     </div>
-    <template #footer>
+    <template v-if="nodeList && nodeList.length > 0" #footer>
       <el-button @click="dialogVisible = false">取消</el-button>
       <el-button :loading="btnLoading" type="primary" @click="handleOk">确认</el-button>
     </template>
diff --git a/packages/web/projects/vgpu/views/poll/admin/getOptions.js b/packages/web/projects/vgpu/views/poll/admin/getOptions.js
index a7cd503..2ad1375 100644
--- a/packages/web/projects/vgpu/views/poll/admin/getOptions.js
+++ b/packages/web/projects/vgpu/views/poll/admin/getOptions.js
@@ -1,4 +1,8 @@
-import { timeParse, formatSmartPercentage } from '@/utils';
+import {
+  timeParse,
+  formatSmartPercentage,
+  getFirstNonEmptyArray,
+} from '@/utils';
 
 export const getRangeOptions = ({
   core = [],
@@ -6,6 +10,8 @@ export const getRangeOptions = ({
   cpu = [],
   internal = [],
 }) => {
+  const xData = getFirstNonEmptyArray([core, memory, cpu, internal]);
+
   return {
     legend: {
       // data: [],
@@ -38,7 +44,7 @@ export const getRangeOptions = ({
     },
     xAxis: {
       type: 'category',
-      data: core.map((item) => timeParse(+item.timestamp)),
+      data: xData.map((item) => timeParse(+item.timestamp)),
       axisLabel: {
         formatter: function (value) {
           return timeParse(value, 'HH:mm');
diff --git a/packages/web/src/utils/index.js b/packages/web/src/utils/index.js
index b0d8e5d..038cb80 100644
--- a/packages/web/src/utils/index.js
+++ b/packages/web/src/utils/index.js
@@ -613,3 +613,12 @@ export function formatSmartPercentage(value) {
 
   return parseFloat(rounded).toString(); // 去除多余的 0 和小数点
 }
+
+export function getFirstNonEmptyArray(arrays, defaultValue = []) {
+  for (const arr of arrays) {
+    if (arr && arr.length > 0) {
+      return arr;
+    }
+  }
+  return defaultValue;
+}

From c0ecc8833181362ebdf129f9a3546c81b441c3b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=8D=9A=E6=96=87?= <1179111926@qq.com>
Date: Fri, 8 Aug 2025 17:07:29 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/web/projects/vgpu/views/node/admin/Detail.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/web/projects/vgpu/views/node/admin/Detail.vue b/packages/web/projects/vgpu/views/node/admin/Detail.vue
index 82df738..46ef0a9 100644
--- a/packages/web/projects/vgpu/views/node/admin/Detail.vue
+++ b/packages/web/projects/vgpu/views/node/admin/Detail.vue
@@ -240,7 +240,7 @@ const gaugeConfig = useInstantVector(
       percent: 0,
       query: ``,
       totalQuery: ``,
-      percentQuery: `avg(sum(hami_container_vcore_allocated{node=~"$node"}) by (instance) / sum(hami_core_size{node=~"$node"}) by (instance) * 100)`,
+      percentQuery: `avg(sum(hami_core_used{node=~"$node"}) by (instance) / sum(hami_core_size{node=~"$node"}) by (instance) * 100)`,
       total: 0,
       used: 0,
       unit: '核',
@@ -250,7 +250,7 @@ const gaugeConfig = useInstantVector(
       percent: 0,
       query: ``,
       totalQuery: ``,
-      percentQuery: `avg(sum(hami_container_vmemory_allocated{node=~"$node"}) by (instance) / sum(hami_memory_size{node=~"$node"}) by (instance) * 100)`,
+      percentQuery: `avg(sum(hami_memory_used{node=~"$node"}) by (instance) / sum(hami_memory_size{node=~"$node"}) by (instance) * 100)`,
       total: 0,
       used: 0,
       unit: 'GiB',