diff --git a/frontend/src/main.ts b/frontend/src/main.ts index 7039b10595295bc4f47757b963a1ede7992bf7f2..94e4c30f999d2f0d09d74c7158965cdcf4a45550 100644 --- a/frontend/src/main.ts +++ b/frontend/src/main.ts @@ -1,4 +1,4 @@ -import './styles/main.css' +import './styles/main.scss' import { createApp } from 'vue' import pinia from '@/stores' diff --git a/frontend/src/styles/main.css b/frontend/src/styles/main.scss similarity index 89% rename from frontend/src/styles/main.css rename to frontend/src/styles/main.scss index 5be96c76f14e879ea8dbc8986d00a303e3bb47dd..bdc067fff84893c073838fef475bc076dd44a7b9 100644 --- a/frontend/src/styles/main.css +++ b/frontend/src/styles/main.scss @@ -54,4 +54,8 @@ body { /* 隐藏无子设备的展开图表 */ .el-table .row-expand-cover .cell .el-table__expand-icon { display: none; +} +/* 权限页面 行颜色修改 */ +.el-table .warning-row { + --el-table-tr-bg-color: var(--el-color-info-light-8); } \ No newline at end of file diff --git a/frontend/src/views/Audit/Audit.vue b/frontend/src/views/Audit/Audit.vue index 5f553a5ed0e1365fdd910c2774431a56f0522084..2fb3d677e488c9888c2ca32a33fac6dfe3c19b57 100644 --- a/frontend/src/views/Audit/Audit.vue +++ b/frontend/src/views/Audit/Audit.vue @@ -53,8 +53,6 @@ - - diff --git a/frontend/src/views/Cluster/Cluster.vue b/frontend/src/views/Cluster/Cluster.vue index e6cbd3014b19259c1e48d9a4dbaf9fb1a53ede59..ec85599cf338d78389fc9603ea16bc08f9e9a344 100644 --- a/frontend/src/views/Cluster/Cluster.vue +++ b/frontend/src/views/Cluster/Cluster.vue @@ -25,7 +25,7 @@ - + 删除 diff --git a/frontend/src/views/Cluster/MachineDetail/Index.vue b/frontend/src/views/Cluster/MachineDetail/Index.vue index bf14982c9954bc75d70087e8915b1f72670e66aa..cf9568cf218802cb7b9cce92bd3f9a14a11171e0 100644 --- a/frontend/src/views/Cluster/MachineDetail/Index.vue +++ b/frontend/src/views/Cluster/MachineDetail/Index.vue @@ -35,7 +35,7 @@ onMounted(() => { { name: 'network', label: '网络配置', component: markRaw(Network) }, { name: 'systl', label: '内核参数', component: markRaw(Sysctl) }, { name: 'package', label: '软件包', component: markRaw(Package) }, - { name: 'terminal', label: '远程终端', component: markRaw(Terminal) }, + // { name: 'terminal', label: '远程终端', component: markRaw(Terminal) }, ] }) diff --git a/frontend/src/views/Cluster/MachineDetail/Service.vue b/frontend/src/views/Cluster/MachineDetail/Service.vue index b0ffc069ef0bb5d901cc8371fe53167a857e35d2..187b4482bd634af666cdd450be4d1cdf3e4a3065 100644 --- a/frontend/src/views/Cluster/MachineDetail/Service.vue +++ b/frontend/src/views/Cluster/MachineDetail/Service.vue @@ -3,9 +3,9 @@
- 启动 +
diff --git a/frontend/src/views/Role/Role.vue b/frontend/src/views/Role/Role.vue index 0591421df2183889110f13e8333527b0a8fa8c0d..e50b63241f95ff8af882a8e80a0bdfbbe5f3d03a 100644 --- a/frontend/src/views/Role/Role.vue +++ b/frontend/src/views/Role/Role.vue @@ -1,51 +1,45 @@ \ No newline at end of file diff --git a/frontend/src/views/Role/components/AddRole.vue b/frontend/src/views/Role/components/AddRole.vue index c04937da5a4e6db5ed0011aab84125ef508f0c0f..579fbcba23c5d9757b87e400489088b1b61bc8bf 100644 --- a/frontend/src/views/Role/components/AddRole.vue +++ b/frontend/src/views/Role/components/AddRole.vue @@ -1,19 +1,18 @@ \ No newline at end of file diff --git a/frontend/src/views/Role/components/RoleDetail.vue b/frontend/src/views/Role/components/RoleDetail.vue deleted file mode 100644 index f6723c57c64fd654f6c9370f086d1083c9240cc3..0000000000000000000000000000000000000000 --- a/frontend/src/views/Role/components/RoleDetail.vue +++ /dev/null @@ -1,104 +0,0 @@ - - - - - \ No newline at end of file diff --git a/frontend/src/views/Role/components/RoleForm.vue b/frontend/src/views/Role/components/RoleForm.vue new file mode 100644 index 0000000000000000000000000000000000000000..6a1493b3f70e4410bf97934e54680147eb7b78d3 --- /dev/null +++ b/frontend/src/views/Role/components/RoleForm.vue @@ -0,0 +1,160 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/views/Role/components/authData.ts b/frontend/src/views/Role/components/authData.ts index f16d73e04fd903224538cdcc6e78d4416756bcf4..532f933dd53081a3c03d07a7b7f49423c4849b66 100644 --- a/frontend/src/views/Role/components/authData.ts +++ b/frontend/src/views/Role/components/authData.ts @@ -1,129 +1,134 @@ // 整个系统需要控制权限的按钮配置项 export let authData = [{ - id: 1, + id: '1', label: '概览', isMenu: true, menuName: 'overview', - children: [] + operations: [] }, { - id: 2, + id: '2', label: '系统', isMenu: true, menuName: 'cluster', - children: [{ - id: 8, - btnId: 1, + operations: [{ + id: '8', + btnId: '1', label: 'rpm下发', menuName: 'rpm_install', }, { - id: 9, - btnId: 2, + id: '9', + btnId: '2', label: 'rpm卸载', menuName: 'rpm_uninstall', }, { - id: 22, - btnId: 15, + id: '22', + btnId: '15', label: '变更部门', menuName: 'dept_change', + },{ + id: '23', + btnId: '16', + label: '机器删除', + menuName: 'machine_delete', }] }, { - id: 3, + id: '3', label: '批次', isMenu: true, menuName: 'batch', - children: [{ - id: 10, - btnId: 3, + operations: [{ + id: '10', + btnId: '3', label: '编辑批次', menuName: 'batch_update', }, { - id: 11, - btnId: 4, + id: '11', + btnId: '4', label: '删除批次', menuName: 'batch_delete', }] }, { - id: 4, + id: '4', label: '用户管理', isMenu: true, menuName: 'usermanager', - children: [{ - id: 12, - btnId: 5, + operations: [{ + id: '12', + btnId: '5', label: '添加用户', menuName: 'user_add', }, { - id: 13, - btnId: 6, + id: '13', + btnId: '6', label: '导入用户', menuName: 'user_import', }, { - id: 14, - btnId: 7, + id: '14', + btnId: '7', label: '编辑用户', menuName: 'user_edit', }, { - id: 15, - btnId: 8, + id: '15', + btnId: '8', label: '重置密码', menuName: 'user_reset', }, { - id: 16, - btnId: 9, + id: '16', + btnId: '9', label: '删除用户', menuName: 'user_del', }] }, { - id: 5, + id: '5', label: '角色管理', isMenu: true, menuName: 'rolemanager', - children: [ + operations: [ { - id: 17, - btnId: 10, + id: '17', + btnId: '10', label: '添加角色', menuName: 'role_add', }, { - id: 18, - btnId: 11, + id: '18', + btnId: '11', label: '编辑角色', menuName: 'role_update', }, { - id: 19, - btnId: 12, + id: '19', + btnId: '12', label: '删除角色', menuName: 'role_delete', }, { - id: 20, - btnId: 13, + id: '20', + btnId: '13', label: '角色授权', menuName: 'role_modify', }] }, { - id: 6, + id: '6', label: '配置管理', isMenu: true, menuName: 'config', - children: [{ - id: 21, - btnId: 14, + operations: [{ + id: '21', + btnId: '14', label: '配置下发', menuName: 'config_install', }] }, { - id: 7, + id: '7', label: '日志管理', isMenu: true, menuName: 'log', - children: [] + operations: [] }, { - id: 8, + id: '8', label: '插件管理', isMenu: true, menuName: 'plugin', - children: [] + operations: [] }]; \ No newline at end of file