From 1df1771e9787ad1248c01ef5f5383da8f4b10903 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 16:28:43 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projects/vgpu/views/monitor/overview/index.vue   | 12 ++++++------
 .../web/projects/vgpu/views/poll/admin/index.vue     |  2 +-
 .../web/projects/vgpu/views/task/admin/index.vue     | 12 +++++++++++-
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/packages/web/projects/vgpu/views/monitor/overview/index.vue b/packages/web/projects/vgpu/views/monitor/overview/index.vue
index 7064d37..56925f0 100644
--- a/packages/web/projects/vgpu/views/monitor/overview/index.vue
+++ b/packages/web/projects/vgpu/views/monitor/overview/index.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="home">
     <div class="home-left">
-      <Block title="显卡资源">
-        <template #extra>
+      <Block title="资源使用率">
+        <!-- <template #extra>
           <div class="all-btn" @click="sendRouteChange('/admin/vgpu/card/admin')">
             全部<svg-icon icon="more" style="margin-left: 4px" />
           </div>
-        </template>
+        </template> -->
         <div class="card-overview">
           <div v-for="item in cardGaugeConfig.slice(0, 5)" :key="item.title">
             <Gauge v-bind="item" />
@@ -19,11 +19,11 @@
         </div>
       </Block>
       <Block title="资源总览">
-        <template #extra>
+        <!-- <template #extra>
           <div class="all-btn" @click="sendRouteChange('/admin/vgpu/card/admin')">
             全部<svg-icon icon="more" style="margin-left: 4px" />
           </div>
-        </template>
+        </template> -->
         <ul class="resourceOverview">
           <li v-for="{ title, count, icon, to, unit } in resourceOverview" :key="title"
             :style="{ cursor: to ? 'pointer' : 'default' }" @click="sendRouteChange(to)">
