diff --git a/packages/web/projects/vgpu/api/poll.js b/packages/web/projects/vgpu/api/poll.js index 99069fd..6c9b79b 100644 --- a/packages/web/projects/vgpu/api/poll.js +++ b/packages/web/projects/vgpu/api/poll.js @@ -52,11 +52,11 @@ class pollApi { } getDetailNodeList(data) { - return { + return request({ url: apiPrefix + '/v1/resource/pool/detail', method: 'post', data, - }; + }); } // getNodes(data) { diff --git a/packages/web/projects/vgpu/views/monitor/overview/index.vue b/packages/web/projects/vgpu/views/monitor/overview/index.vue index d25305d..7064d37 100644 --- a/packages/web/projects/vgpu/views/monitor/overview/index.vue +++ b/packages/web/projects/vgpu/views/monitor/overview/index.vue @@ -135,8 +135,8 @@ const cardGaugeConfig = useInstantVector([ { title: 'CPU 使用率', percent: 0, - query: `avg(count(node_cpu_seconds_total{mode="idle"}) by (instance)) * (1 - avg(rate(node_cpu_seconds_total{mode="idle"}[5m])))`, - totalQuery: `avg(count(node_cpu_seconds_total{mode="idle"}) by (instance))`, + query: `sum(count by(instance) (node_cpu_seconds_total{mode="idle"})*(1 - avg by(instance) (irate(node_cpu_seconds_total{mode="idle"}[1m]))))`, + totalQuery: `sum(count(node_cpu_seconds_total{mode="system"}) by (instance))`, percentQuery: ``, total: 0, used: 0, @@ -145,8 +145,8 @@ const cardGaugeConfig = useInstantVector([ { title: '内存 使用率', percent: 0, - query: `avg(node_memory_MemTotal_bytes - node_memory_MemAvailable_bytes) / 1024 / 1024 / 1024`, - totalQuery: `avg(node_memory_MemTotal_bytes) / 1024 / 1024 / 1024`, + query: `(sum(node_memory_MemTotal_bytes) - sum(node_memory_MemAvailable_bytes)) / 1024 / 1024 / 1024`, + totalQuery: `sum(node_memory_MemTotal_bytes) / 1024 / 1024 / 1024`, percentQuery: ``, total: 0, used: 0, @@ -155,7 +155,7 @@ const cardGaugeConfig = useInstantVector([ { title: '磁盘 使用率', percent: 0, - query: `avg(node_filesystem_size_bytes{fstype!~"tmpfs|overlay"} - node_filesystem_free_bytes{fstype!~"tmpfs|overlay"}) / 1024 / 1024 / 1024`, + 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`, percentQuery: ``, total: 0, diff --git a/packages/web/projects/vgpu/views/poll/admin/Detail.vue b/packages/web/projects/vgpu/views/poll/admin/Detail.vue index ddabaea..28f1fb4 100644 --- a/packages/web/projects/vgpu/views/poll/admin/Detail.vue +++ b/packages/web/projects/vgpu/views/poll/admin/Detail.vue @@ -1,79 +1,20 @@ - - diff --git a/packages/web/projects/vgpu/views/poll/admin/DetailBox.vue b/packages/web/projects/vgpu/views/poll/admin/DetailBox.vue new file mode 100644 index 0000000..29eccb0 --- /dev/null +++ b/packages/web/projects/vgpu/views/poll/admin/DetailBox.vue @@ -0,0 +1,203 @@ + + + + + diff --git a/packages/web/projects/vgpu/views/task/admin/index.vue b/packages/web/projects/vgpu/views/task/admin/index.vue index c15e1e4..844fdba 100644 --- a/packages/web/projects/vgpu/views/task/admin/index.vue +++ b/packages/web/projects/vgpu/views/task/admin/index.vue @@ -105,6 +105,7 @@ const columns = [ { title: '实训名称', dataIndex: 'shixunName', + render: ({ shixunName }) => shixunName || '/', }, { title: '使用者角色', @@ -114,6 +115,7 @@ const columns = [ { title: '用户名', dataIndex: 'role', + render: ({ role }) => role || '/', }, { title: '所属资源池',