diff --git a/public/locales/en.json b/public/locales/en.json index fb6d66f..05994b3 100644 --- a/public/locales/en.json +++ b/public/locales/en.json @@ -45,6 +45,9 @@ "menu": { "taskManagement": "Task", "taskList": "Task", + "aiList": "AI Task", + "hpcList": "HPC Task", + "cloudList": "Cloud Task", "jobTask": "TaskList", "strategyManagement": "Strategy Management", "schedulingStrategy": "Schedule Management", @@ -98,7 +101,8 @@ "storageMana": "Storage Mgmt", "appObserve": "App Monitoring", "logMana": "Log Mgmt", - "monitorSelectPcm": "JCCE" + "monitorSelectPcm": "JCCE", + "fileManagement": "File Management" }, "check": { "input": "Please Input", diff --git a/public/locales/zh.json b/public/locales/zh.json index 8a53740..978989b 100644 --- a/public/locales/zh.json +++ b/public/locales/zh.json @@ -45,6 +45,9 @@ "menu": { "taskManagement": "任务管理", "taskList": "任务列表", + "aiList": "智算任务列表", + "hpcList": "超算任务列表", + "cloudList": "数算任务列表", "jobTask": "作业任务", "strategyManagement": "策略管理", "schedulingStrategy": "调度策略", @@ -98,7 +101,8 @@ "storageMana": "存储管理", "appObserve": "应用观测", "logMana": "日志管理", - "monitorSelectPcm": "云际算力网基础平台" + "monitorSelectPcm": "云际算力网基础平台", + "fileManagement": "文件管理" }, "check": { "input": "请输入", diff --git a/src/assets/images/exhibition/usabilityMonitor-1.png b/src/assets/images/exhibition/usabilityMonitor-1.png new file mode 100644 index 0000000..3907fa2 Binary files /dev/null and b/src/assets/images/exhibition/usabilityMonitor-1.png differ diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 23ce81d..23edaf9 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -56,6 +56,9 @@ {{ $t('menu.systemManagement') }} + + {{ $t('menu.fileManagement') }} + {{ $t('message.logout') }} @@ -165,6 +168,10 @@ export default { this.$store.dispatch('user/setRouteType', 'warnManagement') this.$router.push({ path: '/warnManagement/warnList' }) }, + toFileManagement() { + this.$store.dispatch('user/setRouteType', 'fileManagement') + this.$router.push({ path: '/fileManagement/fileList' }) + }, toSetting() { this.$store.dispatch('user/setRouteType', 'setting') this.$router.push({ path: '/setting/dictManagement' }) diff --git a/src/router/index.js b/src/router/index.js index ceb76b4..590f984 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -18,6 +18,7 @@ import modelarts from './modules/modelarts' import taskManagementRouter from './modules/taskManagement' import strategyManagementRouter from './modules/strategy' import adapterMangementRouter from './modules/adapterManagement' +import fileManagementRouter from './modules/fileManagement' /* Router Modules */ // import componentsRouter from './modules/components' // import tableRouter from './modules/table' @@ -153,7 +154,8 @@ export const asyncRoutes = [ modelarts, taskManagementRouter, strategyManagementRouter, - adapterMangementRouter + adapterMangementRouter, + fileManagementRouter ] const createRouter = () => new Router({ diff --git a/src/router/modules/fileManagement.js b/src/router/modules/fileManagement.js new file mode 100644 index 0000000..cb4f5e3 --- /dev/null +++ b/src/router/modules/fileManagement.js @@ -0,0 +1,20 @@ +import Layout from '@/layout' +const fileManagementRouter = { + path: '/fileManagement', + component: Layout, + name: 'fileManagement', + meta: { + title: 'fileManagement', + icon: 'xunijiguanli-juan' + }, + children: [ + { + path: 'fileList', + component: () => import('@/views/fileManagement/fileList/list'), + name: 'fileManagement', + meta: { title: 'overview', icon: 'gailan', affix: true }, + hidden: false + } + ] +} +export default fileManagementRouter diff --git a/src/router/modules/taskManagement.js b/src/router/modules/taskManagement.js index c6705b0..a87c3af 100644 --- a/src/router/modules/taskManagement.js +++ b/src/router/modules/taskManagement.js @@ -28,6 +28,28 @@ const taskManagementRouter = { name: 'taskList', meta: { title: 'taskList', icon: 'gailan', affix: true }, hidden: false - }] + }, + { + path: 'cloudList', + component: () => import('@/views/taskManagement/cloudList/taskList'), + name: 'cloudList', + meta: { title: 'cloudList', icon: 'gailan', affix: true }, + hidden: false + }, + { + path: 'aiList', + component: () => import('@/views/taskManagement/aiList/taskList'), + name: 'aiList', + meta: { title: 'aiList', icon: 'gailan', affix: true }, + hidden: false + }, + { + path: 'hpcList', + component: () => import('@/views/taskManagement/hpcList/taskList'), + name: 'hpcList', + meta: { title: 'hpcList', icon: 'gailan', affix: true }, + hidden: false + } + ] } export default taskManagementRouter diff --git a/src/views/fileManagement/fileList/list.vue b/src/views/fileManagement/fileList/list.vue new file mode 100644 index 0000000..d2443ac --- /dev/null +++ b/src/views/fileManagement/fileList/list.vue @@ -0,0 +1,408 @@ + + + + + diff --git a/src/views/taskManagement/aiList/taskList.vue b/src/views/taskManagement/aiList/taskList.vue new file mode 100644 index 0000000..ecd1736 --- /dev/null +++ b/src/views/taskManagement/aiList/taskList.vue @@ -0,0 +1,210 @@ + + + + + diff --git a/src/views/taskManagement/cloudList/taskList.vue b/src/views/taskManagement/cloudList/taskList.vue new file mode 100644 index 0000000..437279d --- /dev/null +++ b/src/views/taskManagement/cloudList/taskList.vue @@ -0,0 +1,142 @@ + + + + + diff --git a/src/views/taskManagement/hpcList/taskList.vue b/src/views/taskManagement/hpcList/taskList.vue new file mode 100644 index 0000000..b815be7 --- /dev/null +++ b/src/views/taskManagement/hpcList/taskList.vue @@ -0,0 +1,142 @@ + + + + + diff --git a/src/views/taskManagement/taskList/list.vue b/src/views/taskManagement/taskList/list.vue index e736a4b..820fc0e 100644 --- a/src/views/taskManagement/taskList/list.vue +++ b/src/views/taskManagement/taskList/list.vue @@ -50,6 +50,31 @@ export default { name: { label: this.$t('message.name') } + // status: { + // label: this.$t('page.job') + this.$t('page.status'), + // type: 'select', + // dataSource: [ + // { + // label: '已保留', value: 'unschedulable' + // }, { + // label: '已下发', value: 'running' + // }, { + // label: '错误', value: 'warning' + // } + // ] + // }, + // type: { + // label: this.$t('page.task') + this.$t('page.type'), + // type: 'select', + // dataSource: [ + // { + // label: '智算资源任务', value: 'unschedulable' + // }, { + // label: '智算资源任务', value: 'running' + // } + // ] + // } + } }, columns() {