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

packages/web/projects/vgpu/api/poll.js

@@ -43,6 +43,14 @@ class pollApi {
     });
   }
 
+  remove(data) {
+    return request({
+      url: apiPrefix + '/v1/resource/pool/removeNode',
+      method: 'POST',
+      data,
+    });
+  }
+
   getDetailNodeList(data) {
     return {
       url: apiPrefix + '/v1/resource/pool/detail',

packages/web/projects/vgpu/views/monitor/overview/getOptions.js

@@ -2,6 +2,9 @@ import { timeParse } from '@/utils';
 import { cloneDeep } from 'lodash';
 import nodeApi from '~/vgpu/api/node';
 import { ElMessage } from 'element-plus';
+import useParentAction from '~/vgpu/hooks/useParentAction';
+
+const { sendRouteChange } = useParentAction();
 
 export const getResourceStatus = (statusConfig) => {
   return {
@@ -278,7 +281,7 @@ export const handleChartClick = async (params, router) => {
 
   if (node) {
     const uuid = node.uid;
-    router.push(`/admin/vgpu/node/admin/${uuid}?nodeName=${name}`);
+    sendRouteChange(`/admin/vgpu/node/admin/${uuid}?nodeName=${name}`);
   } else {
     ElMessage.error('节点未找到');
   }

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

@@ -172,11 +172,6 @@ const columns = [
     dataIndex: 'diskSize',
     render: ({ diskSize }) => `${bytesToGB(diskSize)}GiB`,
   },
-  {
-    title: '所属资源池',
-    dataIndex: 'resourcePools',
-    render: ({ resourcePools }) => `${resourcePools.join('、')}`,
-  },
   {
     title: '显卡数量',
     dataIndex: 'cardCnt',
@@ -221,57 +216,23 @@ const rowAction = [
     },
   },
   {
-    title: '禁用',
+    title: '移除',
-    hidden: (row) => !row.isSchedulable,
     onClick: async (row) => {
-      ElMessageBox.confirm(`确认对该节点进行禁用操作？`, '操作确认', {
+      ElMessageBox.confirm(`确定要移除当前节点吗？`, '操作确认', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
       })
         .then(async () => {
           try {
-            await nodeApi.stop(
+            await pollApi.remove(
               {
-                nodeName: row.name,
+                node_id: row.nodeId,
-                status: 'DISABLED'
               }
             ).then(
               () => {
                 setTimeout(() => {
-                  ElMessage.success('节点禁用成功');
+                  ElMessage.success('节点移除成功');
-                  table.value.fetchData();
-                }, 500);
-              }
-            )
-          } catch (error) {
-            ElMessage.error(error.message);
-          }
-        })
-        .catch(() => { });
-    },
-  },
-  {
-    title: '开启',
-    hidden: (row) => row.isSchedulable,
-    disabled: (row) => row.isExternal,
-    onClick: async (row) => {
-      ElMessageBox.confirm(`确认对该节点进行开启调度操作？`, '操作确认', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(async () => {
-          try {
-            await nodeApi.stop(
-              {
-                nodeName: row.name,
-                status: 'ENABLE'
-              }
-            ).then(
-              () => {
-                setTimeout(() => {
-                  ElMessage.success('节点开启调度成功');
                   table.value.fetchData();
                 }, 500);
               }
@@ -523,7 +484,6 @@ onMounted(async () => {
 </script>
 
 <style scoped lang="scss">
-
 .card-gauges {
   margin: 0;
   padding: 0;

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

@@ -64,7 +64,7 @@ import { onMounted, ref, watch, watchEffect } from 'vue';
 import useInstantVector from '~/vgpu/hooks/useInstantVector';
 import cardApi from '~/vgpu/api/card';
 import { QuestionFilled } from '@element-plus/icons-vue';
-import { roundToDecimal, timeParse, calculateDuration } from '@/utils';
+import { roundToDecimal, timeParse, calculateDuration, bytesToGB } from '@/utils';
 import taskApi from '~/vgpu/api/task';
 import BlockBox from '@/components/BlockBox.vue';
 import Gauge from '~/vgpu/components/gauge.vue';
@@ -164,11 +164,23 @@ const columns = [
     value: 'type',
   },
   {
-    label: '可分配算力',
+    label: '分配CPU',
+    value: 'requestedCpuCores',
+    render: ({ requestedCpuCores }) => <span>{requestedCpuCores} 核</span>,
+
+  },
+  {
+    label: '分配内存',
+    value: 'requestedMemory',
+    render: ({ requestedMemory }) => <span>{bytesToGB(requestedMemory)} 核</span>,
+
+  },
+  {
+    label: '分配算力',
     value: 'allocatedCores',
   },
   {
-    label: '可分配显存',
+    label: '分配显存',
     value: 'allocatedMem',
     render: ({ allocatedMem }) =>
       allocatedMem ? (

packages/web/projects/vgpu/views/task/admin/top.vue

@@ -9,7 +9,9 @@ import TabTop from '~/vgpu/components/TabTop.vue';
 import { useRouter } from 'vue-router';
 import nodeApi from '~/vgpu/api/node';
 import { ElMessage } from 'element-plus';
+import useParentAction from '~/vgpu/hooks/useParentAction';
 
+const { sendRouteChange } = useParentAction();
 const router = useRouter();
 
 const handleChartClick = async (params) => {
@@ -20,23 +22,15 @@ const handleChartClick = async (params) => {
     const node = list.find(node => node.name === name);
     if (node) {
       const uuid = node.uid;
-      router.push(`/admin/vgpu/node/admin/${uuid}?nodeName=${name}`);
+      sendRouteChange(`/admin/vgpu/node/admin/${uuid}?nodeName=${name}`);
     } else {
       ElMessage.error('节点未找到');
     }
   } else if (activeTabKey === 'deviceuuid') {
-    router.push({
+    sendRouteChange(`/admin/vgpu/card/admin/${name}`);
-      path: `/admin/vgpu/card/admin/${name}`,
-    });
   } else {
     const [containerName, podUid] = name.split(':');
-    router.push({
+    sendRouteChange(`/admin/vgpu/task/admin/detail?name=${containerName}&podUid=${podUid}`);
-      path: '/admin/vgpu/task/admin/detail',
-      query: {
-        name: containerName,
-        podUid: podUid,
-      },
-    });
   }
 };
 

packages/web/src/components/TextPlus.vue

@@ -10,7 +10,9 @@
 <script setup>
 import { ElMessage } from 'element-plus';
 import { useRouter } from 'vue-router';
+import useParentAction from '~/vgpu/hooks/useParentAction';
 
+const { sendRouteChange } = useParentAction();
 const router = useRouter();
 
 const props = defineProps({
@@ -32,7 +34,7 @@ const handleCopy = () => {
 
 const handleClick = () => {
   if (props.to) {
-    router.push(props.to);
+    sendRouteChange(props.to);
   }
 };
 </script>

packages/web/src/layout/components/Sidebar/index.vue

@@ -41,7 +41,7 @@
                   'side-menus-item-children-item',
                   { 'is-active': route.path.includes(child.path) },
                 ]"
-                @click="router.push(child.path)"
+                @click="sendRouteChange(child.path)"
               >
                 <svg-icon :icon="child.meta?.icon" />
                 <span v-if="sideWidth >= 200"> {{ child.meta?.title }}</span>
@@ -62,6 +62,9 @@
 import { computed, onMounted, ref, nextTick, onBeforeUnmount } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useStore } from 'vuex';
+import useParentAction from '~/vgpu/hooks/useParentAction';
+
+const { sendRouteChange } = useParentAction();
 
 const route = useRoute();
 const router = useRouter();

packages/web/src/layout/index.vue

@@ -50,11 +50,6 @@ export default {
         const messageData = JSON.parse(event.data);
         if (messageData.type === "ChangeTheRoute") {
           // const { pathname, query } = parseUrl(messageData.data)
-          // console.log(messageData.data, 'messageData.data')
-          // this.router.push({
-          //   path: pathname,
-          //   query
-          // });
           this.router.replace(messageData.data)
         }
       } catch (e) { }

packages/web/src/utils/index.js

@@ -569,8 +569,11 @@ export const clearEdges = (items) =>
 
 // 字节转GB
 export const bytesToGB = (bytes) => {
+  if (bytes === '' || bytes === undefined || bytes === null) {
+    return '';
+  }
   return Math.round(bytes / (1024 * 1024 * 1024));
-}
+};
 
 export function parseUrl(url) {
   const [pathname, queryString] = url.split('?');