diff --git a/cmdb-ui/src/modules/acl/api/resource.js b/cmdb-ui/src/modules/acl/api/resource.js index 3ae9fb3..9510cf9 100644 --- a/cmdb-ui/src/modules/acl/api/resource.js +++ b/cmdb-ui/src/modules/acl/api/resource.js @@ -2,7 +2,7 @@ import { axios } from '@/utils/request' const urlPrefix = '/v1/acl' -export function searchResource (params) { +export function searchResource(params) { return axios({ url: urlPrefix + `/resources`, method: 'GET', @@ -10,7 +10,7 @@ export function searchResource (params) { }) } -export function addResource (params) { +export function addResource(params) { return axios({ url: urlPrefix + '/resources', method: 'POST', @@ -18,7 +18,7 @@ export function addResource (params) { }) } -export function updateResourceById (id, params) { +export function updateResourceById(id, params) { return axios({ url: urlPrefix + `/resources/${id}`, method: 'PUT', @@ -26,14 +26,15 @@ export function updateResourceById (id, params) { }) } -export function deleteResourceById (id) { +export function deleteResourceById(id, params) { return axios({ url: urlPrefix + `/resources/${id}`, - method: 'DELETE' + method: 'DELETE', + params }) } -export function searchResourceType (params) { +export function searchResourceType(params) { return axios({ url: urlPrefix + `/resource_types`, method: 'GET', @@ -41,7 +42,7 @@ export function searchResourceType (params) { }) } -export function addResourceType (params) { +export function addResourceType(params) { return axios({ url: urlPrefix + '/resource_types', method: 'POST', @@ -49,7 +50,7 @@ export function addResourceType (params) { }) } -export function updateResourceTypeById (id, params) { +export function updateResourceTypeById(id, params) { return axios({ url: urlPrefix + `/resource_types/${id}`, method: 'PUT', @@ -57,7 +58,7 @@ export function updateResourceTypeById (id, params) { }) } -export function deleteResourceTypeById (id) { +export function deleteResourceTypeById(id) { return axios({ url: urlPrefix + `/resource_types/${id}`, method: 'DELETE' @@ -65,7 +66,7 @@ export function deleteResourceTypeById (id) { } // add resource group -export function getResourceGroups (params) { +export function getResourceGroups(params) { return axios({ url: `${urlPrefix}/resource_groups`, method: 'GET', @@ -73,7 +74,7 @@ export function getResourceGroups (params) { }) } -export function addResourceGroup (data) { +export function addResourceGroup(data) { return axios({ url: `${urlPrefix}/resource_groups`, method: 'POST', @@ -81,7 +82,7 @@ export function addResourceGroup (data) { }) } -export function updateResourceGroup (_id, data) { +export function updateResourceGroup(_id, data) { return axios({ url: `${urlPrefix}/resource_groups/${_id}`, method: 'PUT', @@ -89,14 +90,14 @@ export function updateResourceGroup (_id, data) { }) } -export function deleteResourceGroup (_id) { +export function deleteResourceGroup(_id) { return axios({ url: `${urlPrefix}/resource_groups/${_id}`, method: 'DELETE' }) } -export function getResourceGroupItems (_id) { +export function getResourceGroupItems(_id) { return axios({ url: `${urlPrefix}/resource_groups/${_id}/items`, method: 'GET' diff --git a/cmdb-ui/src/modules/acl/api/user.js b/cmdb-ui/src/modules/acl/api/user.js index 40d6979..a939246 100644 --- a/cmdb-ui/src/modules/acl/api/user.js +++ b/cmdb-ui/src/modules/acl/api/user.js @@ -14,6 +14,7 @@ export function getOnDutyUser() { return axios({ url: urlPrefix + '/users/employee', method: 'GET', + // data: { 'originUrl': 'http://hr.dfc.sh/api/all_users?work_status=在职' } }) } diff --git a/cmdb-ui/src/modules/acl/views/module/resourceForm.vue b/cmdb-ui/src/modules/acl/views/module/resourceForm.vue index 348ecae..cb53d2e 100644 --- a/cmdb-ui/src/modules/acl/views/module/resourceForm.vue +++ b/cmdb-ui/src/modules/acl/views/module/resourceForm.vue @@ -24,8 +24,12 @@ - - + + 是 + + + 否 + @@ -40,11 +44,12 @@