diff --git a/src/components/AccountListTable/ViewSecret.vue b/src/components/AccountListTable/ViewSecret.vue index e3f0e61e1..3aae41d75 100644 --- a/src/components/AccountListTable/ViewSecret.vue +++ b/src/components/AccountListTable/ViewSecret.vue @@ -16,31 +16,31 @@ v-on="$listeners" > - - + + {{ account['name'] }} - + {{ account['username'] }} - +
- + - + {{ sshKeyFingerprint }} {{ $t('common.Download') }}
- - {{ $moment(authInfo.date_created, 'YYYY-MM-DD HH:mm:ss').format('YYYY-MM-DD HH:mm:ss') }} + + {{ account['date_created'] | date }} - - {{ $moment(authInfo.date_updated, 'YYYY-MM-DD HH:mm:ss').format('YYYY-MM-DD HH:mm:ss') }} + + {{ account['date_updated'] | date }} - + {{ authInfo.version }}
@@ -80,7 +80,7 @@ export default { }, data() { return { - dialogTitle: this.$tc('common.ViewSecret'), + dialogTitle: this.$tc('assets.AccountDetail'), authInfo: {}, showAuthInfo: false, sshKeyFingerprint: '', @@ -119,9 +119,19 @@ export default { .item-textarea >>> .el-textarea__inner { height: 110px; } + .el-form-item { + border-bottom: 1px solid #EBEEF5; + padding: 3px 0; + margin-bottom: 0; + &:hover { + background-color: #F5F7FA; + } + } + ul { margin: 0; } + li { display: block; font-size: 13px; @@ -134,7 +144,4 @@ export default { font-weight: 500; } } - .password-form >>> .el-form-item { - margin-bottom: 4px; - } diff --git a/src/filters/datetime.js b/src/filters/datetime.js new file mode 100644 index 000000000..e5e7b1569 --- /dev/null +++ b/src/filters/datetime.js @@ -0,0 +1,7 @@ +import Vue from 'vue' +import moment from 'moment' + +Vue.filter('date', function(value) { + return moment(value, 'YYYY-MM-DD HH:mm:ss').format('YYYY-MM-DD HH:mm:ss') +}) + diff --git a/src/filters/index.js b/src/filters/index.js new file mode 100644 index 000000000..ab999d9c2 --- /dev/null +++ b/src/filters/index.js @@ -0,0 +1 @@ +import './datetime' diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json index db1b106e9..2d7b87dc7 100644 --- a/src/i18n/langs/zh.json +++ b/src/i18n/langs/zh.json @@ -97,6 +97,7 @@ "NoSQLProtocol": "非关系数据库" }, "assets": { + "AccountDetail": "账号详情", "Accounts": "账号列表", "SelectTemplate": "选择模版", "InAssetDetail": "在资产详情中更新账号信息", diff --git a/src/main.js b/src/main.js index de08d3b22..d47f39c9a 100644 --- a/src/main.js +++ b/src/main.js @@ -14,6 +14,7 @@ import i18n from './i18n/i18n' import '@/icons' // icon import '@/guards' // permission control import '@/directive' +import '@/filters' /** * If you don't want to use mock-server diff --git a/src/views/assets/Asset/AssetDetail/Account.vue b/src/views/assets/Asset/AssetDetail/Account.vue index 4fda68ce5..03a0e2798 100644 --- a/src/views/assets/Asset/AssetDetail/Account.vue +++ b/src/views/assets/Asset/AssetDetail/Account.vue @@ -38,7 +38,7 @@ export default { return { columns: [ 'username', 'version', 'privileged', 'connectivity', - 'date_created', 'date_updated', 'actions' + 'is_active', 'date_created', 'date_updated', 'actions' ] } },