diff --git a/src/components/AccountHistoryTable/index.vue b/src/components/AccountHistoryTable/index.vue new file mode 100644 index 000000000..4c67b8fee --- /dev/null +++ b/src/components/AccountHistoryTable/index.vue @@ -0,0 +1,156 @@ + + + + + diff --git a/src/components/AccountListTable/index.vue b/src/components/AccountListTable/index.vue index a61c7f639..fac7bf066 100644 --- a/src/components/AccountListTable/index.vue +++ b/src/components/AccountListTable/index.vue @@ -13,6 +13,7 @@ import ShowSecretInfo from './ShowSecretInfo' import UpdateSecretInfo from './UpdateSecretInfo' import { connectivityMeta } from './const' import { openTaskPage } from '@/utils/jms' +import i18n from '@/i18n/i18n' export default { name: 'AccountListTable', @@ -148,6 +149,17 @@ export default { vm.showUpdateSecretDialog = true }) } + }, + { + name: 'History', + title: i18n.t('common.History'), + can: this.$hasPerm('assets.view_assethistoryaccount') && !this.$store.getters.currentOrgIsRoot, + callback: ({ row }) => { + this.$router.push({ + name: 'AssetAccountHistoryList', + query: { id: row.id } + }) + } } ] } diff --git a/src/components/ListTable/TableAction/ExportDialog.vue b/src/components/ListTable/TableAction/ExportDialog.vue index 044f22348..3603c3007 100644 --- a/src/components/ListTable/TableAction/ExportDialog.vue +++ b/src/components/ListTable/TableAction/ExportDialog.vue @@ -2,6 +2,7 @@
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json index 1e9f001b8..29fe7ebd9 100644 --- a/src/i18n/langs/en.json +++ b/src/i18n/langs/en.json @@ -1,6 +1,7 @@ { "": "", "accounts": { + "AccountHistableHelpMessage": "Record the historical version of the current account", "PleaseClickLeftAssetToViewAssetAccount": "Asset account list, please click on the assets on the left to view", "PleaseClickLeftApplicationToViewApplicationAccount": "Application account list, please click on the application on the left to view", "PleaseClickLeftAssetToViewGatheredUser": "Gathered user list, please click on the assets on the left to view" @@ -254,6 +255,7 @@ "common": { "VerificationCodeSent": "The verification code has been sent", "SendVerificationCode": "Send verification code", + "History": "History", "ChangeViewHelpText": "Click to change view", "Component": "component", "PrivateCloud": "Private cloud", @@ -683,6 +685,7 @@ "SessionDetail": "SessionDetail", "Accounts": "Accounts", "AssetAccount": "Asset Account", + "AssetHistoryAccount": "Asset History Account", "ApplicationAccount": "Application Account", "Ticket": "Tickets", "CommandConfirm": "Command confirm", diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json index 575acb312..5bdbd8a24 100644 --- a/src/i18n/langs/ja.json +++ b/src/i18n/langs/ja.json @@ -1,6 +1,7 @@ { "": "", "accounts": { + "AccountHistableHelpMessage": "現在のアカウントの履歴バージョンを記録する", "PleaseClickLeftAssetToViewAssetAccount": "資産のアカウントのリスト、左側の資産をクリックして表示します", "PleaseClickLeftApplicationToViewApplicationAccount": "アカウントのリストを適用して、左側のアプリケーションをクリックして表示します", "PleaseClickLeftAssetToViewGatheredUser": "ユーザーリストを収集し、左側の資産をクリックして表示します。" @@ -259,6 +260,7 @@ "common": { "VerificationCodeSent": "検証コードが送信されました", "SendVerificationCode": "認証コードの送信", + "History": "歴史", "ChangeViewHelpText": "クリックしてさまざまなビューにアクセス", "Component": "コンポーネント", "PrivateCloud": "プライベートクラウド", @@ -695,6 +697,7 @@ "TicketFlowUpdate": "承認フローの更新", "Accounts": "アカウント管理", "AssetAccount": "資産アカウント", + "AssetHistoryAccount": "資産履歴", "ApplicationAccount": "アプリアカウント", "Ticket": "ワークオーダー", "SessionDetail": "セッションの詳細", diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json index 710164601..758e1a579 100644 --- a/src/i18n/langs/zh.json +++ b/src/i18n/langs/zh.json @@ -1,6 +1,7 @@ { "": "", "accounts": { + "AccountHistableHelpMessage": "记录当前账号的历史版本", "PleaseClickLeftAssetToViewAssetAccount": "资产账号列表,点击左侧资产进行查看", "PleaseClickLeftApplicationToViewApplicationAccount": "应用账号列表,点击左侧应用进行查看", "PleaseClickLeftAssetToViewGatheredUser": "收集用户列表,点击左侧资产进行查看" @@ -259,6 +260,7 @@ "common": { "VerificationCodeSent": "验证码已发送", "SendVerificationCode": "发送验证码", + "History": "历史", "ChangeViewHelpText": "点击切换不同视图", "Component": "组件", "PrivateCloud": "私有云", @@ -695,6 +697,7 @@ "TicketFlowUpdate": "更新审批流", "Accounts": "账号管理", "AssetAccount": "资产账号", + "AssetHistoryAccount": "资产历史账号", "ApplicationAccount": "应用账号", "Ticket":"工单", "MyTickets": "我的申请", diff --git a/src/router/console/accounts.js b/src/router/console/accounts.js index 6293738d8..5bafd5d6f 100644 --- a/src/router/console/accounts.js +++ b/src/router/console/accounts.js @@ -21,6 +21,16 @@ export default [ app: 'assets', permissions: ['assets.view_authbook'] } + }, + { + path: 'history', + name: 'AssetAccountHistoryList', + component: () => import('@/views/accounts/AssetAccount/AssetAccountHistoryList'), + hidden: true, + meta: { + title: i18n.t('route.AssetHistoryAccount'), + permissions: ['assets.view_assethistoryaccount'] + } } ] }, diff --git a/src/views/accounts/AssetAccount/AssetAccountHistoryList.vue b/src/views/accounts/AssetAccount/AssetAccountHistoryList.vue new file mode 100644 index 000000000..51efbdbc6 --- /dev/null +++ b/src/views/accounts/AssetAccount/AssetAccountHistoryList.vue @@ -0,0 +1,78 @@ + + + + +