From 411edbe62dba280458dc9c9b3d1828ddeb6ba673 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Tue, 19 Jul 2022 16:24:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Ds3=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=94=99=E8=AF=AF=E3=80=81=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E9=A1=B5=E9=9D=A2undefined=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Login.vue                                 |  4 +--
 .../table/report/reportTestTable.vue          | 30 ++++++++++---------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/Login.vue b/src/Login.vue
index 7cb52597..b92eb3c3 100644
--- a/src/Login.vue
+++ b/src/Login.vue
@@ -78,9 +78,6 @@ export default {
             if (!_.isEmpty(res.data.theme)) {
               localStorage.setItem(storageKey.theme, res.data.theme)
             }
-            if (!_.isEmpty(res.data.s3_upload)) {
-              localStorage.setItem(storageKey.s3Enable, res.data.s3_upload)
-            }
             res.loginSuccessPath = this.$route.query.redirect
             this.loginSuccess(res)
             localStorage.setItem(storageKey.username, this.username)
@@ -116,6 +113,7 @@ export default {
       if (_.isEmpty(localStorage.getItem(storageKey.theme))) {
         localStorage.setItem(storageKey.theme, data.theme || 'light')
       }
+      localStorage.setItem(storageKey.s3Enable, data.s3_enable)
       localStorage.setItem(storageKey.sysTimezone, data.timezone)
       window.$dayJs.tz.setDefault(data.timezone)
       localStorage.setItem(storageKey.timezoneOffset, window.$dayJs.tz().utcOffset() / 60)
diff --git a/src/components/table/report/reportTestTable.vue b/src/components/table/report/reportTestTable.vue
index e4c1a409..d6785936 100644
--- a/src/components/table/report/reportTestTable.vue
+++ b/src/components/table/report/reportTestTable.vue
@@ -128,20 +128,22 @@
             >
               <template #reference>
                 <span>
-                  <template v-if="scope.row.config.schedulerConfig.type === 'day'">
-                   {{$t('report.daily')}}
-                  </template>
-                  <template v-else-if="scope.row.config.schedulerConfig.type === 'week'">
-                    {{$t('report.weekly')}}
-                   </template>
-                  <template v-else-if="scope.row.config.schedulerConfig.type === 'month'">
-                    {{$t('report.monthly')}}
-                   </template>
-                  <template v-else-if="scope.row.config.schedulerConfig.type === ''">
-                    {{$t('report.oneTime')}}
-                  </template>
-                  <template v-else>
-                     -
+                  <template v-if="scope.row.config.schedulerConfig">
+                    <template v-if="scope.row.config.schedulerConfig.type === 'day'">
+                     {{$t('report.daily')}}
+                    </template>
+                    <template v-else-if="scope.row.config.schedulerConfig.type === 'week'">
+                      {{$t('report.weekly')}}
+                     </template>
+                    <template v-else-if="scope.row.config.schedulerConfig.type === 'month'">
+                      {{$t('report.monthly')}}
+                     </template>
+                    <template v-else-if="scope.row.config.schedulerConfig.type === ''">
+                      {{$t('report.oneTime')}}
+                    </template>
+                    <template v-else>
+                       -
+                    </template>
                   </template>
                 </span>
               </template>