diff --git a/src/components/Apps/AccountListTable/AccountList.vue b/src/components/Apps/AccountListTable/AccountList.vue
index 21bc81efd..6a8872a60 100644
--- a/src/components/Apps/AccountListTable/AccountList.vue
+++ b/src/components/Apps/AccountListTable/AccountList.vue
@@ -161,8 +161,7 @@ export default {
iAsset: this.asset,
account: {},
secretUrl: '',
- quickFilters: accountQuickFilters,
- tabDeactivated: false,
+ quickFilters: accountQuickFilters(this),
tableConfig: {
url: this.url,
permissions: {
diff --git a/src/components/Apps/AccountListTable/const.js b/src/components/Apps/AccountListTable/const.js
index 192178af8..470f693a0 100644
--- a/src/components/Apps/AccountListTable/const.js
+++ b/src/components/Apps/AccountListTable/const.js
@@ -112,7 +112,7 @@ export const accountOtherActions = (vm) => [
{
name: 'SecretHistory',
// 密文历史
- title: vm.$t('SecretHistory'),
+ title: vm.$t('HistoryPassword'),
can: () => vm.$hasPerm('accounts.view_accountsecret'),
type: 'primary',
callback: ({ row }) => {
@@ -124,7 +124,7 @@ export const accountOtherActions = (vm) => [
},
{
name: 'CopyToOther',
- title: vm.$t('CopyToOther'),
+ title: vm.$t('CopyToAsset'),
type: 'primary',
divided: true,
callback: ({ row }) => {
@@ -137,7 +137,7 @@ export const accountOtherActions = (vm) => [
},
{
name: 'MoveToOther',
- title: vm.$t('MoveToOther'),
+ title: vm.$t('MoveToAsset'),
type: 'primary',
callback: ({ row }) => {
vm.accountCreateUpdateTitle = vm.$t('MoveToOther')
@@ -149,36 +149,36 @@ export const accountOtherActions = (vm) => [
}
]
-export const accountQuickFilters = [
+export const accountQuickFilters = (vm) => [
{
- label: '最近(7天)',
+ label: vm.$t('Recent (7 days)'),
options: [
{
- label: '最近发现',
+ label: vm.$t('RecentlyDiscovered'),
filter: {
latest_discovery: '1'
}
},
{
- label: '最近被登录',
+ label: vm.$t('RecentlyLoggedIn'),
filter: {
latest_accessed: '1'
}
},
{
- label: '最近修改',
+ label: vm.$t('RecentlyModified'),
filter: {
latest_updated: '1'
}
},
{
- label: '最近改密',
+ label: vm.$t('RecentlyChangedPassword'),
filter: {
latest_secret_changed: '1'
}
},
{
- label: '最近改密失败',
+ label: vm.$t('RecentPasswordChangeFailed'),
filter: {
latest_secret_changed_failed: '1'
}
@@ -186,40 +186,40 @@ export const accountQuickFilters = [
]
},
{
- label: '风险账号',
+ label: vm.$t('RiskyAccount'),
options: [
{
- label: '僵尸账号',
+ label: vm.$t('LongTimeNoLogin'),
filter: {
risk: 'long_time_no_login'
}
},
{
- label: '幽灵账号',
+ label: vm.$t('UnmanagedAccount'),
filter: {
risk: 'new_found'
}
},
{
- label: '弱密码',
+ label: vm.$t('WeakPassword'),
filter: {
risk: 'weak_password'
}
},
{
- label: '空密码',
+ label: vm.$t('EmptyPassword'),
filter: {
has_secret: 'false'
}
},
{
- label: '长时间未改密',
+ label: vm.$t('LongTimeNoChangeSecret'),
filter: {
long_time_no_change_secret: 'true'
}
},
{
- label: '长时间未验证',
+ label: vm.$t('LongTimeNoVerify'),
filter: {
long_time_no_verify: 'true'
}
@@ -227,34 +227,34 @@ export const accountQuickFilters = [
]
},
{
- label: '账号类型',
+ label: vm.$t('AccountType'),
options: [
{
- label: '全部',
+ label: vm.$t('All'),
filter: {
category: ''
}
},
{
- label: ' 主机',
+ label: vm.$t('Host'),
filter: {
category: 'host'
}
},
{
- label: '数据库',
+ label: vm.$t('Database'),
filter: {
category: 'database'
}
},
{
- label: '云',
+ label: vm.$t('Cloud'),
filter: {
category: 'cloud'
}
},
{
- label: '网络设备',
+ label: vm.$t('Device'),
filter: {
category: 'device'
}
@@ -266,7 +266,7 @@ export const accountQuickFilters = [
}
},
{
- label: '其他',
+ label: vm.$t('Other'),
filter: {
category: 'custom'
}
diff --git a/src/components/Table/TableFormatters/AccountConnectFormatter.vue b/src/components/Table/TableFormatters/AccountConnectFormatter.vue
new file mode 100644
index 000000000..0a69b3c08
--- /dev/null
+++ b/src/components/Table/TableFormatters/AccountConnectFormatter.vue
@@ -0,0 +1,150 @@
+
+
+
+
+
+
+
+ {{ ITitleText }}
+
+
+
+ {{ protocol.name }}
+
+
+
+
+
+
+
+
diff --git a/src/components/Table/TableFormatters/index.js b/src/components/Table/TableFormatters/index.js
index fb555aa14..0c75e49fa 100644
--- a/src/components/Table/TableFormatters/index.js
+++ b/src/components/Table/TableFormatters/index.js
@@ -20,6 +20,7 @@ import SwitchFormatter from './SwitchFormatter.vue'
import AccountInfoFormatter from './AccountInfoFormatter.vue'
import PlatformFormatter from './PlatformFormatter.vue'
import DiscoverConfirmFormatter from './DiscoverConfirmFormatter.vue'
+import AccountConnectFormatter from './AccountConnectFormatter.vue'
export default {
DetailFormatter,
@@ -43,7 +44,8 @@ export default {
SwitchFormatter,
PlatformFormatter,
AccountInfoFormatter,
- DiscoverConfirmFormatter
+ DiscoverConfirmFormatter,
+ AccountConnectFormatter
}
export {
@@ -68,5 +70,6 @@ export {
SwitchFormatter,
PlatformFormatter,
DiscoverConfirmFormatter,
- AccountInfoFormatter
+ AccountInfoFormatter,
+ AccountConnectFormatter
}
diff --git a/src/views/accounts/AccountDiscover/AccountDiscoverList.vue b/src/views/accounts/AccountDiscover/AccountDiscoverList.vue
index 4a58b26a1..9921f42d8 100644
--- a/src/views/accounts/AccountDiscover/AccountDiscoverList.vue
+++ b/src/views/accounts/AccountDiscover/AccountDiscoverList.vue
@@ -75,20 +75,20 @@ export default {
},
quickSummary: [
{
- title: '最近一周发现',
+ title: this.$t('DateLastWeek'),
hasCount: true,
filter: {
'days': '7'
}
},
{
- title: '最近一月发现',
+ title: this.$t('DateLastMonth'),
filter: {
'days': '30'
}
},
{
- title: '待确认',
+ title: this.$t('Pending'),
filter: {
status: '0'
}
diff --git a/src/views/dashboard/Pam/AccountSummary.vue b/src/views/dashboard/Pam/AccountSummary.vue
index c76cdf453..7a0e29b27 100644
--- a/src/views/dashboard/Pam/AccountSummary.vue
+++ b/src/views/dashboard/Pam/AccountSummary.vue
@@ -22,13 +22,14 @@ export default {
data() {
return {
config: {
- title: this.$t('账号汇总'),
+ title: this.$t('AccountSummary'),
tip: this.$t('RealTimeData')
},
counter: {
- total_count_online_sessions: '.',
- total_count_online_users: '.',
- total_count_today_failed_sessions: '.'
+ total_privileged_accounts: '',
+ total_ordinary_accounts: '',
+ total_unmanaged_accounts: '',
+ total_unavailable_accounts: ''
}
}
},
@@ -36,32 +37,31 @@ export default {
summaryItems() {
return [
{
- title: this.$t('特权账号'),
+ title: this.$t('Privileged'),
body: {
route: { name: `SessionList`, params: { activeMenu: 'OnlineList' }},
- count: 4932,
+ count: this.counter.total_privileged_accounts,
disabled: !this.$hasPerm('terminal.view_session')
}
},
{
- title: this.$t('普通账号'),
+ title: this.$t('GeneralAccounts'),
body: {
route: { name: `SessionList`, params: { activeMenu: 'OnlineList' }},
- count: 2323,
- disabled: !this.$hasPerm('terminal.view_session')
+ count: this.counter.total_ordinary_accounts
}
},
{
- title: this.$t('未托管账号'),
+ title: this.$t('UnmanagedAccount'),
body: {
- count: 1233,
+ count: this.counter.total_unmanaged_accounts,
disabled: true
}
},
{
- title: this.$t('不可用账号'),
+ title: this.$t('UnavailableAccount'),
body: {
- count: 123,
+ count: this.counter.total_unavailable_accounts,
disabled: true
}
}
@@ -74,12 +74,13 @@ export default {
methods: {
async getResourcesCount() {
return this.$axios.get(
- '/api/v1/index/',
+ '/api/v1/accounts/pam-dashboard/',
{
params: {
- total_count_online_sessions: 1,
- total_count_online_users: 1,
- total_count_today_failed_sessions: 1
+ total_privileged_accounts: 1,
+ total_ordinary_accounts: 1,
+ total_unmanaged_accounts: 1,
+ total_unavailable_accounts: 1
}
}
)
diff --git a/src/views/dashboard/Pam/DataSummary.vue b/src/views/dashboard/Pam/DataSummary.vue
index 4feb1e3bf..a22ce194c 100644
--- a/src/views/dashboard/Pam/DataSummary.vue
+++ b/src/views/dashboard/Pam/DataSummary.vue
@@ -2,7 +2,7 @@
-
+
@@ -10,41 +10,22 @@
diff --git a/src/views/dashboard/Pam/RiskSummary.vue b/src/views/dashboard/Pam/RiskSummary.vue
index 41eb917b9..a9014cc98 100644
--- a/src/views/dashboard/Pam/RiskSummary.vue
+++ b/src/views/dashboard/Pam/RiskSummary.vue
@@ -22,13 +22,13 @@ export default {
data() {
return {
config: {
- title: this.$t('风险账号'),
+ title: this.$t('RiskyAccount'),
tip: this.$t('RealTimeData')
},
counter: {
- total_count_online_sessions: '.',
- total_count_online_users: '.',
- total_count_today_failed_sessions: '.'
+ total_long_time_no_login_accounts: '.',
+ total_weak_password_accounts: '.',
+ total_long_time_change_password_accounts: '.'
}
}
},
@@ -36,32 +36,23 @@ export default {
summaryItems() {
return [
{
- title: this.$t('幽灵账号'),
+ title: this.$t('LongTimeNoLogin'),
body: {
route: { name: `SessionList`, params: { activeMenu: 'OnlineList' }},
- count: 23,
- disabled: !this.$hasPerm('terminal.view_session')
+ count: this.counter.total_long_time_no_login_accounts
}
},
{
- title: this.$t('僵尸账号'),
+ title: this.$t('WeakPassword'),
body: {
- route: { name: `SessionList`, params: { activeMenu: 'OnlineList' }},
- count: 293,
- disabled: !this.$hasPerm('terminal.view_session')
- }
- },
- {
- title: this.$t('弱密码'),
- body: {
- count: 203,
+ count: this.counter.total_weak_password_accounts,
disabled: true
}
},
{
- title: this.$t('长时未改密'),
+ title: this.$t('LongTimeNoChangeSecret'),
body: {
- count: 1010,
+ count: this.counter.total_long_time_change_password_accounts,
disabled: true
}
}
@@ -74,12 +65,16 @@ export default {
methods: {
async getResourcesCount() {
return this.$axios.get(
- '/api/v1/index/',
+ '/api/v1/accounts/pam-dashboard/',
{
params: {
- total_count_online_sessions: 1,
- total_count_online_users: 1,
- total_count_today_failed_sessions: 1
+ total_privileged_accounts: 1,
+ total_ordinary_accounts: 1,
+ total_unmanaged_accounts: 1,
+ total_unavailable_accounts: 1,
+ total_long_time_no_login_accounts: 1,
+ total_weak_password_accounts: 1,
+ total_long_time_change_password_accounts: 1
}
}
)
diff --git a/src/views/dashboard/Pam/SummaryChart.vue b/src/views/dashboard/Pam/SummaryChart.vue
index d3c6672f1..85e7a7bb9 100644
--- a/src/views/dashboard/Pam/SummaryChart.vue
+++ b/src/views/dashboard/Pam/SummaryChart.vue
@@ -9,7 +9,7 @@
- 1000
+ {{ config.total }}
diff --git a/src/views/pam/Account/AccountList.vue b/src/views/pam/Account/AccountList.vue
index 1c8883a03..1e33d8651 100644
--- a/src/views/pam/Account/AccountList.vue
+++ b/src/views/pam/Account/AccountList.vue
@@ -3,9 +3,8 @@
@@ -208,9 +98,4 @@ export default {
.asset-user-table {
padding-left: 20px;
}
-
-.el-dropdown-menu__item.is-disabled {
- font-weight: 500;
- color: var(--el-text-color-secondary);
-}
diff --git a/src/views/pam/RiskDetect/AccountRiskList.vue b/src/views/pam/RiskDetect/AccountRiskList.vue
index cb888d671..7cc73532d 100644
--- a/src/views/pam/RiskDetect/AccountRiskList.vue
+++ b/src/views/pam/RiskDetect/AccountRiskList.vue
@@ -60,19 +60,19 @@ export default {
},
quickSummary: [
{
- title: '最近一周发现',
+ title: this.$t('DateLastWeek'),
filter: {
'days': '7'
}
},
{
- title: '最近一月发现',
+ title: this.$t('DateLastMonth'),
filter: {
'days': '30'
}
},
{
- title: '待处理',
+ title: this.$t('Pending'),
filter: {
status: '0'
}