Merge branch 'main' of https://bdgit.educoder.net/pgpc5xf4t/hami into main

packages/web/projects/vgpu/components/previewBar.vue

@@ -57,20 +57,20 @@ const echartsRef = ref();
 const totalTop = {
   title: `${props.title}资源分配率 Top5`,
   config: [
-    props.type === 'node' && {
+    // props.type === 'node' && {
-      tab: 'CPU',
+    //   tab: 'CPU',
-      key: 'cpu',
+    //   key: 'cpu',
-      nameKey: 'instance',
+    //   nameKey: 'instance',
-      data: [],
+    //   data: [],
-      query: `topk(5, sum(hami_container_vcore_allocated) by (instance) / sum(hami_core_size) by (instance) * 100)`,
+    //   query: `topk(5, sum(hami_container_vcore_allocated) by (instance) / sum(hami_core_size) by (instance) * 100)`,
-    },
+    // },
-    props.type === 'node' && {
+    // props.type === 'node' && {
-      tab: '内存',
+    //   tab: '内存',
-      key: 'internal',
+    //   key: 'internal',
-      nameKey: 'instance',
+    //   nameKey: 'instance',
-      data: [],
+    //   data: [],
-      query: `topk(5, sum(hami_container_vmemory_allocated) by (instance) / sum(hami_memory_size) by (instance) * 100)`,
+    //   query: `topk(5, sum(hami_container_vmemory_allocated) by (instance) / sum(hami_memory_size) by (instance) * 100)`,
-    },
+    // },
     {
       tab: 'vGPU',
       key: 'vgpu',

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" />
+          <time-picker v-model="times" type="datetimerange" size="small" :key="`time-picker-${title}`" />
         </template>
         <echarts-plus :options="getRangeOptions(dataSource)" style="height: 250px" />
       </Block>

packages/web/projects/vgpu/views/node/admin/Detail.vue

@@ -342,19 +342,19 @@ const detailColumns = [
   },
   {
     label: 'CPU大小',
-    value: 'coreTotal',
+    value: 'cpuCores',
-    render: ({ coreTotal }) => (
+    render: ({ cpuCores }) => (
       <span>
-        {`${coreTotal}核`}
+        {`${cpuCores}核`}
       </span>
     ),
   },
   {
     label: '内存大小',
-    value: 'memoryTotal',
+    value: 'totalMemory',
-    render: ({ memoryTotal }) => (
+    render: ({ totalMemory }) => (
       <span>
-        {`${bytesToGB(memoryTotal)}GiB`}
+        {`${bytesToGB(totalMemory)}GiB`}
       </span>
     ),
   },

packages/web/projects/vgpu/views/node/admin/index.vue

@@ -158,13 +158,13 @@ const columns = [
   },
   {
     title: 'CPU',
-    dataIndex: 'coreTotal',
+    dataIndex: 'cpuCores',
-    render: ({ coreTotal }) => `${coreTotal}核`,
+    render: ({ cpuCores }) => `${cpuCores}核`,
   },
   {
     title: '内存',
-    dataIndex: 'memoryTotal',
+    dataIndex: 'totalMemory',
-    render: ({ memoryTotal }) => `${bytesToGB(memoryTotal)}GiB`,
+    render: ({ totalMemory }) => `${bytesToGB(totalMemory)}GiB`,
   },
   {
     title: '磁盘',

packages/web/projects/vgpu/views/poll/admin/Detail.vue

@@ -81,13 +81,13 @@ const columns = [
   },
   {
     title: 'CPU',
-    dataIndex: 'coreTotal',
+    dataIndex: 'cpuCores',
-    render: ({ coreTotal }) => `${coreTotal}核`,
+    render: ({ cpuCores }) => `${cpuCores}核`,
   },
   {
     title: '内存',
-    dataIndex: 'memoryTotal',
+    dataIndex: 'totalMemory',
-    render: ({ memoryTotal }) => `${bytesToGB(memoryTotal)}GiB`,
+    render: ({ totalMemory }) => `${bytesToGB(totalMemory)}GiB`,
   },
   {
     title: '磁盘',

packages/web/src/components/TimePicker.vue

@@ -8,6 +8,8 @@
     end-placeholder="结束时间"
     unlink-panels
     :shortcuts="type.includes('range') && shortcuts"
+    :teleported="false" 
+    :append-to-body="false"
     class="date-picker"
     :disabled-date="disabledDate"
     @visible-change="onVisibleChange"
@@ -18,7 +20,7 @@
 <script setup lang="jsx">
 import { computed, defineProps, defineEmits, ref } from 'vue';
 
-// Props 和 Emits
+// props 和 emits
 const props = defineProps({
   modelValue: {},
   type: { type: String, default: 'date' },
@@ -26,16 +28,16 @@ const props = defineProps({
 });
 const emits = defineEmits(['update:modelValue']);
 
-// picker 引用 和 当前面板是否显示
+// 本组件自己的 ref 和显示状态
 const pickerRef = ref();
 const visible = ref(false);
 
-// 显示状态变化监听
+// 监听是否显示
 const onVisibleChange = (val) => {
   visible.value = val;
 };
 
-// 双向绑定逻辑
+// 双向绑定
 const value = computed({
   get() {
     return props.modelValue;
@@ -45,7 +47,7 @@ const value = computed({
   },
 });
 
-// 快捷时间生成函数
+// 快捷选项生成器
 function genShortcut(text, hoursAgo) {
   return {
     text,
@@ -53,7 +55,7 @@ function genShortcut(text, hoursAgo) {
       const end = new Date();
       const start = new Date(end.getTime() - hoursAgo * 3600 * 1000);
 
-      // 只关闭当前打开的面板，避免影响其他 time-picker
+      // 只关闭当前面板
       setTimeout(() => {
         if (visible.value) {
           pickerRef.value?.handleClose?.();
@@ -65,7 +67,7 @@ function genShortcut(text, hoursAgo) {
   };
 }
 
-// 快捷选项列表
+// 快捷选项
 const shortcuts = [
   genShortcut('前 1 小时', 1),
   genShortcut('前 6 小时', 6),
@@ -76,7 +78,7 @@ const shortcuts = [
   genShortcut('前 1 周', 168),
 ];
 
-// 禁用未来时间
+// 禁止选择未来时间
 const disabledDate = (time) => {
   return time.getTime() >= Date.now();
 };