From 57d471a2d6c9c892b280f655b1629e7eed3bc831 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Fri, 7 Aug 2020 16:09:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9asset-account-snmp?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=90=8D=E3=80=81=E5=AF=BC=E5=85=A5=E6=A1=86?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/stylus/main.scss          |  2 +-
 nezha-fronted/src/components/common/exportXLSX.vue |  2 +-
 .../src/components/page/asset/accountConfig.vue    | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss
index c62d0c291..d29a1cd26 100644
--- a/nezha-fronted/src/assets/stylus/main.scss
+++ b/nezha-fronted/src/assets/stylus/main.scss
@@ -558,7 +558,7 @@ li{
   align-items : center;
   position: relative;
   flex-direction: row-reverse;
-  z-index: 1;
+  z-index: 2;
 }
 .top-tools>div {
   margin-top: 2px;
diff --git a/nezha-fronted/src/components/common/exportXLSX.vue b/nezha-fronted/src/components/common/exportXLSX.vue
index a5b60c52c..c701403dc 100644
--- a/nezha-fronted/src/components/common/exportXLSX.vue
+++ b/nezha-fronted/src/components/common/exportXLSX.vue
@@ -4,7 +4,7 @@
       <slot name="optionZone"></slot><button @mouseenter="exportMenuHandler(true)" @mouseleave="exportMenuHandler(false)" class="nz-btn nz-btn-size-normal nz-btn-style-light export-dropdown-btn" id="browser-go">
         <i class="el-icon-arrow-down"></i>
         <transition name="el-zoom-in-top">
-          <ul class="el-dropdown-menu el-popper el-dropdown-menu--mini export-dropdown" v-if="exportShow">
+          <ul class="el-dropdown-menu el-popper el-dropdown-menu--mini export-dropdown" v-show="exportShow">
             <li @click="showImportBox(1)" class="el-dropdown-menu__item dropdown-content"><i class="el-icon-upload2"></i>import</li>
             <li @click="showImportBox(2)" class="el-dropdown-menu__item dropdown-content"><i class="el-icon-download"></i>export</li>
           </ul>
diff --git a/nezha-fronted/src/components/page/asset/accountConfig.vue b/nezha-fronted/src/components/page/asset/accountConfig.vue
index fab70175f..65468e64b 100644
--- a/nezha-fronted/src/components/page/asset/accountConfig.vue
+++ b/nezha-fronted/src/components/page/asset/accountConfig.vue
@@ -1,8 +1,8 @@
 <template>
   <el-form label-width="120px" :model="account" :rules="rules" ref="accountForm" style="margin-top: 20px;">
     <template v-if="account.protocol == 'SSH'">
-      <el-form-item :label="$t('asset.account')" prop="params.user">
-        <el-input autocomplete="new-password" size="small" v-model="account.params.user"/>
+      <el-form-item :label="$t('asset.account')" prop="params.username">
+        <el-input autocomplete="new-password" size="small" v-model="account.params.username"/>
       </el-form-item>
       <el-form-item :label="$t('asset.loginType')" prop="params.method">
         <el-radio-group v-model="account.params.method" size="small">
@@ -24,8 +24,8 @@
       </el-form-item>
     </template>
     <template v-if="account.protocol == 'TELNET'">
-      <el-form-item :label="$t('asset.account')" prop="params.user">
-        <el-input autocomplete="new-password" size="small" v-model="account.params.user"/>
+      <el-form-item :label="$t('asset.account')" prop="params.username">
+        <el-input autocomplete="new-password" size="small" v-model="account.params.username"/>
       </el-form-item>
       <el-form-item :label="$t('asset.userTip')" prop="userTip">
         <el-input autocomplete="new-password" size="small" v-model="account.params.userTip"/>
@@ -61,8 +61,8 @@
       </el-form-item>
       <!--SNMP V3 setting-->
       <template v-if="account.params.version == 3">
-        <el-form-item :label="$t('asset.account')" prop="params.user">
-          <el-input size="small" v-model="account.params.user"/>
+        <el-form-item :label="$t('asset.account')" prop="params.username">
+          <el-input size="small" v-model="account.params.username"/>
         </el-form-item>
         <el-form-item :label="$t('project.module.securityLevel')" prop="params.securityLevel">
           <el-radio-group v-model="account.params.securityLevel" size="small">
@@ -105,7 +105,7 @@ export default {
     data(){
       return {
         rules:{
-          "params.user": [
+          "params.username": [
             { required: true, message: this.$t('validate.required'), trigger: 'blur'}
           ],
           port: [