github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-09-14 14:19:16 +00:00
Code Issues Projects Releases Wiki Activity

[fix]

Browse Source
This commit is contained in:
OrangeM21
2020-06-07 23:13:07 +08:00
parent d536930568
commit 1c9f62f2ec
7 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/i18n/langs/cn.json
View File

@@ -151,6 +151,7 @@
"DateLastWeek": "最近一周",
"DateLastMonth": "最近一月",
"DateLast3Months": "最近三月",
"MFAConfirm": "MFA 认证",
"Yes": "是",
"No": "否",
"Remove":"删除",

1
src/i18n/langs/en.json
View File

@@ -150,6 +150,7 @@
"DateLastWeek": "Last week",
"DateLastMonth": "Last month",
"DateLast3Months": "Last 3 months",
"MFAConfirm": "MFA Confirm",
"Yes": "Yes",
"Remove":"Remove",
"No": "No",

14
src/views/assets/AdminUser/AdminUserDetail/AssetsList.vue
View File

@@ -1,12 +1,13 @@
<template><div>
<el-row :gutter="20">
<el-col :span="14">
<el-col :span="18">
<ListTable ref="ListTable" :table-config="tableConfig" :header-actions="headerActions" />
</el-col>
<el-col :span="10">
<el-col :span="6">
<QuickActions type="primary" :actions="quickActions" />
</el-col>
</el-row>
<Dialog width="50" :title="this.$t('common.MFAConfirm')" :visible.sync="showMFADialog" />
<Dialog width="50" :title="this.$t('assets.UpdateAssetUserToken')" :visible.sync="showDialog" @confirm="handleConfirm()" @cancel="handleCancel()">
<el-form label-position="right" label-width="80px" :model="dialogInfo">
<el-form-item :label="this.$t('assets.Hostname')">
@@ -48,6 +49,7 @@ export default {
data() {
return {
showDialog: false,
showMFADialog: false,
dialogInfo: {
asset: '',
username: '',
@@ -109,6 +111,14 @@ export default {
hasDelete: false, // can set function(row, value)
canDelete: false,
extraActions: [
{
name: this.$t('common.View'),
title: this.$t('common.View'),
type: 'primary',
callback: function(val) {
this.showMFADialog = true
}.bind(this)
},
{
name: this.$t('common.Delete'),
title: this.$t('common.Delete'),

4
src/views/assets/AdminUser/AdminUserDetail/Detail.vue
View File

@@ -1,9 +1,9 @@
<template>
<el-row :gutter="20">
<el-col :span="14">
<el-col :span="18">
<DetailCard :items="detailCardItems" />
</el-col>
<el-col :span="10">
<el-col :span="6">
<RelationCard ref="RelationCard" type="info" style="margin-top: 15px" v-bind="nodeRelationConfig" />
</el-col>
</el-row>

2
src/views/assets/Asset/AssetDetail/AssetList.vue
View File

@@ -8,7 +8,7 @@
<QuickActions type="primary" :actions="quickActions" />
</el-col>
</el-row>
<Dialog width="50" :title="this.$t('assets.UpdateAssetUserToken')" :visible.sync="showMFADialog" />
<Dialog width="50" :title="this.$t('common.MFAConfirm')" :visible.sync="showMFADialog" />
<Dialog width="50" :title="this.$t('assets.UpdateAssetUserToken')" :visible.sync="showDialog" @confirm="handleConfirm()" @cancel="handleCancel()">
<el-form label-position="right" label-width="80px" :model="dialogInfo">
<el-form-item :label="this.$t('assets.Hostname')">

4
src/views/assets/Domain/DomainDetail/Detail.vue
View File

@@ -1,9 +1,9 @@
<template>
<el-row :gutter="20">
<el-col :span="14">
<el-col :span="18">
<DetailCard :items="detailCardItems" />
</el-col>
<el-col :span="10" />
<el-col :span="6" />
</el-row>
</template>

14
src/views/assets/SystemUser/SystemUserDetail/AssetList.vue
View File

@@ -1,14 +1,15 @@
<template>
<div>
<el-row :gutter="20">
<el-col :span="14">
<el-col :span="18">
<ListTable ref="ListTable" :table-config="tableConfig" :header-actions="headerActions" />
</el-col>
<el-col :span="10">
<el-col :span="6">
<QuickActions type="primary" :actions="quickActions" />
<RelationCard type="info" style="margin-top: 15px" v-bind="nodeRelationConfig" />
</el-col>
</el-row>
<Dialog width="50" :title="this.$t('common.MFAConfirm')" :visible.sync="showMFADialog" />
<Dialog width="50" :title="this.$t('assets.UpdateAssetUserToken')" :visible.sync="showDialog" @confirm="handleConfirm()" @cancel="handleCancel()">
<el-form label-position="right" label-width="80px" :model="dialogInfo">
<el-form-item :label="this.$t('assets.Hostname')">
@@ -59,6 +60,7 @@ export default {
password: '',
key: ''
},
showMFADialog: false,
AutoPushConfig: {
icon: 'fa-info',
title: this.$t('assets.QuickUpdate'),
@@ -152,6 +154,14 @@ export default {
hasDelete: false, // can set function(row, value)
canDelete: false,
extraActions: [
{
name: this.$t('common.View'),
title: this.$t('common.View'),
type: 'primary',
callback: function(val) {
this.showMFADialog = true
}.bind(this)
},
{
name: 'delete',
title: this.$t('common.Delete'),