diff --git a/hx-ai-intelligent/src/api/origanizemanage.ts b/hx-ai-intelligent/src/api/origanizemanage.ts index 4d02876..aa3821c 100644 --- a/hx-ai-intelligent/src/api/origanizemanage.ts +++ b/hx-ai-intelligent/src/api/origanizemanage.ts @@ -1,6 +1,7 @@ const BASE_URL = '/carbon-smart'; export enum permission { add = `${BASE_URL}/admin/permission/save`, + permissionTree = `${BASE_URL}/api/dept/permissionTree`, } export enum origanizemanage { @@ -27,4 +28,7 @@ export enum department { addRole = `${BASE_URL}/api/dept/addRole`, editRole = `${BASE_URL}/api/dept/editRole`, queryRoleTree = `${BASE_URL}/api/dept/queryRoleTree`, + + queryDeptPermission = `${BASE_URL}/api/dept/queryDeptPermission`, + queryRolePermission = `${BASE_URL}/api/dept/queryRolePermission`, } diff --git a/hx-ai-intelligent/src/router/organizationManage.ts b/hx-ai-intelligent/src/router/organizationManage.ts index 3d118dd..e6031ff 100644 --- a/hx-ai-intelligent/src/router/organizationManage.ts +++ b/hx-ai-intelligent/src/router/organizationManage.ts @@ -38,6 +38,41 @@ const organizationManage = { meta: { title: '用户管理', keepAlive: true, + operates: [ + { title: '新增', code: 'userAdd' }, + { + title: '导入', + code: 'userImport', + }, + { + title: '模板下载', + code: 'userTemDownload', + }, + { + title: '导出', + code: 'userExports', + }, + { + title: '批量删除', + code: 'userBatchDel', + }, + { + title: '编辑', + code: 'userEdit', + }, + { + title: '冻结', + code: 'userFrozen', + }, + { + title: '重置密码', + code: 'userCodeReset', + }, + { + title: '删除', + code: 'userDelete', + }, + ], // backApi: [], }, }, @@ -48,11 +83,11 @@ const organizationManage = { name: 'AuthorityManage', meta: { title: '部门/权限', hideChildren: true, icon: 'dicizhishou' }, component: Base, - redirect: { name: 'authorityManageIndex' }, + redirect: { name: 'AuthorityManageIndex' }, children: [ { path: 'index', - name: 'authorityManageIndex', + name: 'AuthorityManageIndex', component: () => import('/@/view/organizationManage/departmentManage/index.vue'), meta: { title: '部门/权限', @@ -62,7 +97,6 @@ const organizationManage = { }, ], }, - ], }; export default organizationManage; diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue index 63be6f7..62e9a5f 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue @@ -860,6 +860,8 @@ status: "待执行", }, ]); + const columns1 = [ + ]); const columns1 = [ { title: "序号", diff --git a/hx-ai-intelligent/src/view/organizationManage/departmentManage/config.ts b/hx-ai-intelligent/src/view/organizationManage/departmentManage/config.ts index ffd1c1f..f2e5aff 100644 --- a/hx-ai-intelligent/src/view/organizationManage/departmentManage/config.ts +++ b/hx-ai-intelligent/src/view/organizationManage/departmentManage/config.ts @@ -116,7 +116,7 @@ export const formConfig2 = (disabled2: Boolean) => { // }, { label: '节点编码', - field: 'code', + field: 'roleCode', component: 'NsInput', componentProps: { disabled: disabled2, @@ -132,22 +132,22 @@ export const formConfig2 = (disabled2: Boolean) => { }, { label: '是否部门领导', - field: 'isleader', + field: 'isLeader', component: 'NsRadioGroup', componentProps: { disabled: disabled2, radioType: 'radio', options: [ - { label: '是', value: 1 }, - { label: '否', value: 2 }, - ], - rules: [ - { - required: true, - message: '请选择是否部门领导', - }, + { label: '是', value: 0 }, + { label: '否', value: 1 }, ], }, + rules: [ + { + required: true, + message: '请选择是否部门领导', + }, + ], }, { field: 'remark', diff --git a/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue b/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue index 4cf69cd..d1dae33 100644 --- a/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue +++ b/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue @@ -6,9 +6,7 @@