@@ -156,7 +156,7 @@ const cardGaugeConfig = useInstantVector([
     title: '磁盘 使用率',
     percent: 0,
     query: `(sum(node_filesystem_size_bytes{fstype!~"tmpfs|overlay"})-sum(node_filesystem_free_bytes{fstype!~"tmpfs|overlay"})) / 1024 / 1024 / 1024`,
-    totalQuery: `avg(node_filesystem_size_bytes{fstype!~"tmpfs|overlay"}) / 1024 / 1024 / 1024`,
+    totalQuery: `sum(node_filesystem_size_bytes{fstype!~"tmpfs|overlay"}) / 1024 / 1024 / 1024`,
     percentQuery: ``,
     total: 0,
     used: 0,
diff --git a/packages/web/projects/vgpu/views/poll/admin/index.vue b/packages/web/projects/vgpu/views/poll/admin/index.vue
index 2b4aeba..71f4299 100644
--- a/packages/web/projects/vgpu/views/poll/admin/index.vue
+++ b/packages/web/projects/vgpu/views/poll/admin/index.vue
@@ -46,7 +46,7 @@
     :title="editId ? '编辑资源池' : '创建资源池'" width="1180" :before-close="handleClose">
     <el-row :wrap="false" style="align-items: center;">
       <span style="flex-shrink: 0; margin-right: 14px;">资源池名称</span>
-      <el-input style="flex: 1;" v-model="input" size="large" />
+      <el-input style="flex: 1;" v-model="input" size="large" maxlength="20" />
     </el-row>
     <div style="margin-top: 20px; margin-bottom: 10px;">
       <span>选择节点</span>
diff --git a/packages/web/projects/vgpu/views/task/admin/index.vue b/packages/web/projects/vgpu/views/task/admin/index.vue
index 844fdba..860e977 100644
--- a/packages/web/projects/vgpu/views/task/admin/index.vue
+++ b/packages/web/projects/vgpu/views/task/admin/index.vue
@@ -13,7 +13,7 @@
 
 <script setup lang="jsx">
 import taskApi from '~/vgpu/api/task';
-import { calculateDuration, roundToDecimal, timeParse } from '@/utils';
+import { calculateDuration, roundToDecimal, timeParse, bytesToGB } from '@/utils';
 import { QuestionFilled } from '@element-plus/icons-vue';
 import api from '~/vgpu/api/task';
 import { ElMessage, ElMessageBox, ElPopover } from 'element-plus';
@@ -126,6 +126,16 @@ const columns = [
     title: '所属节点',
     dataIndex: 'nodeName',
   },
+  {
+    title: 'CPU',
+    dataIndex: 'requestedCpuCores',
+    render: ({ requestedCpuCores }) => `${requestedCpuCores}核`,
+  },
+  {
+    title: '内存',
+    dataIndex: 'requestedMemory',
+    render: ({ requestedMemory }) => `${bytesToGB(requestedMemory)}GiB`,
+  },
   {
     title: '分配 vGPU',
     dataIndex: 'deviceIds',

From 3142c6aeae8b8374f162551fb3cfbb89528fc34f 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 16:39:37 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/web/projects/vgpu/views/monitor/overview/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/web/projects/vgpu/views/monitor/overview/index.vue b/packages/web/projects/vgpu/views/monitor/overview/index.vue
index 56925f0..776dfca 100644
--- a/packages/web/projects/vgpu/views/monitor/overview/index.vue
+++ b/packages/web/projects/vgpu/views/monitor/overview/index.vue
@@ -227,7 +227,7 @@ const resourceOverview = ref([
     count: 0,
     icon: 'vgpu-pool-tab',
     unit: '个',
-    to: '/admin/vgpu/resource/admin'
+    to: '/admin/vgpu/poll/admin'
   },
   {
     title: 'CPU',

From 945bf7672ddda98dff0f7b54074eb06e5c81e2fb 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 16:52:08 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/web/projects/vgpu/views/poll/admin/index.vue |  7 ++++++-
 packages/web/src/icons/svg/arrow.svg                  | 11 +++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 packages/web/src/icons/svg/arrow.svg

diff --git a/packages/web/projects/vgpu/views/poll/admin/index.vue b/packages/web/projects/vgpu/views/poll/admin/index.vue
index 71f4299..7e34999 100644
--- a/packages/web/projects/vgpu/views/poll/admin/index.vue
+++ b/packages/web/projects/vgpu/views/poll/admin/index.vue
@@ -70,7 +70,9 @@
           </div>
         </div>
       </div>
-      <div class="wrap-center"></div>
+      <div class="wrap-center">
+        <svg-icon icon="arrow" />
+      </div>
       <div class="wrap-right">
         <div style="margin-top: 12px;"
           v-for="{ nodeIp, cpuCores, gpuNum, gpuMemory, totalMemory, diskSize }, index in nodeList.filter(e => nodeSelect.includes(e.nodeIp))"
@@ -304,5 +306,8 @@ onMounted(async () => {
 .wrap-center {
   width: 60px;
   flex-shrink: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 </style>
\ No newline at end of file
diff --git a/packages/web/src/icons/svg/arrow.svg b/packages/web/src/icons/svg/arrow.svg
new file mode 100644
index 0000000..fdbbfe5
--- /dev/null
+++ b/packages/web/src/icons/svg/arrow.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="7px" viewBox="0 0 20 7" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>路径</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="创建资源池" transform="translate(-711.000000, -482.000000)" fill="#9D9FA3" fill-rule="nonzero">
+            <g id="编组" transform="translate(711.000000, 482.000000)">
+                <path d="M0.714289965,6.66666667 C0.31979851,6.66666667 0,6.34215813 0,5.94185657 C0,5.54155501 0.31979851,5.21704647 0.714289965,5.21704647 L17.5615331,5.21704647 L13.6479384,1.24581195 C13.4623852,1.06369645 13.3881074,0.794158347 13.4536531,0.540793105 C13.5191988,0.287427863 13.7143679,0.0896642326 13.9641482,0.0235115646 C14.2139285,-0.0426411034 14.4794491,0.0331118821 14.6586587,0.221655283 L19.7086887,5.34678748 C19.7220221,5.36031727 19.7346412,5.37408866 19.7465461,5.38810166 C19.9756258,5.58441432 20.0594944,5.90500799 19.9565255,6.19076343 C19.8535566,6.47651887 19.5856717,6.66666667 19.285829,6.66666667 L0.714289965,6.66666667 Z" id="路径"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

From 5d9193b2c90b0451f385b4768996509d0f088daf 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:20:24 +0800
Subject: [PATCH 4/6] =?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 | 120 ++++++---------------
 1 file changed, 30 insertions(+), 90 deletions(-)

diff --git a/packages/web/src/components/TimePicker.vue b/packages/web/src/components/TimePicker.vue
index 4a16171..f1e82de 100644
--- a/packages/web/src/components/TimePicker.vue
+++ b/packages/web/src/components/TimePicker.vue
@@ -1,5 +1,6 @@
 <template>
   <el-date-picker
+    ref="pickerRef"
     v-model="value"
     :type="type"
     range-separator="至"
@@ -10,21 +11,25 @@
     class="date-picker"
     :disabled-date="disabledDate"
     v-bind="$attrs"
-  ></el-date-picker>
+  />
 </template>
 
 <script setup lang="jsx">
-import { computed, defineProps, defineEmits } from 'vue';
+import { computed, defineProps, defineEmits, ref } 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']);
 
+// picker ref
+const pickerRef = ref();
+
+// 双向绑定
 const value = computed({
   get() {
     return props.modelValue;
@@ -34,99 +39,34 @@ const value = computed({
   },
 });
 
-const shortcuts = [
-  {
-    text: '前 1 小时',
-    value: () => {
-      const end = new Date();
-      const start = new Date();
-      start.setTime(start.getTime() - 3600 * 1000 * 1);
-      return [start, end];
-    },
-  },
-  {
-    text: '前 6 小时',
+// 生成快捷选项的封装函数
+function genShortcut(text, hoursAgo) {
+  return {
+    text,
     value: () => {
       const end = new Date();
-      const start = new Date();
-      start.setTime(start.getTime() - 3600 * 1000 * 6);
+      const start = new Date(end.getTime() - hoursAgo * 3600 * 1000);
+      // 延迟关闭弹窗，确保值更新后再关闭
+      setTimeout(() => {
+        pickerRef.value?.handleClose?.();
+      }, 0);
       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 shortcuts = [
+  genShortcut('前 1 小时', 1),
+  genShortcut('前 6 小时', 6),
+  genShortcut('前 12 小时', 12),
+  genShortcut('前 1 天', 24),
+  genShortcut('前 2 天', 48),
+  genShortcut('前 3 天', 72),
+  genShortcut('前 1 周', 168),
 ];
 
+// 禁止选择未来时间
 const disabledDate = (time) => {
   return time.getTime() >= Date.now();
 };

From 2218e033763b3c1e51b81666a8bfdede5321a71f 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:38:15 +0800
Subject: [PATCH 5/6] =?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 | 28 +++++++++++++++-------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/packages/web/src/components/TimePicker.vue b/packages/web/src/components/TimePicker.vue
index f1e82de..9289cc0 100644
--- a/packages/web/src/components/TimePicker.vue
+++ b/packages/web/src/components/TimePicker.vue
@@ -10,15 +10,15 @@
     :shortcuts="type.includes('range') && shortcuts"
     class="date-picker"
     :disabled-date="disabledDate"
+    @visible-change="onVisibleChange"
     v-bind="$attrs"
   />
 </template>
 
 <script setup lang="jsx">
 import { computed, defineProps, defineEmits, ref } from 'vue';
-import { ElDatePicker } from 'element-plus';
 
-// props & emits
+// Props 和 Emits
 const props = defineProps({
   modelValue: {},
   type: { type: String, default: 'date' },
@@ -26,10 +26,16 @@ const props = defineProps({
 });
 const emits = defineEmits(['update:modelValue']);
 
-// picker ref
+// picker 引用 和 当前面板是否显示
 const pickerRef = ref();
+const visible = ref(false);
 
-// 双向绑定
+// 显示状态变化监听
+const onVisibleChange = (val) => {
+  visible.value = val;
+};
+
+// 双向绑定逻辑
 const value = computed({
   get() {
     return props.modelValue;
@@ -39,17 +45,21 @@ const value = computed({
   },
 });
 
-// 生成快捷选项的封装函数
+// 快捷时间生成函数
 function genShortcut(text, hoursAgo) {
   return {
     text,
     value: () => {
       const end = new Date();
       const start = new Date(end.getTime() - hoursAgo * 3600 * 1000);
-      // 延迟关闭弹窗，确保值更新后再关闭
+
+      // 只关闭当前打开的面板，避免影响其他 time-picker
       setTimeout(() => {
-        pickerRef.value?.handleClose?.();
+        if (visible.value) {
+          pickerRef.value?.handleClose?.();
+        }
       }, 0);
+
       return [start, end];
     },
   };
@@ -66,13 +76,13 @@ const shortcuts = [
   genShortcut('前 1 周', 168),
 ];
 
-// 禁止选择未来时间
+// 禁用未来时间
 const disabledDate = (time) => {
   return time.getTime() >= Date.now();
 };
 </script>
 
-<style>
+<style scoped>
 .date-picker {
   max-width: 450px;
 }

From 5d1228e9ea38526db03b375f3733f9359d1e526e 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:50:16 +0800
Subject: [PATCH 6/6] =?UTF-8?q?fix=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vgpu/views/monitor/overview/index.vue     | 56 +++++++++----------
 .../projects/vgpu/views/task/admin/Detail.vue |  3 +
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/packages/web/projects/vgpu/views/monitor/overview/index.vue b/packages/web/projects/vgpu/views/monitor/overview/index.vue
index 776dfca..a5661ec 100644
--- a/packages/web/projects/vgpu/views/monitor/overview/index.vue
+++ b/packages/web/projects/vgpu/views/monitor/overview/index.vue
@@ -379,20 +379,20 @@ const nodeUsedTop = {
   title: '节点资源使用率 Top5',
   key: 'used',
   config: [
-    {
-      tab: 'CPU',
-      key: 'cpu',
-      nameKey: 'instance',
-      data: [],
-      query: 'topk(5, avg by (instance) (rate(node_cpu_seconds_total{mode="idle"}[5m])))',
-    },
-    {
-      tab: '内存',
-      key: 'internal',
-      nameKey: 'instance',
-      data: [],
-      query: 'topk(5, ((node_memory_MemTotal_bytes - node_memory_MemAvailable_bytes) / node_memory_MemTotal_bytes))',
-    },
+    // {
+    //   tab: 'CPU',
+    //   key: 'cpu',
+    //   nameKey: 'instance',
+    //   data: [],
+    //   query: 'topk(5, avg by (instance) (rate(node_cpu_seconds_total{mode="idle"}[5m])))',
+    // },
+    // {
+    //   tab: '内存',
+    //   key: 'internal',
+    //   nameKey: 'instance',
+    //   data: [],
+    //   query: 'topk(5, ((node_memory_MemTotal_bytes - node_memory_MemAvailable_bytes) / node_memory_MemTotal_bytes))',
+    // },
     {
       tab: '算力',
       key: 'core',
@@ -415,20 +415,20 @@ const nodeTotalTop = {
   title: '节点资源分配率 Top5',
   key: 'used',
   config: [
-    {
-      tab: 'CPU',
-      key: 'cpu',
-      nameKey: 'instance',
-      data: [],
-      query: `topk(5, sum(hami_container_vcore_allocated) by (instance) / sum(hami_core_size) by (instance) * 100)`,
-    },
-    {
-      tab: '内存',
-      key: 'internal',
-      nameKey: 'instance',
-      data: [],
-      query: `topk(5, sum(hami_container_vmemory_allocated) by (instance) / sum(hami_memory_size) by (instance) * 100)`,
-    },
+    // {
+    //   tab: 'CPU',
+    //   key: 'cpu',
+    //   nameKey: 'instance',
+    //   data: [],
+    //   query: `topk(5, sum(hami_container_vcore_allocated) by (instance) / sum(hami_core_size) by (instance) * 100)`,
+    // },
+    // {
+    //   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',
diff --git a/packages/web/projects/vgpu/views/task/admin/Detail.vue b/packages/web/projects/vgpu/views/task/admin/Detail.vue
index 32e0a58..808e81e 100644
--- a/packages/web/projects/vgpu/views/task/admin/Detail.vue
+++ b/packages/web/projects/vgpu/views/task/admin/Detail.vue
@@ -298,6 +298,9 @@ onMounted(async () => {
   if (foundCard) {
     detail.value.type = foundCard.type;
   }
+  if (!detail.value.deviceIds?.length) {
+    lineConfig.value.splice(0, 2);
+  }
 
   // const start = new Date();
   // start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);