From e6161147ce102365f5724c475a7ca92cc9ccddec Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Thu, 9 Jun 2022 14:22:45 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20apiKey=E6=97=B6=E5=8C=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/rightBox/apiKeyBox.vue  |  1 +
 .../page/config/system/selfApiKeyTable.vue    | 19 +++++++++----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/apiKeyBox.vue b/nezha-fronted/src/components/common/rightBox/apiKeyBox.vue
index 2008ab526..6cc154f10 100644
--- a/nezha-fronted/src/components/common/rightBox/apiKeyBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/apiKeyBox.vue
@@ -102,6 +102,7 @@ export default {
       this.$refs.apiKeyBoxForm.validate((valid) => {
         if (valid) {
           if (this.apiKeyBox.name) {
+            this.apiKeyBox.expireAt = this.timezoneToUtcTimeStr(this.apiKeyBox.expireAt, 'YYYY-MM-DD HH:mm:ss')
             this.$post('sys/apiKey/self', { ...this.apiKeyBox }).then(res => {
               this.prevent_opt.save = false
               if (res.code === 200) {
diff --git a/nezha-fronted/src/components/page/config/system/selfApiKeyTable.vue b/nezha-fronted/src/components/page/config/system/selfApiKeyTable.vue
index d2399f1c1..e50bca1b8 100644
--- a/nezha-fronted/src/components/page/config/system/selfApiKeyTable.vue
+++ b/nezha-fronted/src/components/page/config/system/selfApiKeyTable.vue
@@ -40,10 +40,10 @@
                {{scope.row[item.prop]?scope.row[item.prop]:'-'}}
             </template>
              <template v-if="item.prop == 'expireAt'">
-              {{scope.row[item.prop]?timeFormates(scope.row[item.prop]):'-'}}
+              {{scope.row[item.prop]?utcTimeToTimezoneStr(scope.row[item.prop]):'-'}}
             </template>
             <template v-if="item.prop == 'createAt'">
-              {{scope.row[item.prop]?timeFormates(scope.row[item.prop]):'-'}}
+              {{scope.row[item.prop]?utcTimeToTimezoneStr(scope.row[item.prop]):'-'}}
             </template>
              <template v-if="item.prop == 'remark'">
               {{scope.row[item.prop]?scope.row[item.prop]:'-'}}
@@ -80,7 +80,6 @@
 <script>
 import { tableCommon } from './systemCommon'
 import table from '@/components/common/mixin/table'
-import bus from '@/libs/bus'
 export default {
   name: 'apiKeyTable',
   props: {
@@ -118,13 +117,13 @@ export default {
     }
   },
   methods: {
-    timeFormates (data) {
-      if (localStorage.getItem('nz-default-dateFormat')) {
-        return bus.timeFormate(new Date(data), localStorage.getItem('nz-default-dateFormat'))
-      } else {
-        return bus.timeFormate(new Date(data), 'YYYY-MM-DD HH:mm:ss')
-      }
-    }
+    // timeFormates (data) {
+    //   if (localStorage.getItem('nz-default-dateFormat')) {
+    //     return bus.timeFormate(new Date(data), localStorage.getItem('nz-default-dateFormat'))
+    //   } else {
+    //     return bus.timeFormate(new Date(data), 'YYYY-MM-DD HH:mm:ss')
+    //   }
+    // }
   },
   created () {
   },