From 7bbf078c84e4e2bc24c25d88501422eed3801a0c Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Wed, 5 Jan 2022 10:15:52 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-1480=20fix:=20=E4=BF=AE=E5=A4=8Dlicense?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=B1=95=E7=A4=BA=E9=94=99=E8=AF=AF=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/bottomBox/tabs/panelTabNew.vue        |  1 -
 .../common/rightBox/chart/chartRightBox.vue      |  1 -
 .../components/page/config/system/license.vue    | 16 ++++++++++------
 nezha-fronted/src/permission.js                  |  1 -
 nezha-fronted/src/store/index.js                 |  1 -
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
index 61a6617af..1cdf21bae 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
@@ -338,7 +338,6 @@ export default {
       this.$emit('changeTab', tab)
     },
     closeRightBox (refresh) {
-      console.log('close')
       this.rightBox.chart.show = false
       this.rightBox.chartTemp.show = false
       this.$store.dispatch('clearPanel')
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
index e4b467670..2d65418f6 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
@@ -202,7 +202,6 @@ export default {
     /* 关闭弹框 */
     esc (refresh) {
       this.prevent_opt.save = false
-      console.log(12313)
       this.$emit('close', refresh)
     },
     // 保存endpoint
diff --git a/nezha-fronted/src/components/page/config/system/license.vue b/nezha-fronted/src/components/page/config/system/license.vue
index 150555be4..f2dbccb66 100644
--- a/nezha-fronted/src/components/page/config/system/license.vue
+++ b/nezha-fronted/src/components/page/config/system/license.vue
@@ -29,16 +29,16 @@
         <div>
           <div class="license-left-boyd-title">{{$t('license.proDate')}}</div>
           <div class="license-left-boyd-value">
-            <span v-if="licenseList.production_date">{{utcTimeToTimezoneStr(licenseList.production_date * 1000)}}</span>
+            <span v-if="licenseList.production_date">{{licenseList.production_date}}</span>
             <span v-else>-</span>
           </div>
         </div>
         <div>
           <div class="license-left-boyd-title">{{$t('license.expDate')}}</div>
           <div class="license-left-boyd-value">
-            <span v-if="expData.id === '20001' && expData.license.license_type === 'expiration'">{{utcTimeToTimezoneStr(expData.license.exp_date * 1000)}}</span>
-            <span v-else-if="expData.id === '20001' && expData.license.license_type === 'perpetual'">{{$t('license.permanent')}}</span>
-            <span v-else-if="expData.id === '20001' && expData.license.license_type === 'trial'">{{utcTimeToTimezoneStr(this.stateItem * 1000)}} ~ {{ utcTimeToTimezoneStr(this.endItem * 1000)}}</span>
+            <span v-if="expData.id === '20001' && expData.license.license_type === 'expiration'">{{expData.license.exp_date}}</span>
+            <span v-else-if="expData.id === '20001' && expData.license.license_type === 'perpetual'">{{licenseList.production_date}}</span>
+            <span v-else-if="expData.id === '20001' && expData.license.license_type === 'trial'">{{stateItem}} ~ {{endItem}}</span>
             <span v-else>-</span>
           </div>
         </div>
@@ -92,6 +92,8 @@
 </template>
 
 <script>
+import bus from '@/libs/bus'
+
 export default {
   name: 'license',
   data () {
@@ -124,11 +126,13 @@ export default {
         if (res.code === 200) {
           this.licenseMark = res.data.license
           this.licenseList = res.data.license.hasp
+          this.licenseList.production_date = bus.timeFormate(bus.computeTimezone(this.licenseList.production_date * 1000))
           this.licenseList.feature.map(e => {
             if (e.id === '20001') {
               this.expData = e
-              this.stateItem = e.license.time_start
-              this.endItem = e.license.end_time * 1 + e.license.time_start * 1
+              this.expData.license.exp_date = bus.timeFormate(bus.computeTimezone(this.expData.license.exp_date * 1000))
+              this.stateItem = bus.timeFormate(bus.computeTimezone(e.license.time_start * 1000))
+              this.endItem = bus.timeFormate(bus.computeTimezone(e.license.time_start * 1000)) + bus.timeFormate(bus.computeTimezone(e.license.end_time * 1000))
             }
           })
         } else {
diff --git a/nezha-fronted/src/permission.js b/nezha-fronted/src/permission.js
index 48bdcd0cc..412b1556f 100644
--- a/nezha-fronted/src/permission.js
+++ b/nezha-fronted/src/permission.js
@@ -18,7 +18,6 @@ router.beforeEach((to, from, next) => {
     Vue.http.get(configUrl).then(config => {
       const appearance = new Promise(resolve => {
         get(config.body.baseUrl + '/sys/appearance').then(res => {
-          // console.log(res)
           if (res.code === 200) {
             localStorage.setItem('nz-sys-name', res.data.system_name || '')
             localStorage.setItem('nz-sys-logo', res.data.system_logo || '')
diff --git a/nezha-fronted/src/store/index.js b/nezha-fronted/src/store/index.js
index 68e0d387b..df64cc92d 100644
--- a/nezha-fronted/src/store/index.js
+++ b/nezha-fronted/src/store/index.js
@@ -172,7 +172,6 @@ const store = new Vuex.Store({
       state.langList = langList
     },
     setTimeFormatMain (state, timeFormat) {
-      console.log(timeFormat)
       state.timeFormatMain = timeFormat
     },
     i18nReady (state, ready) {