diff --git a/src/apis/modules/certifications.js b/src/apis/modules/certifications.js index ed05efb..590a31b 100644 --- a/src/apis/modules/certifications.js +++ b/src/apis/modules/certifications.js @@ -1,13 +1,7 @@ import request from '@/utils/request' -//获取banner列表 +//获取审核列表 export const getCertificationsList = (params) => request.basic.get('/api/v1/certifications', params) -//获取单个banner -export const getBanner = (id) => request.basic.get(`/api/v1/banners/${id}`) -//创建banner -export const createBanner = (data) => request.basic.post('/api/v1/banners', data) -//更新banner -export const updateBanner = (id, data) => request.basic.put(`/api/v1/banners/${id}`, data) -//删除banner -export const deleteBanner = (id) => request.basic.delete(`/api/v1/banners/${id}`) \ No newline at end of file +// 审核接口 +export const updateCertifications = (id, data) => request.basic.put(`/api/v1/certifications/${id}`, data) diff --git a/src/apis/modules/resource.js b/src/apis/modules/resource.js new file mode 100644 index 0000000..c274aa2 --- /dev/null +++ b/src/apis/modules/resource.js @@ -0,0 +1,30 @@ +import request from '@/utils/request' + +//获取计算卡列表 +export const getCardsList = (params) => request.basic.get('/api/v1/autoDl-dl-cards', params) + +//获取主机资源列表 +export const getHostsList = (params) => request.basic.get('/api/v1/autoDl-dl-hosts', params) + +// 获取实例卡列表 +export const getInstancesList = (params) => request.basic.get('/api/v1/auto-dl-instances', params) + +// 黑名单列表 +export const getBlackCustomersList = (params) => request.basic.get('/api/v1/blackCustomers', params) + +// 移除黑名单 +export const deleteBlackCustomers = (id) => request.basic.delete(`/api/v1/blackCustomers/${id}`) + + +// 拉黑用户 +export const updateCustomers = (id, data) => request.basic.put(`/api/v1/customers/${id}`, data) + + +//获取单个banner +export const getBanner = (id) => request.basic.get(`/api/v1/banners/${id}`) +//创建banner +export const createBanner = (data) => request.basic.post('/api/v1/banners', data) +//更新banner +export const updateBanner = (id, data) => request.basic.put(`/api/v1/banners/${id}`, data) +//删除banner +export const deleteBanner = (id) => request.basic.delete(`/api/v1/banners/${id}`) \ No newline at end of file diff --git a/src/apis/modules/userControl.js b/src/apis/modules/userControl.js index 543276c..2ad2fe4 100644 --- a/src/apis/modules/userControl.js +++ b/src/apis/modules/userControl.js @@ -1,11 +1,18 @@ import request from '@/utils/request' -//获取banner列表 +//获取用户列表 export const getCustomersList = (params) => request.basic.get('/api/v1/customers', params) // 黑名单列表 export const getBlackCustomersList = (params) => request.basic.get('/api/v1/blackCustomers', params) +// 移除黑名单 +export const deleteBlackCustomers = (id) => request.basic.delete(`/api/v1/blackCustomers/${id}`) + + +// 拉黑用户 +export const updateCustomers = (id, data) => request.basic.put(`/api/v1/customers/${id}`, data) + //获取单个banner export const getBanner = (id) => request.basic.get(`/api/v1/banners/${id}`) diff --git a/src/locales/lang/zh-CN/menu.js b/src/locales/lang/zh-CN/menu.js index 317b5d1..24ac4a0 100644 --- a/src/locales/lang/zh-CN/menu.js +++ b/src/locales/lang/zh-CN/menu.js @@ -36,7 +36,9 @@ export default { 'account.trigger': '触发报错', 'account.logout': '退出登录', resource: 'GPU资源管理', - resourceAdmin: '资源池管理', + resourceAdmin: '主机资源列表', + resourceCard: '计算卡列表', + resourceInstance: '实例卡列表', resourceStatistics: '资源池统计信息', userControl: '用户管理', userList: '用户列表', diff --git a/src/router/routes/resource.js b/src/router/routes/resource.js index 73b0791..92f6e16 100644 --- a/src/router/routes/resource.js +++ b/src/router/routes/resource.js @@ -18,12 +18,35 @@ export default [ name: 'resourceAdmin', component: 'resource/resourceAdmin/index.vue', meta: { - title: '资源池管理 ', + title: '主机资源列表 ', isMenu: true, keepAlive: true, permission: '*', }, }, + { + path: 'resourceCard', + name: 'resourceCard', + component: 'resource/resourceCard/index.vue', + meta: { + title: '计算卡列表 ', + isMenu: true, + keepAlive: true, + permission: '*', + }, + }, + { + path: 'resourceInstance', + name: 'resourceInstance', + component: 'resource/resourceInstance/index.vue', + meta: { + title: '实例卡列表 ', + isMenu: true, + keepAlive: true, + permission: '*', + }, + }, + { path: 'resourceStatistics', name: 'resourceStatistics', diff --git a/src/views/certification/certificationList/components/CertificationTable.vue b/src/views/certification/certificationList/components/CertificationTable.vue new file mode 100644 index 0000000..bd65ef7 --- /dev/null +++ b/src/views/certification/certificationList/components/CertificationTable.vue @@ -0,0 +1,402 @@ + + + + + \ No newline at end of file diff --git a/src/views/certification/certificationList/components/EditDialog.vue b/src/views/certification/certificationList/components/EditDialog.vue index aa18d80..ddf2280 100644 --- a/src/views/certification/certificationList/components/EditDialog.vue +++ b/src/views/certification/certificationList/components/EditDialog.vue @@ -5,32 +5,16 @@ - - - - - - - - + + - - - - - - - - - - - - + + @@ -40,119 +24,103 @@ - - + \ No newline at end of file diff --git a/src/views/certification/certificationList/index.vue b/src/views/certification/certificationList/index.vue index 22d6125..e2c2898 100644 --- a/src/views/certification/certificationList/index.vue +++ b/src/views/certification/certificationList/index.vue @@ -1,137 +1,145 @@ - + \ No newline at end of file diff --git a/src/views/resource/resourceAdmin/index.vue b/src/views/resource/resourceAdmin/index.vue index 0687a05..0c0aa0c 100644 --- a/src/views/resource/resourceAdmin/index.vue +++ b/src/views/resource/resourceAdmin/index.vue @@ -1,249 +1,356 @@