From e159467b54c86b2893451c200bdc452206642f1d Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 16 Aug 2021 11:33:42 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E4=BF=AE=E6=94=B9=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=85=A8=E5=B1=80=E5=8F=98=E9=87=8F=E4=B8=BA=201?=
 =?UTF-8?q?=E6=88=960=20=EF=BC=8C=E4=BF=AE=E6=94=B9=20userBox=20creatTime?=
 =?UTF-8?q?=E4=BC=A0=E2=80=98-=E2=80=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/rightBox/administration/userBox.vue   | 2 +-
 .../src/components/common/table/settings/userTable.vue          | 2 +-
 nezha-fronted/src/components/page/config/user.vue               | 1 -
 .../src/components/page/monitor/endpoint/endpointList.vue       | 1 +
 nezha-fronted/src/store/user.js                                 | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/administration/userBox.vue b/nezha-fronted/src/components/common/rightBox/administration/userBox.vue
index 81f8b4ac6..714cc48f5 100644
--- a/nezha-fronted/src/components/common/rightBox/administration/userBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/administration/userBox.vue
@@ -78,7 +78,7 @@
           </el-form-item>
 
           <el-form-item v-if="editUser.id" :label="$t('config.user.createTime')">
-            <div class="right-box-form-content-txt">{{editUser.createAt}}</div>
+            <div class="right-box-form-content-txt">{{utcTimeToTimezoneStr(editUser.createAt)}}</div>
           </el-form-item>
 
         </el-form>
diff --git a/nezha-fronted/src/components/common/table/settings/userTable.vue b/nezha-fronted/src/components/common/table/settings/userTable.vue
index 813d2ef10..cd0343750 100644
--- a/nezha-fronted/src/components/common/table/settings/userTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/userTable.vue
@@ -38,7 +38,7 @@
           <div>
             <div class="flex-align-center">
               <span class="user-name-top">{{scope.row[item.prop]}}</span>
-              <el-tag size="mini" v-if="mfaEnable!='0' || scope.row.mfaLevel > 0" style="margin-left: 5px">2FA</el-tag>
+              <el-tag size="mini" v-if="mfaEnable == '1' || scope.row.mfaLevel > 0" style="margin-left: 5px">2FA</el-tag>
             </div>
             <div class="user-name-bottom">
               @{{scope.row.username}}
diff --git a/nezha-fronted/src/components/page/config/user.vue b/nezha-fronted/src/components/page/config/user.vue
index c12e08c9d..670a048f6 100644
--- a/nezha-fronted/src/components/page/config/user.vue
+++ b/nezha-fronted/src/components/page/config/user.vue
@@ -112,7 +112,6 @@ export default {
           this.object = {
             ...user,
             status: user.status + '',
-            createAt: this.utcTimeToTimezoneStr(user.createAt),
             roleIds: Number(user.roles.map(item => item.id).join(',')),
             pin: '',
             pinChange: ''
diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
index 05daca31c..8aa69d95d 100644
--- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
+++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
@@ -468,6 +468,7 @@ export default {
         { key: 'Logs', value: 'logs', name: 'Logs' }
       ]
       this.titleSearchList.state.show = true
+      this.titleSearchList.type.show = true
     },
     batchModify () {
       if (!this.batchDeleteObjs.length) {
diff --git a/nezha-fronted/src/store/user.js b/nezha-fronted/src/store/user.js
index f81f91f46..ecdd83f84 100644
--- a/nezha-fronted/src/store/user.js
+++ b/nezha-fronted/src/store/user.js
@@ -50,7 +50,7 @@ const user = {
       localStorage.setItem('nz-sys-max-terminal-num', res.data.maxTerminalNum)
       localStorage.setItem('nz-sys-asset-ping-switch', res.data.assetPingSwitch)
       localStorage.setItem('nz-unnsaved-change', res.data.unsavedChange)
-      localStorage.setItem('nz-mfa-enable', res.data.mfaAuthEnable)
+      localStorage.setItem('nz-mfa-enable', res.data.mfaAuthEnable ? 1 : 0)
       post('/sys/user/permissions', { token: res.data.token }).then(res => {
         const menuList = sortByOrderNum(res.data.menus)
         store.commit('setMenuList', menuList)