diff --git a/src/api/organization.js b/src/api/organization.js index 944790d6f454f4c6ccdec5f9cf417ed549d1fc80..1cd6cc0e6c0a28236e169a18b274b13a479cb958 100644 --- a/src/api/organization.js +++ b/src/api/organization.js @@ -28,6 +28,21 @@ function updateOrgApi(data) { return putReq('/api/v1/organizations', data); } +function addBusinessApi(data) { + return postReq('/api/v1/parameters/business', data); +} + +function updateBusinessApi(data) { + return putReq('/api/v1/parameters/business', data); +} + +function addOperationApi(data) { + return postReq('/api/v1/parameters/operation', data); +} + +function updateOperationApi(data) { + return putReq('/api/v1/parameters/operation', data); +} export default { addJobs: addJobsApi, updateJobs: updateJobsApi, @@ -36,4 +51,8 @@ export default { getOrganizationDetails: getOrganizationDetailsApi, addOrg: addOrgApi, updateOrg: updateOrgApi, + addBusiness: addBusinessApi, + updateBusiness: updateBusinessApi, + addOperation: addOperationApi, + updateOperation: updateOperationApi, }; diff --git a/src/components/table/index.vue b/src/components/table/index.vue index 51e8a6731cc5c4368686dc20e54acd68859a8aca..29b8d60e6fc4f1367f0fe139a2e543d8733c61ae 100644 --- a/src/components/table/index.vue +++ b/src/components/table/index.vue @@ -2,7 +2,7 @@
- + diff --git a/src/components/table/my_item.vue b/src/components/table/my_item.vue index 640d360674dc8b1e70830e1fe0ba67d31c387dcf..e27e74263dc0f1f5924634de8e53624ed86315da 100644 --- a/src/components/table/my_item.vue +++ b/src/components/table/my_item.vue @@ -1,7 +1,7 @@ @@ -11,7 +11,7 @@ export default { data() { return { span: { xs: 24, sm: 24, lg: 12, xl: 6 }, - layout: { labelCol: { span: 5 }, wrapperCol: { span: 19 }, ...this.$attrs }, + layout: { labelCol: { span: 6 }, wrapperCol: { span: 18 }, ...this.$attrs }, }; }, }; diff --git a/src/pages/system/view/organization/OrgManagement.vue b/src/pages/system/view/organization/OrgManagement.vue deleted file mode 100644 index 1384fc248d34e1b2ba0fdaa1ba2e11175bd30743..0000000000000000000000000000000000000000 --- a/src/pages/system/view/organization/OrgManagement.vue +++ /dev/null @@ -1,4 +0,0 @@ - - \ No newline at end of file diff --git a/src/pages/system/view/organization/index.js b/src/pages/system/view/organization/index.js deleted file mode 100644 index bd886781c7255e4a3a0437c51c52dc804d232ef6..0000000000000000000000000000000000000000 --- a/src/pages/system/view/organization/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import OrgManagement from './OrgManagement'; - -export default OrgManagement; \ No newline at end of file diff --git a/src/pages/system/view/parameter/ParamManagement.vue b/src/pages/system/view/parameter/ParamManagement.vue deleted file mode 100644 index 1384fc248d34e1b2ba0fdaa1ba2e11175bd30743..0000000000000000000000000000000000000000 --- a/src/pages/system/view/parameter/ParamManagement.vue +++ /dev/null @@ -1,4 +0,0 @@ - - \ No newline at end of file diff --git a/src/pages/system/view/parameter/business/form.vue b/src/pages/system/view/parameter/business/form.vue new file mode 100644 index 0000000000000000000000000000000000000000..865c8f14081fed856c511ab7649ad53849886ec5 --- /dev/null +++ b/src/pages/system/view/parameter/business/form.vue @@ -0,0 +1,65 @@ + + + diff --git a/src/pages/system/view/parameter/business/index.vue b/src/pages/system/view/parameter/business/index.vue new file mode 100644 index 0000000000000000000000000000000000000000..a5183ea63e639d761abfaf3ad79eef0be73486fc --- /dev/null +++ b/src/pages/system/view/parameter/business/index.vue @@ -0,0 +1,72 @@ + + \ No newline at end of file diff --git a/src/pages/system/view/parameter/index.js b/src/pages/system/view/parameter/index.js deleted file mode 100644 index 702492dd721ace4b4765c1d005a0d9b545abc57c..0000000000000000000000000000000000000000 --- a/src/pages/system/view/parameter/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import ParamManagement from './ParamManagement'; - -export default ParamManagement; \ No newline at end of file diff --git a/src/pages/system/view/parameter/operation/form.vue b/src/pages/system/view/parameter/operation/form.vue new file mode 100644 index 0000000000000000000000000000000000000000..94cf55b6b9dbf45c71ba433ab7dcaf48564f08cf --- /dev/null +++ b/src/pages/system/view/parameter/operation/form.vue @@ -0,0 +1,43 @@ + + + diff --git a/src/pages/system/view/parameter/operation/index.vue b/src/pages/system/view/parameter/operation/index.vue new file mode 100644 index 0000000000000000000000000000000000000000..aedf756581dabf552d7a5efa91e46b9c53ba0ea4 --- /dev/null +++ b/src/pages/system/view/parameter/operation/index.vue @@ -0,0 +1,62 @@ + + \ No newline at end of file diff --git a/src/pages/user/components/todo.vue b/src/pages/user/components/todo.vue index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e29d93ff5fc182411c3d5bae5b06ef566f357624 100644 --- a/src/pages/user/components/todo.vue +++ b/src/pages/user/components/todo.vue @@ -0,0 +1,3 @@ + diff --git a/src/router/async/router.map.js b/src/router/async/router.map.js index b781cffed72a9265b078599f76856779d28735c4..3e2f10751e630d7cb1b8d4e089a39f7b3fee1b81 100644 --- a/src/router/async/router.map.js +++ b/src/router/async/router.map.js @@ -54,18 +54,5 @@ const routerMap = { name: '菜单管理', component: () => import('@/pages/system/view/menu'), }, - - organization_management: { - name: '组织管理', - component: () => import('@/pages/system/view/organization'), - }, - role_management: { - name: '角色管理', - component: () => import('@/pages/system/view/role'), - }, - parameter_management: { - name: '参数管理', - component: () => import('@/pages/system/view/parameter'), - }, }; export default routerMap; diff --git a/src/router/config.js b/src/router/config.js index 9bf1e0f368702085ff50396bf0486f1033c5cd5e..50ec493f93b22e431f8d12101a29a976f4bb2aaf 100644 --- a/src/router/config.js +++ b/src/router/config.js @@ -110,7 +110,21 @@ const options = { { path: 'parameter_management', name: '参数管理', - component: () => import('@/pages/system/view/parameter'), + component: BlankTemplateView, + children: [ + { + path: 'business_management', + name: '业务参数', + component: () => + import('@/pages/system/view/parameter/business/index.vue'), + }, + { + path: 'operation_management', + name: '运维参数', + component: () => + import('@/pages/system/view/parameter/operation/index.vue'), + }, + ], }, { path: 'log_management',