From 1c9f62f2ecb74b5e6b6b58e32999fd820cf28e48 Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Sun, 7 Jun 2020 23:13:07 +0800
Subject: [PATCH] [fix]

---
 src/i18n/langs/cn.json                             |  1 +
 src/i18n/langs/en.json                             |  1 +
 .../AdminUser/AdminUserDetail/AssetsList.vue       | 14 ++++++++++++--
 .../assets/AdminUser/AdminUserDetail/Detail.vue    |  4 ++--
 src/views/assets/Asset/AssetDetail/AssetList.vue   |  2 +-
 src/views/assets/Domain/DomainDetail/Detail.vue    |  4 ++--
 .../SystemUser/SystemUserDetail/AssetList.vue      | 14 ++++++++++++--
 7 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 1b0187c44..272201818 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -151,6 +151,7 @@
     "DateLastWeek": "最近一周",
     "DateLastMonth": "最近一月",
     "DateLast3Months": "最近三月",
+    "MFAConfirm": "MFA 认证",
     "Yes": "是",
     "No": "否",
     "Remove":"删除",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 20d847437..d87e3c1e9 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -150,6 +150,7 @@
     "DateLastWeek": "Last week",
     "DateLastMonth": "Last month",
     "DateLast3Months": "Last 3 months",
+    "MFAConfirm": "MFA Confirm",
     "Yes": "Yes",
     "Remove":"Remove",
     "No": "No",
diff --git a/src/views/assets/AdminUser/AdminUserDetail/AssetsList.vue b/src/views/assets/AdminUser/AdminUserDetail/AssetsList.vue
index 170785c76..22684a38b 100644
--- a/src/views/assets/AdminUser/AdminUserDetail/AssetsList.vue
+++ b/src/views/assets/AdminUser/AdminUserDetail/AssetsList.vue
@@ -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'),
diff --git a/src/views/assets/AdminUser/AdminUserDetail/Detail.vue b/src/views/assets/AdminUser/AdminUserDetail/Detail.vue
index 232cd4f8d..a7ca5bff4 100644
--- a/src/views/assets/AdminUser/AdminUserDetail/Detail.vue
+++ b/src/views/assets/AdminUser/AdminUserDetail/Detail.vue
@@ -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>
diff --git a/src/views/assets/Asset/AssetDetail/AssetList.vue b/src/views/assets/Asset/AssetDetail/AssetList.vue
index 2f502ce4f..396f5e024 100644
--- a/src/views/assets/Asset/AssetDetail/AssetList.vue
+++ b/src/views/assets/Asset/AssetDetail/AssetList.vue
@@ -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')">
diff --git a/src/views/assets/Domain/DomainDetail/Detail.vue b/src/views/assets/Domain/DomainDetail/Detail.vue
index 8d6db4634..ef5bf6c07 100644
--- a/src/views/assets/Domain/DomainDetail/Detail.vue
+++ b/src/views/assets/Domain/DomainDetail/Detail.vue
@@ -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>
 
diff --git a/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue b/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue
index 3618db514..dbade9135 100644
--- a/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue
+++ b/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue
@@ -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'),