diff --git a/web_src/vuepages/apis/modules/resources.js b/web_src/vuepages/apis/modules/resources.js index 69c94d8fc..4ace89959 100644 --- a/web_src/vuepages/apis/modules/resources.js +++ b/web_src/vuepages/apis/modules/resources.js @@ -1,5 +1,15 @@ import service from '../service'; +// 查询智算列表 +export const getAiCenterList = () => { + return service({ + url: '/admin/resources/queue/centers', + method: 'get', + params: {}, + data: {}, + }); +} + // 查询资源队列列表 // page 当前页数,从1开始 // cluster 所属集群 :OpenI 启智集群,C2Net 智算集群 @@ -44,6 +54,16 @@ export const getResQueueCode = (params) => { // cluster }); } +// 同步智算网络资源池(队列) +export const syncResQueue = () => { + return service({ + url: '/admin/resources/queue/grampus/sync', + method: 'post', + params: {}, + data: {}, + }); +} + // 新增资源规格 export const addResSpecification = (data) => { return service({ @@ -80,6 +100,16 @@ export const getResSpecificationList = (params) => { }); } +// 同步智算网络资源池(队列) +export const syncResSpecification = () => { + return service({ + url: '/admin/resources/specification/grampus/sync', + method: 'post', + params: {}, + data: {}, + }); +} + // 新增资源应用场景 /* { diff --git a/web_src/vuepages/const/index.js b/web_src/vuepages/const/index.js index af097ac01..dde164344 100644 --- a/web_src/vuepages/const/index.js +++ b/web_src/vuepages/const/index.js @@ -11,6 +11,6 @@ export const JOB_TYPE = [{ k: 'DEBUG', v: i18n.t('debugTask') }, { k: 'TRAIN', v // 资源管理 export const CLUSTERS = [{ k: 'OpenI', v: i18n.t('resourcesManagement.OpenI') }, { k: 'C2Net', v: i18n.t('resourcesManagement.C2Net') }]; export const AI_CENTER = [{ k: 'OpenIOne', v: i18n.t('resourcesManagement.OpenIOne') }, { k: 'OpenITwo', v: i18n.t('resourcesManagement.OpenITwo') }, { k: 'chendu', v: i18n.t('resourcesManagement.chenduCenter') }, { k: 'pclcci', v: i18n.t('resourcesManagement.pclcci') }, { k: 'hefei', v: i18n.t('resourcesManagement.hefeiCenter') }, { k: 'xuchang', v: i18n.t('resourcesManagement.xuchangCenter') }]; -export const COMPUTER_RESOURCES = [{ k: 'GPU', v: 'GPU' }, { k: 'NPU', v: 'NPU' }]; -export const ACC_CARD_TYPE = [{ k: 'T4', v: 'T4' }, { k: 'A100', v: 'A100' }, { k: 'V100', v: 'V100' }, { k: 'Ascend910', v: 'Ascend 910' }]; -export const SPECIFICATION_STATUS = [{ k: '1', v: i18n.t('resourcesManagement.toOnShelf') }, { k: '2', v: i18n.t('resourcesManagement.onShelf') }, { k: '3', v: i18n.t('resourcesManagement.offShelf') }]; +export const COMPUTER_RESOURCES = [{ k: 'GPU', v: 'GPU' }, { k: 'NPU', v: 'NPU' }, { k: 'MLU', v: 'MLU' }]; +export const ACC_CARD_TYPE = [{ k: 'T4', v: 'T4' }, { k: 'A100', v: 'A100' }, { k: 'V100', v: 'V100' }, { k: 'ASCEND910', v: 'Ascend 910' }, { k: 'MLU270', v: 'MLU270' }, { k: 'RTX3080', v: 'RTX3080' }]; +export const SPECIFICATION_STATUS = [{ k: '1', v: i18n.t('resourcesManagement.willOnShelf') }, { k: '2', v: i18n.t('resourcesManagement.onShelf') }, { k: '3', v: i18n.t('resourcesManagement.offShelf') }]; diff --git a/web_src/vuepages/langs/config/en-US.js b/web_src/vuepages/langs/config/en-US.js index cc66eb33a..64da0bb5d 100644 --- a/web_src/vuepages/langs/config/en-US.js +++ b/web_src/vuepages/langs/config/en-US.js @@ -85,7 +85,7 @@ const en = { pclcci: 'PCL Cloud Computer Institute', hefeiCenter: 'HeFei AI Center', xuchangCenter: 'XuChang AI Center', - toOnShelf: 'To Be On Shelf', + willOnShelf: 'To Be On Shelf', onShelf: 'On Shelf', offShelf: 'Off Shelf', toOnShelf: 'To On Shelf', diff --git a/web_src/vuepages/langs/config/zh-CN.js b/web_src/vuepages/langs/config/zh-CN.js index a468eccb5..abbde5dae 100644 --- a/web_src/vuepages/langs/config/zh-CN.js +++ b/web_src/vuepages/langs/config/zh-CN.js @@ -85,7 +85,7 @@ const zh = { pclcci: '鹏城云计算所', hefeiCenter: '合肥类脑类脑智能开放平台', xuchangCenter: '中原人工智能计算中心', - toOnShelf: '待上架', + willOnShelf: '待上架', onShelf: '已上架', offShelf: '已下架', toOnShelf: '上架', diff --git a/web_src/vuepages/pages/resources/components/QueueDialog.vue b/web_src/vuepages/pages/resources/components/QueueDialog.vue index 8527a1487..b49e5a93d 100644 --- a/web_src/vuepages/pages/resources/components/QueueDialog.vue +++ b/web_src/vuepages/pages/resources/components/QueueDialog.vue @@ -100,8 +100,8 @@ export default { data() { return { dialogShow: false, - clusterList: [...CLUSTERS], - computingCenterList: [...AI_CENTER], + clusterList: [CLUSTERS[0]], + computingCenterList: [AI_CENTER[0], AI_CENTER[1]], computingTypeList: [...COMPUTER_RESOURCES], cardTypeList: [...ACC_CARD_TYPE], diff --git a/web_src/vuepages/pages/resources/components/SceneDialog.vue b/web_src/vuepages/pages/resources/components/SceneDialog.vue index ba83ba291..0bc8068ef 100644 --- a/web_src/vuepages/pages/resources/components/SceneDialog.vue +++ b/web_src/vuepages/pages/resources/components/SceneDialog.vue @@ -53,7 +53,7 @@