diff --git a/cmdb-ui/src/config/app.js b/cmdb-ui/src/config/app.js index 9ae4893..af69cb8 100644 --- a/cmdb-ui/src/config/app.js +++ b/cmdb-ui/src/config/app.js @@ -1,14 +1,13 @@ const appConfig = { - buildModules: ['cmdb'], // 需要编译的模块 - useMessageNotice: false, // 是否启用消息通知 - useTodoNotice: false, // 是否启用ticket通知 - useClaimNotice: false, // 是否启动ticket claim 通知 - useDagReviewNotice: false, // 是否启用dag审核通知 - redirectTo: '/cmdb', // 首页的重定向路径 - buildAclToModules: true, // 是否在各个应用下 内联权限管理 - ssoLogoutURL: '/api/sso/logout', - useDFC: false, - showDocs: false, + buildModules: ['cmdb'], // 需要编译的模块 + useMessageNotice: false, // 是否启用消息通知 + useTodoNotice: false, // 是否启用ticket通知 + useClaimNotice: false, // 是否启动ticket claim 通知 + useDagReviewNotice: false, // 是否启用dag审核通知 + redirectTo: '/cmdb', // 首页的重定向路径 + buildAclToModules: true, // 是否在各个应用下 内联权限管理 + ssoLogoutURL: '/api/sso/logout', + showDocs: false, } export default appConfig diff --git a/cmdb-ui/src/modules/acl/api/user.js b/cmdb-ui/src/modules/acl/api/user.js index a939246..40d6979 100644 --- a/cmdb-ui/src/modules/acl/api/user.js +++ b/cmdb-ui/src/modules/acl/api/user.js @@ -14,7 +14,6 @@ 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/views/setting/companyStructure/BatchUpload.vue b/cmdb-ui/src/views/setting/companyStructure/BatchUpload.vue index 963a3a3..7582e22 100644 --- a/cmdb-ui/src/views/setting/companyStructure/BatchUpload.vue +++ b/cmdb-ui/src/views/setting/companyStructure/BatchUpload.vue @@ -46,15 +46,13 @@ :column-config="{ resizable: true }" > - + - - @@ -94,7 +92,6 @@ diff --git a/cmdb-ui/src/views/setting/companyStructure/EmployeeModal.vue b/cmdb-ui/src/views/setting/companyStructure/EmployeeModal.vue index 9994380..1c65ac3 100644 --- a/cmdb-ui/src/views/setting/companyStructure/EmployeeModal.vue +++ b/cmdb-ui/src/views/setting/companyStructure/EmployeeModal.vue @@ -137,29 +137,6 @@ :formatter="(value) => `${value} 天`" /> - - - - - - @@ -439,7 +416,6 @@ import { postEmployee, putEmployee } from '@/api/employee' import Bus from './eventBus/bus' import EmployeeTreeSelect from '../components/employeeTreeSelect.vue' import DepartmentTreeSelect from '../components/departmentTreeSelect.vue' -import appConfig from '@/config/app' import moment from 'moment' import { v4 as uuidv4 } from 'uuid' export default { @@ -477,7 +453,6 @@ export default { ], }, type: 'add', - useDFC: appConfig.useDFC, educational_experience: [], children_information: [], file_is_show: true,