diff --git a/src/components/Cards/DetailCard/index.vue b/src/components/Cards/DetailCard/index.vue index 82da4bf47..e99a9db86 100644 --- a/src/components/Cards/DetailCard/index.vue +++ b/src/components/Cards/DetailCard/index.vue @@ -26,7 +26,7 @@ export default { }, fa: { type: String, - default: 'fa-info-circle' + default: 'fa-info-circle-o' }, items: { type: Array, diff --git a/src/components/DataActions/index.vue b/src/components/DataActions/index.vue index 5e10e6482..2c061d517 100644 --- a/src/components/DataActions/index.vue +++ b/src/components/DataActions/index.vue @@ -197,13 +197,9 @@ export default { } } - .el-button { + .el-button.el-button--default { color: var(--el-text-color); } - - .el-button--primary.el-button { - color: #ffffff ; - } } // 主要是左侧 LeftSide diff --git a/src/components/QuickActions/index.vue b/src/components/QuickActions/index.vue index 8dfe05c75..57cb3a5a9 100644 --- a/src/components/QuickActions/index.vue +++ b/src/components/QuickActions/index.vue @@ -55,7 +55,7 @@ export default { } .quick-actions >>> button { - padding: 2px 10px; + padding: 4px 10px; font-size: 13px; } diff --git a/src/components/Table/TableFormatters/AmountFormatter.vue b/src/components/Table/TableFormatters/AmountFormatter.vue index fc1082d4a..e59f0f207 100644 --- a/src/components/Table/TableFormatters/AmountFormatter.vue +++ b/src/components/Table/TableFormatters/AmountFormatter.vue @@ -142,6 +142,10 @@ export default { } } +>>> .detail { + padding: 0 5px; +} + .detail-item:first-child { //border-top: 1px solid #EBEEF5; } diff --git a/src/styles/menu.scss b/src/styles/menu.scss index bf37a8fa9..cc86410e2 100644 --- a/src/styles/menu.scss +++ b/src/styles/menu.scss @@ -31,7 +31,7 @@ .el-menu-item, .el-submenu-sidebar .el-menu-item { background-color: $subMenuBg; color: $menuText; - list-style: disc inside; + list-style: circle inside; &.submenu-title-noDropdown { list-style: none; diff --git a/src/views/accounts/Account/AccountDetail/index.vue b/src/views/accounts/Account/AccountDetail/index.vue index d44521123..4b92a25c9 100644 --- a/src/views/accounts/Account/AccountDetail/index.vue +++ b/src/views/accounts/Account/AccountDetail/index.vue @@ -41,7 +41,7 @@ export default { activeMenu: 'Detail', submenu: [ { - title: this.$t('BasicInfo'), + title: this.$t('Basic'), name: 'Detail' } ], diff --git a/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionDetail/index.vue b/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionDetail/index.vue index d2fd02c7c..154ce46eb 100644 --- a/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionDetail/index.vue +++ b/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionDetail/index.vue @@ -27,7 +27,7 @@ export default { }, submenu: [ { - title: this.$t('BasicInfo'), + title: this.$t('Basic'), name: 'AccountBackupPlanExecutionInfo' } ], diff --git a/src/views/accounts/AccountBackup/AccountBackupDetail/index.vue b/src/views/accounts/AccountBackup/AccountBackupDetail/index.vue index d8c0cbdd9..7ce47774c 100644 --- a/src/views/accounts/AccountBackup/AccountBackupDetail/index.vue +++ b/src/views/accounts/AccountBackup/AccountBackupDetail/index.vue @@ -24,7 +24,7 @@ export default { activeMenu: 'AccountBackupPlanInfo', submenu: [ { - title: this.$t('BasicInfo'), + title: this.$t('Basic'), name: 'AccountBackupPlanInfo' } ], diff --git a/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/index.vue b/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/index.vue index 585879a54..d2108aaf6 100644 --- a/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/index.vue +++ b/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretExecution/AccountChangeSecretExecutionDetail/index.vue @@ -29,7 +29,7 @@ export default { }, submenu: [ { - title: this.$t('BasicInfo'), + title: this.$t('Basic'), name: 'AccountChangeSecretExecutionInfo', hidden: () => !this.$hasPerm('accounts.view_changesecretexecution') }, diff --git a/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/index.vue b/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/index.vue index 6b1a578e6..bfa9f9847 100644 --- a/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/index.vue +++ b/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/index.vue @@ -31,7 +31,7 @@ export default { }, submenu: [ { - title: this.$t('BasicInfo'), + title: this.$t('Basic'), name: 'AccountChangeSecretInfo', hidden: () => !this.$hasPerm('accounts.view_changesecretautomation') }, diff --git a/src/views/accounts/AccountGather/TaskDetail/AccountGatherExecutionDetail/index.vue b/src/views/accounts/AccountGather/TaskDetail/AccountGatherExecutionDetail/index.vue index 17a93ead7..d76cf84d5 100644 --- a/src/views/accounts/AccountGather/TaskDetail/AccountGatherExecutionDetail/index.vue +++ b/src/views/accounts/AccountGather/TaskDetail/AccountGatherExecutionDetail/index.vue @@ -27,7 +27,7 @@ export default { }, submenu: [ { - title: this.$t('BasicInfo'), + title: this.$t('Basic'), name: 'Info' } ], diff --git a/src/views/accounts/AccountGather/TaskDetail/index.vue b/src/views/accounts/AccountGather/TaskDetail/index.vue index 628eaf4b7..47a759834 100644 --- a/src/views/accounts/AccountGather/TaskDetail/index.vue +++ b/src/views/accounts/AccountGather/TaskDetail/index.vue @@ -33,7 +33,7 @@ export default { }, submenu: [ { - title: this.$t('BasicInfo'), + title: this.$t('Basic'), name: 'Detail' } ], diff --git a/src/views/accounts/AccountPush/AccountPushDetail/index.vue b/src/views/accounts/AccountPush/AccountPushDetail/index.vue index d788dcd6a..6ce2cd531 100644 --- a/src/views/accounts/AccountPush/AccountPushDetail/index.vue +++ b/src/views/accounts/AccountPush/AccountPushDetail/index.vue @@ -23,7 +23,7 @@ export default { url: '/api/v1/accounts/push-account-automations', submenu: [ { - title: this.$t('BasicInfo'), + title: this.$t('Basic'), name: 'AccountPushInfo', hidden: () => !this.$hasPerm('accounts.view_changesecretautomation') } diff --git a/src/views/accounts/AccountPush/AccountPushExecutionDetail/index.vue b/src/views/accounts/AccountPush/AccountPushExecutionDetail/index.vue index 40eeda4a1..8595a7b08 100644 --- a/src/views/accounts/AccountPush/AccountPushExecutionDetail/index.vue +++ b/src/views/accounts/AccountPush/AccountPushExecutionDetail/index.vue @@ -29,7 +29,7 @@ export default { }, submenu: [ { - title: this.$t('BasicInfo'), + title: this.$t('Basic'), name: 'AccountPushExecutionInfo', hidden: () => !this.$hasPerm('accounts.view_pushaccountexecution') }, diff --git a/src/views/accounts/AccountTemplate/AccountTemplateDetail/index.vue b/src/views/accounts/AccountTemplate/AccountTemplateDetail/index.vue index f2b95f33f..207e8a9a4 100644 --- a/src/views/accounts/AccountTemplate/AccountTemplateDetail/index.vue +++ b/src/views/accounts/AccountTemplate/AccountTemplateDetail/index.vue @@ -31,7 +31,7 @@ export default { activeMenu: 'Detail', submenu: [ { - title: this.$t('BasicInfo'), + title: this.$t('Basic'), name: 'Detail' }, { diff --git a/src/views/accounts/VirtualAccount/VirtualDetail/index.vue b/src/views/accounts/VirtualAccount/VirtualDetail/index.vue index e383a4a7a..fd0069bd6 100644 --- a/src/views/accounts/VirtualAccount/VirtualDetail/index.vue +++ b/src/views/accounts/VirtualAccount/VirtualDetail/index.vue @@ -26,7 +26,7 @@ export default { activeMenu: 'Detail', submenu: [ { - title: this.$t('Detail'), + title: this.$t('Basic'), name: 'Detail' } ] diff --git a/src/views/acl/AssetLoginAcl/AssetLoginAclDetail/index.vue b/src/views/acl/AssetLoginAcl/AssetLoginAclDetail/index.vue index d928ac4b2..65f108be3 100644 --- a/src/views/acl/AssetLoginAcl/AssetLoginAclDetail/index.vue +++ b/src/views/acl/AssetLoginAcl/AssetLoginAclDetail/index.vue @@ -26,7 +26,7 @@ export default { activeMenu: 'Detail', submenu: [ { - title: this.$t('RuleDetail'), + title: this.$t('Basic'), name: 'Detail' }, { diff --git a/src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclDetail/index.vue b/src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclDetail/index.vue index 39445e075..6fcbe0d69 100644 --- a/src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclDetail/index.vue +++ b/src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclDetail/index.vue @@ -33,7 +33,7 @@ export default { activeMenu: 'Detail', submenu: [ { - title: this.$t('BasicInfo'), + title: this.$t('Basic'), name: 'Detail' }, { diff --git a/src/views/acl/CommandAcl/CommandGroup/CommandGroupDetail/index.vue b/src/views/acl/CommandAcl/CommandGroup/CommandGroupDetail/index.vue index fcbe41577..d0d43df2f 100644 --- a/src/views/acl/CommandAcl/CommandGroup/CommandGroupDetail/index.vue +++ b/src/views/acl/CommandAcl/CommandGroup/CommandGroupDetail/index.vue @@ -29,7 +29,7 @@ export default { activeMenu: 'Detail', submenu: [ { - title: this.$t('BasicInfo'), + title: this.$t('Basic'), name: 'Detail' } ], diff --git a/src/views/acl/ConnectMethodAcl/ConnectMethodAclDetail/index.vue b/src/views/acl/ConnectMethodAcl/ConnectMethodAclDetail/index.vue index 5bcbe53af..692439f87 100644 --- a/src/views/acl/ConnectMethodAcl/ConnectMethodAclDetail/index.vue +++ b/src/views/acl/ConnectMethodAcl/ConnectMethodAclDetail/index.vue @@ -26,7 +26,7 @@ export default { activeMenu: 'Detail', submenu: [ { - title: this.$t('RuleDetail'), + title: this.$t('Basic'), name: 'Detail' }, { diff --git a/src/views/acl/UserLoginACL/UserDetail/index.vue b/src/views/acl/UserLoginACL/UserDetail/index.vue index 29f78c94a..5a1fe4984 100644 --- a/src/views/acl/UserLoginACL/UserDetail/index.vue +++ b/src/views/acl/UserLoginACL/UserDetail/index.vue @@ -22,7 +22,7 @@ export default { activeMenu: 'Detail', submenu: [ { - title: this.$t('RuleDetail'), + title: this.$t('Basic'), name: 'Detail' } ], diff --git a/src/views/assets/Platform/PlatformDetail/index.vue b/src/views/assets/Platform/PlatformDetail/index.vue index 4695a1d94..cda81dbd5 100644 --- a/src/views/assets/Platform/PlatformDetail/index.vue +++ b/src/views/assets/Platform/PlatformDetail/index.vue @@ -29,7 +29,7 @@ export default { activeMenu: 'Detail', submenu: [ { - title: this.$t('BasicInfo'), + title: this.$t('Basic'), name: 'Detail' }, { diff --git a/src/views/audits/LoginLog/LoginLogDetail/index.vue b/src/views/audits/LoginLog/LoginLogDetail/index.vue index e6a3e2eea..de9a83c1e 100644 --- a/src/views/audits/LoginLog/LoginLogDetail/index.vue +++ b/src/views/audits/LoginLog/LoginLogDetail/index.vue @@ -28,7 +28,7 @@ export default { activeMenu: 'Detail', submenu: [ { - title: this.$t('BasicInfo'), + title: this.$t('Basic'), name: 'Detail' } ], diff --git a/src/views/audits/OperateLog/OperateLogDetail/index.vue b/src/views/audits/OperateLog/OperateLogDetail/index.vue index e6a3e2eea..de9a83c1e 100644 --- a/src/views/audits/OperateLog/OperateLogDetail/index.vue +++ b/src/views/audits/OperateLog/OperateLogDetail/index.vue @@ -28,7 +28,7 @@ export default { activeMenu: 'Detail', submenu: [ { - title: this.$t('BasicInfo'), + title: this.$t('Basic'), name: 'Detail' } ], diff --git a/src/views/ops/Execution/ExecutionDetail/index.vue b/src/views/ops/Execution/ExecutionDetail/index.vue index 04c6be985..7b9b53144 100644 --- a/src/views/ops/Execution/ExecutionDetail/index.vue +++ b/src/views/ops/Execution/ExecutionDetail/index.vue @@ -31,7 +31,7 @@ export default { activeMenu: 'JobExecutionDetail', submenu: [ { - title: this.$t('ExecutionDetail'), + title: this.$t('Basic'), name: 'JobExecutionDetail' } ], diff --git a/src/views/ops/Job/JobDetail/index.vue b/src/views/ops/Job/JobDetail/index.vue index 613c8dd43..27781af2d 100644 --- a/src/views/ops/Job/JobDetail/index.vue +++ b/src/views/ops/Job/JobDetail/index.vue @@ -28,7 +28,7 @@ export default { activeMenu: 'JobDetail', submenu: [ { - title: this.$t('AdhocDetail'), + title: this.$t('Basic'), name: 'JobDetail' }, { diff --git a/src/views/ops/Template/Adhoc/AdhocDetail/index.vue b/src/views/ops/Template/Adhoc/AdhocDetail/index.vue index fefd51ad5..7cd72d705 100644 --- a/src/views/ops/Template/Adhoc/AdhocDetail/index.vue +++ b/src/views/ops/Template/Adhoc/AdhocDetail/index.vue @@ -26,7 +26,7 @@ export default { activeMenu: 'AdhocDetail', submenu: [ { - title: this.$t('AdhocDetail'), + title: this.$t('Basic'), name: 'AdhocDetail' } ], diff --git a/src/views/ops/Template/Playbook/PlaybookDetail/index.vue b/src/views/ops/Template/Playbook/PlaybookDetail/index.vue index 2c113a10b..509daf161 100644 --- a/src/views/ops/Template/Playbook/PlaybookDetail/index.vue +++ b/src/views/ops/Template/Playbook/PlaybookDetail/index.vue @@ -33,7 +33,7 @@ export default { activeMenu: 'PlaybookDetail', submenu: [ { - title: this.$t('PlaybookDetail'), + title: this.$t('Basic'), name: 'PlaybookDetail' }, { diff --git a/src/views/perms/AssetPermission/AssetPermissionDetail/index.vue b/src/views/perms/AssetPermission/AssetPermissionDetail/index.vue index 379787f13..22a68416e 100644 --- a/src/views/perms/AssetPermission/AssetPermissionDetail/index.vue +++ b/src/views/perms/AssetPermission/AssetPermissionDetail/index.vue @@ -32,7 +32,7 @@ export default { activeMenu: 'AssetPermissionDetail', submenu: [ { - title: this.$t('BasicInfo'), + title: this.$t('Basic'), name: 'AssetPermissionDetail' }, { diff --git a/src/views/sessions/SessionDetail/index.vue b/src/views/sessions/SessionDetail/index.vue index 45c3b2611..692b834c3 100644 --- a/src/views/sessions/SessionDetail/index.vue +++ b/src/views/sessions/SessionDetail/index.vue @@ -34,7 +34,7 @@ export default { activeMenu: 'SessionDetailInfo', submenu: [ { - title: this.$t('Detail'), + title: this.$t('Basic'), name: 'SessionDetailInfo' }, { diff --git a/src/views/settings/Task/TaskDetail/index.vue b/src/views/settings/Task/TaskDetail/index.vue index 418748eef..c31d5727c 100644 --- a/src/views/settings/Task/TaskDetail/index.vue +++ b/src/views/settings/Task/TaskDetail/index.vue @@ -34,7 +34,7 @@ export default { activeMenu: 'TaskDetail', submenu: [ { - title: this.$t('TaskDetail'), + title: this.$t('Basic'), name: 'TaskDetail' }, { diff --git a/src/views/tickets/CommandConfirm/Detail/index.vue b/src/views/tickets/CommandConfirm/Detail/index.vue index e955c0092..1d5ced5dd 100644 --- a/src/views/tickets/CommandConfirm/Detail/index.vue +++ b/src/views/tickets/CommandConfirm/Detail/index.vue @@ -22,7 +22,7 @@ export default { url: '', submenu: [ { - title: this.$t('TicketDetail'), + title: this.$t('Basic'), name: 'TicketDetail' } ], diff --git a/src/views/tickets/LoginAssetConfirm/Detail/index.vue b/src/views/tickets/LoginAssetConfirm/Detail/index.vue index 1eb0e3f8f..e08ab1a42 100644 --- a/src/views/tickets/LoginAssetConfirm/Detail/index.vue +++ b/src/views/tickets/LoginAssetConfirm/Detail/index.vue @@ -22,7 +22,7 @@ export default { url: '', submenu: [ { - title: this.$t('TicketDetail'), + title: this.$t('Basic'), name: 'TicketDetail' } ], diff --git a/src/views/users/Group/UserGroupDetail/index.vue b/src/views/users/Group/UserGroupDetail/index.vue index a88433652..1bd98d8b5 100644 --- a/src/views/users/Group/UserGroupDetail/index.vue +++ b/src/views/users/Group/UserGroupDetail/index.vue @@ -25,7 +25,7 @@ export default { activeMenu: 'GroupInfo', submenu: [ { - title: this.$t('BasicInfo'), + title: this.$t('Basic'), name: 'GroupInfo' }, { diff --git a/src/views/users/Role/RoleDetail/index.vue b/src/views/users/Role/RoleDetail/index.vue index 2efa2f491..2394ad24b 100644 --- a/src/views/users/Role/RoleDetail/index.vue +++ b/src/views/users/Role/RoleDetail/index.vue @@ -49,7 +49,7 @@ export default { }, submenu: [ { - title: this.$t('BasicInfo'), + title: this.$t('Basic'), name: 'RoleInfo' }, { diff --git a/src/views/users/User/UserDetail/index.vue b/src/views/users/User/UserDetail/index.vue index 45fae5a4e..813e057be 100644 --- a/src/views/users/User/UserDetail/index.vue +++ b/src/views/users/User/UserDetail/index.vue @@ -38,7 +38,7 @@ export default { }, submenu: [ { - title: this.$t('BasicInfo'), + title: this.$t('Basic'), name: 'UserInfo' }, {